X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Ftramp-arm.c;h=937655f0d70cbb7d5afde33403e6bc144feba4f6;hb=c39718bbb394fe97281e6e64945b4572bef29121;hp=39070e676082c334b01c9a290e9878c65d48eca0;hpb=1022c507525d46416fcd6029121e66ac5cb85a07;p=mono.git diff --git a/mono/mini/tramp-arm.c b/mono/mini/tramp-arm.c index 39070e67608..937655f0d70 100644 --- a/mono/mini/tramp-arm.c +++ b/mono/mini/tramp-arm.c @@ -16,15 +16,13 @@ #include #include #include +#include #include "mini.h" #include "mini-arm.h" #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1)) -static guint8* nullified_class_init_trampoline; - - #ifdef USE_JUMP_TABLES static guint16 @@ -131,16 +129,13 @@ mono_arch_patch_plt_entry (guint8 *code, gpointer *got, mgreg_t *regs, guint8 *a void mono_arch_nullify_class_init_trampoline (guint8 *code, mgreg_t *regs) { - mono_arch_patch_callsite (NULL, code, nullified_class_init_trampoline); + mono_arch_patch_callsite (NULL, code, mini_get_nullified_class_init_trampoline ()); } void mono_arch_nullify_plt_entry (guint8 *code, mgreg_t *regs) { - if (mono_aot_only && !nullified_class_init_trampoline) - nullified_class_init_trampoline = mono_aot_get_trampoline ("nullified_class_init_trampoline"); - - mono_arch_patch_plt_entry (code, NULL, regs, nullified_class_init_trampoline); + mono_arch_patch_plt_entry (code, NULL, regs, mini_get_nullified_class_init_trampoline ()); } #ifndef DISABLE_JIT @@ -179,7 +174,7 @@ emit_bx (guint8* code, int reg) return code; } -/* Stack size for trampoline function +/* Stack size for trampoline function */ #define STACK ALIGN_TO (sizeof (MonoLMF), 8) @@ -201,7 +196,7 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf gpointer *constants; #endif - int cfa_offset, lmf_offset, regsave_size, lr_offset; + int cfa_offset, regsave_size, lr_offset; GSList *unwind_ops = NULL; MonoJumpInfo *ji = NULL; int buf_len; @@ -213,7 +208,12 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf /* Now we'll create in 'buf' the ARM trampoline code. This is the trampoline code common to all methods */ - buf_len = 212; + buf_len = 272; + + /* Add space for saving/restoring VFP regs. */ + if (mono_arm_is_hard_float ()) + buf_len += 8 * 2; + code = buf = mono_global_codeman_reserve (buf_len); /* @@ -222,8 +222,6 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf * saved as sp + LR_OFFSET by the push in the specific trampoline */ - /* The offset of lmf inside the stack frame */ - lmf_offset = STACK - sizeof (MonoLMF); /* The size of the area already allocated by the push in the specific trampoline */ regsave_size = 14 * sizeof (mgreg_t); /* The offset where lr was saved inside the regsave area */ @@ -288,11 +286,13 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf * The pointer to the struct is put in r1. * the iregs array is already allocated on the stack by push. */ - ARM_SUB_REG_IMM8 (code, ARMREG_SP, ARMREG_SP, STACK - regsave_size); + code = mono_arm_emit_load_imm (code, ARMREG_R2, STACK - regsave_size); + ARM_SUB_REG_REG (code, ARMREG_SP, ARMREG_SP, ARMREG_R2); cfa_offset += STACK - regsave_size; mono_add_unwind_op_def_cfa_offset (unwind_ops, code, buf, cfa_offset); /* V1 == lmf */ - ARM_ADD_REG_IMM8 (code, ARMREG_V1, ARMREG_SP, STACK - sizeof (MonoLMF)); + code = mono_arm_emit_load_imm (code, ARMREG_R2, STACK - sizeof (MonoLMF)); + ARM_ADD_REG_REG (code, ARMREG_V1, ARMREG_SP, ARMREG_R2); /* * The stack now looks like: @@ -316,7 +316,8 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf ARM_STR_IMM (code, ARMREG_R2, ARMREG_V1, G_STRUCT_OFFSET (MonoLMF, method)); } /* save caller SP */ - ARM_ADD_REG_IMM8 (code, ARMREG_R2, ARMREG_SP, cfa_offset); + code = mono_arm_emit_load_imm (code, ARMREG_R2, cfa_offset); + ARM_ADD_REG_REG (code, ARMREG_R2, ARMREG_SP, ARMREG_R2); ARM_STR_IMM (code, ARMREG_R2, ARMREG_V1, G_STRUCT_OFFSET (MonoLMF, sp)); /* save caller FP */ ARM_LDR_IMM (code, ARMREG_R2, ARMREG_V1, (G_STRUCT_OFFSET (MonoLMF, iregs) + ARMREG_FP*4)); @@ -329,11 +330,22 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf } ARM_STR_IMM (code, ARMREG_R2, ARMREG_V1, G_STRUCT_OFFSET (MonoLMF, ip)); + /* Save VFP registers. */ + if (mono_arm_is_hard_float ()) { + /* + * Strictly speaking, we don't have to save d0-d7 in the LMF, but + * it's easier than attempting to store them on the stack since + * this trampoline code is pretty messy. + */ + ARM_ADD_REG_IMM8 (code, ARMREG_R0, ARMREG_V1, G_STRUCT_OFFSET (MonoLMF, fregs)); + ARM_FSTMD (code, ARM_VFP_D0, 8, ARMREG_R0); + } + /* * Now we're ready to call xxx_trampoline (). */ /* Arg 1: the saved registers */ - ARM_ADD_REG_IMM8 (code, ARMREG_R0, ARMREG_V1, G_STRUCT_OFFSET (MonoLMF, iregs)); + ARM_ADD_REG_IMM (code, ARMREG_R0, ARMREG_V1, G_STRUCT_OFFSET (MonoLMF, iregs), 0); /* Arg 2: code (next address to the instruction that called us) */ if (tramp_type == MONO_TRAMPOLINE_JUMP) { @@ -413,6 +425,12 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf /* *(lmf_addr) = previous_lmf */ ARM_STR_IMM (code, ARMREG_IP, ARMREG_LR, G_STRUCT_OFFSET (MonoLMF, previous_lmf)); + /* Restore VFP registers. */ + if (mono_arm_is_hard_float ()) { + ARM_ADD_REG_IMM8 (code, ARMREG_R0, ARMREG_V1, G_STRUCT_OFFSET (MonoLMF, fregs)); + ARM_FLDMD (code, ARM_VFP_D0, 8, ARMREG_R0); + } + /* Non-standard function epilogue. Instead of doing a proper * return, we just jump to the compiled code. */ @@ -452,10 +470,6 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf /* Sanity check */ g_assert ((code - buf) <= buf_len); - if (tramp_type == MONO_TRAMPOLINE_CLASS_INIT) - /* Initialize the nullified class init trampoline used in the AOT case */ - nullified_class_init_trampoline = mono_arch_get_nullified_class_init_trampoline (NULL); - if (info) { tramp_name = mono_get_generic_trampoline_name (tramp_type); *info = mono_tramp_info_create (tramp_name, buf, code - buf, ji, unwind_ops); @@ -928,6 +942,13 @@ mono_arch_create_generic_class_init_trampoline (MonoTrampInfo **info, gboolean a g_assert_not_reached (); return NULL; } + +gpointer +mono_arch_get_nullified_class_init_trampoline (MonoTrampInfo **info) +{ + g_assert_not_reached (); + return NULL; +} #endif /* DISABLE_JIT */ @@ -1056,7 +1077,7 @@ mono_arch_get_gsharedvt_arg_trampoline (MonoDomain *domain, gpointer arg, gpoint #endif -#if defined(MONOTOUCH) || defined(MONO_EXTENSIONS) +#if defined(ENABLE_GSHAREDVT) #include "../../../mono-extensions/mono/mini/tramp-arm-gsharedvt.c"