X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini-s390x.h;h=5147ad413cea93fc78aec4082299cd09ceede92f;hb=bc2340ff3c81fb7f9fabdf5c43142eda685c9198;hp=26ec96de7cb582a6676c1016b34f22ae377a2e6b;hpb=3b193af24d79ff9b76af1677766d096b2a482b0a;p=mono.git

diff --git a/mono/mini/mini-s390x.h b/mono/mini/mini-s390x.h
index 26ec96de7cb..5147ad413ce 100644
--- a/mono/mini/mini-s390x.h
+++ b/mono/mini/mini-s390x.h
@@ -5,7 +5,7 @@
 #include <mono/utils/mono-context.h>
 #include <signal.h>
 
-#define MONO_ARCH_CPU_SPEC s390x_cpu_desc
+#define MONO_ARCH_CPU_SPEC mono_s390x_cpu_desc
 
 #define MONO_MAX_IREGS 16
 #define MONO_MAX_FREGS 16
@@ -47,11 +47,9 @@ typedef struct
 #define MONO_ARCH_NEED_DIV_CHECK			1
 #define MONO_ARCH_SIGNAL_STACK_SIZE 			256*1024
 #define MONO_ARCH_HAVE_DECOMPOSE_OPTS 			1
-#define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE	1
-#define MONO_ARCH_HAVE_TLS_GET				1
 #define MONO_ARCH_ENABLE_MONO_LMF_VAR			1
 #define MONO_ARCH_IMT_REG				s390_r9
-#define MONO_ARCH_VTABLE_REG				MONO_ARCH_IMT_REG
+#define MONO_ARCH_VTABLE_REG				S390_FIRST_ARG_REG
 #define MONO_ARCH_RGCTX_REG				MONO_ARCH_IMT_REG
 #define MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX		1
 #define MONO_ARCH_SOFT_DEBUG_SUPPORTED			1
@@ -62,8 +60,8 @@ typedef struct
 #define MONO_ARCH_MONITOR_ENTER_ADJUSTMENT		1
 #define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD		1
 #define MONO_ARCH_HAVE_INVALIDATE_METHOD		1
-#define MONO_ARCH_MONITOR_OBJECT_REG			s390_r2
-#define MONO_ARCH_LOCK_TAKEN_REG			s390_r1
+#define MONO_ARCH_HAVE_OP_GENERIC_CLASS_INIT		1
+#define MONO_ARCH_HAVE_SETUP_ASYNC_CALLBACK		1
 
 #define S390_STACK_ALIGNMENT		 8
 #define S390_FIRST_ARG_REG 		s390_r2
@@ -98,7 +96,8 @@ typedef struct
 #define MONO_ARCH_FPSTACK_SIZE 0
 
 #define MONO_ARCH_INST_FIXED_REG(desc) ((desc == 'o') ? s390_r2 : 		\
-					((desc == 'g') ? s390_f0 : - 1))
+					((desc == 'g') ? s390_f0 : 		\
+					((desc == 'A') ? S390_FIRST_ARG_REG : -1)))
 
 #define MONO_ARCH_INST_IS_FLOAT(desc)  ((desc == 'f') || (desc == 'g'))
 
@@ -112,6 +111,14 @@ typedef struct
 #define MONO_ARCH_FRAME_ALIGNMENT 8
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
+/*-----------------------------------------------*/
+/* SIMD Related Definitions                      */
+/*-----------------------------------------------*/
+
+#define MONO_MAX_XREGS			31
+#define MONO_ARCH_CALLEE_XREGS		0x0
+#define MONO_ARCH_CALLEE_SAVED_XREGS	0x0
+
 /*-----------------------------------------------*/
 /* Macros used to generate instructions          */
 /*-----------------------------------------------*/