Merge pull request #1369 from DynamicDevices/ajl/appveyor

[mono.git] / mono / mini / mini-arm.h

diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h
index 44282055df6cf9b48b05ec3f5a842fcd00b75062..f22514b61ef3e58d2d6acbc1a1e4132e1ebc76c1 100644 (file)
--- a/mono/mini/mini-arm.h
+++ b/mono/mini/mini-arm.h
@@ -52,7 +52,6 @@
 #endif
 
 #define MONO_MAX_IREGS 16
-#define MONO_MAX_FREGS 32
 
 #define MONO_SAVED_GREGS 10 /* r4-r11, ip, lr */
 
@@ -77,6 +76,8 @@
 
 #if defined(ARM_FPU_VFP_HARD)
 #define MONO_SAVED_FREGS 16
+#define MONO_MAX_FREGS 32
+
 /*
  * d8-d15 must be preserved across function calls. We use d14-d15 as
  * scratch registers in the JIT. The rest have no meaning tied to them.
@@ -84,7 +85,9 @@
 #define MONO_ARCH_CALLEE_FREGS 0x00005555
 #define MONO_ARCH_CALLEE_SAVED_FREGS 0x55550000
 #else
-#define MONO_SAVED_FREGS 0
+#define MONO_SAVED_FREGS 8
+#define MONO_MAX_FREGS 16
+
 /*
  * No registers need to be preserved across function calls. We use d0-d1
  * as scratch registers in the JIT. The rest have no meaning tied to them.
@@ -121,6 +124,17 @@
  * reproduceable results for benchmarks */
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
+/* Argument marshallings for calls between gsharedvt and normal code */
+typedef enum {
+       GSHAREDVT_ARG_NONE = 0,
+       GSHAREDVT_ARG_BYVAL_TO_BYREF = 1,
+       GSHAREDVT_ARG_BYREF_TO_BYVAL = 2,
+       GSHAREDVT_ARG_BYREF_TO_BYVAL_I1 = 3,
+       GSHAREDVT_ARG_BYREF_TO_BYVAL_I2 = 4,
+       GSHAREDVT_ARG_BYREF_TO_BYVAL_U1 = 5,
+       GSHAREDVT_ARG_BYREF_TO_BYVAL_U2 = 6
+} GSharedVtArgMarshal;
+
 /* Return value marshalling for calls between gsharedvt and normal code */
 typedef enum {
        GSHAREDVT_RET_NONE = 0,
@@ -153,6 +167,23 @@ typedef struct {
        int map [MONO_ZERO_LEN_ARRAY];
 } GSharedVtCallInfo;
 
+/* Structure used by the sequence points in AOTed code */
+typedef struct {
+       gpointer ss_trigger_page;
+       gpointer bp_trigger_page;
+       guint8* bp_addrs [MONO_ZERO_LEN_ARRAY];
+} SeqPointInfo;
+
+
+#define PARAM_REGS 4
+#define DYN_CALL_STACK_ARGS 6
+
+typedef struct {
+       mgreg_t regs [PARAM_REGS + DYN_CALL_STACK_ARGS];
+       mgreg_t res, res2;
+       guint8 *ret;
+} DynCallArgs;
+
 void arm_patch (guchar *code, const guchar *target);
 guint8* mono_arm_emit_load_imm (guint8 *code, int dreg, guint32 val);
 int mono_arm_is_rotated_imm8 (guint32 val, gint *rot_amount);
@@ -199,6 +230,8 @@ typedef struct MonoCompileArch {
        gpointer seq_point_bp_method_var;
        gboolean omit_fp, omit_fp_computed;
        gpointer cinfo;
+       gpointer *vfp_scratch_slots [2];
+       int atomic_tmp_offset;
 } MonoCompileArch;
 
 #define MONO_ARCH_EMULATE_FCONV_TO_I8 1
@@ -223,25 +256,25 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_NEED_DIV_CHECK 1
 
 #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
-#define MONO_ARCH_HAVE_XP_UNWIND 1
 #define MONO_ARCH_HAVE_GENERALIZED_IMT_THUNK 1
 
 #define ARM_NUM_REG_ARGS (ARM_LAST_ARG_REG-ARM_FIRST_ARG_REG+1)
 #define ARM_NUM_REG_FPARGS 0
 
 #define MONO_ARCH_HAVE_FULL_AOT_TRAMPOLINES 1
-#define MONO_ARCH_HAVE_IMT 1
 #define MONO_ARCH_HAVE_DECOMPOSE_LONG_OPTS 1
 
 #define MONO_ARCH_AOT_SUPPORTED 1
 #define MONO_ARCH_LLVM_SUPPORTED 1
-#define MONO_ARCH_THIS_AS_FIRST_ARG 1
 
 #define MONO_ARCH_GSHARED_SUPPORTED 1
 #define MONO_ARCH_DYN_CALL_SUPPORTED 1
 #define MONO_ARCH_DYN_CALL_PARAM_AREA 24
 
+#ifndef MONO_CROSS_COMPILE
 #define MONO_ARCH_SOFT_DEBUG_SUPPORTED 1
+#endif
+
 #define MONO_ARCH_HAVE_EXCEPTIONS_INIT 1
 #define MONO_ARCH_HAVE_GET_TRAMPOLINES 1
 #define MONO_ARCH_HAVE_CONTEXT_SET_INT_REG 1
@@ -249,12 +282,16 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_GC_MAPS_SUPPORTED 1
 #define MONO_ARCH_HAVE_SETUP_ASYNC_CALLBACK 1
 #define MONO_ARCH_HAVE_CONTEXT_SET_INT_REG 1
+#define MONO_ARCH_HAVE_HANDLER_BLOCK_GUARD 1
 #define MONO_ARCH_HAVE_SETUP_RESUME_FROM_SIGNAL_HANDLER_CTX 1
 #define MONO_ARCH_GSHAREDVT_SUPPORTED 1
 #define MONO_ARCH_HAVE_GENERAL_RGCTX_LAZY_FETCH_TRAMPOLINE 1
 #define MONO_ARCH_HAVE_OPCODE_NEEDS_EMULATION 1
 #define MONO_ARCH_HAVE_OBJC_GET_SELECTOR 1
-#define MONO_ARCH_HAVE_CARD_TABLE_WBARRIER_IN_AOT 1
+#ifdef __linux__
+#define MONO_ARCH_HAVE_OP_TAIL_CALL 1
+#endif
+#define MONO_ARCH_HAVE_DUMMY_INIT 1
 
 #if defined(__native_client__)
 #undef MONO_ARCH_SOFT_DEBUG_SUPPORTED