Merge pull request #3563 from lewurm/interpreter
[mono.git] / mono / mini / mini-s390x.h
index 3de7f0b0e2b68ee40b27e96f8b6ba4eb61c5beef..5147ad413cea93fc78aec4082299cd09ceede92f 100644 (file)
@@ -2,9 +2,10 @@
 #define __MONO_MINI_S390X_H__
 
 #include <mono/arch/s390x/s390x-codegen.h>
+#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
 /* Parameters used by the register allocator */
 /*-------------------------------------------*/
 
-#define S390_LONG(loc, opy, op, r, ix, br, off)                                        \
-       if (has_ld) {                                                           \
-               if (s390_is_imm20(off)) {                                       \
-                       s390_##opy (loc, r, ix, br, off);                       \
-               } else {                                                        \
-                       s390_basr (code, s390_r13, 0);                          \
-                       s390_j    (code, 6);                                    \
-                       s390_llong(code, off);                                  \
-                       s390_lg   (code, s390_r13, 0, s390_r13, 4);             \
-                       s390_##op (code, r, s390_r13, br, 0);                   \
-               }                                                               \
-       } else {                                                                \
-               if (s390_is_uimm12(off)) {                                      \
-                       s390_##op (loc, r, ix, br, off);                        \
-               } else {                                                        \
-                       s390_basr (code, s390_r13, 0);                          \
-                       s390_j    (code, 6);                                    \
-                       s390_llong(code, off);                                  \
-                       s390_lg   (code, s390_r13, 0, s390_r13, 4);             \
-                       s390_##op (code, r, s390_r13, br, 0);                   \
-               }                                                               \
-       }
-
 struct MonoLMF {
        gpointer    previous_lmf;
        gpointer    lmf_addr;
@@ -47,8 +25,6 @@ struct MonoLMF {
        gdouble     fregs[16];
 };
 
-typedef struct ucontext MonoContext;
-
 typedef struct MonoCompileArch {
        gpointer    litpool;
        glong       litsize;
@@ -64,29 +40,34 @@ typedef struct
 } MonoS390StackFrame;
 
 // #define MONO_ARCH_SIGSEGV_ON_ALTSTACK               1
-#define MONO_ARCH_EMULATE_LCONV_TO_R8_UN       1
-#define MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS     1
-#define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS    1
-#define MONO_ARCH_HAVE_IS_INT_OVERFLOW         1
-#define MONO_ARCH_NEED_DIV_CHECK               1
-#define MONO_ARCH_HAVE_ATOMIC_ADD 1
-#define MONO_ARCH_HAVE_ATOMIC_EXCHANGE 1
-#define MONO_ARCH_SIGNAL_STACK_SIZE            256*1024
-#define MONO_ARCH_HAVE_DECOMPOSE_OPTS 1
-// #define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION       1
-
-#define MONO_ARCH_USE_SIGACTION        1
+#define MONO_ARCH_EMULATE_LCONV_TO_R8_UN               1
+#define MONO_ARCH_NO_EMULATE_LONG_MUL_OPTS             1
+#define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS            1
+#define MONO_ARCH_HAVE_IS_INT_OVERFLOW                 1
+#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_ENABLE_MONO_LMF_VAR                  1
+#define MONO_ARCH_IMT_REG                              s390_r9
+#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
+#define MONO_ARCH_HAVE_CONTEXT_SET_INT_REG             1
+#define MONO_ARCH_USE_SIGACTION                        1
+#define MONO_ARCH_GC_MAPS_SUPPORTED                    1
+#define MONO_ARCH_GSHARED_SUPPORTED                    1
+#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_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
 #define S390_LAST_ARG_REG              s390_r6
 #define S390_FIRST_FPARG_REG           s390_f0
 #define S390_LAST_FPARG_REG            s390_f6
-#define S390_PASS_STRUCTS_BY_VALUE      1
-#define S390_SMALL_RET_STRUCT_IN_REG    1
-
-#define S390_NUM_REG_ARGS (S390_LAST_ARG_REG-S390_FIRST_ARG_REG+1)
-#define S390_NUM_REG_FPARGS ((S390_LAST_FPARG_REG-S390_FIRST_FPARG_REG)/2)
 
 /*===============================================*/
 /* Definitions used by mini-codegen.c            */
@@ -98,6 +79,7 @@ typedef struct
 /* s390_r8..s390_r11 are used for global regalloc       */
 /* s390_r15 is the stack pointer                        */
 /*------------------------------------------------------*/
+
 #define MONO_ARCH_CALLEE_REGS (0xfc)
 
 #define MONO_ARCH_CALLEE_SAVED_REGS 0xff80
@@ -114,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'))
 
@@ -128,7 +111,13 @@ typedef struct
 #define MONO_ARCH_FRAME_ALIGNMENT 8
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_RETREG1 s390_r2
+/*-----------------------------------------------*/
+/* 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          */
@@ -142,32 +131,16 @@ typedef struct
 #define S390_CC_EQ                     8
 #define S390_ALIGN(v, a)       (((a) > 0 ? (((v) + ((a) - 1)) & ~((a) - 1)) : (v)))
 
-#define MONO_CONTEXT_SET_IP(ctx,ip)                                    \
-       do {                                                            \
-               (ctx)->uc_mcontext.gregs[14] = (unsigned long)ip;       \
-               (ctx)->uc_mcontext.psw.addr = (unsigned long)ip;        \
-       } while (0); 
-
-#define MONO_CONTEXT_SET_SP(ctx,bp) MONO_CONTEXT_SET_BP((ctx),(bp))
-#define MONO_CONTEXT_SET_BP(ctx,bp)                                    \
-       do {                                                            \
-               (ctx)->uc_mcontext.gregs[15] = (unsigned long)bp;       \
-               (ctx)->uc_stack.ss_sp        = (void*)bp;               \
-       } while (0) 
-
-#define MONO_CONTEXT_GET_IP(ctx) (gpointer) (ctx)->uc_mcontext.psw.addr
-#define MONO_CONTEXT_GET_BP(ctx) MONO_CONTEXT_GET_SP((ctx))
-#define MONO_CONTEXT_GET_SP(ctx) ((gpointer)((ctx)->uc_mcontext.gregs[15]))
-
 #define MONO_INIT_CONTEXT_FROM_FUNC(ctx,func) do {                     \
                MonoS390StackFrame *sframe;                             \
                __asm__ volatile("lgr   %0,15" : "=r" (sframe));        \
                MONO_CONTEXT_SET_BP ((ctx), sframe->prev);              \
                MONO_CONTEXT_SET_SP ((ctx), sframe->prev);              \
-               sframe = (MonoS390StackFrame*)sframe->prev;             \
-               MONO_CONTEXT_SET_IP ((ctx), sframe->return_address);    \
+               MONO_CONTEXT_SET_IP ((ctx), func);                      \
        } while (0)
 
+#define MONO_ARCH_INIT_TOP_LMF_ENTRY(lmf) do { (lmf)->ebp = -1; } while (0)
+
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - s390_patch_rel                                    */