X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Fmini%2Fmini-arm.h;h=589419e8f83c40e98fcf0495bbe6fc084ff69c17;hb=cdf08abc9dca1fd248f242477601ffc66660327b;hp=f015f903008c6bd7b238ef9694ca78bbe4dc81e1;hpb=42399858d76da2ddcbc91d577df5bee3e729dce9;p=mono.git

diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h
index f015f903008..589419e8f83 100644
--- a/mono/mini/mini-arm.h
+++ b/mono/mini/mini-arm.h
@@ -4,10 +4,32 @@
 #include <mono/arch/arm/arm-codegen.h>
 #include <glib.h>
 
-#if defined(ARM_FPU_NONE) || defined(ARM_FPU_VFP) || defined(__ARM_EABI__)
+#if defined(ARM_FPU_NONE) || (defined(__ARM_EABI__) && !defined(ARM_FPU_VFP))
 #define MONO_ARCH_SOFT_FLOAT 1
 #endif
 
+#if defined(__ARM_EABI__)
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+#define ARM_ARCHITECTURE "armel"
+#else
+#define ARM_ARCHITECTURE "armeb"
+#endif
+#else
+#define ARM_ARCHITECTURE "arm"
+#endif
+
+#if defined(ARM_FPU_FPA)
+#define ARM_FP_MODEL "fpa"
+#elif defined(ARM_FPU_VFP)
+#define ARM_FP_MODEL "vfp"
+#elif defined(ARM_FPU_NONE)
+#define ARM_FP_MODEL "soft-float"
+#else
+#error "At least one of ARM_FPU_NONE or ARM_FPU_FPA or ARM_FPU_VFP must be defined."
+#endif
+
+#define MONO_ARCH_ARCHITECTURE ARM_ARCHITECTURE "," ARM_FP_MODEL
+
 #define MONO_ARCH_CPU_SPEC arm_cpu_desc
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
@@ -32,7 +54,12 @@
 #define MONO_ARCH_CALLEE_REGS ((1<<ARMREG_R0) | (1<<ARMREG_R1) | (1<<ARMREG_R2) | (1<<ARMREG_R3) | (1<<ARMREG_IP))
 #define MONO_ARCH_CALLEE_SAVED_REGS ((1<<ARMREG_V1) | (1<<ARMREG_V2) | (1<<ARMREG_V3) | (1<<ARMREG_V4) | (1<<ARMREG_V5) | (1<<ARMREG_V6) | (1<<ARMREG_V7))
 
+#ifdef ARM_FPU_VFP
+/* Every double precision vfp register, d0 is reserved for a scratch reg */
+#define MONO_ARCH_CALLEE_FREGS 0x55555554
+#else
 #define MONO_ARCH_CALLEE_FREGS 0xf
+#endif
 #define MONO_ARCH_CALLEE_SAVED_FREGS 0
 
 #define MONO_ARCH_USE_FPSTACK FALSE
@@ -41,11 +68,11 @@
 #define MONO_ARCH_INST_SREG2_MASK(ins) (0)
 
 #ifdef MONO_ARCH_SOFT_FLOAT
-#define MONO_ARCH_INST_FIXED_REG(desc) (((desc) == 'l' || (desc == 'f') || (desc == 'g'))? ARM_LSW_REG: -1)
+#define MONO_ARCH_INST_FIXED_REG(desc) (((desc) == 'l' || (desc == 'f') || (desc == 'g')) ? ARM_LSW_REG: (((desc) == 'a') ? ARMREG_R0 : -1))
 #define MONO_ARCH_INST_IS_REGPAIR(desc) ((desc) == 'l' || (desc) == 'L' || (desc) == 'f' || (desc) == 'g')
 #define MONO_ARCH_INST_IS_FLOAT(desc) (FALSE)
 #else
