X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fmono-endian.h;h=8704dc5959d768ec585df4cd4a2ce9596505d978;hb=HEAD;hp=343b97194a2144e4bb4104c6cc07f03014af20ab;hpb=392bae3c453763e8f887f447678ab0202a36228a;p=mono.git

diff --git a/mono/metadata/mono-endian.h b/mono/metadata/mono-endian.h
index 343b97194a2..8704dc5959d 100644
--- a/mono/metadata/mono-endian.h
+++ b/mono/metadata/mono-endian.h
@@ -1,3 +1,7 @@
+/**
+ * \file
+ */
+
 #ifndef _MONO_METADATA_ENDIAN_H_
 #define _MONO_METADATA_ENDIAN_H_ 1
 
@@ -14,7 +18,49 @@ typedef union {
 	unsigned char cval [8];
 } mono_rdouble;
 
-#if NO_UNALIGNED_ACCESS
+#if defined(__s390x__)
+
+#define read16(x)	s390x_read16(*(guint16 *)(x))
+#define read32(x)	s390x_read32(*(guint32 *)(x))
+#define read64(x)	s390x_read64(*(guint64 *)(x))
+
+static __inline__ guint16
+s390x_read16(guint16 x)
+{
+	guint16 ret;
+
+	__asm__ ("	lrvr	%0,%1\n"
+		 "	sra	%0,16\n"
+		 : "=r" (ret) : "r" (x));
+
+	return(ret);
+}
+
+static __inline__ guint32
+s390x_read32(guint32 x)
+{
+	guint32 ret;
+
+	__asm__ ("	lrvr	%0,%1\n"
+		 : "=r" (ret) : "r" (x));
+
+	return(ret);
+}
+
+static __inline__ guint64
+s390x_read64(guint64 x)
+{
+	guint64 ret;
+
+	__asm__ ("	lrvgr	%0,%1\n"
+		 : "=r" (ret) : "r" (x));
+
+	return(ret);
+}
+
+#else
+
+# if NO_UNALIGNED_ACCESS
 
 guint16 mono_read16 (const unsigned char *x);
 guint32 mono_read32 (const unsigned char *x);
@@ -24,12 +70,14 @@ guint64 mono_read64 (const unsigned char *x);
 #define read32(x) (mono_read32 ((const unsigned char *)(x)))
 #define read64(x) (mono_read64 ((const unsigned char *)(x)))
 
-#else
+# 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
+
 #endif
 
 #define readr4(x,dest)	\