overhaul of the register cache (improves generated code by some 10+%)

This commit is contained in:
kub 2019-04-01 23:39:58 +02:00
parent e267031a50
commit 4f4e9bf3bd
4 changed files with 1455 additions and 667 deletions

View file

@ -5,6 +5,7 @@
* This work is licensed under the terms of MAME license.
* See COPYING file in the top-level directory.
*/
#define HOST_REGS 16
#define CONTEXT_REG 11
#define RET_REG 0
@ -406,9 +407,24 @@ static int emith_xbranch(int cond, void *target, int is_call)
#define emith_add_r_r_r_lsl(d, s1, s2, lslimm) \
EOP_ADD_REG(A_COND_AL,0,d,s1,s2,A_AM1_LSL,lslimm)
#define emith_addf_r_r_r_lsl(d, s1, s2, lslimm) \
EOP_ADD_REG(A_COND_AL,1,d,s1,s2,A_AM1_LSL,lslimm)
#define emith_addf_r_r_r_lsr(d, s1, s2, lslimm) \
EOP_ADD_REG(A_COND_AL,1,d,s1,s2,A_AM1_LSR,lslimm)
#define emith_adcf_r_r_r_lsl(d, s1, s2, lslimm) \
EOP_ADC_REG(A_COND_AL,1,d,s1,s2,A_AM1_LSL,lslimm)
#define emith_sub_r_r_r_lsl(d, s1, s2, lslimm) \
EOP_SUB_REG(A_COND_AL,0,d,s1,s2,A_AM1_LSL,lslimm)
#define emith_subf_r_r_r_lsl(d, s1, s2, lslimm) \
EOP_SUB_REG(A_COND_AL,1,d,s1,s2,A_AM1_LSL,lslimm)
#define emith_sbcf_r_r_r_lsl(d, s1, s2, lslimm) \
EOP_SBC_REG(A_COND_AL,1,d,s1,s2,A_AM1_LSL,lslimm)
#define emith_or_r_r_r_lsl(d, s1, s2, lslimm) \
EOP_ORR_REG(A_COND_AL,0,d,s1,s2,A_AM1_LSL,lslimm)
@ -418,6 +434,9 @@ static int emith_xbranch(int cond, void *target, int is_call)
#define emith_eor_r_r_r_lsr(d, s1, s2, lsrimm) \
EOP_EOR_REG(A_COND_AL,0,d,s1,s2,A_AM1_LSR,lsrimm)
#define emith_and_r_r_r_lsl(d, s1, s2, lslimm) \
EOP_AND_REG(A_COND_AL,0,d,s1,s2,A_AM1_LSL,lslimm)
#define emith_or_r_r_lsl(d, s, lslimm) \
emith_or_r_r_r_lsl(d, d, s, lslimm)
@ -427,12 +446,30 @@ static int emith_xbranch(int cond, void *target, int is_call)
#define emith_add_r_r_r(d, s1, s2) \
emith_add_r_r_r_lsl(d, s1, s2, 0)
#define emith_addf_r_r_r(d, s1, s2) \
emith_addf_r_r_r_lsl(d, s1, s2, 0)
#define emith_adcf_r_r_r(d, s1, s2) \
emith_adcf_r_r_r_lsl(d, s1, s2, 0)
#define emith_sub_r_r_r(d, s1, s2) \
emith_sub_r_r_r_lsl(d, s1, s2, 0)
#define emith_subf_r_r_r(d, s1, s2) \
emith_subf_r_r_r_lsl(d, s1, s2, 0)
#define emith_sbcf_r_r_r(d, s1, s2) \
emith_sbcf_r_r_r_lsl(d, s1, s2, 0)
#define emith_or_r_r_r(d, s1, s2) \
emith_or_r_r_r_lsl(d, s1, s2, 0)
#define emith_eor_r_r_r(d, s1, s2) \
emith_eor_r_r_r_lsl(d, s1, s2, 0)
#define emith_and_r_r_r(d, s1, s2) \
emith_and_r_r_r_lsl(d, s1, s2, 0)
#define emith_add_r_r(d, s) \
emith_add_r_r_r(d, d, s)
@ -539,11 +576,14 @@ static int emith_xbranch(int cond, void *target, int is_call)
#define emith_bic_r_imm_c(cond, r, imm) \
emith_op_imm(cond, 0, A_OP_BIC, r, imm)
#define emith_tst_r_imm_c(cond, r, imm) \
emith_top_imm(cond, A_OP_TST, r, imm)
#define emith_move_r_imm_s8(r, imm) { \
if ((imm) & 0x80) \
EOP_MVN_IMM(r, 0, ((imm) ^ 0xff)); \
if ((s8)(imm) < 0) \
EOP_MVN_IMM(r, 0, ((u8)(imm) ^ 0xff)); \
else \
EOP_MOV_IMM(r, 0, imm); \
EOP_MOV_IMM(r, 0, (u8)imm); \
}
#define emith_and_r_r_imm(d, s, imm) \
@ -558,6 +598,15 @@ static int emith_xbranch(int cond, void *target, int is_call)
#define emith_sub_r_r_imm(d, s, imm) \
emith_op_imm2(A_COND_AL, 0, A_OP_SUB, d, s, imm)
#define emith_subf_r_r_imm(d, s, imm) \
emith_op_imm2(A_COND_AL, 1, A_OP_SUB, d, s, (imm))
#define emith_or_r_r_imm(d, s, imm) \
emith_op_imm2(A_COND_AL, 0, A_OP_ORR, d, s, (imm))
#define emith_eor_r_r_imm(d, s, imm) \
emith_op_imm2(A_COND_AL, 0, A_OP_EOR, d, s, (imm))
#define emith_neg_r_r(d, s) \
EOP_RSB_IMM(d, s, 0, 0)

