X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Ftypes.h;h=1516bc2178c39056e8431a72f4cf6d2b8d53b777;hp=69cb16a28d704a648e074da0e6eaa077360df5a5;hb=4e7ec0893969bda2ee77cb89617f909a45e8ff0f;hpb=cb582796539d35920e918bec2d0118eb3736d40e

diff --git a/src/helper/types.h b/src/helper/types.h
index 69cb16a28d..1516bc2178 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -2,6 +2,9 @@
  *   Copyright (C) 2004, 2005 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -20,7 +23,13 @@
 #ifndef TYPES_H
 #define TYPES_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
 #ifndef u8
 typedef unsigned char u8;
@@ -38,52 +47,94 @@ typedef unsigned int u32;
 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 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); \
-	} while (0)
-
-#define h_u16_to_le(buf, val)  \
-	do { \
-		buf[0] = (val & 0xff000) >> 8; \
-		buf[1] = (val & 0x00ff); \
-	} while (0)
-
-#define h_u32_to_be(buf, val) do { *(u32*)(buf) = (val); } while (0)
-#define h_u16_to_be(buf, val) do { *(u16*)(buf) = (val); } while (0)
-
-#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 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); \
-	} while (0)
-
-#define h_u16_to_be(buf, val) \
-	do { \
-		buf[0] = (val & 0xff000) >> 8; \
-		buf[1] = (val & 0x00ff); \
-	} while (0)
-#endif
+typedef struct jtag_tap_s jtag_tap_t;
+
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#else	/* HAVE_STDBOOL_H */
+#define __bool_true_false_are_defined 1
+
+#ifndef HAVE__BOOL
+#ifndef __cplusplus
+
+#define false	0
+#define true		1
+
+typedef int _Bool;
+#else 
+typedef bool _Bool;
+#endif	/* __cplusplus */
+#endif	/* HAVE__BOOL */
+
+#define bool _Bool
+
+#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.
+ */
+
+
+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 */