X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini-arm.c;h=343cb49b8dc00e45f9b9df396c6d3c2259a37ddd;hb=33861cf32b8df64ed2d01d2581a7982a096485c6;hp=456a8b34250cc5fa765e628179d71c12a4a94442;hpb=8cdb1c959eb82c79c4068a933f7c0cdd8d2f530c;p=mono.git diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c index 456a8b34250..343cb49b8dc 100644 --- a/mono/mini/mini-arm.c +++ b/mono/mini/mini-arm.c @@ -177,30 +177,7 @@ int mono_exc_esp_offset = 0; #define LDR_PC_VAL ((ARMCOND_AL << ARMCOND_SHIFT) | (1 << 26) | (0 << 22) | (1 << 20) | (15 << 12)) #define IS_LDR_PC(val) (((val) & LDR_MASK) == LDR_PC_VAL) -#define ADD_LR_PC_4 ((ARMCOND_AL << ARMCOND_SHIFT) | (1 << 25) | (1 << 23) | (ARMREG_PC << 16) | (ARMREG_LR << 12) | 4) -#define MOV_LR_PC ((ARMCOND_AL << ARMCOND_SHIFT) | (1 << 24) | (0xa << 20) | (ARMREG_LR << 12) | ARMREG_PC) //#define DEBUG_IMT 0 - -/* A variant of ARM_LDR_IMM which can handle large offsets */ -#define ARM_LDR_IMM_GENERAL(code, dreg, basereg, offset, scratch_reg) do { \ - if (arm_is_imm12 ((offset))) { \ - ARM_LDR_IMM (code, (dreg), (basereg), (offset)); \ - } else { \ - g_assert ((scratch_reg) != (basereg)); \ - code = mono_arm_emit_load_imm (code, (scratch_reg), (offset)); \ - ARM_LDR_REG_REG (code, (dreg), (basereg), (scratch_reg)); \ - } \ - } while (0) - -#define ARM_STR_IMM_GENERAL(code, dreg, basereg, offset, scratch_reg) do { \ - if (arm_is_imm12 ((offset))) { \ - ARM_STR_IMM (code, (dreg), (basereg), (offset)); \ - } else { \ - g_assert ((scratch_reg) != (basereg)); \ - code = mono_arm_emit_load_imm (code, (scratch_reg), (offset)); \ - ARM_STR_REG_REG (code, (dreg), (basereg), (scratch_reg)); \ - } \ - } while (0) #ifndef DISABLE_JIT static void mono_arch_compute_omit_fp (MonoCompile *cfg); @@ -1116,8 +1093,6 @@ mono_arch_get_allocatable_int_vars (MonoCompile *cfg) return vars; } -#define USE_EXTRA_TEMPS 0 - GList * mono_arch_get_global_int_regs (MonoCompile *cfg) {