Changeset 3569 for trunk/kStuff/include/k

Timestamp:

Aug 31, 2007, 4:16:27 AM (18 years ago)

Author:

bird

Message:

Dropped kLdrBase.h

Location:

trunk/kStuff/include/k

Files:

• kDefs.h (modified) (1 diff)
• kLdrFmts/lx.h (modified) (1 diff)
• kLdrFmts/mach-o.h (modified) (3 diffs)
• kLdrFmts/mz.h (modified) (1 diff)
• kLdrFmts/pe.h (modified) (1 diff)

trunk/kStuff/include/k/kDefs.h

@@ -252 +252 @@
 /** @def K_E2E_U16
  * Convert the endian of an unsigned 16-bit value. */
-# define K_E2E_U16(u16)         ( (uint16_t) (((u16) >> 8) | ((u16) << 8)) )
+# define K_E2E_U16(u16)         ( (KU16) (((u16) >> 8) | ((u16) << 8)) )
 /** @def K_E2E_U32
  * Convert the endian of an unsigned 32-bit value. */
-# define K_E2E_U32(u32)         (   ( ((u32) & UINT32_C(0xff000000)) >> 24 ) \
-                                  | ( ((u32) & UINT32_C(0x00ff0000)) >>  8 ) \
-                                  | ( ((u32) & UINT32_C(0x0000ff00)) <<  8 ) \
-                                  | ( ((u32) & UINT32_C(0x000000ff)) << 24 ) \
+# define K_E2E_U32(u32)         (   ( ((u32) & KU32_C(0xff000000)) >> 24 ) \
+                                  | ( ((u32) & KU32_C(0x00ff0000)) >>  8 ) \
+                                  | ( ((u32) & KU32_C(0x0000ff00)) <<  8 ) \
+                                  | ( ((u32) & KU32_C(0x000000ff)) << 24 ) \
                                 )
 /** @def K_E2E_U64
  * Convert the endian of an unsigned 64-bit value. */
-# define K_E2E_U64(u64)         (   ( ((u64) & UINT64_C(0xff00000000000000)) >> 56 ) \
-                                  | ( ((u64) & UINT64_C(0x00ff000000000000)) >> 40 ) \
-                                  | ( ((u64) & UINT64_C(0x0000ff0000000000)) >> 24 ) \
-                                  | ( ((u64) & UINT64_C(0x000000ff00000000)) >>  8 ) \
-                                  | ( ((u64) & UINT64_C(0x00000000ff000000)) <<  8 ) \
-                                  | ( ((u64) & UINT64_C(0x0000000000ff0000)) << 24 ) \
-                                  | ( ((u64) & UINT64_C(0x000000000000ff00)) << 40 ) \
-                                  | ( ((u64) & UINT64_C(0x00000000000000ff)) << 56 ) \
+# define K_E2E_U64(u64)         (   ( ((u64) & KU64_C(0xff00000000000000)) >> 56 ) \
+                                  | ( ((u64) & KU64_C(0x00ff000000000000)) >> 40 ) \
+                                  | ( ((u64) & KU64_C(0x0000ff0000000000)) >> 24 ) \
+                                  | ( ((u64) & KU64_C(0x000000ff00000000)) >>  8 ) \
+                                  | ( ((u64) & KU64_C(0x00000000ff000000)) <<  8 ) \
+                                  | ( ((u64) & KU64_C(0x0000000000ff0000)) << 24 ) \
+                                  | ( ((u64) & KU64_C(0x000000000000ff00)) << 40 ) \
+                                  | ( ((u64) & KU64_C(0x00000000000000ff)) << 56 ) \
                                 )
 

trunk/kStuff/include/k/kLdrFmts/lx.h

@@ -13 +13 @@
 #ifndef IMAGE_OS2_SIGNATURE_LX
 /** LX signature ("LX") */
-# define IMAGE_LX_SIGNATURE  KLDR_LE2H_U16('L' | ('X' << 8))
+# define IMAGE_LX_SIGNATURE  K_LE2H_U16('L' | ('X' << 8))
 #endif
 

trunk/kStuff/include/k/kLdrFmts/mach-o.h

@@ -865 +865 @@
 typedef struct scattered_relocation_info
 {
-#ifdef KLDR_LITTLE_ENDIAN
+#if K_ENDIAN == K_ENDIAN_LITTLE
     KU32        r_address : 24,     /**< Section relative address of the fixup. (macho_relocation_info_t::r_address) */
                 r_type : 4,         /**< Relocation type; 0 is standard, non-zero are machine specific. (macho_relocation_info_t::r_type) */
@@ -871 +871 @@
                 r_pcrel : 1,        /**< PC (program counter) relative fixup; subtract the fixup address. (macho_relocation_info_t::r_pcrel) */
                 r_scattered : 1;    /**< Set if scattered relocation, clear if normal relocation. */
-#elif defined(KLDR_BIG_ENDIAN)
+#elif K_ENDIAN == K_ENDIAN_BIG
     KU32        r_scattered : 1,    /**< Set if scattered relocation, clear if normal relocation. */
                 r_pcrel : 1,        /**< PC (program counter) relative fixup; subtract the fixup address. (macho_relocation_info_t::r_pcrel) */
@@ -878 +878 @@
                 r_address : 24;     /**< Section relative address of the fixup. (macho_relocation_info_t::r_address) */
 #else
-# error "Neither KLDR_LITTLE_ENDIAN nor KLDR_BIG_ENDIAN is defined!"
+# error "Neither K_ENDIAN isn't LITTLE or BIG!"
 #endif
     KI32        r_value;            /**< The value the fixup is refering to (without offset added). */

trunk/kStuff/include/k/kLdrFmts/mz.h

@@ -37 +37 @@
 
 #ifndef IMAGE_DOS_SIGNATURE
-# define IMAGE_DOS_SIGNATURE KLDR_LE2H_U16('M' | ('Z' << 8))
+# define IMAGE_DOS_SIGNATURE K_LE2H_U16('M' | ('Z' << 8))
 #endif
 

trunk/kStuff/include/k/kLdrFmts/pe.h

@@ -19 +19 @@
 *******************************************************************************/
 #ifndef IMAGE_NT_SIGNATURE
-# define  IMAGE_NT_SIGNATURE KLDR_LE2H_U32('P' | ('E' << 8))
+# define  IMAGE_NT_SIGNATURE K_LE2H_U32('P' | ('E' << 8))
 #endif