Fri Mar 29 18:09:08 CET 2002 Paolo Molaro <lupus@ximian.com>

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

diff --git a/mono/metadata/mono-endian.h b/mono/metadata/mono-endian.h
index 08075b406ce881bb0ddf414e09b5a1b6552ceba8..c371250f91b0d247089a47f29fda3f018dffec86 100644 (file)
--- a/mono/metadata/mono-endian.h
+++ b/mono/metadata/mono-endian.h
@@ -3,8 +3,6 @@
 
 #include <glib.h>
 
-/* FIXME: implement support for misaligned reads */
-
 typedef union {
        guint32 ival;
        float fval;
@@ -15,9 +13,23 @@ typedef union {
        double fval;
 } mono_rdouble;
 
-#define read16(x) GUINT16_FROM_LE (*((guint16 *) (x)))
-#define read32(x) GUINT32_FROM_LE (*((guint32 *) (x)))
-#define read64(x) GUINT64_FROM_LE (*((guint64 *) (x)))
+#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 ((x)))
+#define read32(x) (mono_read32 ((x)))
+#define read64(x) (mono_read64 ((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 {    \