X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhelper%2Ftypes.h;h=047f76c2fda4c5970b8e8dd48e046aeeecefafc1;hb=647e61cc6d9b13dd2799d2302ce9289a1627e36c;hp=641190d8920a2a9352722eab919667c959b28454;hpb=0cba0d4df3fe120f08945703506f8405760325c9;p=openocd

diff --git a/src/helper/types.h b/src/helper/types.h
index 641190d8..047f76c2 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -45,37 +45,87 @@ typedef unsigned long long u64;
 
 typedef struct jtag_tap_s jtag_tap_t;
 
-/* DANGER!!!! here be dragons! Note that the pointer in 
- * memory might be unaligned. On some CPU's, i.e. ARM7,
- * the 2 lsb are ignored for 32 bit access, on others
- * it will cause an exception and on e.g. x86, it works
- * the same as if aligned.
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#else	/* HAVE_STDBOOL_H */
+#define __bool_true_false_are_defined 1
+
+#ifndef __cplusplus
+
+#define false	0
+#define true		1
+
+#define bool		_Bool
+typedef int _Bool;
+#endif	/* __cplusplus */
+
+#endif	/* HAVE_STDBOOL_H */
+
+/* DANGER!!!! here be dragons!
+ *
+ * Leave these fn's as byte accesses because it is safe
+ * across architectures. Clever usage of 32 bit access
+ * will create problems on some hosts.
+ *
+ * Note that the "buf" pointer in memory is probably unaligned.
+ *
+ * Were these functions to be re-written to take a 32 bit wide or 16 bit wide
+ * memory access shortcut, then on some CPU's, i.e. ARM7, the 2 lsbytes of the address are
+ * ignored for 32 bit access, whereas on other CPU's a 32 bit wide unaligned memory access
+ * will cause an exception, and lastly on x86, an unaligned "greater than bytewide"
+ * memory access works as if aligned.  So what follows below will work for all
+ * platforms and gives the compiler leeway to do its own platform specific optimizations.
+ *
+ * Again, note that the "buf" pointer in memory is probably unaligned.
  */
-#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)[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 {\
-	(buf)[3] = ((val) & 0xff000000) >> 24;\
-	(buf)[2] = ((val) & 0x00ff0000) >> 16;\
-	(buf)[1] = ((val) & 0x0000ff00) >> 8;\
-	(buf)[0] = ((val) & 0x000000ff);\
-} 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);\
-} while (0)
-
-#define h_u16_to_le(buf, val) do {\
-	(buf)[1] = ((val) & 0xff00) >> 8;\
-	(buf)[0] = ((val) & 0x00ff) >> 0;\
-} while (0)
-#define h_u16_to_be(buf, val) do {\
-	(buf)[0] = ((val) & 0xff00) >> 8;\
-	(buf)[1] = ((val) & 0x00ff) >> 0;\
-} while (0)
+
+
+static inline u32 le_to_h_u32(const u8* buf)
+{
+	return (u32)(buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24);
+}
+
+static inline u16 le_to_h_u16(const u8* buf)
+{
+	return (u16)(buf[0] | buf[1] << 8);
+}
+
+static inline u32 be_to_h_u32(const u8* buf)
+{
+	return (u32)(buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24);
+}
+
+static inline u16 be_to_h_u16(const u8* buf)
+{
+	return (u16)(buf[1] | buf[0] << 8);
+}
+
+static inline void h_u32_to_le(u8* buf, int val)
+{
+	buf[3] = (u8) (val >> 24);
+	buf[2] = (u8) (val >> 16);
+	buf[1] = (u8) (val >> 8);
+	buf[0] = (u8) (val >> 0);
+}
+
+static inline void h_u32_to_be(u8* buf, int val)
+{
+	buf[0] = (u8) (val >> 24);
+	buf[1] = (u8) (val >> 16);
+	buf[2] = (u8) (val >> 8);
+	buf[3] = (u8) (val >> 0);
+}
+
+static inline void h_u16_to_le(u8* buf, int val)
+{
+	buf[1] = (u8) (val >> 8);
+	buf[0] = (u8) (val >> 0);
+}
+
+static inline void h_u16_to_be(u8* buf, int val)
+{
+	buf[0] = (u8) (val >> 8);
+	buf[1] = (u8) (val >> 0);
+}
 
 #endif /* TYPES_H */