[runtime] Fix a few more places which accessed jinfo->method directly.
[mono.git] / mono / mini / mini-s390x.h
index 3de7f0b0e2b68ee40b27e96f8b6ba4eb61c5beef..a5be8f01087162cbde7ed649cf1cb945bc0464aa 100644 (file)
@@ -2,6 +2,7 @@
 #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
@@ -14,7 +15,7 @@
 /*-------------------------------------------*/
 
 #define S390_LONG(loc, opy, op, r, ix, br, off)                                        \
-       if (has_ld) {                                                           \
+       if (mono_hwcap_s390x_has_ld) {                                          \
                if (s390_is_imm20(off)) {                                       \
                        s390_##opy (loc, r, ix, br, off);                       \
                } else {                                                        \
@@ -47,8 +48,6 @@ struct MonoLMF {
        gdouble     fregs[16];
 };
 
-typedef struct ucontext MonoContext;
-
 typedef struct MonoCompileArch {
        gpointer    litpool;
        glong       litsize;
@@ -63,19 +62,72 @@ typedef struct
        void *return_address;
 } MonoS390StackFrame;
 
+typedef struct
+{
+       char    n3:1;           // N3 instructions present
+       char    zArch:1;        // z/Architecture mode installed
+       char    zAct:1;         // z/Architecture mode active
+       char    date:1;         // DATE enhancement facility
+       char    idte1:1;        // IDTE present (PST)
+       char    idte2:1;        // IDTE present (REG)
+       char    asnlx:1;        // ASN and LX reuse facility
+       char    stfle:1;        // STFLE installed
+       char    zDATe:1;        // Enhanced DAT in z mode
+       char    srstat:1;       // Sense running status facility
+       char    cSSKE:1;        // Conditional SSKE facility
+       char    topo:1;         // COnfiguration topology facility
+       char    xTrans2:1;      // Extended translation facility 2
+       char    msgSec:1;       // Message security facility
+       char    longDsp:1;      // Long displacement facility
+       char    hiPerfLD:1;     // High performance long displacement facility
+       char    hfpMAS:1;       // HFP multiply-and-add/subtrace facility
+       char    xImm:1;         // Extended immediate facility
+       char    xTrans3:1;      // Extended translation facility 3
+       char    hfpUnX:1;       // HFP unnormalized extension facility
+       char    etf2:1;         // ETF2-enhancement facility
+       char    stckf:1;        // Store-clock-fast facility
+       char    parse:1;        // Parsing enhancement facility
+       char    mvcos:1;        // MVCOS facility
+       char    todSteer:1;     // TOD-clock steering facility
+       char    etf3:1;         // ETF3-enhancement facility
+       char    xCPUtm:1;       // Extract CPU time facility
+       char    csst:1;         // Compare-swap-and-store facility
+       char    csst2:1;        // Compare-swap-and-store facility 2
+       char    giX:1;          // General instructions extension facility
+       char    exX:1;          // Execute extensions facility
+       char    ibm:1;          // IBM internal use
+       char    fps:1;          // Floating point support enhancement
+       char    dfp:1;          // Decimal floating point facility
+       char    hiDFP:1;        // High Performance DFP facility
+       char    pfpo:1;         // PFPO instruction facility
+} __attribute__((aligned(8))) facilityList_t;
+       
 // #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_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_CREATE_DELEGATE_TRAMPOLINE      1
+#define MONO_ARCH_HAVE_IMT                             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_RGCTX_REG                            MONO_ARCH_IMT_REG
+#define MONO_ARCH_THIS_AS_FIRST_ARG                    1
+#define MONO_ARCH_HAVE_XP_UNWIND                       1
+#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 S390_STACK_ALIGNMENT            8
 #define S390_FIRST_ARG_REG             s390_r2
@@ -98,6 +150,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
@@ -142,32 +195,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                                    */