- fixed endianness helper macros (thanks to obilix and wiml for finding and fixing...

[openocd.git] / src / helper / types.h

diff --git a/src/helper/types.h b/src/helper/types.h
index 90f493963eb3aacabfe8f8ffff160722960fac11..a68c301ee632946add2fbf64c4baf4d7a90fd992 100644 (file)
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -34,25 +34,29 @@ typedef unsigned short u16;
 typedef unsigned int u32;
 #endif
 
+#ifndef u64
+typedef unsigned long long u64;
+#endif
+
 #ifdef WORDS_BIGENDIAN /* big endian host */
 
-#define le_to_h_u32(x) (u32)(x[0] | x[1] << 8 | x[2] << 16 | x[3] << 24)
-#define le_to_h_u16(x) (u16)(x[0] | x[1] << 8)
+#define le_to_h_u32(x) (u32)((x)[0] | (x)[1] << 8 | (x)[2] << 16 | (x)[3] << 24)
+#define le_to_h_u16(x) (u16)((x)[0] | (x)[1] << 8)
 #define be_to_h_u32(x) (*(u32*)(x))
 #define be_to_h_u16(x) (*(u16*)(x))
 
 #define h_u32_to_le(buf, val) \
        do { \
-               buf[3] = (val & 0xff000000) >> 24; \
-               buf[2] = (val & 0x00ff0000) >> 16; \
-               buf[1] = (val & 0x0000ff00) >> 8; \
-               buf[0] = (val & 0x000000ff); \
+               (buf)[3] = ((val) & 0xff000000) >> 24; \
+               (buf)[2] = ((val) & 0x00ff0000) >> 16; \
+               (buf)[1] = ((val) & 0x0000ff00) >> 8; \
+               (buf)[0] = ((val) & 0x000000ff); \
        } while (0)
 
 #define h_u16_to_le(buf, val)  \
        do { \
-               buf[0] = (val & 0xff000) >> 8; \
-               buf[1] = (val & 0x00ff); \
+               (buf)[0] = ((val) & 0xff000) >> 8; \
+               (buf)[1] = ((val) & 0x00ff); \
        } while (0)
 
 #define h_u32_to_be(buf, val) do { *(u32*)(buf) = (val); } while (0)
@@ -61,24 +65,24 @@ typedef unsigned int u32;
 #else /* little endian host */
 #define le_to_h_u32(x) (*(u32*)(x))
 #define le_to_h_u16(x) (*(u16*)(x))
-#define be_to_h_u32(x) (u32)(x[3] | x[2] << 8 | x[1] << 16 | x[0] << 24)
-#define be_to_h_u16(x) (u16)(x[1] | x[0] << 8)
+#define be_to_h_u32(x) (u32)((x)[3] | (x)[2] << 8 | (x)[1] << 16 | (x)[0] << 24)
+#define be_to_h_u16(x) (u16)((x)[1] | (x)[0] << 8)
 
 #define h_u32_to_le(buf, val) do { *(u32*)(buf) = (val); } while (0)
 #define h_u16_to_le(buf, val) do { *(u16*)(buf) = (val); } while (0)
 
 #define h_u32_to_be(buf, val) \
        do { \
-               buf[0] = (val & 0xff000000) >> 24; \
-               buf[1] = (val & 0x00ff0000) >> 16; \
-               buf[2] = (val & 0x0000ff00) >> 8; \
-               buf[3] = (val & 0x000000ff); \
+               (buf)[0] = ((val) & 0xff000000) >> 24; \
+               (buf)[1] = ((val) & 0x00ff0000) >> 16; \
+               (buf)[2] = ((val) & 0x0000ff00) >> 8; \
+               (buf)[3] = ((val) & 0x000000ff); \
        } while (0)
 
 #define h_u16_to_be(buf, val) \
        do { \
-               buf[0] = (val & 0xff000) >> 8; \
-               buf[1] = (val & 0x00ff); \
+               (buf)[0] = ((val) & 0xff000) >> 8; \
+               (buf)[1] = ((val) & 0x00ff); \
        } while (0)
 #endif