View file

@ -15,6 +15,7 @@
enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
#define HOST_REGS 8
#define CONTEXT_REG xBP
#define RET_REG xAX
@ -185,6 +186,61 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
} \
} while (0)
#define emith_sub_r_r_r(d, s1, s2) do { \
if (d == s1) { \
emith_sub_r_r(d, s2); \
} else if (d == s2) { \
emith_sub_r_r(d, s1); \
} else { \
emith_move_r_r(d, s1); \
emith_sub_r_r(d, s2); \
} \
} while (0)
#define emith_adc_r_r_r(d, s1, s2) do { \
if (d == s1) { \
emith_adc_r_r(d, s2); \
} else if (d == s2) { \
emith_adc_r_r(d, s1); \
} else { \
emith_move_r_r(d, s1); \
emith_adc_r_r(d, s2); \
} \
} while (0)
#define emith_sbc_r_r_r(d, s1, s2) do { \
if (d == s1) { \
emith_sbc_r_r(d, s2); \
} else if (d == s2) { \
emith_sbc_r_r(d, s1); \
} else { \
emith_move_r_r(d, s1); \
emith_sbc_r_r(d, s2); \
} \
} while (0)
#define emith_and_r_r_r(d, s1, s2) do { \
if (d == s1) { \
emith_and_r_r(d, s2); \
} else if (d == s2) { \
emith_and_r_r(d, s1); \
} else { \
emith_move_r_r(d, s1); \
emith_and_r_r(d, s2); \
} \
} while (0)
#define emith_or_r_r_r(d, s1, s2) do { \
if (d == s1) { \
emith_or_r_r(d, s2); \
} else if (d == s2) { \
emith_or_r_r(d, s1); \
} else { \
emith_move_r_r(d, s1); \
emith_or_r_r(d, s2); \
} \
} while (0)
#define emith_eor_r_r_r(d, s1, s2) do { \
if (d == s1) { \
emith_eor_r_r(d, s2); \
@ -281,6 +337,8 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
emith_eor_r_imm(r, imm)
#define emith_bic_r_imm_c(cond, r, imm) \
emith_bic_r_imm(r, imm)
#define emith_tst_r_imm_c(cond, r, imm) \
emith_tst_r_imm(r, imm)
#define emith_ror_c(cond, d, s, cnt) \
emith_ror(d, s, cnt)
@ -324,12 +382,33 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
EMIT(imm, s32); \
} while (0)
#define emith_sub_r_r_imm(d, s, imm) do { \
if (d != s) \
emith_move_r_r(d, s); \
if (imm) \
emith_sub_r_imm(d, imm); \
} while (0)
#define emith_and_r_r_imm(d, s, imm) do { \
if (d != s) \
emith_move_r_r(d, s); \
emith_and_r_imm(d, imm); \
} while (0)
#define emith_or_r_r_imm(d, s, imm) do { \
if (d != s) \
emith_move_r_r(d, s); \
if ((s32)imm != 0) \
emith_or_r_imm(d, imm); \
} while (0)
#define emith_eor_r_r_imm(d, s, imm) do { \
if (d != s) \
emith_move_r_r(d, s); \
if ((s32)imm != 0) \
emith_eor_r_imm(d, imm); \
} while (0)
// shift
#define emith_shift(op, d, s, cnt) do { \
if (d != s) \
@ -456,6 +535,14 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
#define emith_eorf_r_r emith_eor_r_r
#define emith_negcf_r_r emith_negc_r_r
#define emith_subf_r_r_imm emith_sub_r_r_imm
#define emith_addf_r_r_r emith_add_r_r_r
#define emith_subf_r_r_r emith_sub_r_r_r
#define emith_adcf_r_r_r emith_adc_r_r_r
#define emith_sbcf_r_r_r emith_sbc_r_r_r
#define emith_eorf_r_r_r emith_eor_r_r_r
#define emith_addf_r_r_r_lsr emith_add_r_r_r_lsr
#define emith_lslf emith_lsl
#define emith_lsrf emith_lsr
#define emith_asrf emith_asr
@ -705,7 +792,7 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
case 0: rd = xDI; break; \
case 1: rd = xSI; break; \
case 2: rd = xDX; break; \
case 3: rd = xBX; break; \
default: rd = xCX; break; \
}
#define emith_sh2_drc_entry() { \
@ -728,6 +815,7 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
case 0: rd = xCX; break; \
case 1: rd = xDX; break; \
case 2: rd = 8; break; \
default: rd = 9; break; \
}
#define emith_sh2_drc_entry() { \
@ -764,6 +852,7 @@ enum { xAX = 0, xCX, xDX, xBX, xSP, xBP, xSI, xDI };
case 0: rd = xAX; break; \
case 1: rd = xDX; break; \
case 2: rd = xCX; break; \
default: rd = xBX; break; \
}
#define emith_sh2_drc_entry() { \

File diff suppressed because it is too large Load diff

View file

@ -31,8 +31,10 @@ void scan_block(unsigned int base_pc, int is_slave,
// XXX MUST match definitions in cpu/sh2/compiler.c
#if defined(__arm__)
#define DRC_SR_REG r10
#elif defined(__i386__) || defined(__x86_64__)
#elif defined(__i386__)
#define DRC_SR_REG edi
#elif defined(__x86_64__)
#define DRC_SR_REG ebx
#else
#warning "direct DRC register access not available for this host"
#endif