Merge pull request #868 from mariokmk/master

[mono.git] / mono / metadata / mono-endian.h

diff --git a/mono/metadata/mono-endian.h b/mono/metadata/mono-endian.h
index 8da0e4126e0e6b3bbcd717fe60405bbdc727890d..343b97194a2144e4bb4104c6cc07f03014af20ab 100644 (file)
--- a/mono/metadata/mono-endian.h
+++ b/mono/metadata/mono-endian.h
@@ -1,13 +1,49 @@
 #ifndef _MONO_METADATA_ENDIAN_H_
 #define _MONO_METADATA_ENDIAN_H_ 1
 
-/* FIXME: implement big endian versions */
-
-#define le64_to_cpu(x) (x)
-#define le32_to_cpu(x) (x)
-#define le16_to_cpu(x) (x)
-#define read32(x) le32_to_cpu (*((guint32 *) (x)))
-#define read16(x) le16_to_cpu (*((guint16 *) (x)))
-#define read64(x) le64_to_cpu (*((guint64 *) (x)))
+#include <glib.h>
+
+typedef union {
+       guint32 ival;
+       float fval;
+} mono_rfloat;
+
+typedef union {
+       guint64 ival;
+       double fval;
+       unsigned char cval [8];
+} mono_rdouble;
+
+#if NO_UNALIGNED_ACCESS
+
+guint16 mono_read16 (const unsigned char *x);
+guint32 mono_read32 (const unsigned char *x);
+guint64 mono_read64 (const unsigned char *x);
+
+#define read16(x) (mono_read16 ((const unsigned char *)(x)))
+#define read32(x) (mono_read32 ((const unsigned char *)(x)))
+#define read64(x) (mono_read64 ((const unsigned char *)(x)))
+
+#else
+
+#define read16(x) GUINT16_FROM_LE (*((const guint16 *) (x)))
+#define read32(x) GUINT32_FROM_LE (*((const guint32 *) (x)))
+#define read64(x) GUINT64_FROM_LE (*((const guint64 *) (x)))
+
+#endif
+
+#define readr4(x,dest) \
+       do {    \
+               mono_rfloat mf; \
+               mf.ival = read32 ((x)); \
+               *(dest) = mf.fval;      \
+       } while (0)
+
+#define readr8(x,dest) \
+       do {    \
+               mono_rdouble mf;        \
+               mf.ival = read64 ((x)); \
+               *(dest) = mf.fval;      \
+       } while (0)
 
 #endif /* _MONO_METADATA_ENDIAN_H_ */