diff options
| -rw-r--r-- | src/jit/compiler.h | 5 | ||||
| -rw-r--r-- | src/jit/target.h | 80 |
2 files changed, 4 insertions, 81 deletions
diff --git a/src/jit/compiler.h b/src/jit/compiler.h index 8dd365428d..516790e769 100644 --- a/src/jit/compiler.h +++ b/src/jit/compiler.h @@ -10130,11 +10130,6 @@ extern const BYTE genActualTypes[]; /*****************************************************************************/ -#define REG_CORRUPT regNumber(REG_NA + 1) -#define RBM_CORRUPT (RBM_ILLEGAL | regMaskTP(1)) - -/*****************************************************************************/ - extern BasicBlock dummyBB; /*****************************************************************************/ diff --git a/src/jit/target.h b/src/jit/target.h index 98b3421e3a..304c7b07fb 100644 --- a/src/jit/target.h +++ b/src/jit/target.h @@ -374,20 +374,7 @@ typedef unsigned char regNumberSmall; #define CALLEE_SAVED_REG_MAXSZ (CNT_CALLEE_SAVED*REGSIZE_BYTES) // EBX,ESI,EDI,EBP - // We reuse the ESP register as a illegal value in the register predictor - #define RBM_ILLEGAL RBM_ESP - // We reuse the ESP register as a flag for last use handling in the register predictor - #define RBM_LASTUSE RBM_ESP - // We're using the encoding for ESP to indicate a half-long on the frame - #define REG_L_STK REG_ESP - - // This is the first register in REG_TMP_ORDER #define REG_TMP_0 REG_EAX - #define RBM_TMP_0 RBM_EAX - - // This is the second register in REG_TMP_ORDER - #define REG_TMP_1 REG_EDX - #define RBM_TMP_1 RBM_EDX #define REG_LNGARG_LO REG_EAX #define RBM_LNGARG_LO RBM_EAX @@ -403,7 +390,6 @@ typedef unsigned char regNumberSmall; // This is a general scratch register that does not conflict with the argument registers #define REG_SCRATCH REG_EAX - #define RBM_SCRATCH RBM_EAX // Where is the exception object on entry to the handler block? #define REG_EXCEPTION_OBJECT REG_EAX @@ -455,9 +441,6 @@ typedef unsigned char regNumberSmall; #define REG_NEXT(reg) ((regNumber)((unsigned)(reg) + 1)) #define REG_PREV(reg) ((regNumber)((unsigned)(reg) - 1)) - // genCodeForCall() moves the target address of the tailcall into this register, before pushing it on the stack - #define REG_TAILCALL_ADDR REG_EAX - // Which register are int and long values returned in ? #define REG_INTRET REG_EAX #define RBM_INTRET RBM_EAX @@ -718,25 +701,7 @@ typedef unsigned char regNumberSmall; #define CALLEE_SAVED_REG_MAXSZ (CNT_CALLEE_SAVED*REGSIZE_BYTES) #define CALLEE_SAVED_FLOAT_MAXSZ (CNT_CALLEE_SAVED_FLOAT*16) - // We reuse the ESP register as a illegal value in the register predictor - #define RBM_ILLEGAL RBM_ESP - // We reuse the ESP register as a flag for last use handling in the register predictor - #define RBM_LASTUSE RBM_ESP - // We're using the encoding for ESP to indicate a half-long on the frame - #define REG_L_STK REG_ESP - - // This is the first register in REG_TMP_ORDER #define REG_TMP_0 REG_EAX - #define RBM_TMP_0 RBM_EAX - - // This is the second register in REG_TMP_ORDER -#ifdef UNIX_AMD64_ABI - #define REG_TMP_1 REG_EDI - #define RBM_TMP_1 RBM_EDI -#else // !UNIX_AMD64_ABI - #define REG_TMP_1 REG_EDX - #define RBM_TMP_1 RBM_EDX -#endif // !UNIX_AMD64_ABI // register to hold shift amount #define REG_SHIFT REG_ECX @@ -744,7 +709,6 @@ typedef unsigned char regNumberSmall; // This is a general scratch register that does not conflict with the argument registers #define REG_SCRATCH REG_EAX - #define RBM_SCRATCH RBM_EAX // Where is the exception object on entry to the handler block? #ifdef UNIX_AMD64_ABI @@ -800,9 +764,6 @@ typedef unsigned char regNumberSmall; #define REG_NEXT(reg) ((regNumber)((unsigned)(reg) + 1)) #define REG_PREV(reg) ((regNumber)((unsigned)(reg) - 1)) - // genCodeForCall() moves the target address of the tailcall into this register, before pushing it on the stack - #define REG_TAILCALL_ADDR REG_RDX - // Which register are int and long values returned in ? #define REG_INTRET REG_EAX #define RBM_INTRET RBM_EAX @@ -1051,20 +1012,7 @@ typedef unsigned char regNumberSmall; #define CALLEE_SAVED_REG_MAXSZ (CNT_CALLEE_SAVED*REGSIZE_BYTES) #define CALLEE_SAVED_FLOAT_MAXSZ (CNT_CALLEE_SAVED_FLOAT*sizeof(float)) - // We reuse the ESP register as a illegal value in the register predictor - #define RBM_ILLEGAL RBM_SP - // We reuse the ESP register as a flag for last use handling in the register predictor - #define RBM_LASTUSE RBM_SP - // We're using the encoding for ESP to indicate a half-long on the frame - #define REG_L_STK REG_SP - - // This is the first register in REG_TMP_ORDER #define REG_TMP_0 REG_R3 - #define RBM_TMP_0 RBM_R3 - - // This is the second register in REG_TMP_ORDER - #define REG_TMP_1 REG_R2 - #define RBM_TMP_1 RBM_R2 // Temporary registers used for the GS cookie check. #define REG_GSCOOKIE_TMP_0 REG_R12 @@ -1080,7 +1028,6 @@ typedef unsigned char regNumberSmall; // This is a general scratch register that does not conflict with the argument registers #define REG_SCRATCH REG_LR - #define RBM_SCRATCH RBM_LR // This is a general register that can be optionally reserved for other purposes during codegen #define REG_OPT_RSVD REG_R10 @@ -1168,9 +1115,6 @@ typedef unsigned char regNumberSmall; #define REG_NEXT(reg) ((regNumber)((unsigned)(reg) + 1)) #define REG_PREV(reg) ((regNumber)((unsigned)(reg) - 1)) - // genCodeForCall() moves the target address of the tailcall into this register, before pushing it on the stack - #define REG_TAILCALL_ADDR REG_R1 - // The following registers are used in emitting Enter/Leave/Tailcall profiler callbacks #define REG_PROFILER_ENTER_ARG REG_R0 #define RBM_PROFILER_ENTER_ARG RBM_R0 @@ -1376,16 +1320,7 @@ typedef unsigned char regNumberSmall; #define CALLEE_SAVED_REG_MAXSZ (CNT_CALLEE_SAVED * REGSIZE_BYTES) #define CALLEE_SAVED_FLOAT_MAXSZ (CNT_CALLEE_SAVED_FLOAT * FPSAVE_REGSIZE_BYTES) - // TODO-ARM64-Cleanup: Remove this - #define REG_L_STK REG_ZR - - // This is the first register in REG_TMP_ORDER #define REG_TMP_0 REG_R9 - #define RBM_TMP_0 RBM_R9 - - // This is the second register in REG_TMP_ORDER - #define REG_TMP_1 REG_R10 - #define RBM_TMP_1 RBM_R10 // Temporary registers used for the GS cookie check. #define REG_GSCOOKIE_TMP_0 REG_R9 @@ -1397,7 +1332,6 @@ typedef unsigned char regNumberSmall; // This is a general scratch register that does not conflict with the argument registers #define REG_SCRATCH REG_R9 - #define RBM_SCRATCH RBM_R9 // This is a general register that can be optionally reserved for other purposes during codegen #define REG_OPT_RSVD REG_IP1 @@ -1494,9 +1428,6 @@ typedef unsigned char regNumberSmall; #define REG_NEXT(reg) ((regNumber)((unsigned)(reg) + 1)) #define REG_PREV(reg) ((regNumber)((unsigned)(reg) - 1)) - // genCodeForCall() moves the target address of the tailcall into this register, before pushing it on the stack - #define REG_TAILCALL_ADDR REG_R9 - // The following registers are used in emitting Enter/Leave/Tailcall profiler callbacks #define REG_PROFILER_ENTER_ARG REG_R0 #define RBM_PROFILER_ENTER_ARG RBM_R0 @@ -1506,7 +1437,6 @@ typedef unsigned char regNumberSmall; #define REG_PROFILER_JMP_ARG REG_R0 #define RBM_PROFILER_JMP_USED RBM_R0 #define RBM_PROFILER_TAIL_USED (RBM_R0 | RBM_R12 | RBM_LR) - // Which register are int and long values returned in ? #define REG_INTRET REG_R0 @@ -1535,10 +1465,10 @@ typedef unsigned char regNumberSmall; #define FIRST_ARG_STACK_OFFS (2*REGSIZE_BYTES) // Caller's saved FP and return address - // On ARM64 the calling convention defines REG_R8 (x8) as an additional argument register - // It isn't allocated for the normal user arguments, so it isn't counted by MAX_REG_ARG - // whether we use this register to pass the RetBuff is controlled by the function hasFixedRetBuffReg() - // it is consider to be the next integer argnum, which is 8 + // On ARM64 the calling convention defines REG_R8 (x8) as an additional argument register. + // It isn't allocated for the normal user arguments, so it isn't counted by MAX_REG_ARG. + // Whether we use this register to pass the RetBuff is controlled by the function hasFixedRetBuffReg(). + // It is considered to be the next integer argnum, which is 8. // #define REG_ARG_RET_BUFF REG_R8 #define RBM_ARG_RET_BUFF RBM_R8 @@ -1602,7 +1532,6 @@ typedef unsigned char regNumberSmall; #define LBL_DIST_SMALL_MAX_POS (+1048575) #define LBL_SIZE_SMALL (4) - #define LBL_SIZE_LARGE (8) #define JCC_DIST_SMALL_MAX_NEG (-1048576) #define JCC_DIST_SMALL_MAX_POS (+1048575) @@ -1617,7 +1546,6 @@ typedef unsigned char regNumberSmall; #define LDC_DIST_SMALL_MAX_POS (+1048575) #define LDC_SIZE_SMALL (4) - #define LDC_SIZE_LARGE (8) #define JMP_SIZE_SMALL (4) |