-#define MONO_ARCH_INST_FIXED_REG(desc) (((desc) == 'l')? ARM_LSW_REG: -1)
+#define MONO_ARCH_INST_FIXED_REG(desc) (((desc) == 'l')? ARM_LSW_REG: (((desc) == 'a') ? ARMREG_R0 : -1))
 #define MONO_ARCH_INST_IS_REGPAIR(desc) (desc == 'l' || desc == 'L')
 #define MONO_ARCH_INST_IS_FLOAT(desc) ((desc == 'f') || (desc == 'g'))
 #endif
@@ -57,10 +84,12 @@
  * reproduceable results for benchmarks */
 #define MONO_ARCH_CODE_ALIGNMENT 32
 
-#define MONO_ARCH_AOT_PLT_OFFSET_REG ARMREG_IP
-
 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);
+
+void
+mono_arm_throw_exception_by_token (guint32 type_token, unsigned long eip, unsigned long esp, gulong *int_regs, gdouble *fp_regs);
 
 /* keep the size of the structure a multiple of 8 */
 struct MonoLMF {
@@ -102,6 +131,7 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_EMULATE_FREM 1
 #define MONO_ARCH_EMULATE_DIV 1
 #define MONO_ARCH_EMULATE_CONV_R8_UN 1
+#define MONO_ARCH_EMULATE_MUL_OVF 1
 //#define MONO_ARCH_BIGMUL_INTRINS 1
 
 #define ARM_FIRST_ARG_REG 0
@@ -110,17 +140,25 @@ typedef struct MonoCompileArch {
 #define MONO_ARCH_USE_SIGACTION 1
 #define MONO_ARCH_NEED_DIV_CHECK 1
 
+#define MONO_ARCH_HAVE_THROW_CORLIB_EXCEPTION 1
 #define MONO_ARCH_HAVE_CREATE_TRAMPOLINE_FROM_TOKEN
 #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE
 #define MONO_ARCH_COMMON_VTABLE_TRAMPOLINE 1
+#define MONO_ARCH_HAVE_XP_UNWIND 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_AOT_SUPPORTED 1
 
+/* ARM doesn't have too many registers, so we have to use a callee saved one */
+#define MONO_ARCH_RGCTX_REG ARMREG_V5
+/* First argument reg */
+#define MONO_ARCH_VTABLE_REG ARMREG_R0
+
 /* we have the stack pointer, not the base pointer in sigcontext */
 #define MONO_CONTEXT_SET_IP(ctx,ip) do { (ctx)->eip = (int)ip; } while (0); 
 #define MONO_CONTEXT_SET_BP(ctx,bp) do { (ctx)->ebp = (int)bp; } while (0); 
@@ -136,5 +174,21 @@ typedef struct MonoCompileArch {
 		MONO_CONTEXT_SET_IP ((ctx), (func));	\
 	} while (0)
 
+#if __APPLE__
+	#define UCONTEXT_REG_PC(ctx) ((ctx)->uc_mcontext->__ss.__pc)
+	#define UCONTEXT_REG_SP(ctx) ((ctx)->uc_mcontext->__ss.__sp)
+	#define UCONTEXT_REG_R4(ctx) ((ctx)->uc_mcontext->__ss.__r[4])
+#else
+	#define UCONTEXT_REG_PC(ctx) ((ctx)->sig_ctx.arm_pc)
+	#define UCONTEXT_REG_SP(ctx) ((ctx)->sig_ctx.arm_sp)
+	#define UCONTEXT_REG_R4(ctx) ((ctx)->sig_ctx.arm_r4)
+#endif
+
+void
+mono_arm_throw_exception (MonoObject *exc, unsigned long eip, unsigned long esp, gulong *int_regs, gdouble *fp_regs);
+
+void
+mono_arm_throw_exception_by_token (guint32 type_token, unsigned long eip, unsigned long esp, gulong *int_regs, gdouble *fp_regs);
+
 #endif /* __MONO_MINI_ARM_H__ */