From fb033c53017d42526ec9c612b0f8ecd564c44c7e Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Wed, 19 Nov 2014 19:12:52 -0500 Subject: [PATCH] [jit] Remove some unused defines. --- mono/mini/debug-mini.c | 1 - mono/mini/exceptions-s390x.c | 2 -- mono/mini/ir-emit.h | 2 -- mono/mini/mini-amd64.h | 3 --- mono/mini/mini-arm.c | 25 ------------------------- mono/mini/mini-arm.h | 4 ---- mono/mini/mini-ia64.h | 4 ---- mono/mini/mini-mips.h | 3 --- mono/mini/mini-ppc.h | 4 ---- mono/mini/mini-s390x.h | 7 ------- mono/mini/mini-sparc.h | 2 -- mono/mini/mini-x86.h | 4 ---- mono/mini/mini.c | 2 +- mono/mini/mini.h | 17 ----------------- mono/mini/ssa.c | 1 - 15 files changed, 1 insertion(+), 80 deletions(-) diff --git a/mono/mini/debug-mini.c b/mono/mini/debug-mini.c index 742b6e93d9d..1565a8684f8 100644 --- a/mono/mini/debug-mini.c +++ b/mono/mini/debug-mini.c @@ -16,7 +16,6 @@ #include #include -#define _IN_THE_MONO_DEBUGGER #include #include diff --git a/mono/mini/exceptions-s390x.c b/mono/mini/exceptions-s390x.c index bc05005d01d..8ff629876f5 100644 --- a/mono/mini/exceptions-s390x.c +++ b/mono/mini/exceptions-s390x.c @@ -33,8 +33,6 @@ #define S390_THROWSTACK_ACCREGS (S390_THROWSTACK_FLTREGS+(16*sizeof(gdouble))) #define S390_THROWSTACK_SIZE (S390_THROWSTACK_ACCREGS+(16*sizeof(gint32))) -#define S390_REG_SAVE_R13 (S390_REG_SAVE_OFFSET+(7*sizeof(gulong))) - #define SZ_THROW 384 #define setup_context(ctx) diff --git a/mono/mini/ir-emit.h b/mono/mini/ir-emit.h index c208c2a4b12..2bfd1ac5172 100644 --- a/mono/mini/ir-emit.h +++ b/mono/mini/ir-emit.h @@ -302,8 +302,6 @@ alloc_dreg (MonoCompile *cfg, MonoStackType stack_type) #define NEW_JIT_ICALL_ADDRCONST(cfg,dest,name) NEW_AOTCONST ((cfg), (dest), MONO_PATCH_INFO_JIT_ICALL_ADDR, (name)) -#define GET_VARINFO_INST(cfg,num) ((cfg)->varinfo [(num)]->inst) - #define NEW_VARLOAD(cfg,dest,var,vartype) do { \ MONO_INST_NEW ((cfg), (dest), OP_MOVE); \ (dest)->opcode = mono_type_to_regmove ((cfg), (vartype)); \ diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h index dc43eb731a2..f5c5282a5e5 100755 --- a/mono/mini/mini-amd64.h +++ b/mono/mini/mini-amd64.h @@ -161,9 +161,6 @@ struct sigcontext { * reproduceable results for benchmarks */ #define MONO_ARCH_CODE_ALIGNMENT 32 -#define MONO_ARCH_RETREG1 X86_EAX -#define MONO_ARCH_RETREG2 X86_EDX - /*This is the max size of the locals area of a given frame. I think 1MB is a safe default for now*/ #define MONO_ARCH_MAX_FRAME_SIZE 0x100000 diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c index 9ccc982e37a..50aa640e8b4 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) { diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h index f22514b61ef..e9f99014610 100644 --- a/mono/mini/mini-arm.h +++ b/mono/mini/mini-arm.h @@ -242,7 +242,6 @@ typedef struct MonoCompileArch { #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 #define ARM_LAST_ARG_REG 3 @@ -258,9 +257,6 @@ typedef struct MonoCompileArch { #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE #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_DECOMPOSE_LONG_OPTS 1 diff --git a/mono/mini/mini-ia64.h b/mono/mini/mini-ia64.h index 15bb596d414..928ccfbb535 100644 --- a/mono/mini/mini-ia64.h +++ b/mono/mini/mini-ia64.h @@ -41,9 +41,6 @@ #define MONO_ARCH_CODE_ALIGNMENT 16 -#define MONO_ARCH_RETREG1 IA64_R8 -#define MONO_ARCH_FRETREG1 8 - #define MONO_ARCH_SIGNAL_STACK_SIZE SIGSTKSZ struct MonoLMF { @@ -106,7 +103,6 @@ unw_dyn_region_info_t* mono_ia64_create_unwind_region (Ia64CodegenState *code); #define MONO_ARCH_EMULATE_LCONV_TO_R8_UN 1 #define MONO_ARCH_EMULATE_FREM 1 #define MONO_ARCH_EMULATE_MUL_DIV 1 -#define MONO_ARCH_EMULATE_LONG_MUL_OPTS 1 #define MONO_ARCH_NEED_DIV_CHECK 1 #define MONO_ARCH_HAVE_IS_INT_OVERFLOW 1 diff --git a/mono/mini/mini-mips.h b/mono/mini/mini-mips.h index d8d769130c4..1d84ef867b0 100644 --- a/mono/mini/mini-mips.h +++ b/mono/mini/mini-mips.h @@ -231,7 +231,6 @@ typedef struct MonoCompileArch { #define MONO_ARCH_EMULATE_LCONV_TO_R4 1 #define MONO_ARCH_EMULATE_LCONV_TO_R8_UN 1 #define MONO_ARCH_EMULATE_FREM 1 -#define MONO_ARCH_BIGMUL_INTRINS 1 #endif #if SIZEOF_REGISTER == 8 @@ -330,8 +329,6 @@ typedef struct { #undef DEBUG_EXCEPTIONS -#define MONO_ZERO_REG mips_zero - #define MONO_EMIT_NEW_MIPS_COND_EXC(cfg,cond,sr1,sr2,name) do { \ MonoInst *inst; \ MONO_INST_NEW ((cfg), (inst), cond); \ diff --git a/mono/mini/mini-ppc.h b/mono/mini/mini-ppc.h index 4b39b7ac223..671672c682a 100644 --- a/mono/mini/mini-ppc.h +++ b/mono/mini/mini-ppc.h @@ -93,7 +93,6 @@ typedef struct MonoCompileArch { #define MONO_ARCH_EMULATE_LCONV_TO_R8_UN 1 #define MONO_ARCH_EMULATE_FREM 1 -#define MONO_ARCH_BIGMUL_INTRINS 1 #define MONO_ARCH_GC_MAPS_SUPPORTED 1 /* Parameters used by the register allocator */ @@ -147,7 +146,6 @@ typedef struct MonoCompileArch { #define PPC_MINIMAL_PARAM_AREA_SIZE 64 #define PPC_LAST_FPARG_REG ppc_f13 #define PPC_PASS_STRUCTS_BY_VALUE 1 -#define PPC_SMALL_RET_STRUCT_IN_REG 0 #define PPC_THREAD_PTR_REG ppc_r13 #else #define PPC_RET_ADDR_OFFSET 4 @@ -156,7 +154,6 @@ typedef struct MonoCompileArch { #define PPC_MINIMAL_PARAM_AREA_SIZE 0 #define PPC_LAST_FPARG_REG ppc_f8 #define PPC_PASS_STRUCTS_BY_VALUE 0 -#define PPC_SMALL_RET_STRUCT_IN_REG 1 #define PPC_THREAD_PTR_REG ppc_r2 #endif #define PPC_FIRST_ARG_REG ppc_r3 @@ -194,7 +191,6 @@ typedef struct MonoCompileArch { #define MONO_ARCH_HAVE_OP_TAIL_CALL 1 #define PPC_NUM_REG_ARGS (PPC_LAST_ARG_REG-PPC_FIRST_ARG_REG+1) -#define PPC_NUM_REG_FPARGS (PPC_LAST_FPARG_REG-PPC_FIRST_FPARG_REG+1) #ifdef MONO_CROSS_COMPILE diff --git a/mono/mini/mini-s390x.h b/mono/mini/mini-s390x.h index b40425c6478..7de88fdf1e2 100644 --- a/mono/mini/mini-s390x.h +++ b/mono/mini/mini-s390x.h @@ -68,11 +68,6 @@ typedef struct #define S390_LAST_ARG_REG s390_r6 #define S390_FIRST_FPARG_REG s390_f0 #define S390_LAST_FPARG_REG s390_f6 -#define S390_PASS_STRUCTS_BY_VALUE 1 -#define S390_SMALL_RET_STRUCT_IN_REG 1 - -#define S390_NUM_REG_ARGS (S390_LAST_ARG_REG-S390_FIRST_ARG_REG+1) -#define S390_NUM_REG_FPARGS ((S390_LAST_FPARG_REG-S390_FIRST_FPARG_REG)/2) /*===============================================*/ /* Definitions used by mini-codegen.c */ @@ -115,8 +110,6 @@ typedef struct #define MONO_ARCH_FRAME_ALIGNMENT 8 #define MONO_ARCH_CODE_ALIGNMENT 32 -#define MONO_ARCH_RETREG1 s390_r2 - /*-----------------------------------------------*/ /* Macros used to generate instructions */ /*-----------------------------------------------*/ diff --git a/mono/mini/mini-sparc.h b/mono/mini/mini-sparc.h index ab8e452b70e..2c9d8772f68 100644 --- a/mono/mini/mini-sparc.h +++ b/mono/mini/mini-sparc.h @@ -57,8 +57,6 @@ #define MONO_ARCH_CODE_ALIGNMENT 32 -#define MONO_ARCH_RETREG1 sparc_i0 - #ifdef SPARCV9 #define MONO_SPARC_STACK_BIAS 2047 #else diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h index f6ddc930427..2d9df6a3495 100644 --- a/mono/mini/mini-x86.h +++ b/mono/mini/mini-x86.h @@ -134,9 +134,6 @@ struct sigcontext { * reproduceable results for benchmarks */ #define MONO_ARCH_CODE_ALIGNMENT 32 -#define MONO_ARCH_RETREG1 X86_EAX -#define MONO_ARCH_RETREG2 X86_EDX - /*This is the max size of the locals area of a given frame. I think 1MB is a safe default for now*/ #define MONO_ARCH_MAX_FRAME_SIZE 0x100000 @@ -201,7 +198,6 @@ typedef struct { /* Enables OP_LSHL, OP_LSHL_IMM, OP_LSHR, OP_LSHR_IMM, OP_LSHR_UN, OP_LSHR_UN_IMM */ #define MONO_ARCH_NO_EMULATE_LONG_SHIFT_OPS -#define MONO_ARCH_BIGMUL_INTRINS 1 #define MONO_ARCH_NEED_DIV_CHECK 1 #define MONO_ARCH_HAVE_IS_INT_OVERFLOW 1 #define MONO_ARCH_HAVE_INVALIDATE_METHOD 1 diff --git a/mono/mini/mini.c b/mono/mini/mini.c index a93fe7b550c..00521b5cb52 100755 --- a/mono/mini/mini.c +++ b/mono/mini/mini.c @@ -5431,7 +5431,7 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, JitFl */ //#define DEBUGSSA "logic_run" -#define DEBUGSSA_CLASS "Tests" +//#define DEBUGSSA_CLASS "Tests" #ifdef DEBUGSSA if (!cfg->disable_ssa) { diff --git a/mono/mini/mini.h b/mono/mini/mini.h index a5c5484b59a..7c33eb955dd 100755 --- a/mono/mini/mini.h +++ b/mono/mini/mini.h @@ -113,10 +113,6 @@ #define printf g_print #endif -#if !defined(HAVE_KW_THREAD) || !defined(MONO_ARCH_ENABLE_MONO_LMF_VAR) -#define MONO_JIT_TLS_DATA_HAS_LMF -#endif - #define MONO_TYPE_IS_PRIMITIVE(t) ((!(t)->byref && ((((t)->type >= MONO_TYPE_BOOLEAN && (t)->type <= MONO_TYPE_R8) || ((t)->type >= MONO_TYPE_I && (t)->type <= MONO_TYPE_U))))) /* Constants used to encode different types of methods in AOT */ @@ -352,15 +348,9 @@ typedef struct { #define mono_bitset_foreach_bit(set,b,n) \ for (b = 0; b < n; b++)\ if (mono_bitset_test_fast(set,b)) -#define mono_bitset_foreach_bit_rev(set,b,n) \ - for (b = n - 1; b >= 0; b--)\ - if (mono_bitset_test_fast(set,b)) #else #define mono_bitset_foreach_bit(set,b,n) \ for (b = mono_bitset_find_start (set); b < n && b >= 0; b = mono_bitset_find_first (set, b)) -#define mono_bitset_foreach_bit_rev(set,b,n) \ - for (b = mono_bitset_find_last (set, n - 1); b >= 0; b = b ? mono_bitset_find_last (set, b) : -1) - #endif /* @@ -397,11 +387,6 @@ enum { (dest)->inst.cil_code = (cfg)->ip; \ } while (0) -#define MONO_INST_NEW_CALL_ARG(cfg,dest,op) do { \ - (dest) = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoCallArgParm)); \ - (dest)->ins.opcode = (op); \ - } while (0) - #define MONO_ADD_INS(b,inst) do { \ if ((b)->last_ins) { \ (b)->last_ins->next = (inst); \ @@ -2758,8 +2743,6 @@ enum { SIMD_VERSION_INDEX_END = 6 }; -#define MASK(x) (1 << x) - enum { SIMD_COMP_EQ, SIMD_COMP_LT, diff --git a/mono/mini/ssa.c b/mono/mini/ssa.c index 160db5fec57..8f804b85c93 100644 --- a/mono/mini/ssa.c +++ b/mono/mini/ssa.c @@ -20,7 +20,6 @@ #include #endif -#define USE_ORIGINAL_VARS #define CREATE_PRUNED_SSA //#define DEBUG_SSA 1 -- 2.25.1