Changeset 2954 for trunk/kLdr/kLdrHlp.h

Timestamp:

Feb 7, 2007, 5:42:32 AM (19 years ago)

Author:

bird

Message:

implemented kldrModMachOPreParseLoadCommands

File:

• trunk/kLdr/kLdrHlp.h (modified) (4 diffs)

trunk/kLdr/kLdrHlp.h

@@ -46 +46 @@
 #define KLDR_ELEMENTS(a)            ( sizeof(a) / sizeof((a)[0]) )
 
-/** @def KLDRHLP_LE2H_U16
- * Unsigned 16-bit little-endian to host translation. */
-/** @def KLDRHLP_LE2H_U32
- * Unsigned 32-bit little-endian to host translation. */
-#if 1
-# define KLDRHLP_LE2H_U16(u16)  ((uint16_t)(u16))
-# define KLDRHLP_LE2H_U32(u32)  ((uint32_t)(u32))
-#else
-# define KLDRHLP_LE2H_U16(u16)  ( (uint16_t) (((u16) >> 8) | ((u16) << 8)) )
-# define KLDRHLP_LE2H_U32(u32)  (   ( ((u32) & UINT32_C(0xff000000)) >> 24 ) \
+
+/** @name Endian Conversion
+ * @{ */
+
+/** @def KLDRHLP_E2E_U16
+ * Convert the endian of an unsigned 16-bit value. */
+# define KLDRHLP_E2E_U16(u16)   ( (uint16_t) (((u16) >> 8) | ((u16) << 8)) )
+/** @def KLDRHLP_E2E_U32
+ * Convert the endian of an unsigned 32-bit value. */
+# define KLDRHLP_E2E_U32(u32)   (   ( ((u32) & UINT32_C(0xff000000)) >> 24 ) \
                                   | ( ((u32) & UINT32_C(0x00ff0000)) >>  8 ) \
                                   | ( ((u32) & UINT32_C(0x0000ff00)) <<  8 ) \
                                   | ( ((u32) & UINT32_C(0x000000ff)) << 24 ) \
                                 )
-#endif
+/** @def KLDRHLP_E2E_U64
+ * Convert the endian of an unsigned 64-bit value. */
+# define KLDRHLP_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 ) \
+                                )
+
+/** @def KLDRHLP_LE2H_U16
+ * Unsigned 16-bit little-endian to host endian. */
+/** @def KLDRHLP_LE2H_U32
+ * Unsigned 32-bit little-endian to host endian. */
+/** @def KLDRHLP_LE2H_U64
+ * Unsigned 64-bit little-endian to host endian. */
+/** @def KLDRHLP_BE2H_U16
+ * Unsigned 16-bit big-endian to host endian. */
+/** @def KLDRHLP_BE2H_U32
+ * Unsigned 32-bit big-endian to host endian. */
+/** @def KLDRHLP_BE2H_U64
+ * Unsigned 64-bit big-endian to host endian. */
+#if 1
+# define KLDRHLP_LE2H_U16(u16)  ((uint16_t)(u16))
+# define KLDRHLP_LE2H_U32(u32)  ((uint32_t)(u32))
+# define KLDRHLP_LE2H_U64(u64)  ((uint32_t)(u32))
+# define KLDRHLP_BE2H_U16(u16)  KLDRHLP_E2E_U16(u16)
+# define KLDRHLP_BE2H_U32(u32)  KLDRHLP_E2E_U32(u32)
+# define KLDRHLP_BE2H_U64(u64)  KLDRHLP_E2E_U64(u64)
+#else
+# define KLDRHLP_LE2H_U16(u16)  KLDRHLP_E2E_U16(u16)
+# define KLDRHLP_LE2H_U32(u32)  KLDRHLP_E2E_U32(u32)
+# define KLDRHLP_LE2H_U32(u64)  KLDRHLP_E2E_U64(u64)
+# define KLDRHLP_BE2H_U16(u16)  ((uint16_t)(u16))
+# define KLDRHLP_BE2H_U32(u32)  ((uint32_t)(u32))
+# define KLDRHLP_BE2H_U64(u64)  ((uint32_t)(u32))
+#endif
+
+/** @} */
+
 
 /*
@@ -174 +215 @@
 #  ifdef __GNUC__
 #   define kldrHlpBreakpoint() do { __asm__ __volatile__ ("int3\n\tnop"); } while (0)
-#  endif 
+#  endif
 #  ifdef _MSC_VER
 #   define kldrHlpBreakpoint() __debugbreak()
-#  endif 
-
-#endif 
+#  endif
+
+#endif
 
 #if (!defined(kLdrHlpMemChr) && !defined(kLdrHlpStrChr_needed))\
@@ -196 +237 @@
 #ifdef __cplusplus
 extern "C" {
-#endif 
+#endif
 
 int     kLdrHlpMemIComp(const void *pv1, const void *pv2, size_t cb);
@@ -230 +271 @@
 #ifdef __cplusplus
 }
-#endif 
+#endif