From fca489276be488f6332dfb95b259d233fa2a1927 Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Sat, 5 Sep 2015 18:18:19 +0200 Subject: [PATCH] JIT: R1, R2, R4 -> RR1, RR2, RR4 (name collision on ARM) --- jit/codegen_x86.cpp | 4 + jit/compemu.h | 202 +++++++++---------- jit/compemu_midfunc_x86.cpp | 380 ++++++++++++++++++------------------ jit/compemu_support.cpp | 4 +- 4 files changed, 300 insertions(+), 290 deletions(-) diff --git a/jit/codegen_x86.cpp b/jit/codegen_x86.cpp index 41835f7b..5b2629b9 100644 --- a/jit/codegen_x86.cpp +++ b/jit/codegen_x86.cpp @@ -5,6 +5,10 @@ only target, and it's easier this way... */ * Some basic information about the the target CPU * *************************************************************************/ +#define R1 RR1 +#define R2 RR2 +#define R4 RR4 + #define EAX_INDEX 0 #define ECX_INDEX 1 #define EDX_INDEX 2 diff --git a/jit/compemu.h b/jit/compemu.h index b70e99d0..9892ad9d 100644 --- a/jit/compemu.h +++ b/jit/compemu.h @@ -238,9 +238,15 @@ extern int touchcnt; #define IMMS uae_s32 #define IMM uae_u32 +#define RR1 uae_u32 +#define RR2 uae_u32 +#define RR4 uae_u32 +/* + R1, R2, R4 collides with ARM registers defined in ucontext #define R1 uae_u32 #define R2 uae_u32 #define R4 uae_u32 +*/ #define W1 uae_u32 #define W2 uae_u32 #define W4 uae_u32 @@ -274,16 +280,16 @@ extern int touchcnt; /* What we expose to the outside */ -DECLARE(bt_l_ri(R4 r, IMM i)); -DECLARE(bt_l_rr(R4 r, R4 b)); +DECLARE(bt_l_ri(RR4 r, IMM i)); +DECLARE(bt_l_rr(RR4 r, RR4 b)); DECLARE(btc_l_ri(RW4 r, IMM i)); -DECLARE(btc_l_rr(RW4 r, R4 b)); +DECLARE(btc_l_rr(RW4 r, RR4 b)); DECLARE(bts_l_ri(RW4 r, IMM i)); -DECLARE(bts_l_rr(RW4 r, R4 b)); +DECLARE(bts_l_rr(RW4 r, RR4 b)); DECLARE(btr_l_ri(RW4 r, IMM i)); -DECLARE(btr_l_rr(RW4 r, R4 b)); +DECLARE(btr_l_rr(RW4 r, RR4 b)); DECLARE(mov_l_rm(W4 d, IMM s)); -DECLARE(call_r(R4 r)); +DECLARE(call_r(RR4 r)); DECLARE(sub_l_mi(IMM d, IMM s)); DECLARE(mov_l_mi(IMM d, IMM s)); DECLARE(mov_w_mi(IMM d, IMM s)); @@ -291,24 +297,24 @@ DECLARE(mov_b_mi(IMM d, IMM s)); DECLARE(rol_b_ri(RW1 r, IMM i)); DECLARE(rol_w_ri(RW2 r, IMM i)); DECLARE(rol_l_ri(RW4 r, IMM i)); -DECLARE(rol_l_rr(RW4 d, R1 r)); -DECLARE(rol_w_rr(RW2 d, R1 r)); -DECLARE(rol_b_rr(RW1 d, R1 r)); -DECLARE(shll_l_rr(RW4 d, R1 r)); -DECLARE(shll_w_rr(RW2 d, R1 r)); -DECLARE(shll_b_rr(RW1 d, R1 r)); -DECLARE(ror_b_ri(R1 r, IMM i)); -DECLARE(ror_w_ri(R2 r, IMM i)); -DECLARE(ror_l_ri(R4 r, IMM i)); -DECLARE(ror_l_rr(R4 d, R1 r)); -DECLARE(ror_w_rr(R2 d, R1 r)); -DECLARE(ror_b_rr(R1 d, R1 r)); -DECLARE(shrl_l_rr(RW4 d, R1 r)); -DECLARE(shrl_w_rr(RW2 d, R1 r)); -DECLARE(shrl_b_rr(RW1 d, R1 r)); -DECLARE(shra_l_rr(RW4 d, R1 r)); -DECLARE(shra_w_rr(RW2 d, R1 r)); -DECLARE(shra_b_rr(RW1 d, R1 r)); +DECLARE(rol_l_rr(RW4 d, RR1 r)); +DECLARE(rol_w_rr(RW2 d, RR1 r)); +DECLARE(rol_b_rr(RW1 d, RR1 r)); +DECLARE(shll_l_rr(RW4 d, RR1 r)); +DECLARE(shll_w_rr(RW2 d, RR1 r)); +DECLARE(shll_b_rr(RW1 d, RR1 r)); +DECLARE(ror_b_ri(RR1 r, IMM i)); +DECLARE(ror_w_ri(RR2 r, IMM i)); +DECLARE(ror_l_ri(RR4 r, IMM i)); +DECLARE(ror_l_rr(RR4 d, RR1 r)); +DECLARE(ror_w_rr(RR2 d, RR1 r)); +DECLARE(ror_b_rr(RR1 d, RR1 r)); +DECLARE(shrl_l_rr(RW4 d, RR1 r)); +DECLARE(shrl_w_rr(RW2 d, RR1 r)); +DECLARE(shrl_b_rr(RW1 d, RR1 r)); +DECLARE(shra_l_rr(RW4 d, RR1 r)); +DECLARE(shra_w_rr(RW2 d, RR1 r)); +DECLARE(shra_b_rr(RW1 d, RR1 r)); DECLARE(shll_l_ri(RW4 r, IMM i)); DECLARE(shll_w_ri(RW2 r, IMM i)); DECLARE(shll_b_ri(RW1 r, IMM i)); @@ -320,59 +326,59 @@ DECLARE(shra_w_ri(RW2 r, IMM i)); DECLARE(shra_b_ri(RW1 r, IMM i)); DECLARE(setcc(W1 d, IMM cc)); DECLARE(setcc_m(IMM d, IMM cc)); -DECLARE(cmov_b_rr(RW1 d, R1 s, IMM cc)); -DECLARE(cmov_w_rr(RW2 d, R2 s, IMM cc)); -DECLARE(cmov_l_rr(RW4 d, R4 s, IMM cc)); +DECLARE(cmov_b_rr(RW1 d, RR1 s, IMM cc)); +DECLARE(cmov_w_rr(RW2 d, RR2 s, IMM cc)); +DECLARE(cmov_l_rr(RW4 d, RR4 s, IMM cc)); DECLARE(setzflg_l(RW4 r)); DECLARE(cmov_l_rm(RW4 d, IMM s, IMM cc)); -DECLARE(bsf_l_rr(W4 d, R4 s)); +DECLARE(bsf_l_rr(W4 d, RR4 s)); DECLARE(pop_m(IMM d)); DECLARE(push_m(IMM d)); DECLARE(pop_l(W4 d)); DECLARE(push_l_i(IMM i)); -DECLARE(push_l(R4 s)); +DECLARE(push_l(RR4 s)); DECLARE(clear_16(RW4 r)); DECLARE(clear_8(RW4 r)); -DECLARE(sign_extend_16_rr(W4 d, R2 s)); -DECLARE(sign_extend_8_rr(W4 d, R1 s)); -DECLARE(zero_extend_16_rr(W4 d, R2 s)); -DECLARE(zero_extend_8_rr(W4 d, R1 s)); +DECLARE(sign_extend_16_rr(W4 d, RR2 s)); +DECLARE(sign_extend_8_rr(W4 d, RR1 s)); +DECLARE(zero_extend_16_rr(W4 d, RR2 s)); +DECLARE(zero_extend_8_rr(W4 d, RR1 s)); DECLARE(imul_64_32(RW4 d, RW4 s)); DECLARE(mul_64_32(RW4 d, RW4 s)); -DECLARE(imul_32_32(RW4 d, R4 s)); -DECLARE(mov_b_rr(W1 d, R1 s)); -DECLARE(mov_w_rr(W2 d, R2 s)); -DECLARE(mov_l_rrm_indexed(W4 d, R4 baser, R4 index)); -DECLARE(mov_w_rrm_indexed(W2 d, R4 baser, R4 index)); -DECLARE(mov_b_rrm_indexed(W1 d, R4 baser, R4 index)); -DECLARE(mov_l_mrr_indexed(R4 baser, R4 index, R4 s)); -DECLARE(mov_w_mrr_indexed(R4 baser, R4 index, R2 s)); -DECLARE(mov_b_mrr_indexed(R4 baser, R4 index, R1 s)); -DECLARE(mov_l_rm_indexed(W4 d, IMM base, R4 index)); -DECLARE(mov_l_rR(W4 d, R4 s, IMM offset)); -DECLARE(mov_w_rR(W2 d, R4 s, IMM offset)); -DECLARE(mov_b_rR(W1 d, R4 s, IMM offset)); -DECLARE(mov_l_brR(W4 d, R4 s, IMM offset)); -DECLARE(mov_w_brR(W2 d, R4 s, IMM offset)); -DECLARE(mov_b_brR(W1 d, R4 s, IMM offset)); -DECLARE(mov_l_Ri(R4 d, IMM i, IMM offset)); -DECLARE(mov_w_Ri(R4 d, IMM i, IMM offset)); -DECLARE(mov_b_Ri(R4 d, IMM i, IMM offset)); -DECLARE(mov_l_Rr(R4 d, R4 s, IMM offset)); -DECLARE(mov_w_Rr(R4 d, R2 s, IMM offset)); -DECLARE(mov_b_Rr(R4 d, R1 s, IMM offset)); -DECLARE(lea_l_brr(W4 d, R4 s, IMM offset)); -DECLARE(lea_l_brr_indexed(W4 d, R4 s, R4 index, IMM factor, IMM offset)); -DECLARE(mov_l_bRr(R4 d, R4 s, IMM offset)); -DECLARE(mov_w_bRr(R4 d, R2 s, IMM offset)); -DECLARE(mov_b_bRr(R4 d, R1 s, IMM offset)); +DECLARE(imul_32_32(RW4 d, RR4 s)); +DECLARE(mov_b_rr(W1 d, RR1 s)); +DECLARE(mov_w_rr(W2 d, RR2 s)); +DECLARE(mov_l_rrm_indexed(W4 d, RR4 baser, RR4 index)); +DECLARE(mov_w_rrm_indexed(W2 d, RR4 baser, RR4 index)); +DECLARE(mov_b_rrm_indexed(W1 d, RR4 baser, RR4 index)); +DECLARE(mov_l_mrr_indexed(RR4 baser, RR4 index, RR4 s)); +DECLARE(mov_w_mrr_indexed(RR4 baser, RR4 index, RR2 s)); +DECLARE(mov_b_mrr_indexed(RR4 baser, RR4 index, RR1 s)); +DECLARE(mov_l_rm_indexed(W4 d, IMM base, RR4 index)); +DECLARE(mov_l_rR(W4 d, RR4 s, IMM offset)); +DECLARE(mov_w_rR(W2 d, RR4 s, IMM offset)); +DECLARE(mov_b_rR(W1 d, RR4 s, IMM offset)); +DECLARE(mov_l_brR(W4 d, RR4 s, IMM offset)); +DECLARE(mov_w_brR(W2 d, RR4 s, IMM offset)); +DECLARE(mov_b_brR(W1 d, RR4 s, IMM offset)); +DECLARE(mov_l_Ri(RR4 d, IMM i, IMM offset)); +DECLARE(mov_w_Ri(RR4 d, IMM i, IMM offset)); +DECLARE(mov_b_Ri(RR4 d, IMM i, IMM offset)); +DECLARE(mov_l_Rr(RR4 d, RR4 s, IMM offset)); +DECLARE(mov_w_Rr(RR4 d, RR2 s, IMM offset)); +DECLARE(mov_b_Rr(RR4 d, RR1 s, IMM offset)); +DECLARE(lea_l_brr(W4 d, RR4 s, IMM offset)); +DECLARE(lea_l_brr_indexed(W4 d, RR4 s, RR4 index, IMM factor, IMM offset)); +DECLARE(mov_l_bRr(RR4 d, RR4 s, IMM offset)); +DECLARE(mov_w_bRr(RR4 d, RR2 s, IMM offset)); +DECLARE(mov_b_bRr(RR4 d, RR1 s, IMM offset)); DECLARE(gen_bswap_32(RW4 r)); DECLARE(gen_bswap_16(RW2 r)); -DECLARE(mov_l_rr(W4 d, R4 s)); -DECLARE(mov_l_mr(IMM d, R4 s)); -DECLARE(mov_w_mr(IMM d, R2 s)); +DECLARE(mov_l_rr(W4 d, RR4 s)); +DECLARE(mov_l_mr(IMM d, RR4 s)); +DECLARE(mov_w_mr(IMM d, RR2 s)); DECLARE(mov_w_rm(W2 d, IMM s)); -DECLARE(mov_b_mr(IMM d, R1 s)); +DECLARE(mov_b_mr(IMM d, RR1 s)); DECLARE(mov_b_rm(W1 d, IMM s)); DECLARE(mov_l_ri(W4 d, IMM s)); DECLARE(mov_w_ri(W2 d, IMM s)); @@ -380,43 +386,43 @@ DECLARE(mov_b_ri(W1 d, IMM s)); DECLARE(add_l_mi(IMM d, IMM s) ); DECLARE(add_w_mi(IMM d, IMM s) ); DECLARE(add_b_mi(IMM d, IMM s) ); -DECLARE(test_l_ri(R4 d, IMM i)); -DECLARE(test_l_rr(R4 d, R4 s)); -DECLARE(test_w_rr(R2 d, R2 s)); -DECLARE(test_b_rr(R1 d, R1 s)); +DECLARE(test_l_ri(RR4 d, IMM i)); +DECLARE(test_l_rr(RR4 d, RR4 s)); +DECLARE(test_w_rr(RR2 d, RR2 s)); +DECLARE(test_b_rr(RR1 d, RR1 s)); DECLARE(and_l_ri(RW4 d, IMM i)); -DECLARE(and_l(RW4 d, R4 s)); -DECLARE(and_w(RW2 d, R2 s)); -DECLARE(and_b(RW1 d, R1 s)); +DECLARE(and_l(RW4 d, RR4 s)); +DECLARE(and_w(RW2 d, RR2 s)); +DECLARE(and_b(RW1 d, RR1 s)); DECLARE(or_l_ri(RW4 d, IMM i)); -DECLARE(or_l(RW4 d, R4 s)); -DECLARE(or_w(RW2 d, R2 s)); -DECLARE(or_b(RW1 d, R1 s)); -DECLARE(adc_l(RW4 d, R4 s)); -DECLARE(adc_w(RW2 d, R2 s)); -DECLARE(adc_b(RW1 d, R1 s)); -DECLARE(add_l(RW4 d, R4 s)); -DECLARE(add_w(RW2 d, R2 s)); -DECLARE(add_b(RW1 d, R1 s)); +DECLARE(or_l(RW4 d, RR4 s)); +DECLARE(or_w(RW2 d, RR2 s)); +DECLARE(or_b(RW1 d, RR1 s)); +DECLARE(adc_l(RW4 d, RR4 s)); +DECLARE(adc_w(RW2 d, RR2 s)); +DECLARE(adc_b(RW1 d, RR1 s)); +DECLARE(add_l(RW4 d, RR4 s)); +DECLARE(add_w(RW2 d, RR2 s)); +DECLARE(add_b(RW1 d, RR1 s)); DECLARE(sub_l_ri(RW4 d, IMM i)); DECLARE(sub_w_ri(RW2 d, IMM i)); DECLARE(sub_b_ri(RW1 d, IMM i)); DECLARE(add_l_ri(RW4 d, IMM i)); DECLARE(add_w_ri(RW2 d, IMM i)); DECLARE(add_b_ri(RW1 d, IMM i)); -DECLARE(sbb_l(RW4 d, R4 s)); -DECLARE(sbb_w(RW2 d, R2 s)); -DECLARE(sbb_b(RW1 d, R1 s)); -DECLARE(sub_l(RW4 d, R4 s)); -DECLARE(sub_w(RW2 d, R2 s)); -DECLARE(sub_b(RW1 d, R1 s)); -DECLARE(cmp_l(R4 d, R4 s)); -DECLARE(cmp_l_ri(R4 r, IMM i)); -DECLARE(cmp_w(R2 d, R2 s)); -DECLARE(cmp_b(R1 d, R1 s)); -DECLARE(xor_l(RW4 d, R4 s)); -DECLARE(xor_w(RW2 d, R2 s)); -DECLARE(xor_b(RW1 d, R1 s)); +DECLARE(sbb_l(RW4 d, RR4 s)); +DECLARE(sbb_w(RW2 d, RR2 s)); +DECLARE(sbb_b(RW1 d, RR1 s)); +DECLARE(sub_l(RW4 d, RR4 s)); +DECLARE(sub_w(RW2 d, RR2 s)); +DECLARE(sub_b(RW1 d, RR1 s)); +DECLARE(cmp_l(RR4 d, RR4 s)); +DECLARE(cmp_l_ri(RR4 r, IMM i)); +DECLARE(cmp_w(RR2 d, RR2 s)); +DECLARE(cmp_b(RR1 d, RR1 s)); +DECLARE(xor_l(RW4 d, RR4 s)); +DECLARE(xor_w(RW2 d, RR2 s)); +DECLARE(xor_b(RW1 d, RR1 s)); DECLARE(live_flags(void)); DECLARE(dont_care_flags(void)); DECLARE(duplicate_carry(void)); @@ -424,10 +430,10 @@ DECLARE(restore_carry(void)); DECLARE(start_needflags(void)); DECLARE(end_needflags(void)); DECLARE(make_flags_live(void)); -DECLARE(call_r_11(R4 r, W4 out1, R4 in1, IMM osize, IMM isize)); -DECLARE(call_r_02(R4 r, R4 in1, R4 in2, IMM isize1, IMM isize2)); -DECLARE(readmem_new(R4 address, W4 dest, IMM offset, IMM size, W4 tmp)); -DECLARE(writemem_new(R4 address, R4 source, IMM offset, IMM size, W4 tmp)); +DECLARE(call_r_11(RR4 r, W4 out1, RR4 in1, IMM osize, IMM isize)); +DECLARE(call_r_02(RR4 r, RR4 in1, RR4 in2, IMM isize1, IMM isize2)); +DECLARE(readmem_new(RR4 address, W4 dest, IMM offset, IMM size, W4 tmp)); +DECLARE(writemem_new(RR4 address, RR4 source, IMM offset, IMM size, W4 tmp)); DECLARE(forget_about(W4 r)); DECLARE(nop(void)); @@ -449,7 +455,7 @@ DECLARE(fcut_r(FRW r)); DECLARE(fmov_ext_mr(MEMW m, FR r)); DECLARE(fmov_ext_rm(FW r, MEMR m)); DECLARE(fmov_rr(FW d, FR s)); -DECLARE(fldcw_m_indexed(R4 index, IMM base)); +DECLARE(fldcw_m_indexed(RR4 index, IMM base)); DECLARE(ftst_r(FR r)); DECLARE(dont_care_fflags(void)); DECLARE(fsqrt_rr(FW d, FR s)); diff --git a/jit/compemu_midfunc_x86.cpp b/jit/compemu_midfunc_x86.cpp index 256ec97f..3ae2eeb3 100644 --- a/jit/compemu_midfunc_x86.cpp +++ b/jit/compemu_midfunc_x86.cpp @@ -99,7 +99,7 @@ MIDFUNC(1,fflags_into_flags,(W2 tmp)) } MENDFUNC(1,fflags_into_flags,(W2 tmp)) -MIDFUNC(2,bt_l_ri,(R4 r, IMM i)) /* This is defined as only affecting C */ +MIDFUNC(2,bt_l_ri,(RR4 r, IMM i)) /* This is defined as only affecting C */ { int size=4; if (i<16) @@ -109,9 +109,9 @@ MIDFUNC(2,bt_l_ri,(R4 r, IMM i)) /* This is defined as only affecting C */ raw_bt_l_ri(r,i); unlock2(r); } -MENDFUNC(2,bt_l_ri,(R4 r, IMM i)) /* This is defined as only affecting C */ +MENDFUNC(2,bt_l_ri,(RR4 r, IMM i)) /* This is defined as only affecting C */ -MIDFUNC(2,bt_l_rr,(R4 r, R4 b)) /* This is defined as only affecting C */ +MIDFUNC(2,bt_l_rr,(RR4 r, RR4 b)) /* This is defined as only affecting C */ { CLOBBER_BT; r=readreg(r,4); @@ -120,7 +120,7 @@ MIDFUNC(2,bt_l_rr,(R4 r, R4 b)) /* This is defined as only affecting C */ unlock2(r); unlock2(b); } -MENDFUNC(2,bt_l_rr,(R4 r, R4 b)) /* This is defined as only affecting C */ +MENDFUNC(2,bt_l_rr,(RR4 r, RR4 b)) /* This is defined as only affecting C */ MIDFUNC(2,btc_l_ri,(RW4 r, IMM i)) { @@ -134,7 +134,7 @@ MIDFUNC(2,btc_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,btc_l_ri,(RW4 r, IMM i)) -MIDFUNC(2,btc_l_rr,(RW4 r, R4 b)) +MIDFUNC(2,btc_l_rr,(RW4 r, RR4 b)) { CLOBBER_BT; b=readreg(b,4); @@ -143,7 +143,7 @@ MIDFUNC(2,btc_l_rr,(RW4 r, R4 b)) unlock2(r); unlock2(b); } -MENDFUNC(2,btc_l_rr,(RW4 r, R4 b)) +MENDFUNC(2,btc_l_rr,(RW4 r, RR4 b)) MIDFUNC(2,btr_l_ri,(RW4 r, IMM i)) { @@ -157,7 +157,7 @@ MIDFUNC(2,btr_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,btr_l_ri,(RW4 r, IMM i)) -MIDFUNC(2,btr_l_rr,(RW4 r, R4 b)) +MIDFUNC(2,btr_l_rr,(RW4 r, RR4 b)) { CLOBBER_BT; b=readreg(b,4); @@ -166,7 +166,7 @@ MIDFUNC(2,btr_l_rr,(RW4 r, R4 b)) unlock2(r); unlock2(b); } -MENDFUNC(2,btr_l_rr,(RW4 r, R4 b)) +MENDFUNC(2,btr_l_rr,(RW4 r, RR4 b)) MIDFUNC(2,bts_l_ri,(RW4 r, IMM i)) { @@ -180,7 +180,7 @@ MIDFUNC(2,bts_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,bts_l_ri,(RW4 r, IMM i)) -MIDFUNC(2,bts_l_rr,(RW4 r, R4 b)) +MIDFUNC(2,bts_l_rr,(RW4 r, RR4 b)) { CLOBBER_BT; b=readreg(b,4); @@ -189,7 +189,7 @@ MIDFUNC(2,bts_l_rr,(RW4 r, R4 b)) unlock2(r); unlock2(b); } -MENDFUNC(2,bts_l_rr,(RW4 r, R4 b)) +MENDFUNC(2,bts_l_rr,(RW4 r, RR4 b)) MIDFUNC(2,mov_l_rm,(W4 d, IMM s)) { @@ -200,13 +200,13 @@ MIDFUNC(2,mov_l_rm,(W4 d, IMM s)) } MENDFUNC(2,mov_l_rm,(W4 d, IMM s)) -MIDFUNC(1,call_r,(R4 r)) /* Clobbering is implicit */ +MIDFUNC(1,call_r,(RR4 r)) /* Clobbering is implicit */ { r=readreg(r,4); raw_call_r(r); unlock2(r); } -MENDFUNC(1,call_r,(R4 r)) /* Clobbering is implicit */ +MENDFUNC(1,call_r,(RR4 r)) /* Clobbering is implicit */ MIDFUNC(2,sub_l_mi,(IMM d, IMM s)) { @@ -269,7 +269,7 @@ MIDFUNC(2,rol_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,rol_l_ri,(RW4 r, IMM i)) -MIDFUNC(2,rol_l_rr,(RW4 d, R1 r)) +MIDFUNC(2,rol_l_rr,(RW4 d, RR1 r)) { if (isconst(r)) { COMPCALL(rol_l_ri)(d,(uae_u8)live.state[r].val); @@ -285,9 +285,9 @@ MIDFUNC(2,rol_l_rr,(RW4 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,rol_l_rr,(RW4 d, R1 r)) +MENDFUNC(2,rol_l_rr,(RW4 d, RR1 r)) -MIDFUNC(2,rol_w_rr,(RW2 d, R1 r)) +MIDFUNC(2,rol_w_rr,(RW2 d, RR1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -304,9 +304,9 @@ MIDFUNC(2,rol_w_rr,(RW2 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,rol_w_rr,(RW2 d, R1 r)) +MENDFUNC(2,rol_w_rr,(RW2 d, RR1 r)) -MIDFUNC(2,rol_b_rr,(RW1 d, R1 r)) +MIDFUNC(2,rol_b_rr,(RW1 d, RR1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -324,9 +324,9 @@ MIDFUNC(2,rol_b_rr,(RW1 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,rol_b_rr,(RW1 d, R1 r)) +MENDFUNC(2,rol_b_rr,(RW1 d, RR1 r)) -MIDFUNC(2,shll_l_rr,(RW4 d, R1 r)) +MIDFUNC(2,shll_l_rr,(RW4 d, RR1 r)) { if (isconst(r)) { COMPCALL(shll_l_ri)(d,(uae_u8)live.state[r].val); @@ -342,9 +342,9 @@ MIDFUNC(2,shll_l_rr,(RW4 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,shll_l_rr,(RW4 d, R1 r)) +MENDFUNC(2,shll_l_rr,(RW4 d, RR1 r)) -MIDFUNC(2,shll_w_rr,(RW2 d, R1 r)) +MIDFUNC(2,shll_w_rr,(RW2 d, RR1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -361,9 +361,9 @@ MIDFUNC(2,shll_w_rr,(RW2 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,shll_w_rr,(RW2 d, R1 r)) +MENDFUNC(2,shll_w_rr,(RW2 d, RR1 r)) -MIDFUNC(2,shll_b_rr,(RW1 d, R1 r)) +MIDFUNC(2,shll_b_rr,(RW1 d, RR1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -381,9 +381,9 @@ MIDFUNC(2,shll_b_rr,(RW1 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,shll_b_rr,(RW1 d, R1 r)) +MENDFUNC(2,shll_b_rr,(RW1 d, RR1 r)) -MIDFUNC(2,ror_b_ri,(R1 r, IMM i)) +MIDFUNC(2,ror_b_ri,(RR1 r, IMM i)) { if (!i && !needflags) return; @@ -392,9 +392,9 @@ MIDFUNC(2,ror_b_ri,(R1 r, IMM i)) raw_ror_b_ri(r,i); unlock2(r); } -MENDFUNC(2,ror_b_ri,(R1 r, IMM i)) +MENDFUNC(2,ror_b_ri,(RR1 r, IMM i)) -MIDFUNC(2,ror_w_ri,(R2 r, IMM i)) +MIDFUNC(2,ror_w_ri,(RR2 r, IMM i)) { if (!i && !needflags) return; @@ -403,9 +403,9 @@ MIDFUNC(2,ror_w_ri,(R2 r, IMM i)) raw_ror_w_ri(r,i); unlock2(r); } -MENDFUNC(2,ror_w_ri,(R2 r, IMM i)) +MENDFUNC(2,ror_w_ri,(RR2 r, IMM i)) -MIDFUNC(2,ror_l_ri,(R4 r, IMM i)) +MIDFUNC(2,ror_l_ri,(RR4 r, IMM i)) { if (!i && !needflags) return; @@ -414,9 +414,9 @@ MIDFUNC(2,ror_l_ri,(R4 r, IMM i)) raw_ror_l_ri(r,i); unlock2(r); } -MENDFUNC(2,ror_l_ri,(R4 r, IMM i)) +MENDFUNC(2,ror_l_ri,(RR4 r, IMM i)) -MIDFUNC(2,ror_l_rr,(R4 d, R1 r)) +MIDFUNC(2,ror_l_rr,(RR4 d, RR1 r)) { if (isconst(r)) { COMPCALL(ror_l_ri)(d,(uae_u8)live.state[r].val); @@ -429,9 +429,9 @@ MIDFUNC(2,ror_l_rr,(R4 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,ror_l_rr,(R4 d, R1 r)) +MENDFUNC(2,ror_l_rr,(RR4 d, RR1 r)) -MIDFUNC(2,ror_w_rr,(R2 d, R1 r)) +MIDFUNC(2,ror_w_rr,(RR2 d, RR1 r)) { if (isconst(r)) { COMPCALL(ror_w_ri)(d,(uae_u8)live.state[r].val); @@ -444,9 +444,9 @@ MIDFUNC(2,ror_w_rr,(R2 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,ror_w_rr,(R2 d, R1 r)) +MENDFUNC(2,ror_w_rr,(RR2 d, RR1 r)) -MIDFUNC(2,ror_b_rr,(R1 d, R1 r)) +MIDFUNC(2,ror_b_rr,(RR1 d, RR1 r)) { if (isconst(r)) { COMPCALL(ror_b_ri)(d,(uae_u8)live.state[r].val); @@ -460,9 +460,9 @@ MIDFUNC(2,ror_b_rr,(R1 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,ror_b_rr,(R1 d, R1 r)) +MENDFUNC(2,ror_b_rr,(RR1 d, RR1 r)) -MIDFUNC(2,shrl_l_rr,(RW4 d, R1 r)) +MIDFUNC(2,shrl_l_rr,(RW4 d, RR1 r)) { if (isconst(r)) { COMPCALL(shrl_l_ri)(d,(uae_u8)live.state[r].val); @@ -478,9 +478,9 @@ MIDFUNC(2,shrl_l_rr,(RW4 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,shrl_l_rr,(RW4 d, R1 r)) +MENDFUNC(2,shrl_l_rr,(RW4 d, RR1 r)) -MIDFUNC(2,shrl_w_rr,(RW2 d, R1 r)) +MIDFUNC(2,shrl_w_rr,(RW2 d, RR1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -497,9 +497,9 @@ MIDFUNC(2,shrl_w_rr,(RW2 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,shrl_w_rr,(RW2 d, R1 r)) +MENDFUNC(2,shrl_w_rr,(RW2 d, RR1 r)) -MIDFUNC(2,shrl_b_rr,(RW1 d, R1 r)) +MIDFUNC(2,shrl_b_rr,(RW1 d, RR1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -517,7 +517,7 @@ MIDFUNC(2,shrl_b_rr,(RW1 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,shrl_b_rr,(RW1 d, R1 r)) +MENDFUNC(2,shrl_b_rr,(RW1 d, RR1 r)) MIDFUNC(2,shll_l_ri,(RW4 r, IMM i)) { @@ -626,7 +626,7 @@ MIDFUNC(2,shra_b_ri,(RW1 r, IMM i)) } MENDFUNC(2,shra_b_ri,(RW1 r, IMM i)) -MIDFUNC(2,shra_l_rr,(RW4 d, R1 r)) +MIDFUNC(2,shra_l_rr,(RW4 d, RR1 r)) { if (isconst(r)) { COMPCALL(shra_l_ri)(d,(uae_u8)live.state[r].val); @@ -642,9 +642,9 @@ MIDFUNC(2,shra_l_rr,(RW4 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,shra_l_rr,(RW4 d, R1 r)) +MENDFUNC(2,shra_l_rr,(RW4 d, RR1 r)) -MIDFUNC(2,shra_w_rr,(RW2 d, R1 r)) +MIDFUNC(2,shra_w_rr,(RW2 d, RR1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -661,9 +661,9 @@ MIDFUNC(2,shra_w_rr,(RW2 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,shra_w_rr,(RW2 d, R1 r)) +MENDFUNC(2,shra_w_rr,(RW2 d, RR1 r)) -MIDFUNC(2,shra_b_rr,(RW1 d, R1 r)) +MIDFUNC(2,shra_b_rr,(RW1 d, RR1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -681,7 +681,7 @@ MIDFUNC(2,shra_b_rr,(RW1 d, R1 r)) unlock2(r); unlock2(d); } -MENDFUNC(2,shra_b_rr,(RW1 d, R1 r)) +MENDFUNC(2,shra_b_rr,(RW1 d, RR1 r)) MIDFUNC(2,setcc,(W1 d, IMM cc)) { @@ -699,7 +699,7 @@ MIDFUNC(2,setcc_m,(IMM d, IMM cc)) } MENDFUNC(2,setcc_m,(IMM d, IMM cc)) -MIDFUNC(3,cmov_b_rr,(RW1 d, R1 s, IMM cc)) +MIDFUNC(3,cmov_b_rr,(RW1 d, RR1 s, IMM cc)) { if (d==s) return; @@ -710,9 +710,9 @@ MIDFUNC(3,cmov_b_rr,(RW1 d, R1 s, IMM cc)) unlock2(s); unlock2(d); } -MENDFUNC(3,cmov_b_rr,(RW1 d, R1 s, IMM cc)) +MENDFUNC(3,cmov_b_rr,(RW1 d, RR1 s, IMM cc)) -MIDFUNC(3,cmov_w_rr,(RW2 d, R2 s, IMM cc)) +MIDFUNC(3,cmov_w_rr,(RW2 d, RR2 s, IMM cc)) { if (d==s) return; @@ -723,9 +723,9 @@ MIDFUNC(3,cmov_w_rr,(RW2 d, R2 s, IMM cc)) unlock2(s); unlock2(d); } -MENDFUNC(3,cmov_w_rr,(RW2 d, R2 s, IMM cc)) +MENDFUNC(3,cmov_w_rr,(RW2 d, RR2 s, IMM cc)) -MIDFUNC(3,cmov_l_rr,(RW4 d, R4 s, IMM cc)) +MIDFUNC(3,cmov_l_rr,(RW4 d, RR4 s, IMM cc)) { if (d==s) return; @@ -736,7 +736,7 @@ MIDFUNC(3,cmov_l_rr,(RW4 d, R4 s, IMM cc)) unlock2(s); unlock2(d); } -MENDFUNC(3,cmov_l_rr,(RW4 d, R4 s, IMM cc)) +MENDFUNC(3,cmov_l_rr,(RW4 d, RR4 s, IMM cc)) MIDFUNC(1,setzflg_l,(RW4 r)) { @@ -773,7 +773,7 @@ MIDFUNC(3,cmov_l_rm,(RW4 d, IMM s, IMM cc)) } MENDFUNC(3,cmov_l_rm,(RW4 d, IMM s, IMM cc)) -MIDFUNC(2,bsf_l_rr,(W4 d, R4 s)) +MIDFUNC(2,bsf_l_rr,(W4 d, RR4 s)) { CLOBBER_BSF; s=readreg(s,4); @@ -782,9 +782,9 @@ MIDFUNC(2,bsf_l_rr,(W4 d, R4 s)) unlock2(s); unlock2(d); } -MENDFUNC(2,bsf_l_rr,(W4 d, R4 s)) +MENDFUNC(2,bsf_l_rr,(W4 d, RR4 s)) -MIDFUNC(2,imul_32_32,(RW4 d, R4 s)) +MIDFUNC(2,imul_32_32,(RW4 d, RR4 s)) { CLOBBER_MUL; s=readreg(s,4); @@ -793,7 +793,7 @@ MIDFUNC(2,imul_32_32,(RW4 d, R4 s)) unlock2(s); unlock2(d); } -MENDFUNC(2,imul_32_32,(RW4 d, R4 s)) +MENDFUNC(2,imul_32_32,(RW4 d, RR4 s)) MIDFUNC(2,imul_64_32,(RW4 d, RW4 s)) { @@ -817,7 +817,7 @@ MIDFUNC(2,mul_64_32,(RW4 d, RW4 s)) } MENDFUNC(2,mul_64_32,(RW4 d, RW4 s)) -MIDFUNC(2,sign_extend_16_rr,(W4 d, R2 s)) +MIDFUNC(2,sign_extend_16_rr,(W4 d, RR2 s)) { int isrmw; @@ -845,9 +845,9 @@ MIDFUNC(2,sign_extend_16_rr,(W4 d, R2 s)) unlock2(s); } } -MENDFUNC(2,sign_extend_16_rr,(W4 d, R2 s)) +MENDFUNC(2,sign_extend_16_rr,(W4 d, RR2 s)) -MIDFUNC(2,sign_extend_8_rr,(W4 d, R1 s)) +MIDFUNC(2,sign_extend_8_rr,(W4 d, RR1 s)) { int isrmw; @@ -877,9 +877,9 @@ MIDFUNC(2,sign_extend_8_rr,(W4 d, R1 s)) unlock2(s); } } -MENDFUNC(2,sign_extend_8_rr,(W4 d, R1 s)) +MENDFUNC(2,sign_extend_8_rr,(W4 d, RR1 s)) -MIDFUNC(2,zero_extend_16_rr,(W4 d, R2 s)) +MIDFUNC(2,zero_extend_16_rr,(W4 d, RR2 s)) { int isrmw; @@ -907,9 +907,9 @@ MIDFUNC(2,zero_extend_16_rr,(W4 d, R2 s)) unlock2(s); } } -MENDFUNC(2,zero_extend_16_rr,(W4 d, R2 s)) +MENDFUNC(2,zero_extend_16_rr,(W4 d, RR2 s)) -MIDFUNC(2,zero_extend_8_rr,(W4 d, R1 s)) +MIDFUNC(2,zero_extend_8_rr,(W4 d, RR1 s)) { int isrmw; if (isconst(s)) { @@ -938,9 +938,9 @@ MIDFUNC(2,zero_extend_8_rr,(W4 d, R1 s)) unlock2(s); } } -MENDFUNC(2,zero_extend_8_rr,(W4 d, R1 s)) +MENDFUNC(2,zero_extend_8_rr,(W4 d, RR1 s)) -MIDFUNC(2,mov_b_rr,(W1 d, R1 s)) +MIDFUNC(2,mov_b_rr,(W1 d, RR1 s)) { if (d==s) return; @@ -956,9 +956,9 @@ MIDFUNC(2,mov_b_rr,(W1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,mov_b_rr,(W1 d, R1 s)) +MENDFUNC(2,mov_b_rr,(W1 d, RR1 s)) -MIDFUNC(2,mov_w_rr,(W2 d, R2 s)) +MIDFUNC(2,mov_w_rr,(W2 d, RR2 s)) { if (d==s) return; @@ -974,9 +974,9 @@ MIDFUNC(2,mov_w_rr,(W2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,mov_w_rr,(W2 d, R2 s)) +MENDFUNC(2,mov_w_rr,(W2 d, RR2 s)) -MIDFUNC(3,mov_l_rrm_indexed,(W4 d,R4 baser, R4 index)) +MIDFUNC(3,mov_l_rrm_indexed,(W4 d,RR4 baser, RR4 index)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -988,9 +988,9 @@ MIDFUNC(3,mov_l_rrm_indexed,(W4 d,R4 baser, R4 index)) unlock2(baser); unlock2(index); } -MENDFUNC(3,mov_l_rrm_indexed,(W4 d,R4 baser, R4 index)) +MENDFUNC(3,mov_l_rrm_indexed,(W4 d,RR4 baser, RR4 index)) -MIDFUNC(3,mov_w_rrm_indexed,(W2 d, R4 baser, R4 index)) +MIDFUNC(3,mov_w_rrm_indexed,(W2 d, RR4 baser, RR4 index)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -1002,9 +1002,9 @@ MIDFUNC(3,mov_w_rrm_indexed,(W2 d, R4 baser, R4 index)) unlock2(baser); unlock2(index); } -MENDFUNC(3,mov_w_rrm_indexed,(W2 d, R4 baser, R4 index)) +MENDFUNC(3,mov_w_rrm_indexed,(W2 d, RR4 baser, RR4 index)) -MIDFUNC(3,mov_b_rrm_indexed,(W1 d, R4 baser, R4 index)) +MIDFUNC(3,mov_b_rrm_indexed,(W1 d, RR4 baser, RR4 index)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -1017,9 +1017,9 @@ MIDFUNC(3,mov_b_rrm_indexed,(W1 d, R4 baser, R4 index)) unlock2(baser); unlock2(index); } -MENDFUNC(3,mov_b_rrm_indexed,(W1 d, R4 baser, R4 index)) +MENDFUNC(3,mov_b_rrm_indexed,(W1 d, RR4 baser, RR4 index)) -MIDFUNC(3,mov_l_mrr_indexed,(R4 baser, R4 index, R4 s)) +MIDFUNC(3,mov_l_mrr_indexed,(RR4 baser, RR4 index, RR4 s)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -1034,9 +1034,9 @@ MIDFUNC(3,mov_l_mrr_indexed,(R4 baser, R4 index, R4 s)) unlock2(baser); unlock2(index); } -MENDFUNC(3,mov_l_mrr_indexed,(R4 baser, R4 index, R4 s)) +MENDFUNC(3,mov_l_mrr_indexed,(RR4 baser, RR4 index, RR4 s)) -MIDFUNC(3,mov_w_mrr_indexed,(R4 baser, R4 index, R2 s)) +MIDFUNC(3,mov_w_mrr_indexed,(RR4 baser, RR4 index, RR2 s)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -1048,9 +1048,9 @@ MIDFUNC(3,mov_w_mrr_indexed,(R4 baser, R4 index, R2 s)) unlock2(baser); unlock2(index); } -MENDFUNC(3,mov_w_mrr_indexed,(R4 baser, R4 index, R2 s)) +MENDFUNC(3,mov_w_mrr_indexed,(RR4 baser, RR4 index, RR2 s)) -MIDFUNC(3,mov_b_mrr_indexed,(R4 baser, R4 index, R1 s)) +MIDFUNC(3,mov_b_mrr_indexed,(RR4 baser, RR4 index, RR1 s)) { CLOBBER_MOV; s=readreg(s,1); @@ -1062,10 +1062,10 @@ MIDFUNC(3,mov_b_mrr_indexed,(R4 baser, R4 index, R1 s)) unlock2(baser); unlock2(index); } -MENDFUNC(3,mov_b_mrr_indexed,(R4 baser, R4 index, R1 s)) +MENDFUNC(3,mov_b_mrr_indexed,(RR4 baser, RR4 index, RR1 s)) /* Read a long from base+4*index */ -MIDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, R4 index)) +MIDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, RR4 index)) { int indexreg=index; @@ -1083,10 +1083,10 @@ MIDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, R4 index)) unlock2(index); unlock2(d); } -MENDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, R4 index)) +MENDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, RR4 index)) /* read the long at the address contained in s+offset and store in d */ -MIDFUNC(3,mov_l_rR,(W4 d, R4 s, IMM offset)) +MIDFUNC(3,mov_l_rR,(W4 d, RR4 s, IMM offset)) { if (isconst(s)) { COMPCALL(mov_l_rm)(d,live.state[s].val+offset); @@ -1100,10 +1100,10 @@ MIDFUNC(3,mov_l_rR,(W4 d, R4 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_l_rR,(W4 d, R4 s, IMM offset)) +MENDFUNC(3,mov_l_rR,(W4 d, RR4 s, IMM offset)) /* read the word at the address contained in s+offset and store in d */ -MIDFUNC(3,mov_w_rR,(W2 d, R4 s, IMM offset)) +MIDFUNC(3,mov_w_rR,(W2 d, RR4 s, IMM offset)) { if (isconst(s)) { COMPCALL(mov_w_rm)(d,live.state[s].val+offset); @@ -1117,10 +1117,10 @@ MIDFUNC(3,mov_w_rR,(W2 d, R4 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_w_rR,(W2 d, R4 s, IMM offset)) +MENDFUNC(3,mov_w_rR,(W2 d, RR4 s, IMM offset)) /* read the word at the address contained in s+offset and store in d */ -MIDFUNC(3,mov_b_rR,(W1 d, R4 s, IMM offset)) +MIDFUNC(3,mov_b_rR,(W1 d, RR4 s, IMM offset)) { if (isconst(s)) { COMPCALL(mov_b_rm)(d,live.state[s].val+offset); @@ -1134,10 +1134,10 @@ MIDFUNC(3,mov_b_rR,(W1 d, R4 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_b_rR,(W1 d, R4 s, IMM offset)) +MENDFUNC(3,mov_b_rR,(W1 d, RR4 s, IMM offset)) /* read the long at the address contained in s+offset and store in d */ -MIDFUNC(3,mov_l_brR,(W4 d, R4 s, IMM offset)) +MIDFUNC(3,mov_l_brR,(W4 d, RR4 s, IMM offset)) { int sreg=s; if (isconst(s)) { @@ -1153,10 +1153,10 @@ MIDFUNC(3,mov_l_brR,(W4 d, R4 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_l_brR,(W4 d, R4 s, IMM offset)) +MENDFUNC(3,mov_l_brR,(W4 d, RR4 s, IMM offset)) /* read the word at the address contained in s+offset and store in d */ -MIDFUNC(3,mov_w_brR,(W2 d, R4 s, IMM offset)) +MIDFUNC(3,mov_w_brR,(W2 d, RR4 s, IMM offset)) { int sreg=s; if (isconst(s)) { @@ -1173,10 +1173,10 @@ MIDFUNC(3,mov_w_brR,(W2 d, R4 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_w_brR,(W2 d, R4 s, IMM offset)) +MENDFUNC(3,mov_w_brR,(W2 d, RR4 s, IMM offset)) /* read the word at the address contained in s+offset and store in d */ -MIDFUNC(3,mov_b_brR,(W1 d, R4 s, IMM offset)) +MIDFUNC(3,mov_b_brR,(W1 d, RR4 s, IMM offset)) { int sreg=s; if (isconst(s)) { @@ -1193,9 +1193,9 @@ MIDFUNC(3,mov_b_brR,(W1 d, R4 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_b_brR,(W1 d, R4 s, IMM offset)) +MENDFUNC(3,mov_b_brR,(W1 d, RR4 s, IMM offset)) -MIDFUNC(3,mov_l_Ri,(R4 d, IMM i, IMM offset)) +MIDFUNC(3,mov_l_Ri,(RR4 d, IMM i, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1209,9 +1209,9 @@ MIDFUNC(3,mov_l_Ri,(R4 d, IMM i, IMM offset)) raw_mov_l_Ri(d,i,offset); unlock2(d); } -MENDFUNC(3,mov_l_Ri,(R4 d, IMM i, IMM offset)) +MENDFUNC(3,mov_l_Ri,(RR4 d, IMM i, IMM offset)) -MIDFUNC(3,mov_w_Ri,(R4 d, IMM i, IMM offset)) +MIDFUNC(3,mov_w_Ri,(RR4 d, IMM i, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1225,9 +1225,9 @@ MIDFUNC(3,mov_w_Ri,(R4 d, IMM i, IMM offset)) raw_mov_w_Ri(d,i,offset); unlock2(d); } -MENDFUNC(3,mov_w_Ri,(R4 d, IMM i, IMM offset)) +MENDFUNC(3,mov_w_Ri,(RR4 d, IMM i, IMM offset)) -MIDFUNC(3,mov_b_Ri,(R4 d, IMM i, IMM offset)) +MIDFUNC(3,mov_b_Ri,(RR4 d, IMM i, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1241,10 +1241,10 @@ MIDFUNC(3,mov_b_Ri,(R4 d, IMM i, IMM offset)) raw_mov_b_Ri(d,i,offset); unlock2(d); } -MENDFUNC(3,mov_b_Ri,(R4 d, IMM i, IMM offset)) +MENDFUNC(3,mov_b_Ri,(RR4 d, IMM i, IMM offset)) /* Warning! OFFSET is byte sized only! */ -MIDFUNC(3,mov_l_Rr,(R4 d, R4 s, IMM offset)) +MIDFUNC(3,mov_l_Rr,(RR4 d, RR4 s, IMM offset)) { if (isconst(d)) { COMPCALL(mov_l_mr)(live.state[d].val+offset,s); @@ -1263,9 +1263,9 @@ MIDFUNC(3,mov_l_Rr,(R4 d, R4 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_l_Rr,(R4 d, R4 s, IMM offset)) +MENDFUNC(3,mov_l_Rr,(RR4 d, RR4 s, IMM offset)) -MIDFUNC(3,mov_w_Rr,(R4 d, R2 s, IMM offset)) +MIDFUNC(3,mov_w_Rr,(RR4 d, RR2 s, IMM offset)) { if (isconst(d)) { COMPCALL(mov_w_mr)(live.state[d].val+offset,s); @@ -1283,9 +1283,9 @@ MIDFUNC(3,mov_w_Rr,(R4 d, R2 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_w_Rr,(R4 d, R2 s, IMM offset)) +MENDFUNC(3,mov_w_Rr,(RR4 d, RR2 s, IMM offset)) -MIDFUNC(3,mov_b_Rr,(R4 d, R1 s, IMM offset)) +MIDFUNC(3,mov_b_Rr,(RR4 d, RR1 s, IMM offset)) { if (isconst(d)) { COMPCALL(mov_b_mr)(live.state[d].val+offset,s); @@ -1303,9 +1303,9 @@ MIDFUNC(3,mov_b_Rr,(R4 d, R1 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_b_Rr,(R4 d, R1 s, IMM offset)) +MENDFUNC(3,mov_b_Rr,(RR4 d, RR1 s, IMM offset)) -MIDFUNC(3,lea_l_brr,(W4 d, R4 s, IMM offset)) +MIDFUNC(3,lea_l_brr,(W4 d, RR4 s, IMM offset)) { if (isconst(s)) { COMPCALL(mov_l_ri)(d,live.state[s].val+offset); @@ -1324,9 +1324,9 @@ MIDFUNC(3,lea_l_brr,(W4 d, R4 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,lea_l_brr,(W4 d, R4 s, IMM offset)) +MENDFUNC(3,lea_l_brr,(W4 d, RR4 s, IMM offset)) -MIDFUNC(5,lea_l_brr_indexed,(W4 d, R4 s, R4 index, IMM factor, IMM offset)) +MIDFUNC(5,lea_l_brr_indexed,(W4 d, RR4 s, RR4 index, IMM factor, IMM offset)) { CLOBBER_LEA; s=readreg(s,4); @@ -1338,10 +1338,10 @@ MIDFUNC(5,lea_l_brr_indexed,(W4 d, R4 s, R4 index, IMM factor, IMM offset)) unlock2(index); unlock2(s); } -MENDFUNC(5,lea_l_brr_indexed,(W4 d, R4 s, R4 index, IMM factor, IMM offset)) +MENDFUNC(5,lea_l_brr_indexed,(W4 d, RR4 s, RR4 index, IMM factor, IMM offset)) /* write d to the long at the address contained in s+offset */ -MIDFUNC(3,mov_l_bRr,(R4 d, R4 s, IMM offset)) +MIDFUNC(3,mov_l_bRr,(RR4 d, RR4 s, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1358,10 +1358,10 @@ MIDFUNC(3,mov_l_bRr,(R4 d, R4 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_l_bRr,(R4 d, R4 s, IMM offset)) +MENDFUNC(3,mov_l_bRr,(RR4 d, RR4 s, IMM offset)) /* write the word at the address contained in s+offset and store in d */ -MIDFUNC(3,mov_w_bRr,(R4 d, R2 s, IMM offset)) +MIDFUNC(3,mov_w_bRr,(RR4 d, RR2 s, IMM offset)) { int dreg=d; @@ -1378,9 +1378,9 @@ MIDFUNC(3,mov_w_bRr,(R4 d, R2 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_w_bRr,(R4 d, R2 s, IMM offset)) +MENDFUNC(3,mov_w_bRr,(RR4 d, RR2 s, IMM offset)) -MIDFUNC(3,mov_b_bRr,(R4 d, R1 s, IMM offset)) +MIDFUNC(3,mov_b_bRr,(RR4 d, RR1 s, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1396,7 +1396,7 @@ MIDFUNC(3,mov_b_bRr,(R4 d, R1 s, IMM offset)) unlock2(d); unlock2(s); } -MENDFUNC(3,mov_b_bRr,(R4 d, R1 s, IMM offset)) +MENDFUNC(3,mov_b_bRr,(RR4 d, RR1 s, IMM offset)) MIDFUNC(1,gen_bswap_32,(RW4 r)) { @@ -1432,7 +1432,7 @@ MIDFUNC(1,gen_bswap_16,(RW2 r)) } MENDFUNC(1,gen_bswap_16,(RW2 r)) -MIDFUNC(2,mov_l_rr,(W4 d, R4 s)) +MIDFUNC(2,mov_l_rr,(W4 d, RR4 s)) { int olds; @@ -1471,9 +1471,9 @@ MIDFUNC(2,mov_l_rr,(W4 d, R4 s)) unlock2(s); #endif } -MENDFUNC(2,mov_l_rr,(W4 d, R4 s)) +MENDFUNC(2,mov_l_rr,(W4 d, RR4 s)) -MIDFUNC(2,mov_l_mr,(IMM d, R4 s)) +MIDFUNC(2,mov_l_mr,(IMM d, RR4 s)) { if (isconst(s)) { COMPCALL(mov_l_mi)(d,live.state[s].val); @@ -1485,9 +1485,9 @@ MIDFUNC(2,mov_l_mr,(IMM d, R4 s)) raw_mov_l_mr(d,s); unlock2(s); } -MENDFUNC(2,mov_l_mr,(IMM d, R4 s)) +MENDFUNC(2,mov_l_mr,(IMM d, RR4 s)) -MIDFUNC(2,mov_w_mr,(IMM d, R2 s)) +MIDFUNC(2,mov_w_mr,(IMM d, RR2 s)) { if (isconst(s)) { COMPCALL(mov_w_mi)(d,(uae_u16)live.state[s].val); @@ -1499,7 +1499,7 @@ MIDFUNC(2,mov_w_mr,(IMM d, R2 s)) raw_mov_w_mr(d,s); unlock2(s); } -MENDFUNC(2,mov_w_mr,(IMM d, R2 s)) +MENDFUNC(2,mov_w_mr,(IMM d, RR2 s)) MIDFUNC(2,mov_w_rm,(W2 d, IMM s)) { @@ -1511,7 +1511,7 @@ MIDFUNC(2,mov_w_rm,(W2 d, IMM s)) } MENDFUNC(2,mov_w_rm,(W2 d, IMM s)) -MIDFUNC(2,mov_b_mr,(IMM d, R1 s)) +MIDFUNC(2,mov_b_mr,(IMM d, RR1 s)) { if (isconst(s)) { COMPCALL(mov_b_mi)(d,(uae_u8)live.state[s].val); @@ -1524,7 +1524,7 @@ MIDFUNC(2,mov_b_mr,(IMM d, R1 s)) raw_mov_b_mr(d,s); unlock2(s); } -MENDFUNC(2,mov_b_mr,(IMM d, R1 s)) +MENDFUNC(2,mov_b_mr,(IMM d, RR1 s)) MIDFUNC(2,mov_b_rm,(W1 d, IMM s)) { @@ -1584,7 +1584,7 @@ MIDFUNC(2,add_b_mi,(IMM d, IMM s)) } MENDFUNC(2,add_b_mi,(IMM d, IMM s)) -MIDFUNC(2,test_l_ri,(R4 d, IMM i)) +MIDFUNC(2,test_l_ri,(RR4 d, IMM i)) { CLOBBER_TEST; d=readreg(d,4); @@ -1592,9 +1592,9 @@ MIDFUNC(2,test_l_ri,(R4 d, IMM i)) raw_test_l_ri(d,i); unlock2(d); } -MENDFUNC(2,test_l_ri,(R4 d, IMM i)) +MENDFUNC(2,test_l_ri,(RR4 d, IMM i)) -MIDFUNC(2,test_l_rr,(R4 d, R4 s)) +MIDFUNC(2,test_l_rr,(RR4 d, RR4 s)) { CLOBBER_TEST; d=readreg(d,4); @@ -1604,9 +1604,9 @@ MIDFUNC(2,test_l_rr,(R4 d, R4 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,test_l_rr,(R4 d, R4 s)) +MENDFUNC(2,test_l_rr,(RR4 d, RR4 s)) -MIDFUNC(2,test_w_rr,(R2 d, R2 s)) +MIDFUNC(2,test_w_rr,(RR2 d, RR2 s)) { CLOBBER_TEST; d=readreg(d,2); @@ -1616,9 +1616,9 @@ MIDFUNC(2,test_w_rr,(R2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,test_w_rr,(R2 d, R2 s)) +MENDFUNC(2,test_w_rr,(RR2 d, RR2 s)) -MIDFUNC(2,test_b_rr,(R1 d, R1 s)) +MIDFUNC(2,test_b_rr,(RR1 d, RR1 s)) { CLOBBER_TEST; d=readreg(d,1); @@ -1628,7 +1628,7 @@ MIDFUNC(2,test_b_rr,(R1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,test_b_rr,(R1 d, R1 s)) +MENDFUNC(2,test_b_rr,(RR1 d, RR1 s)) MIDFUNC(2,and_l_ri,(RW4 d, IMM i)) { @@ -1645,7 +1645,7 @@ MIDFUNC(2,and_l_ri,(RW4 d, IMM i)) } MENDFUNC(2,and_l_ri,(RW4 d, IMM i)) -MIDFUNC(2,and_l,(RW4 d, R4 s)) +MIDFUNC(2,and_l,(RW4 d, RR4 s)) { CLOBBER_AND; s=readreg(s,4); @@ -1655,9 +1655,9 @@ MIDFUNC(2,and_l,(RW4 d, R4 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,and_l,(RW4 d, R4 s)) +MENDFUNC(2,and_l,(RW4 d, RR4 s)) -MIDFUNC(2,and_w,(RW2 d, R2 s)) +MIDFUNC(2,and_w,(RW2 d, RR2 s)) { CLOBBER_AND; s=readreg(s,2); @@ -1667,9 +1667,9 @@ MIDFUNC(2,and_w,(RW2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,and_w,(RW2 d, R2 s)) +MENDFUNC(2,and_w,(RW2 d, RR2 s)) -MIDFUNC(2,and_b,(RW1 d, R1 s)) +MIDFUNC(2,and_b,(RW1 d, RR1 s)) { CLOBBER_AND; s=readreg(s,1); @@ -1679,7 +1679,7 @@ MIDFUNC(2,and_b,(RW1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,and_b,(RW1 d, R1 s)) +MENDFUNC(2,and_b,(RW1 d, RR1 s)) MIDFUNC(2,or_l_ri,(RW4 d, IMM i)) { @@ -1695,7 +1695,7 @@ MIDFUNC(2,or_l_ri,(RW4 d, IMM i)) } MENDFUNC(2,or_l_ri,(RW4 d, IMM i)) -MIDFUNC(2,or_l,(RW4 d, R4 s)) +MIDFUNC(2,or_l,(RW4 d, RR4 s)) { if (isconst(d) && isconst(s) && !needflags) { live.state[d].val|=live.state[s].val; @@ -1709,9 +1709,9 @@ MIDFUNC(2,or_l,(RW4 d, R4 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,or_l,(RW4 d, R4 s)) +MENDFUNC(2,or_l,(RW4 d, RR4 s)) -MIDFUNC(2,or_w,(RW2 d, R2 s)) +MIDFUNC(2,or_w,(RW2 d, RR2 s)) { CLOBBER_OR; s=readreg(s,2); @@ -1721,9 +1721,9 @@ MIDFUNC(2,or_w,(RW2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,or_w,(RW2 d, R2 s)) +MENDFUNC(2,or_w,(RW2 d, RR2 s)) -MIDFUNC(2,or_b,(RW1 d, R1 s)) +MIDFUNC(2,or_b,(RW1 d, RR1 s)) { CLOBBER_OR; s=readreg(s,1); @@ -1733,9 +1733,9 @@ MIDFUNC(2,or_b,(RW1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,or_b,(RW1 d, R1 s)) +MENDFUNC(2,or_b,(RW1 d, RR1 s)) -MIDFUNC(2,adc_l,(RW4 d, R4 s)) +MIDFUNC(2,adc_l,(RW4 d, RR4 s)) { CLOBBER_ADC; s=readreg(s,4); @@ -1746,9 +1746,9 @@ MIDFUNC(2,adc_l,(RW4 d, R4 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,adc_l,(RW4 d, R4 s)) +MENDFUNC(2,adc_l,(RW4 d, RR4 s)) -MIDFUNC(2,adc_w,(RW2 d, R2 s)) +MIDFUNC(2,adc_w,(RW2 d, RR2 s)) { CLOBBER_ADC; s=readreg(s,2); @@ -1758,9 +1758,9 @@ MIDFUNC(2,adc_w,(RW2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,adc_w,(RW2 d, R2 s)) +MENDFUNC(2,adc_w,(RW2 d, RR2 s)) -MIDFUNC(2,adc_b,(RW1 d, R1 s)) +MIDFUNC(2,adc_b,(RW1 d, RR1 s)) { CLOBBER_ADC; s=readreg(s,1); @@ -1770,9 +1770,9 @@ MIDFUNC(2,adc_b,(RW1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,adc_b,(RW1 d, R1 s)) +MENDFUNC(2,adc_b,(RW1 d, RR1 s)) -MIDFUNC(2,add_l,(RW4 d, R4 s)) +MIDFUNC(2,add_l,(RW4 d, RR4 s)) { if (isconst(s)) { COMPCALL(add_l_ri)(d,live.state[s].val); @@ -1788,9 +1788,9 @@ MIDFUNC(2,add_l,(RW4 d, R4 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,add_l,(RW4 d, R4 s)) +MENDFUNC(2,add_l,(RW4 d, RR4 s)) -MIDFUNC(2,add_w,(RW2 d, R2 s)) +MIDFUNC(2,add_w,(RW2 d, RR2 s)) { if (isconst(s)) { COMPCALL(add_w_ri)(d,(uae_u16)live.state[s].val); @@ -1805,9 +1805,9 @@ MIDFUNC(2,add_w,(RW2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,add_w,(RW2 d, R2 s)) +MENDFUNC(2,add_w,(RW2 d, RR2 s)) -MIDFUNC(2,add_b,(RW1 d, R1 s)) +MIDFUNC(2,add_b,(RW1 d, RR1 s)) { if (isconst(s)) { COMPCALL(add_b_ri)(d,(uae_u8)live.state[s].val); @@ -1822,7 +1822,7 @@ MIDFUNC(2,add_b,(RW1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,add_b,(RW1 d, R1 s)) +MENDFUNC(2,add_b,(RW1 d, RR1 s)) MIDFUNC(2,sub_l_ri,(RW4 d, IMM i)) { @@ -1922,7 +1922,7 @@ MIDFUNC(2,add_b_ri,(RW1 d, IMM i)) } MENDFUNC(2,add_b_ri,(RW1 d, IMM i)) -MIDFUNC(2,sbb_l,(RW4 d, R4 s)) +MIDFUNC(2,sbb_l,(RW4 d, RR4 s)) { CLOBBER_SBB; s=readreg(s,4); @@ -1932,9 +1932,9 @@ MIDFUNC(2,sbb_l,(RW4 d, R4 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,sbb_l,(RW4 d, R4 s)) +MENDFUNC(2,sbb_l,(RW4 d, RR4 s)) -MIDFUNC(2,sbb_w,(RW2 d, R2 s)) +MIDFUNC(2,sbb_w,(RW2 d, RR2 s)) { CLOBBER_SBB; s=readreg(s,2); @@ -1944,9 +1944,9 @@ MIDFUNC(2,sbb_w,(RW2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,sbb_w,(RW2 d, R2 s)) +MENDFUNC(2,sbb_w,(RW2 d, RR2 s)) -MIDFUNC(2,sbb_b,(RW1 d, R1 s)) +MIDFUNC(2,sbb_b,(RW1 d, RR1 s)) { CLOBBER_SBB; s=readreg(s,1); @@ -1956,9 +1956,9 @@ MIDFUNC(2,sbb_b,(RW1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,sbb_b,(RW1 d, R1 s)) +MENDFUNC(2,sbb_b,(RW1 d, RR1 s)) -MIDFUNC(2,sub_l,(RW4 d, R4 s)) +MIDFUNC(2,sub_l,(RW4 d, RR4 s)) { if (isconst(s)) { COMPCALL(sub_l_ri)(d,live.state[s].val); @@ -1973,9 +1973,9 @@ MIDFUNC(2,sub_l,(RW4 d, R4 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,sub_l,(RW4 d, R4 s)) +MENDFUNC(2,sub_l,(RW4 d, RR4 s)) -MIDFUNC(2,sub_w,(RW2 d, R2 s)) +MIDFUNC(2,sub_w,(RW2 d, RR2 s)) { if (isconst(s)) { COMPCALL(sub_w_ri)(d,(uae_u16)live.state[s].val); @@ -1990,9 +1990,9 @@ MIDFUNC(2,sub_w,(RW2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,sub_w,(RW2 d, R2 s)) +MENDFUNC(2,sub_w,(RW2 d, RR2 s)) -MIDFUNC(2,sub_b,(RW1 d, R1 s)) +MIDFUNC(2,sub_b,(RW1 d, RR1 s)) { if (isconst(s)) { COMPCALL(sub_b_ri)(d,(uae_u8)live.state[s].val); @@ -2007,9 +2007,9 @@ MIDFUNC(2,sub_b,(RW1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,sub_b,(RW1 d, R1 s)) +MENDFUNC(2,sub_b,(RW1 d, RR1 s)) -MIDFUNC(2,cmp_l,(R4 d, R4 s)) +MIDFUNC(2,cmp_l,(RR4 d, RR4 s)) { CLOBBER_CMP; s=readreg(s,4); @@ -2019,9 +2019,9 @@ MIDFUNC(2,cmp_l,(R4 d, R4 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,cmp_l,(R4 d, R4 s)) +MENDFUNC(2,cmp_l,(RR4 d, RR4 s)) -MIDFUNC(2,cmp_l_ri,(R4 r, IMM i)) +MIDFUNC(2,cmp_l_ri,(RR4 r, IMM i)) { CLOBBER_CMP; r=readreg(r,4); @@ -2029,9 +2029,9 @@ MIDFUNC(2,cmp_l_ri,(R4 r, IMM i)) raw_cmp_l_ri(r,i); unlock2(r); } -MENDFUNC(2,cmp_l_ri,(R4 r, IMM i)) +MENDFUNC(2,cmp_l_ri,(RR4 r, IMM i)) -MIDFUNC(2,cmp_w,(R2 d, R2 s)) +MIDFUNC(2,cmp_w,(RR2 d, RR2 s)) { CLOBBER_CMP; s=readreg(s,2); @@ -2041,9 +2041,9 @@ MIDFUNC(2,cmp_w,(R2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,cmp_w,(R2 d, R2 s)) +MENDFUNC(2,cmp_w,(RR2 d, RR2 s)) -MIDFUNC(2,cmp_b,(R1 d, R1 s)) +MIDFUNC(2,cmp_b,(RR1 d, RR1 s)) { CLOBBER_CMP; s=readreg(s,1); @@ -2053,9 +2053,9 @@ MIDFUNC(2,cmp_b,(R1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,cmp_b,(R1 d, R1 s)) +MENDFUNC(2,cmp_b,(RR1 d, RR1 s)) -MIDFUNC(2,xor_l,(RW4 d, R4 s)) +MIDFUNC(2,xor_l,(RW4 d, RR4 s)) { CLOBBER_XOR; s=readreg(s,4); @@ -2065,9 +2065,9 @@ MIDFUNC(2,xor_l,(RW4 d, R4 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,xor_l,(RW4 d, R4 s)) +MENDFUNC(2,xor_l,(RW4 d, RR4 s)) -MIDFUNC(2,xor_w,(RW2 d, R2 s)) +MIDFUNC(2,xor_w,(RW2 d, RR2 s)) { CLOBBER_XOR; s=readreg(s,2); @@ -2077,9 +2077,9 @@ MIDFUNC(2,xor_w,(RW2 d, R2 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,xor_w,(RW2 d, R2 s)) +MENDFUNC(2,xor_w,(RW2 d, RR2 s)) -MIDFUNC(2,xor_b,(RW1 d, R1 s)) +MIDFUNC(2,xor_b,(RW1 d, RR1 s)) { CLOBBER_XOR; s=readreg(s,1); @@ -2089,9 +2089,9 @@ MIDFUNC(2,xor_b,(RW1 d, R1 s)) unlock2(d); unlock2(s); } -MENDFUNC(2,xor_b,(RW1 d, R1 s)) +MENDFUNC(2,xor_b,(RW1 d, RR1 s)) -MIDFUNC(5,call_r_11,(W4 out1, R4 r, R4 in1, IMM osize, IMM isize)) +MIDFUNC(5,call_r_11,(W4 out1, RR4 r, RR4 in1, IMM osize, IMM isize)) { clobber_flags(); remove_all_offsets(); @@ -2134,9 +2134,9 @@ MIDFUNC(5,call_r_11,(W4 out1, R4 r, R4 in1, IMM osize, IMM isize)) live.state[out1].dirtysize=osize; set_status(out1,DIRTY); } -MENDFUNC(5,call_r_11,(W4 out1, R4 r, R4 in1, IMM osize, IMM isize)) +MENDFUNC(5,call_r_11,(W4 out1, RR4 r, RR4 in1, IMM osize, IMM isize)) -MIDFUNC(5,call_r_02,(R4 r, R4 in1, R4 in2, IMM isize1, IMM isize2)) +MIDFUNC(5,call_r_02,(RR4 r, RR4 in1, RR4 in2, IMM isize1, IMM isize2)) { clobber_flags(); remove_all_offsets(); @@ -2159,7 +2159,7 @@ MIDFUNC(5,call_r_02,(R4 r, R4 in1, R4 in2, IMM isize1, IMM isize2)) raw_inc_sp(8); #endif } -MENDFUNC(5,call_r_02,(R4 r, R4 in1, R4 in2, IMM isize1, IMM isize2)) +MENDFUNC(5,call_r_02,(RR4 r, RR4 in1, RR4 in2, IMM isize1, IMM isize2)) MIDFUNC(1,forget_about,(W4 r)) { @@ -2336,14 +2336,14 @@ MIDFUNC(2,fmov_rr,(FW d, FR s)) } MENDFUNC(2,fmov_rr,(FW d, FR s)) -MIDFUNC(2,fldcw_m_indexed,(R4 index, IMM base)) +MIDFUNC(2,fldcw_m_indexed,(RR4 index, IMM base)) { index=readreg(index,4); raw_fldcw_m_indexed(index,base); unlock2(index); } -MENDFUNC(2,fldcw_m_indexed,(R4 index, IMM base)) +MENDFUNC(2,fldcw_m_indexed,(RR4 index, IMM base)) MIDFUNC(1,ftst_r,(FR r)) { diff --git a/jit/compemu_support.cpp b/jit/compemu_support.cpp index c4b8cc4b..bf4af939 100644 --- a/jit/compemu_support.cpp +++ b/jit/compemu_support.cpp @@ -601,7 +601,7 @@ STATIC_INLINE uae_u8* get_target(void) * Flags status handling. EMIT TIME! * ********************************************************************/ -static void bt_l_ri_noclobber(R4 r, IMM i); +static void bt_l_ri_noclobber(RR4 r, IMM i); static void make_flags_live_internal(void) { @@ -1395,7 +1395,7 @@ static int rmw_specific(int r, int wsize, int rsize, int spec) /* needed for restoring the carry flag on non-P6 cores */ -static void bt_l_ri_noclobber(R4 r, IMM i) +static void bt_l_ri_noclobber(RR4 r, IMM i) { int size=4; if (i<16) -- 2.47.3