From: Frode Solheim Date: Sat, 5 Sep 2015 16:14:53 +0000 (+0200) Subject: JIT: fix indentation in compemu_midfunc_x86.cpp X-Git-Tag: 3200~80^2~2 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=e0003b47410744e94e9fe0d2cf0c0718f6be5aeb;p=francis%2Fwinuae.git JIT: fix indentation in compemu_midfunc_x86.cpp --- diff --git a/jit/compemu_midfunc_x86.cpp b/jit/compemu_midfunc_x86.cpp index a894d142..17bcc592 100644 --- a/jit/compemu_midfunc_x86.cpp +++ b/jit/compemu_midfunc_x86.cpp @@ -3,24 +3,24 @@ ********************************************************************/ /* -* RULES FOR HANDLING REGISTERS: -* -* * In the function headers, order the parameters -* - 1st registers written to -* - 2nd read/modify/write registers -* - 3rd registers read from -* * Before calling raw_*, you must call readreg, writereg or rmw for -* each register -* * The order for this is -* - 1st call remove_offset for all registers written to with size<4 -* - 2nd call readreg for all registers read without offset -* - 3rd call rmw for all rmw registers -* - 4th call readreg_offset for all registers that can handle offsets -* - 5th call get_offset for all the registers from the previous step -* - 6th call writereg for all written-to registers -* - 7th call raw_* -* - 8th unlock all registers that were locked -*/ + * RULES FOR HANDLING REGISTERS: + * + * * In the function headers, order the parameters + * - 1st registers written to + * - 2nd read/modify/write registers + * - 3rd registers read from + * * Before calling raw_*, you must call readreg, writereg or rmw for + * each register + * * The order for this is + * - 1st call remove_offset for all registers written to with size<4 + * - 2nd call readreg for all registers read without offset + * - 3rd call rmw for all rmw registers + * - 4th call readreg_offset for all registers that can handle offsets + * - 5th call get_offset for all the registers from the previous step + * - 6th call writereg for all written-to registers + * - 7th call raw_* + * - 8th unlock all registers that were locked + */ MIDFUNC(0,live_flags,(void)) { @@ -30,21 +30,20 @@ MIDFUNC(0,live_flags,(void)) } MENDFUNC(0,live_flags,(void)) - MIDFUNC(0,dont_care_flags,(void)) +MIDFUNC(0,dont_care_flags,(void)) { live.flags_are_important=0; } MENDFUNC(0,dont_care_flags,(void)) - - /* - * Copy m68k C flag into m68k X flag - * - * FIXME: This needs to be moved into the machdep - * part of the source because it depends on what bit - * is used to hold X. - */ - MIDFUNC(0,duplicate_carry,(void)) +/* + * Copy m68k C flag into m68k X flag + * + * FIXME: This needs to be moved into the machdep + * part of the source because it depends on what bit + * is used to hold X. + */ +MIDFUNC(0,duplicate_carry,(void)) { evict(FLAGX); make_flags_live_internal(); @@ -52,14 +51,14 @@ MENDFUNC(0,dont_care_flags,(void)) } MENDFUNC(0,duplicate_carry,(void)) - /* - * Set host C flag from m68k X flag. - * - * FIXME: This needs to be moved into the machdep - * part of the source because it depends on what bit - * is used to hold X. - */ - MIDFUNC(0,restore_carry,(void)) +/* + * Set host C flag from m68k X flag. + * + * FIXME: This needs to be moved into the machdep + * part of the source because it depends on what bit + * is used to hold X. + */ +MIDFUNC(0,restore_carry,(void)) { if (!have_rat_stall) { /* Not a P6 core, i.e. no partial stalls */ bt_l_ri_noclobber(FLAGX, 8); @@ -75,33 +74,32 @@ MENDFUNC(0,duplicate_carry,(void)) } MENDFUNC(0,restore_carry,(void)) - MIDFUNC(0,start_needflags,(void)) +MIDFUNC(0,start_needflags,(void)) { needflags=1; } MENDFUNC(0,start_needflags,(void)) - MIDFUNC(0,end_needflags,(void)) +MIDFUNC(0,end_needflags,(void)) { needflags=0; } MENDFUNC(0,end_needflags,(void)) - MIDFUNC(0,make_flags_live,(void)) +MIDFUNC(0,make_flags_live,(void)) { make_flags_live_internal(); } MENDFUNC(0,make_flags_live,(void)) - MIDFUNC(1,fflags_into_flags,(W2 tmp)) +MIDFUNC(1,fflags_into_flags,(W2 tmp)) { clobber_flags(); fflags_into_flags_internal(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,(R4 r, IMM i)) /* This is defined as only affecting C */ { int size=4; if (i<16) @@ -113,7 +111,7 @@ MENDFUNC(1,fflags_into_flags,(W2 tmp)) } MENDFUNC(2,bt_l_ri,(R4 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,(R4 r, R4 b)) /* This is defined as only affecting C */ { CLOBBER_BT; r=readreg(r,4); @@ -124,7 +122,7 @@ MENDFUNC(2,bt_l_ri,(R4 r, IMM i)) /* This is defined as only affecting C */ } MENDFUNC(2,bt_l_rr,(R4 r, R4 b)) /* This is defined as only affecting C */ - MIDFUNC(2,btc_l_ri,(RW4 r, IMM i)) +MIDFUNC(2,btc_l_ri,(RW4 r, IMM i)) { int size=4; if (i<16) @@ -136,7 +134,7 @@ MENDFUNC(2,bt_l_rr,(R4 r, R4 b)) /* This is defined as only affecting C */ } 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, R4 b)) { CLOBBER_BT; b=readreg(b,4); @@ -147,8 +145,7 @@ MENDFUNC(2,btc_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,btc_l_rr,(RW4 r, R4 b)) - - MIDFUNC(2,btr_l_ri,(RW4 r, IMM i)) +MIDFUNC(2,btr_l_ri,(RW4 r, IMM i)) { int size=4; if (i<16) @@ -160,7 +157,7 @@ MENDFUNC(2,btc_l_rr,(RW4 r, R4 b)) } 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, R4 b)) { CLOBBER_BT; b=readreg(b,4); @@ -171,8 +168,7 @@ MENDFUNC(2,btr_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,btr_l_rr,(RW4 r, R4 b)) - - MIDFUNC(2,bts_l_ri,(RW4 r, IMM i)) +MIDFUNC(2,bts_l_ri,(RW4 r, IMM i)) { int size=4; if (i<16) @@ -184,7 +180,7 @@ MENDFUNC(2,btr_l_rr,(RW4 r, R4 b)) } 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, R4 b)) { CLOBBER_BT; b=readreg(b,4); @@ -195,7 +191,7 @@ MENDFUNC(2,bts_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,bts_l_rr,(RW4 r, R4 b)) - MIDFUNC(2,mov_l_rm,(W4 d, IMM s)) +MIDFUNC(2,mov_l_rm,(W4 d, IMM s)) { CLOBBER_MOV; d=writereg(d,4); @@ -204,8 +200,7 @@ MENDFUNC(2,bts_l_rr,(RW4 r, R4 b)) } MENDFUNC(2,mov_l_rm,(W4 d, IMM s)) - - MIDFUNC(1,call_r,(R4 r)) /* Clobbering is implicit */ +MIDFUNC(1,call_r,(R4 r)) /* Clobbering is implicit */ { r=readreg(r,4); raw_call_r(r); @@ -213,35 +208,35 @@ MENDFUNC(2,mov_l_rm,(W4 d, IMM s)) } MENDFUNC(1,call_r,(R4 r)) /* Clobbering is implicit */ - MIDFUNC(2,sub_l_mi,(IMM d, IMM s)) +MIDFUNC(2,sub_l_mi,(IMM d, IMM s)) { CLOBBER_SUB; raw_sub_l_mi(d,s) ; } MENDFUNC(2,sub_l_mi,(IMM d, IMM s)) - MIDFUNC(2,mov_l_mi,(IMM d, IMM s)) +MIDFUNC(2,mov_l_mi,(IMM d, IMM s)) { CLOBBER_MOV; raw_mov_l_mi(d,s) ; } MENDFUNC(2,mov_l_mi,(IMM d, IMM s)) - MIDFUNC(2,mov_w_mi,(IMM d, IMM s)) +MIDFUNC(2,mov_w_mi,(IMM d, IMM s)) { CLOBBER_MOV; raw_mov_w_mi(d,s) ; } MENDFUNC(2,mov_w_mi,(IMM d, IMM s)) - MIDFUNC(2,mov_b_mi,(IMM d, IMM s)) +MIDFUNC(2,mov_b_mi,(IMM d, IMM s)) { CLOBBER_MOV; raw_mov_b_mi(d,s) ; } MENDFUNC(2,mov_b_mi,(IMM d, IMM s)) - MIDFUNC(2,rol_b_ri,(RW1 r, IMM i)) +MIDFUNC(2,rol_b_ri,(RW1 r, IMM i)) { if (!i && !needflags) return; @@ -252,7 +247,7 @@ MENDFUNC(2,mov_b_mi,(IMM d, IMM s)) } MENDFUNC(2,rol_b_ri,(RW1 r, IMM i)) - MIDFUNC(2,rol_w_ri,(RW2 r, IMM i)) +MIDFUNC(2,rol_w_ri,(RW2 r, IMM i)) { if (!i && !needflags) return; @@ -263,7 +258,7 @@ MENDFUNC(2,rol_b_ri,(RW1 r, IMM i)) } MENDFUNC(2,rol_w_ri,(RW2 r, IMM i)) - MIDFUNC(2,rol_l_ri,(RW4 r, IMM i)) +MIDFUNC(2,rol_l_ri,(RW4 r, IMM i)) { if (!i && !needflags) return; @@ -274,7 +269,7 @@ MENDFUNC(2,rol_w_ri,(RW2 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, R1 r)) { if (isconst(r)) { COMPCALL(rol_l_ri)(d,(uae_u8)live.state[r].val); @@ -292,7 +287,7 @@ MENDFUNC(2,rol_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,rol_l_rr,(RW4 d, R1 r)) - MIDFUNC(2,rol_w_rr,(RW2 d, R1 r)) +MIDFUNC(2,rol_w_rr,(RW2 d, R1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -311,7 +306,7 @@ MENDFUNC(2,rol_l_rr,(RW4 d, R1 r)) } MENDFUNC(2,rol_w_rr,(RW2 d, R1 r)) - MIDFUNC(2,rol_b_rr,(RW1 d, R1 r)) +MIDFUNC(2,rol_b_rr,(RW1 d, R1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -331,8 +326,7 @@ MENDFUNC(2,rol_w_rr,(RW2 d, R1 r)) } MENDFUNC(2,rol_b_rr,(RW1 d, R1 r)) - - MIDFUNC(2,shll_l_rr,(RW4 d, R1 r)) +MIDFUNC(2,shll_l_rr,(RW4 d, R1 r)) { if (isconst(r)) { COMPCALL(shll_l_ri)(d,(uae_u8)live.state[r].val); @@ -350,7 +344,7 @@ MENDFUNC(2,rol_b_rr,(RW1 d, R1 r)) } MENDFUNC(2,shll_l_rr,(RW4 d, R1 r)) - MIDFUNC(2,shll_w_rr,(RW2 d, R1 r)) +MIDFUNC(2,shll_w_rr,(RW2 d, R1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -369,7 +363,7 @@ MENDFUNC(2,shll_l_rr,(RW4 d, R1 r)) } MENDFUNC(2,shll_w_rr,(RW2 d, R1 r)) - MIDFUNC(2,shll_b_rr,(RW1 d, R1 r)) +MIDFUNC(2,shll_b_rr,(RW1 d, R1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -389,8 +383,7 @@ MENDFUNC(2,shll_w_rr,(RW2 d, R1 r)) } MENDFUNC(2,shll_b_rr,(RW1 d, R1 r)) - - MIDFUNC(2,ror_b_ri,(R1 r, IMM i)) +MIDFUNC(2,ror_b_ri,(R1 r, IMM i)) { if (!i && !needflags) return; @@ -401,7 +394,7 @@ MENDFUNC(2,shll_b_rr,(RW1 d, R1 r)) } MENDFUNC(2,ror_b_ri,(R1 r, IMM i)) - MIDFUNC(2,ror_w_ri,(R2 r, IMM i)) +MIDFUNC(2,ror_w_ri,(R2 r, IMM i)) { if (!i && !needflags) return; @@ -412,7 +405,7 @@ MENDFUNC(2,ror_b_ri,(R1 r, IMM i)) } MENDFUNC(2,ror_w_ri,(R2 r, IMM i)) - MIDFUNC(2,ror_l_ri,(R4 r, IMM i)) +MIDFUNC(2,ror_l_ri,(R4 r, IMM i)) { if (!i && !needflags) return; @@ -423,7 +416,7 @@ MENDFUNC(2,ror_w_ri,(R2 r, IMM i)) } MENDFUNC(2,ror_l_ri,(R4 r, IMM i)) - MIDFUNC(2,ror_l_rr,(R4 d, R1 r)) +MIDFUNC(2,ror_l_rr,(R4 d, R1 r)) { if (isconst(r)) { COMPCALL(ror_l_ri)(d,(uae_u8)live.state[r].val); @@ -438,7 +431,7 @@ MENDFUNC(2,ror_l_ri,(R4 r, IMM i)) } MENDFUNC(2,ror_l_rr,(R4 d, R1 r)) - MIDFUNC(2,ror_w_rr,(R2 d, R1 r)) +MIDFUNC(2,ror_w_rr,(R2 d, R1 r)) { if (isconst(r)) { COMPCALL(ror_w_ri)(d,(uae_u8)live.state[r].val); @@ -453,7 +446,7 @@ MENDFUNC(2,ror_l_rr,(R4 d, R1 r)) } MENDFUNC(2,ror_w_rr,(R2 d, R1 r)) - MIDFUNC(2,ror_b_rr,(R1 d, R1 r)) +MIDFUNC(2,ror_b_rr,(R1 d, R1 r)) { if (isconst(r)) { COMPCALL(ror_b_ri)(d,(uae_u8)live.state[r].val); @@ -469,7 +462,7 @@ MENDFUNC(2,ror_w_rr,(R2 d, R1 r)) } MENDFUNC(2,ror_b_rr,(R1 d, R1 r)) - MIDFUNC(2,shrl_l_rr,(RW4 d, R1 r)) +MIDFUNC(2,shrl_l_rr,(RW4 d, R1 r)) { if (isconst(r)) { COMPCALL(shrl_l_ri)(d,(uae_u8)live.state[r].val); @@ -487,7 +480,7 @@ MENDFUNC(2,ror_b_rr,(R1 d, R1 r)) } MENDFUNC(2,shrl_l_rr,(RW4 d, R1 r)) - MIDFUNC(2,shrl_w_rr,(RW2 d, R1 r)) +MIDFUNC(2,shrl_w_rr,(RW2 d, R1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -506,7 +499,7 @@ MENDFUNC(2,shrl_l_rr,(RW4 d, R1 r)) } MENDFUNC(2,shrl_w_rr,(RW2 d, R1 r)) - MIDFUNC(2,shrl_b_rr,(RW1 d, R1 r)) +MIDFUNC(2,shrl_b_rr,(RW1 d, R1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -526,7 +519,7 @@ MENDFUNC(2,shrl_w_rr,(RW2 d, R1 r)) } MENDFUNC(2,shrl_b_rr,(RW1 d, R1 r)) - MIDFUNC(2,shll_l_ri,(RW4 r, IMM i)) +MIDFUNC(2,shll_l_ri,(RW4 r, IMM i)) { if (!i && !needflags) return; @@ -541,7 +534,7 @@ MENDFUNC(2,shrl_b_rr,(RW1 d, R1 r)) } MENDFUNC(2,shll_l_ri,(RW4 r, IMM i)) - MIDFUNC(2,shll_w_ri,(RW2 r, IMM i)) +MIDFUNC(2,shll_w_ri,(RW2 r, IMM i)) { if (!i && !needflags) return; @@ -552,7 +545,7 @@ MENDFUNC(2,shll_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,shll_w_ri,(RW2 r, IMM i)) - MIDFUNC(2,shll_b_ri,(RW1 r, IMM i)) +MIDFUNC(2,shll_b_ri,(RW1 r, IMM i)) { if (!i && !needflags) return; @@ -563,7 +556,7 @@ MENDFUNC(2,shll_w_ri,(RW2 r, IMM i)) } MENDFUNC(2,shll_b_ri,(RW1 r, IMM i)) - MIDFUNC(2,shrl_l_ri,(RW4 r, IMM i)) +MIDFUNC(2,shrl_l_ri,(RW4 r, IMM i)) { if (!i && !needflags) return; @@ -578,7 +571,7 @@ MENDFUNC(2,shll_b_ri,(RW1 r, IMM i)) } MENDFUNC(2,shrl_l_ri,(RW4 r, IMM i)) - MIDFUNC(2,shrl_w_ri,(RW2 r, IMM i)) +MIDFUNC(2,shrl_w_ri,(RW2 r, IMM i)) { if (!i && !needflags) return; @@ -589,7 +582,7 @@ MENDFUNC(2,shrl_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,shrl_w_ri,(RW2 r, IMM i)) - MIDFUNC(2,shrl_b_ri,(RW1 r, IMM i)) +MIDFUNC(2,shrl_b_ri,(RW1 r, IMM i)) { if (!i && !needflags) return; @@ -600,7 +593,7 @@ MENDFUNC(2,shrl_w_ri,(RW2 r, IMM i)) } MENDFUNC(2,shrl_b_ri,(RW1 r, IMM i)) - MIDFUNC(2,shra_l_ri,(RW4 r, IMM i)) +MIDFUNC(2,shra_l_ri,(RW4 r, IMM i)) { if (!i && !needflags) return; @@ -611,7 +604,7 @@ MENDFUNC(2,shrl_b_ri,(RW1 r, IMM i)) } MENDFUNC(2,shra_l_ri,(RW4 r, IMM i)) - MIDFUNC(2,shra_w_ri,(RW2 r, IMM i)) +MIDFUNC(2,shra_w_ri,(RW2 r, IMM i)) { if (!i && !needflags) return; @@ -622,7 +615,7 @@ MENDFUNC(2,shra_l_ri,(RW4 r, IMM i)) } MENDFUNC(2,shra_w_ri,(RW2 r, IMM i)) - MIDFUNC(2,shra_b_ri,(RW1 r, IMM i)) +MIDFUNC(2,shra_b_ri,(RW1 r, IMM i)) { if (!i && !needflags) return; @@ -633,7 +626,7 @@ MENDFUNC(2,shra_w_ri,(RW2 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, R1 r)) { if (isconst(r)) { COMPCALL(shra_l_ri)(d,(uae_u8)live.state[r].val); @@ -651,7 +644,7 @@ MENDFUNC(2,shra_b_ri,(RW1 r, IMM i)) } MENDFUNC(2,shra_l_rr,(RW4 d, R1 r)) - MIDFUNC(2,shra_w_rr,(RW2 d, R1 r)) +MIDFUNC(2,shra_w_rr,(RW2 d, R1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -670,7 +663,7 @@ MENDFUNC(2,shra_l_rr,(RW4 d, R1 r)) } MENDFUNC(2,shra_w_rr,(RW2 d, R1 r)) - MIDFUNC(2,shra_b_rr,(RW1 d, R1 r)) +MIDFUNC(2,shra_b_rr,(RW1 d, R1 r)) { /* Can only do this with r==1, i.e. cl */ if (isconst(r)) { @@ -690,7 +683,7 @@ MENDFUNC(2,shra_w_rr,(RW2 d, R1 r)) } MENDFUNC(2,shra_b_rr,(RW1 d, R1 r)) - MIDFUNC(2,setcc,(W1 d, IMM cc)) +MIDFUNC(2,setcc,(W1 d, IMM cc)) { CLOBBER_SETCC; d=writereg(d,1); @@ -699,14 +692,14 @@ MENDFUNC(2,shra_b_rr,(RW1 d, R1 r)) } MENDFUNC(2,setcc,(W1 d, IMM cc)) - MIDFUNC(2,setcc_m,(IMM d, IMM cc)) +MIDFUNC(2,setcc_m,(IMM d, IMM cc)) { CLOBBER_SETCC; raw_setcc_m(d,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, R1 s, IMM cc)) { if (d==s) return; @@ -719,7 +712,7 @@ MENDFUNC(2,setcc_m,(IMM d, IMM cc)) } MENDFUNC(3,cmov_b_rr,(RW1 d, R1 s, IMM cc)) - MIDFUNC(3,cmov_w_rr,(RW2 d, R2 s, IMM cc)) +MIDFUNC(3,cmov_w_rr,(RW2 d, R2 s, IMM cc)) { if (d==s) return; @@ -732,7 +725,7 @@ MENDFUNC(3,cmov_b_rr,(RW1 d, R1 s, IMM cc)) } MENDFUNC(3,cmov_w_rr,(RW2 d, R2 s, IMM cc)) - MIDFUNC(3,cmov_l_rr,(RW4 d, R4 s, IMM cc)) +MIDFUNC(3,cmov_l_rr,(RW4 d, R4 s, IMM cc)) { if (d==s) return; @@ -745,7 +738,7 @@ MENDFUNC(3,cmov_w_rr,(RW2 d, R2 s, IMM cc)) } MENDFUNC(3,cmov_l_rr,(RW4 d, R4 s, IMM cc)) - MIDFUNC(1,setzflg_l,(RW4 r)) +MIDFUNC(1,setzflg_l,(RW4 r)) { if (setzflg_uses_bsf) { CLOBBER_BSF; @@ -771,7 +764,7 @@ MENDFUNC(3,cmov_l_rr,(RW4 d, R4 s, IMM cc)) } MENDFUNC(1,setzflg_l,(RW4 r)) - MIDFUNC(3,cmov_l_rm,(RW4 d, IMM s, IMM cc)) +MIDFUNC(3,cmov_l_rm,(RW4 d, IMM s, IMM cc)) { CLOBBER_CMOV; d=rmw(d,4,4); @@ -780,7 +773,7 @@ MENDFUNC(1,setzflg_l,(RW4 r)) } 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, R4 s)) { CLOBBER_BSF; s=readreg(s,4); @@ -791,7 +784,7 @@ MENDFUNC(3,cmov_l_rm,(RW4 d, IMM s, IMM cc)) } MENDFUNC(2,bsf_l_rr,(W4 d, R4 s)) - MIDFUNC(2,imul_32_32,(RW4 d, R4 s)) +MIDFUNC(2,imul_32_32,(RW4 d, R4 s)) { CLOBBER_MUL; s=readreg(s,4); @@ -802,7 +795,7 @@ MENDFUNC(2,bsf_l_rr,(W4 d, R4 s)) } MENDFUNC(2,imul_32_32,(RW4 d, R4 s)) - MIDFUNC(2,imul_64_32,(RW4 d, RW4 s)) +MIDFUNC(2,imul_64_32,(RW4 d, RW4 s)) { CLOBBER_MUL; s=rmw_specific(s,4,4,MUL_NREG2); @@ -813,7 +806,7 @@ MENDFUNC(2,imul_32_32,(RW4 d, R4 s)) } MENDFUNC(2,imul_64_32,(RW4 d, RW4 s)) - MIDFUNC(2,mul_64_32,(RW4 d, RW4 s)) +MIDFUNC(2,mul_64_32,(RW4 d, RW4 s)) { CLOBBER_MUL; s=rmw_specific(s,4,4,MUL_NREG2); @@ -824,7 +817,7 @@ MENDFUNC(2,imul_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, R2 s)) { int isrmw; @@ -854,7 +847,7 @@ MENDFUNC(2,mul_64_32,(RW4 d, RW4 s)) } MENDFUNC(2,sign_extend_16_rr,(W4 d, R2 s)) - MIDFUNC(2,sign_extend_8_rr,(W4 d, R1 s)) +MIDFUNC(2,sign_extend_8_rr,(W4 d, R1 s)) { int isrmw; @@ -886,7 +879,7 @@ MENDFUNC(2,sign_extend_16_rr,(W4 d, R2 s)) } MENDFUNC(2,sign_extend_8_rr,(W4 d, R1 s)) - MIDFUNC(2,zero_extend_16_rr,(W4 d, R2 s)) +MIDFUNC(2,zero_extend_16_rr,(W4 d, R2 s)) { int isrmw; @@ -916,7 +909,7 @@ MENDFUNC(2,sign_extend_8_rr,(W4 d, R1 s)) } MENDFUNC(2,zero_extend_16_rr,(W4 d, R2 s)) - MIDFUNC(2,zero_extend_8_rr,(W4 d, R1 s)) +MIDFUNC(2,zero_extend_8_rr,(W4 d, R1 s)) { int isrmw; if (isconst(s)) { @@ -947,7 +940,7 @@ MENDFUNC(2,zero_extend_16_rr,(W4 d, R2 s)) } MENDFUNC(2,zero_extend_8_rr,(W4 d, R1 s)) - MIDFUNC(2,mov_b_rr,(W1 d, R1 s)) +MIDFUNC(2,mov_b_rr,(W1 d, R1 s)) { if (d==s) return; @@ -965,7 +958,7 @@ MENDFUNC(2,zero_extend_8_rr,(W4 d, R1 s)) } MENDFUNC(2,mov_b_rr,(W1 d, R1 s)) - MIDFUNC(2,mov_w_rr,(W2 d, R2 s)) +MIDFUNC(2,mov_w_rr,(W2 d, R2 s)) { if (d==s) return; @@ -983,7 +976,7 @@ MENDFUNC(2,mov_b_rr,(W1 d, R1 s)) } MENDFUNC(2,mov_w_rr,(W2 d, R2 s)) - MIDFUNC(3,mov_l_rrm_indexed,(W4 d,R4 baser, R4 index)) +MIDFUNC(3,mov_l_rrm_indexed,(W4 d,R4 baser, R4 index)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -997,7 +990,7 @@ MENDFUNC(2,mov_w_rr,(W2 d, R2 s)) } MENDFUNC(3,mov_l_rrm_indexed,(W4 d,R4 baser, R4 index)) - MIDFUNC(3,mov_w_rrm_indexed,(W2 d, R4 baser, R4 index)) +MIDFUNC(3,mov_w_rrm_indexed,(W2 d, R4 baser, R4 index)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -1011,7 +1004,7 @@ MENDFUNC(3,mov_l_rrm_indexed,(W4 d,R4 baser, R4 index)) } MENDFUNC(3,mov_w_rrm_indexed,(W2 d, R4 baser, R4 index)) - MIDFUNC(3,mov_b_rrm_indexed,(W1 d, R4 baser, R4 index)) +MIDFUNC(3,mov_b_rrm_indexed,(W1 d, R4 baser, R4 index)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -1026,7 +1019,7 @@ MENDFUNC(3,mov_w_rrm_indexed,(W2 d, R4 baser, R4 index)) } MENDFUNC(3,mov_b_rrm_indexed,(W1 d, R4 baser, R4 index)) - MIDFUNC(3,mov_l_mrr_indexed,(R4 baser, R4 index, R4 s)) +MIDFUNC(3,mov_l_mrr_indexed,(R4 baser, R4 index, R4 s)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -1043,7 +1036,7 @@ MENDFUNC(3,mov_b_rrm_indexed,(W1 d, R4 baser, R4 index)) } MENDFUNC(3,mov_l_mrr_indexed,(R4 baser, R4 index, R4 s)) - MIDFUNC(3,mov_w_mrr_indexed,(R4 baser, R4 index, R2 s)) +MIDFUNC(3,mov_w_mrr_indexed,(R4 baser, R4 index, R2 s)) { CLOBBER_MOV; baser=readreg(baser,4); @@ -1057,7 +1050,7 @@ MENDFUNC(3,mov_l_mrr_indexed,(R4 baser, R4 index, R4 s)) } MENDFUNC(3,mov_w_mrr_indexed,(R4 baser, R4 index, R2 s)) - MIDFUNC(3,mov_b_mrr_indexed,(R4 baser, R4 index, R1 s)) +MIDFUNC(3,mov_b_mrr_indexed,(R4 baser, R4 index, R1 s)) { CLOBBER_MOV; s=readreg(s,1); @@ -1071,8 +1064,8 @@ MENDFUNC(3,mov_w_mrr_indexed,(R4 baser, R4 index, R2 s)) } MENDFUNC(3,mov_b_mrr_indexed,(R4 baser, R4 index, R1 s)) - /* Read a long from base+4*index */ - MIDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, R4 index)) +/* Read a long from base+4*index */ +MIDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, R4 index)) { int indexreg=index; @@ -1092,8 +1085,8 @@ MENDFUNC(3,mov_b_mrr_indexed,(R4 baser, R4 index, R1 s)) } MENDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, R4 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)) +/* 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)) { if (isconst(s)) { COMPCALL(mov_l_rm)(d,live.state[s].val+offset); @@ -1109,8 +1102,8 @@ MENDFUNC(3,mov_l_rm_indexed,(W4 d, IMM base, R4 index)) } MENDFUNC(3,mov_l_rR,(W4 d, R4 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)) +/* 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)) { if (isconst(s)) { COMPCALL(mov_w_rm)(d,live.state[s].val+offset); @@ -1126,8 +1119,8 @@ MENDFUNC(3,mov_l_rR,(W4 d, R4 s, IMM offset)) } MENDFUNC(3,mov_w_rR,(W2 d, R4 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)) +/* 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)) { if (isconst(s)) { COMPCALL(mov_b_rm)(d,live.state[s].val+offset); @@ -1143,8 +1136,8 @@ MENDFUNC(3,mov_w_rR,(W2 d, R4 s, IMM offset)) } MENDFUNC(3,mov_b_rR,(W1 d, R4 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)) +/* 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)) { int sreg=s; if (isconst(s)) { @@ -1162,8 +1155,8 @@ MENDFUNC(3,mov_b_rR,(W1 d, R4 s, IMM offset)) } MENDFUNC(3,mov_l_brR,(W4 d, R4 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)) +/* 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)) { int sreg=s; if (isconst(s)) { @@ -1182,8 +1175,8 @@ MENDFUNC(3,mov_l_brR,(W4 d, R4 s, IMM offset)) } MENDFUNC(3,mov_w_brR,(W2 d, R4 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)) +/* 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)) { int sreg=s; if (isconst(s)) { @@ -1202,7 +1195,7 @@ MENDFUNC(3,mov_w_brR,(W2 d, R4 s, IMM offset)) } MENDFUNC(3,mov_b_brR,(W1 d, R4 s, IMM offset)) - MIDFUNC(3,mov_l_Ri,(R4 d, IMM i, IMM offset)) +MIDFUNC(3,mov_l_Ri,(R4 d, IMM i, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1218,7 +1211,7 @@ MENDFUNC(3,mov_b_brR,(W1 d, R4 s, IMM offset)) } MENDFUNC(3,mov_l_Ri,(R4 d, IMM i, IMM offset)) - MIDFUNC(3,mov_w_Ri,(R4 d, IMM i, IMM offset)) +MIDFUNC(3,mov_w_Ri,(R4 d, IMM i, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1234,7 +1227,7 @@ MENDFUNC(3,mov_l_Ri,(R4 d, IMM i, IMM offset)) } MENDFUNC(3,mov_w_Ri,(R4 d, IMM i, IMM offset)) - MIDFUNC(3,mov_b_Ri,(R4 d, IMM i, IMM offset)) +MIDFUNC(3,mov_b_Ri,(R4 d, IMM i, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1250,8 +1243,8 @@ MENDFUNC(3,mov_w_Ri,(R4 d, IMM i, IMM offset)) } MENDFUNC(3,mov_b_Ri,(R4 d, IMM i, IMM offset)) - /* Warning! OFFSET is byte sized only! */ - MIDFUNC(3,mov_l_Rr,(R4 d, R4 s, IMM offset)) +/* Warning! OFFSET is byte sized only! */ +MIDFUNC(3,mov_l_Rr,(R4 d, R4 s, IMM offset)) { if (isconst(d)) { COMPCALL(mov_l_mr)(live.state[d].val+offset,s); @@ -1272,7 +1265,7 @@ MENDFUNC(3,mov_b_Ri,(R4 d, IMM i, IMM offset)) } MENDFUNC(3,mov_l_Rr,(R4 d, R4 s, IMM offset)) - MIDFUNC(3,mov_w_Rr,(R4 d, R2 s, IMM offset)) +MIDFUNC(3,mov_w_Rr,(R4 d, R2 s, IMM offset)) { if (isconst(d)) { COMPCALL(mov_w_mr)(live.state[d].val+offset,s); @@ -1292,7 +1285,7 @@ MENDFUNC(3,mov_l_Rr,(R4 d, R4 s, IMM offset)) } MENDFUNC(3,mov_w_Rr,(R4 d, R2 s, IMM offset)) - MIDFUNC(3,mov_b_Rr,(R4 d, R1 s, IMM offset)) +MIDFUNC(3,mov_b_Rr,(R4 d, R1 s, IMM offset)) { if (isconst(d)) { COMPCALL(mov_b_mr)(live.state[d].val+offset,s); @@ -1312,7 +1305,7 @@ MENDFUNC(3,mov_w_Rr,(R4 d, R2 s, IMM offset)) } MENDFUNC(3,mov_b_Rr,(R4 d, R1 s, IMM offset)) - MIDFUNC(3,lea_l_brr,(W4 d, R4 s, IMM offset)) +MIDFUNC(3,lea_l_brr,(W4 d, R4 s, IMM offset)) { if (isconst(s)) { COMPCALL(mov_l_ri)(d,live.state[s].val+offset); @@ -1333,7 +1326,7 @@ MENDFUNC(3,mov_b_Rr,(R4 d, R1 s, IMM offset)) } MENDFUNC(3,lea_l_brr,(W4 d, R4 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, R4 s, R4 index, IMM factor, IMM offset)) { CLOBBER_LEA; s=readreg(s,4); @@ -1347,8 +1340,8 @@ MENDFUNC(3,lea_l_brr,(W4 d, R4 s, IMM offset)) } MENDFUNC(5,lea_l_brr_indexed,(W4 d, R4 s, R4 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)) +/* write d to the long at the address contained in s+offset */ +MIDFUNC(3,mov_l_bRr,(R4 d, R4 s, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1367,8 +1360,8 @@ MENDFUNC(5,lea_l_brr_indexed,(W4 d, R4 s, R4 index, IMM factor, IMM offset)) } MENDFUNC(3,mov_l_bRr,(R4 d, R4 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)) +/* 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)) { int dreg=d; @@ -1387,7 +1380,7 @@ MENDFUNC(3,mov_l_bRr,(R4 d, R4 s, IMM offset)) } MENDFUNC(3,mov_w_bRr,(R4 d, R2 s, IMM offset)) - MIDFUNC(3,mov_b_bRr,(R4 d, R1 s, IMM offset)) +MIDFUNC(3,mov_b_bRr,(R4 d, R1 s, IMM offset)) { int dreg=d; if (isconst(d)) { @@ -1405,7 +1398,7 @@ MENDFUNC(3,mov_w_bRr,(R4 d, R2 s, IMM offset)) } MENDFUNC(3,mov_b_bRr,(R4 d, R1 s, IMM offset)) - MIDFUNC(1,gen_bswap_32,(RW4 r)) +MIDFUNC(1,gen_bswap_32,(RW4 r)) { int reg=r; @@ -1422,7 +1415,7 @@ MENDFUNC(3,mov_b_bRr,(R4 d, R1 s, IMM offset)) } MENDFUNC(1,gen_bswap_32,(RW4 r)) - MIDFUNC(1,gen_bswap_16,(RW2 r)) +MIDFUNC(1,gen_bswap_16,(RW2 r)) { if (isconst(r)) { uae_u32 oldv=live.state[r].val; @@ -1439,9 +1432,7 @@ MENDFUNC(1,gen_bswap_32,(RW4 r)) } MENDFUNC(1,gen_bswap_16,(RW2 r)) - - - MIDFUNC(2,mov_l_rr,(W4 d, R4 s)) +MIDFUNC(2,mov_l_rr,(W4 d, R4 s)) { int olds; @@ -1482,7 +1473,7 @@ MENDFUNC(1,gen_bswap_16,(RW2 r)) } MENDFUNC(2,mov_l_rr,(W4 d, R4 s)) - MIDFUNC(2,mov_l_mr,(IMM d, R4 s)) +MIDFUNC(2,mov_l_mr,(IMM d, R4 s)) { if (isconst(s)) { COMPCALL(mov_l_mi)(d,live.state[s].val); @@ -1496,8 +1487,7 @@ MENDFUNC(2,mov_l_rr,(W4 d, R4 s)) } MENDFUNC(2,mov_l_mr,(IMM d, R4 s)) - - MIDFUNC(2,mov_w_mr,(IMM d, R2 s)) +MIDFUNC(2,mov_w_mr,(IMM d, R2 s)) { if (isconst(s)) { COMPCALL(mov_w_mi)(d,(uae_u16)live.state[s].val); @@ -1511,7 +1501,7 @@ MENDFUNC(2,mov_l_mr,(IMM d, R4 s)) } MENDFUNC(2,mov_w_mr,(IMM d, R2 s)) - MIDFUNC(2,mov_w_rm,(W2 d, IMM s)) +MIDFUNC(2,mov_w_rm,(W2 d, IMM s)) { CLOBBER_MOV; d=writereg(d,2); @@ -1521,7 +1511,7 @@ MENDFUNC(2,mov_w_mr,(IMM d, R2 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, R1 s)) { if (isconst(s)) { COMPCALL(mov_b_mi)(d,(uae_u8)live.state[s].val); @@ -1536,7 +1526,7 @@ MENDFUNC(2,mov_w_rm,(W2 d, IMM s)) } MENDFUNC(2,mov_b_mr,(IMM d, R1 s)) - MIDFUNC(2,mov_b_rm,(W1 d, IMM s)) +MIDFUNC(2,mov_b_rm,(W1 d, IMM s)) { CLOBBER_MOV; d=writereg(d,1); @@ -1546,14 +1536,14 @@ MENDFUNC(2,mov_b_mr,(IMM d, R1 s)) } MENDFUNC(2,mov_b_rm,(W1 d, IMM s)) - MIDFUNC(2,mov_l_ri,(W4 d, IMM s)) +MIDFUNC(2,mov_l_ri,(W4 d, IMM s)) { set_const(d,s); return; } MENDFUNC(2,mov_l_ri,(W4 d, IMM s)) - MIDFUNC(2,mov_w_ri,(W2 d, IMM s)) +MIDFUNC(2,mov_w_ri,(W2 d, IMM s)) { CLOBBER_MOV; d=writereg(d,2); @@ -1563,7 +1553,7 @@ MENDFUNC(2,mov_l_ri,(W4 d, IMM s)) } MENDFUNC(2,mov_w_ri,(W2 d, IMM s)) - MIDFUNC(2,mov_b_ri,(W1 d, IMM s)) +MIDFUNC(2,mov_b_ri,(W1 d, IMM s)) { CLOBBER_MOV; d=writereg(d,1); @@ -1573,30 +1563,28 @@ MENDFUNC(2,mov_w_ri,(W2 d, IMM s)) } MENDFUNC(2,mov_b_ri,(W1 d, IMM s)) - - MIDFUNC(2,add_l_mi,(IMM d, IMM s)) +MIDFUNC(2,add_l_mi,(IMM d, IMM s)) { CLOBBER_ADD; raw_add_l_mi(d,s) ; } MENDFUNC(2,add_l_mi,(IMM d, IMM s)) - MIDFUNC(2,add_w_mi,(IMM d, IMM s)) +MIDFUNC(2,add_w_mi,(IMM d, IMM s)) { CLOBBER_ADD; raw_add_w_mi(d,s) ; } MENDFUNC(2,add_w_mi,(IMM d, IMM s)) - MIDFUNC(2,add_b_mi,(IMM d, IMM s)) +MIDFUNC(2,add_b_mi,(IMM d, IMM s)) { CLOBBER_ADD; raw_add_b_mi(d,s) ; } MENDFUNC(2,add_b_mi,(IMM d, IMM s)) - - MIDFUNC(2,test_l_ri,(R4 d, IMM i)) +MIDFUNC(2,test_l_ri,(R4 d, IMM i)) { CLOBBER_TEST; d=readreg(d,4); @@ -1606,7 +1594,7 @@ MENDFUNC(2,add_b_mi,(IMM d, IMM s)) } MENDFUNC(2,test_l_ri,(R4 d, IMM i)) - MIDFUNC(2,test_l_rr,(R4 d, R4 s)) +MIDFUNC(2,test_l_rr,(R4 d, R4 s)) { CLOBBER_TEST; d=readreg(d,4); @@ -1618,7 +1606,7 @@ MENDFUNC(2,test_l_ri,(R4 d, IMM i)) } MENDFUNC(2,test_l_rr,(R4 d, R4 s)) - MIDFUNC(2,test_w_rr,(R2 d, R2 s)) +MIDFUNC(2,test_w_rr,(R2 d, R2 s)) { CLOBBER_TEST; d=readreg(d,2); @@ -1630,7 +1618,7 @@ MENDFUNC(2,test_l_rr,(R4 d, R4 s)) } MENDFUNC(2,test_w_rr,(R2 d, R2 s)) - MIDFUNC(2,test_b_rr,(R1 d, R1 s)) +MIDFUNC(2,test_b_rr,(R1 d, R1 s)) { CLOBBER_TEST; d=readreg(d,1); @@ -1642,7 +1630,7 @@ MENDFUNC(2,test_w_rr,(R2 d, R2 s)) } MENDFUNC(2,test_b_rr,(R1 d, R1 s)) - MIDFUNC(2,and_l_ri,(RW4 d, IMM i)) +MIDFUNC(2,and_l_ri,(RW4 d, IMM i)) { if (isconst (d) && ! needflags) { live.state[d].val &= i; @@ -1657,7 +1645,7 @@ MENDFUNC(2,test_b_rr,(R1 d, R1 s)) } MENDFUNC(2,and_l_ri,(RW4 d, IMM i)) - MIDFUNC(2,and_l,(RW4 d, R4 s)) +MIDFUNC(2,and_l,(RW4 d, R4 s)) { CLOBBER_AND; s=readreg(s,4); @@ -1669,7 +1657,7 @@ MENDFUNC(2,and_l_ri,(RW4 d, IMM i)) } MENDFUNC(2,and_l,(RW4 d, R4 s)) - MIDFUNC(2,and_w,(RW2 d, R2 s)) +MIDFUNC(2,and_w,(RW2 d, R2 s)) { CLOBBER_AND; s=readreg(s,2); @@ -1681,7 +1669,7 @@ MENDFUNC(2,and_l,(RW4 d, R4 s)) } MENDFUNC(2,and_w,(RW2 d, R2 s)) - MIDFUNC(2,and_b,(RW1 d, R1 s)) +MIDFUNC(2,and_b,(RW1 d, R1 s)) { CLOBBER_AND; s=readreg(s,1); @@ -1693,7 +1681,7 @@ MENDFUNC(2,and_w,(RW2 d, R2 s)) } MENDFUNC(2,and_b,(RW1 d, R1 s)) - MIDFUNC(2,or_l_ri,(RW4 d, IMM i)) +MIDFUNC(2,or_l_ri,(RW4 d, IMM i)) { if (isconst(d) && !needflags) { live.state[d].val|=i; @@ -1707,7 +1695,7 @@ MENDFUNC(2,and_b,(RW1 d, R1 s)) } MENDFUNC(2,or_l_ri,(RW4 d, IMM i)) - MIDFUNC(2,or_l,(RW4 d, R4 s)) +MIDFUNC(2,or_l,(RW4 d, R4 s)) { if (isconst(d) && isconst(s) && !needflags) { live.state[d].val|=live.state[s].val; @@ -1723,7 +1711,7 @@ MENDFUNC(2,or_l_ri,(RW4 d, IMM i)) } MENDFUNC(2,or_l,(RW4 d, R4 s)) - MIDFUNC(2,or_w,(RW2 d, R2 s)) +MIDFUNC(2,or_w,(RW2 d, R2 s)) { CLOBBER_OR; s=readreg(s,2); @@ -1735,7 +1723,7 @@ MENDFUNC(2,or_l,(RW4 d, R4 s)) } MENDFUNC(2,or_w,(RW2 d, R2 s)) - MIDFUNC(2,or_b,(RW1 d, R1 s)) +MIDFUNC(2,or_b,(RW1 d, R1 s)) { CLOBBER_OR; s=readreg(s,1); @@ -1747,7 +1735,7 @@ MENDFUNC(2,or_w,(RW2 d, R2 s)) } MENDFUNC(2,or_b,(RW1 d, R1 s)) - MIDFUNC(2,adc_l,(RW4 d, R4 s)) +MIDFUNC(2,adc_l,(RW4 d, R4 s)) { CLOBBER_ADC; s=readreg(s,4); @@ -1760,7 +1748,7 @@ MENDFUNC(2,or_b,(RW1 d, R1 s)) } MENDFUNC(2,adc_l,(RW4 d, R4 s)) - MIDFUNC(2,adc_w,(RW2 d, R2 s)) +MIDFUNC(2,adc_w,(RW2 d, R2 s)) { CLOBBER_ADC; s=readreg(s,2); @@ -1772,7 +1760,7 @@ MENDFUNC(2,adc_l,(RW4 d, R4 s)) } MENDFUNC(2,adc_w,(RW2 d, R2 s)) - MIDFUNC(2,adc_b,(RW1 d, R1 s)) +MIDFUNC(2,adc_b,(RW1 d, R1 s)) { CLOBBER_ADC; s=readreg(s,1); @@ -1784,7 +1772,7 @@ MENDFUNC(2,adc_w,(RW2 d, R2 s)) } MENDFUNC(2,adc_b,(RW1 d, R1 s)) - MIDFUNC(2,add_l,(RW4 d, R4 s)) +MIDFUNC(2,add_l,(RW4 d, R4 s)) { if (isconst(s)) { COMPCALL(add_l_ri)(d,live.state[s].val); @@ -1802,7 +1790,7 @@ MENDFUNC(2,adc_b,(RW1 d, R1 s)) } MENDFUNC(2,add_l,(RW4 d, R4 s)) - MIDFUNC(2,add_w,(RW2 d, R2 s)) +MIDFUNC(2,add_w,(RW2 d, R2 s)) { if (isconst(s)) { COMPCALL(add_w_ri)(d,(uae_u16)live.state[s].val); @@ -1819,7 +1807,7 @@ MENDFUNC(2,add_l,(RW4 d, R4 s)) } MENDFUNC(2,add_w,(RW2 d, R2 s)) - MIDFUNC(2,add_b,(RW1 d, R1 s)) +MIDFUNC(2,add_b,(RW1 d, R1 s)) { if (isconst(s)) { COMPCALL(add_b_ri)(d,(uae_u8)live.state[s].val); @@ -1836,7 +1824,7 @@ MENDFUNC(2,add_w,(RW2 d, R2 s)) } MENDFUNC(2,add_b,(RW1 d, R1 s)) - MIDFUNC(2,sub_l_ri,(RW4 d, IMM i)) +MIDFUNC(2,sub_l_ri,(RW4 d, IMM i)) { if (!i && !needflags) return; @@ -1859,7 +1847,7 @@ MENDFUNC(2,add_b,(RW1 d, R1 s)) } MENDFUNC(2,sub_l_ri,(RW4 d, IMM i)) - MIDFUNC(2,sub_w_ri,(RW2 d, IMM i)) +MIDFUNC(2,sub_w_ri,(RW2 d, IMM i)) { if (!i && !needflags) return; @@ -1872,7 +1860,7 @@ MENDFUNC(2,sub_l_ri,(RW4 d, IMM i)) } MENDFUNC(2,sub_w_ri,(RW2 d, IMM i)) - MIDFUNC(2,sub_b_ri,(RW1 d, IMM i)) +MIDFUNC(2,sub_b_ri,(RW1 d, IMM i)) { if (!i && !needflags) return; @@ -1886,7 +1874,7 @@ MENDFUNC(2,sub_w_ri,(RW2 d, IMM i)) } MENDFUNC(2,sub_b_ri,(RW1 d, IMM i)) - MIDFUNC(2,add_l_ri,(RW4 d, IMM i)) +MIDFUNC(2,add_l_ri,(RW4 d, IMM i)) { if (!i && !needflags) return; @@ -1907,7 +1895,7 @@ MENDFUNC(2,sub_b_ri,(RW1 d, IMM i)) } MENDFUNC(2,add_l_ri,(RW4 d, IMM i)) - MIDFUNC(2,add_w_ri,(RW2 d, IMM i)) +MIDFUNC(2,add_w_ri,(RW2 d, IMM i)) { if (!i && !needflags) return; @@ -1920,7 +1908,7 @@ MENDFUNC(2,add_l_ri,(RW4 d, IMM i)) } MENDFUNC(2,add_w_ri,(RW2 d, IMM i)) - MIDFUNC(2,add_b_ri,(RW1 d, IMM i)) +MIDFUNC(2,add_b_ri,(RW1 d, IMM i)) { if (!i && !needflags) return; @@ -1934,7 +1922,7 @@ MENDFUNC(2,add_w_ri,(RW2 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, R4 s)) { CLOBBER_SBB; s=readreg(s,4); @@ -1946,7 +1934,7 @@ MENDFUNC(2,add_b_ri,(RW1 d, IMM i)) } MENDFUNC(2,sbb_l,(RW4 d, R4 s)) - MIDFUNC(2,sbb_w,(RW2 d, R2 s)) +MIDFUNC(2,sbb_w,(RW2 d, R2 s)) { CLOBBER_SBB; s=readreg(s,2); @@ -1958,7 +1946,7 @@ MENDFUNC(2,sbb_l,(RW4 d, R4 s)) } MENDFUNC(2,sbb_w,(RW2 d, R2 s)) - MIDFUNC(2,sbb_b,(RW1 d, R1 s)) +MIDFUNC(2,sbb_b,(RW1 d, R1 s)) { CLOBBER_SBB; s=readreg(s,1); @@ -1970,7 +1958,7 @@ MENDFUNC(2,sbb_w,(RW2 d, R2 s)) } MENDFUNC(2,sbb_b,(RW1 d, R1 s)) - MIDFUNC(2,sub_l,(RW4 d, R4 s)) +MIDFUNC(2,sub_l,(RW4 d, R4 s)) { if (isconst(s)) { COMPCALL(sub_l_ri)(d,live.state[s].val); @@ -1987,7 +1975,7 @@ MENDFUNC(2,sbb_b,(RW1 d, R1 s)) } MENDFUNC(2,sub_l,(RW4 d, R4 s)) - MIDFUNC(2,sub_w,(RW2 d, R2 s)) +MIDFUNC(2,sub_w,(RW2 d, R2 s)) { if (isconst(s)) { COMPCALL(sub_w_ri)(d,(uae_u16)live.state[s].val); @@ -2004,7 +1992,7 @@ MENDFUNC(2,sub_l,(RW4 d, R4 s)) } MENDFUNC(2,sub_w,(RW2 d, R2 s)) - MIDFUNC(2,sub_b,(RW1 d, R1 s)) +MIDFUNC(2,sub_b,(RW1 d, R1 s)) { if (isconst(s)) { COMPCALL(sub_b_ri)(d,(uae_u8)live.state[s].val); @@ -2021,7 +2009,7 @@ MENDFUNC(2,sub_w,(RW2 d, R2 s)) } MENDFUNC(2,sub_b,(RW1 d, R1 s)) - MIDFUNC(2,cmp_l,(R4 d, R4 s)) +MIDFUNC(2,cmp_l,(R4 d, R4 s)) { CLOBBER_CMP; s=readreg(s,4); @@ -2033,7 +2021,7 @@ MENDFUNC(2,sub_b,(RW1 d, R1 s)) } MENDFUNC(2,cmp_l,(R4 d, R4 s)) - MIDFUNC(2,cmp_l_ri,(R4 r, IMM i)) +MIDFUNC(2,cmp_l_ri,(R4 r, IMM i)) { CLOBBER_CMP; r=readreg(r,4); @@ -2043,7 +2031,7 @@ MENDFUNC(2,cmp_l,(R4 d, R4 s)) } MENDFUNC(2,cmp_l_ri,(R4 r, IMM i)) - MIDFUNC(2,cmp_w,(R2 d, R2 s)) +MIDFUNC(2,cmp_w,(R2 d, R2 s)) { CLOBBER_CMP; s=readreg(s,2); @@ -2055,7 +2043,7 @@ MENDFUNC(2,cmp_l_ri,(R4 r, IMM i)) } MENDFUNC(2,cmp_w,(R2 d, R2 s)) - MIDFUNC(2,cmp_b,(R1 d, R1 s)) +MIDFUNC(2,cmp_b,(R1 d, R1 s)) { CLOBBER_CMP; s=readreg(s,1); @@ -2067,8 +2055,7 @@ MENDFUNC(2,cmp_w,(R2 d, R2 s)) } MENDFUNC(2,cmp_b,(R1 d, R1 s)) - - MIDFUNC(2,xor_l,(RW4 d, R4 s)) +MIDFUNC(2,xor_l,(RW4 d, R4 s)) { CLOBBER_XOR; s=readreg(s,4); @@ -2080,7 +2067,7 @@ MENDFUNC(2,cmp_b,(R1 d, R1 s)) } MENDFUNC(2,xor_l,(RW4 d, R4 s)) - MIDFUNC(2,xor_w,(RW2 d, R2 s)) +MIDFUNC(2,xor_w,(RW2 d, R2 s)) { CLOBBER_XOR; s=readreg(s,2); @@ -2092,7 +2079,7 @@ MENDFUNC(2,xor_l,(RW4 d, R4 s)) } MENDFUNC(2,xor_w,(RW2 d, R2 s)) - MIDFUNC(2,xor_b,(RW1 d, R1 s)) +MIDFUNC(2,xor_b,(RW1 d, R1 s)) { CLOBBER_XOR; s=readreg(s,1); @@ -2104,7 +2091,7 @@ MENDFUNC(2,xor_w,(RW2 d, R2 s)) } MENDFUNC(2,xor_b,(RW1 d, R1 s)) - MIDFUNC(5,call_r_11,(W4 out1, R4 r, R4 in1, IMM osize, IMM isize)) +MIDFUNC(5,call_r_11,(W4 out1, R4 r, R4 in1, IMM osize, IMM isize)) { clobber_flags(); remove_all_offsets(); @@ -2149,7 +2136,7 @@ MENDFUNC(2,xor_b,(RW1 d, R1 s)) } MENDFUNC(5,call_r_11,(W4 out1, R4 r, R4 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,(R4 r, R4 in1, R4 in2, IMM isize1, IMM isize2)) { clobber_flags(); remove_all_offsets(); @@ -2174,7 +2161,7 @@ MENDFUNC(5,call_r_11,(W4 out1, R4 r, R4 in1, IMM osize, IMM isize)) } MENDFUNC(5,call_r_02,(R4 r, R4 in1, R4 in2, IMM isize1, IMM isize2)) - MIDFUNC(1,forget_about,(W4 r)) +MIDFUNC(1,forget_about,(W4 r)) { if (isinreg(r)) disassociate(r); @@ -2183,13 +2170,13 @@ MENDFUNC(5,call_r_02,(R4 r, R4 in1, R4 in2, IMM isize1, IMM isize2)) } MENDFUNC(1,forget_about,(W4 r)) - MIDFUNC(0,nop,(void)) +MIDFUNC(0,nop,(void)) { raw_nop(); } MENDFUNC(0,nop,(void)) - MIDFUNC(1,f_forget_about,(FW r)) +MIDFUNC(1,f_forget_about,(FW r)) { if (f_isinreg(r)) f_disassociate(r); @@ -2197,7 +2184,7 @@ MENDFUNC(0,nop,(void)) } MENDFUNC(1,f_forget_about,(FW r)) - MIDFUNC(1,fmov_pi,(FW r)) +MIDFUNC(1,fmov_pi,(FW r)) { r=f_writereg(r); raw_fmov_pi(r); @@ -2205,7 +2192,7 @@ MENDFUNC(1,f_forget_about,(FW r)) } MENDFUNC(1,fmov_pi,(FW r)) - MIDFUNC(1,fmov_log10_2,(FW r)) +MIDFUNC(1,fmov_log10_2,(FW r)) { r=f_writereg(r); raw_fmov_log10_2(r); @@ -2213,7 +2200,7 @@ MENDFUNC(1,fmov_pi,(FW r)) } MENDFUNC(1,fmov_log10_2,(FW r)) - MIDFUNC(1,fmov_log2_e,(FW r)) +MIDFUNC(1,fmov_log2_e,(FW r)) { r=f_writereg(r); raw_fmov_log2_e(r); @@ -2221,7 +2208,7 @@ MENDFUNC(1,fmov_log10_2,(FW r)) } MENDFUNC(1,fmov_log2_e,(FW r)) - MIDFUNC(1,fmov_loge_2,(FW r)) +MIDFUNC(1,fmov_loge_2,(FW r)) { r=f_writereg(r); raw_fmov_loge_2(r); @@ -2229,7 +2216,7 @@ MENDFUNC(1,fmov_log2_e,(FW r)) } MENDFUNC(1,fmov_loge_2,(FW r)) - MIDFUNC(1,fmov_1,(FW r)) +MIDFUNC(1,fmov_1,(FW r)) { r=f_writereg(r); raw_fmov_1(r); @@ -2237,7 +2224,7 @@ MENDFUNC(1,fmov_loge_2,(FW r)) } MENDFUNC(1,fmov_1,(FW r)) - MIDFUNC(1,fmov_0,(FW r)) +MIDFUNC(1,fmov_0,(FW r)) { r=f_writereg(r); raw_fmov_0(r); @@ -2245,7 +2232,7 @@ MENDFUNC(1,fmov_1,(FW r)) } MENDFUNC(1,fmov_0,(FW r)) - MIDFUNC(2,fmov_rm,(FW r, MEMR m)) +MIDFUNC(2,fmov_rm,(FW r, MEMR m)) { r=f_writereg(r); raw_fmov_rm(r,m); @@ -2253,7 +2240,7 @@ MENDFUNC(1,fmov_0,(FW r)) } MENDFUNC(2,fmov_rm,(FW r, MEMR m)) - MIDFUNC(2,fmovi_rm,(FW r, MEMR m)) +MIDFUNC(2,fmovi_rm,(FW r, MEMR m)) { r=f_writereg(r); raw_fmovi_rm(r,m); @@ -2261,7 +2248,7 @@ MENDFUNC(2,fmov_rm,(FW r, MEMR m)) } MENDFUNC(2,fmovi_rm,(FW r, MEMR m)) - MIDFUNC(3,fmovi_mrb,(MEMW m, FR r, double *bounds)) +MIDFUNC(3,fmovi_mrb,(MEMW m, FR r, double *bounds)) { r=f_readreg(r); raw_fmovi_mrb(m,r,bounds); @@ -2269,7 +2256,7 @@ MENDFUNC(2,fmovi_rm,(FW r, MEMR m)) } MENDFUNC(3,fmovi_mrb,(MEMW m, FR r, double *bounds)) - MIDFUNC(2,fmovs_rm,(FW r, MEMR m)) +MIDFUNC(2,fmovs_rm,(FW r, MEMR m)) { r=f_writereg(r); raw_fmovs_rm(r,m); @@ -2277,7 +2264,7 @@ MENDFUNC(3,fmovi_mrb,(MEMW m, FR r, double *bounds)) } MENDFUNC(2,fmovs_rm,(FW r, MEMR m)) - MIDFUNC(2,fmovs_mr,(MEMW m, FR r)) +MIDFUNC(2,fmovs_mr,(MEMW m, FR r)) { r=f_readreg(r); raw_fmovs_mr(m,r); @@ -2285,7 +2272,7 @@ MENDFUNC(2,fmovs_rm,(FW r, MEMR m)) } MENDFUNC(2,fmovs_mr,(MEMW m, FR r)) - MIDFUNC(1,fcuts_r,(FRW r)) +MIDFUNC(1,fcuts_r,(FRW r)) { r=f_rmw(r); raw_fcuts_r(r); @@ -2293,7 +2280,7 @@ MENDFUNC(2,fmovs_mr,(MEMW m, FR r)) } MENDFUNC(1,fcuts_r,(FRW r)) - MIDFUNC(1,fcut_r,(FRW r)) +MIDFUNC(1,fcut_r,(FRW r)) { r=f_rmw(r); raw_fcut_r(r); @@ -2301,7 +2288,7 @@ MENDFUNC(1,fcuts_r,(FRW r)) } MENDFUNC(1,fcut_r,(FRW r)) - MIDFUNC(2,fmov_ext_mr,(MEMW m, FR r)) +MIDFUNC(2,fmov_ext_mr,(MEMW m, FR r)) { r=f_readreg(r); raw_fmov_ext_mr(m,r); @@ -2309,7 +2296,7 @@ MENDFUNC(1,fcut_r,(FRW r)) } MENDFUNC(2,fmov_ext_mr,(MEMW m, FR r)) - MIDFUNC(2,fmov_mr,(MEMW m, FR r)) +MIDFUNC(2,fmov_mr,(MEMW m, FR r)) { r=f_readreg(r); raw_fmov_mr(m,r); @@ -2317,7 +2304,7 @@ MENDFUNC(2,fmov_ext_mr,(MEMW m, FR r)) } MENDFUNC(2,fmov_mr,(MEMW m, FR r)) - MIDFUNC(2,fmov_ext_rm,(FW r, MEMR m)) +MIDFUNC(2,fmov_ext_rm,(FW r, MEMR m)) { r=f_writereg(r); raw_fmov_ext_rm(r,m); @@ -2325,7 +2312,7 @@ MENDFUNC(2,fmov_mr,(MEMW m, FR r)) } MENDFUNC(2,fmov_ext_rm,(FW r, MEMR m)) - MIDFUNC(2,fmov_rr,(FW d, FR s)) +MIDFUNC(2,fmov_rr,(FW d, FR s)) { if (d==s) { /* How pointless! */ return; @@ -2349,7 +2336,7 @@ MENDFUNC(2,fmov_ext_rm,(FW r, MEMR m)) } MENDFUNC(2,fmov_rr,(FW d, FR s)) - MIDFUNC(2,fldcw_m_indexed,(R4 index, IMM base)) +MIDFUNC(2,fldcw_m_indexed,(R4 index, IMM base)) { index=readreg(index,4); @@ -2358,7 +2345,7 @@ MENDFUNC(2,fmov_rr,(FW d, FR s)) } MENDFUNC(2,fldcw_m_indexed,(R4 index, IMM base)) - MIDFUNC(1,ftst_r,(FR r)) +MIDFUNC(1,ftst_r,(FR r)) { r=f_readreg(r); raw_ftst_r(r); @@ -2366,13 +2353,13 @@ MENDFUNC(2,fldcw_m_indexed,(R4 index, IMM base)) } MENDFUNC(1,ftst_r,(FR r)) - MIDFUNC(0,dont_care_fflags,(void)) +MIDFUNC(0,dont_care_fflags,(void)) { f_disassociate(FP_RESULT); } MENDFUNC(0,dont_care_fflags,(void)) - MIDFUNC(2,fsqrt_rr,(FW d, FR s)) +MIDFUNC(2,fsqrt_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2382,7 +2369,7 @@ MENDFUNC(0,dont_care_fflags,(void)) } MENDFUNC(2,fsqrt_rr,(FW d, FR s)) - MIDFUNC(2,fabs_rr,(FW d, FR s)) +MIDFUNC(2,fabs_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2392,7 +2379,7 @@ MENDFUNC(2,fsqrt_rr,(FW d, FR s)) } MENDFUNC(2,fabs_rr,(FW d, FR s)) - MIDFUNC(2,frndint_rr,(FW d, FR s)) +MIDFUNC(2,frndint_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2402,7 +2389,7 @@ MENDFUNC(2,fabs_rr,(FW d, FR s)) } MENDFUNC(2,frndint_rr,(FW d, FR s)) - MIDFUNC(2,fgetexp_rr,(FW d, FR s)) +MIDFUNC(2,fgetexp_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2412,7 +2399,7 @@ MENDFUNC(2,frndint_rr,(FW d, FR s)) } MENDFUNC(2,fgetexp_rr,(FW d, FR s)) - MIDFUNC(2,fgetman_rr,(FW d, FR s)) +MIDFUNC(2,fgetman_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2422,7 +2409,7 @@ MENDFUNC(2,fgetexp_rr,(FW d, FR s)) } MENDFUNC(2,fgetman_rr,(FW d, FR s)) - MIDFUNC(2,fsin_rr,(FW d, FR s)) +MIDFUNC(2,fsin_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2432,7 +2419,7 @@ MENDFUNC(2,fgetman_rr,(FW d, FR s)) } MENDFUNC(2,fsin_rr,(FW d, FR s)) - MIDFUNC(2,fcos_rr,(FW d, FR s)) +MIDFUNC(2,fcos_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2442,7 +2429,7 @@ MENDFUNC(2,fsin_rr,(FW d, FR s)) } MENDFUNC(2,fcos_rr,(FW d, FR s)) - MIDFUNC(2,ftan_rr,(FW d, FR s)) +MIDFUNC(2,ftan_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2452,7 +2439,7 @@ MENDFUNC(2,fcos_rr,(FW d, FR s)) } MENDFUNC(2,ftan_rr,(FW d, FR s)) - MIDFUNC(3,fsincos_rr,(FW d, FW c, FR s)) +MIDFUNC(3,fsincos_rr,(FW d, FW c, FR s)) { s=f_readreg(s); /* s for source */ d=f_writereg(d); /* d for sine */ @@ -2464,7 +2451,7 @@ MENDFUNC(2,ftan_rr,(FW d, FR s)) } MENDFUNC(3,fsincos_rr,(FW d, FW c, FR s)) - MIDFUNC(2,fscale_rr,(FRW d, FR s)) +MIDFUNC(2,fscale_rr,(FRW d, FR s)) { s=f_readreg(s); d=f_rmw(d); @@ -2474,7 +2461,7 @@ MENDFUNC(3,fsincos_rr,(FW d, FW c, FR s)) } MENDFUNC(2,fscale_rr,(FRW d, FR s)) - MIDFUNC(2,ftwotox_rr,(FW d, FR s)) +MIDFUNC(2,ftwotox_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2484,7 +2471,7 @@ MENDFUNC(2,fscale_rr,(FRW d, FR s)) } MENDFUNC(2,ftwotox_rr,(FW d, FR s)) - MIDFUNC(2,fetox_rr,(FW d, FR s)) +MIDFUNC(2,fetox_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2494,7 +2481,7 @@ MENDFUNC(2,ftwotox_rr,(FW d, FR s)) } MENDFUNC(2,fetox_rr,(FW d, FR s)) - MIDFUNC(2,fetoxM1_rr,(FW d, FR s)) +MIDFUNC(2,fetoxM1_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2504,7 +2491,7 @@ MENDFUNC(2,fetox_rr,(FW d, FR s)) } MENDFUNC(2,fetoxM1_rr,(FW d, FR s)) - MIDFUNC(2,ftentox_rr,(FW d, FR s)) +MIDFUNC(2,ftentox_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2514,7 +2501,7 @@ MENDFUNC(2,fetoxM1_rr,(FW d, FR s)) } MENDFUNC(2,ftentox_rr,(FW d, FR s)) - MIDFUNC(2,flog2_rr,(FW d, FR s)) +MIDFUNC(2,flog2_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2524,7 +2511,7 @@ MENDFUNC(2,ftentox_rr,(FW d, FR s)) } MENDFUNC(2,flog2_rr,(FW d, FR s)) - MIDFUNC(2,flogN_rr,(FW d, FR s)) +MIDFUNC(2,flogN_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2534,7 +2521,7 @@ MENDFUNC(2,flog2_rr,(FW d, FR s)) } MENDFUNC(2,flogN_rr,(FW d, FR s)) - MIDFUNC(2,flogNP1_rr,(FW d, FR s)) +MIDFUNC(2,flogNP1_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2544,7 +2531,7 @@ MENDFUNC(2,flogN_rr,(FW d, FR s)) } MENDFUNC(2,flogNP1_rr,(FW d, FR s)) - MIDFUNC(2,flog10_rr,(FW d, FR s)) +MIDFUNC(2,flog10_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2554,7 +2541,7 @@ MENDFUNC(2,flogNP1_rr,(FW d, FR s)) } MENDFUNC(2,flog10_rr,(FW d, FR s)) - MIDFUNC(2,fasin_rr,(FW d, FR s)) +MIDFUNC(2,fasin_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2564,7 +2551,7 @@ MENDFUNC(2,flog10_rr,(FW d, FR s)) } MENDFUNC(2,fasin_rr,(FW d, FR s)) - MIDFUNC(2,facos_rr,(FW d, FR s)) +MIDFUNC(2,facos_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2574,7 +2561,7 @@ MENDFUNC(2,fasin_rr,(FW d, FR s)) } MENDFUNC(2,facos_rr,(FW d, FR s)) - MIDFUNC(2,fatan_rr,(FW d, FR s)) +MIDFUNC(2,fatan_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2584,7 +2571,7 @@ MENDFUNC(2,facos_rr,(FW d, FR s)) } MENDFUNC(2,fatan_rr,(FW d, FR s)) - MIDFUNC(2,fatanh_rr,(FW d, FR s)) +MIDFUNC(2,fatanh_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2594,7 +2581,7 @@ MENDFUNC(2,fatan_rr,(FW d, FR s)) } MENDFUNC(2,fatanh_rr,(FW d, FR s)) - MIDFUNC(2,fsinh_rr,(FW d, FR s)) +MIDFUNC(2,fsinh_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2604,7 +2591,7 @@ MENDFUNC(2,fatanh_rr,(FW d, FR s)) } MENDFUNC(2,fsinh_rr,(FW d, FR s)) - MIDFUNC(2,fcosh_rr,(FW d, FR s)) +MIDFUNC(2,fcosh_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2614,7 +2601,7 @@ MENDFUNC(2,fsinh_rr,(FW d, FR s)) } MENDFUNC(2,fcosh_rr,(FW d, FR s)) - MIDFUNC(2,ftanh_rr,(FW d, FR s)) +MIDFUNC(2,ftanh_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2624,7 +2611,7 @@ MENDFUNC(2,fcosh_rr,(FW d, FR s)) } MENDFUNC(2,ftanh_rr,(FW d, FR s)) - MIDFUNC(2,fneg_rr,(FW d, FR s)) +MIDFUNC(2,fneg_rr,(FW d, FR s)) { s=f_readreg(s); d=f_writereg(d); @@ -2634,7 +2621,7 @@ MENDFUNC(2,ftanh_rr,(FW d, FR s)) } MENDFUNC(2,fneg_rr,(FW d, FR s)) - MIDFUNC(2,fadd_rr,(FRW d, FR s)) +MIDFUNC(2,fadd_rr,(FRW d, FR s)) { s=f_readreg(s); d=f_rmw(d); @@ -2644,7 +2631,7 @@ MENDFUNC(2,fneg_rr,(FW d, FR s)) } MENDFUNC(2,fadd_rr,(FRW d, FR s)) - MIDFUNC(2,fsub_rr,(FRW d, FR s)) +MIDFUNC(2,fsub_rr,(FRW d, FR s)) { s=f_readreg(s); d=f_rmw(d); @@ -2654,7 +2641,7 @@ MENDFUNC(2,fadd_rr,(FRW d, FR s)) } MENDFUNC(2,fsub_rr,(FRW d, FR s)) - MIDFUNC(2,fcmp_rr,(FR d, FR s)) +MIDFUNC(2,fcmp_rr,(FR d, FR s)) { d=f_readreg(d); s=f_readreg(s); @@ -2664,7 +2651,7 @@ MENDFUNC(2,fsub_rr,(FRW d, FR s)) } MENDFUNC(2,fcmp_rr,(FR d, FR s)) - MIDFUNC(2,fdiv_rr,(FRW d, FR s)) +MIDFUNC(2,fdiv_rr,(FRW d, FR s)) { s=f_readreg(s); d=f_rmw(d); @@ -2674,7 +2661,7 @@ MENDFUNC(2,fcmp_rr,(FR d, FR s)) } MENDFUNC(2,fdiv_rr,(FRW d, FR s)) - MIDFUNC(2,frem_rr,(FRW d, FR s)) +MIDFUNC(2,frem_rr,(FRW d, FR s)) { s=f_readreg(s); d=f_rmw(d); @@ -2684,7 +2671,7 @@ MENDFUNC(2,fdiv_rr,(FRW d, FR s)) } MENDFUNC(2,frem_rr,(FRW d, FR s)) - MIDFUNC(2,frem1_rr,(FRW d, FR s)) +MIDFUNC(2,frem1_rr,(FRW d, FR s)) { s=f_readreg(s); d=f_rmw(d); @@ -2694,7 +2681,7 @@ MENDFUNC(2,frem_rr,(FRW d, FR s)) } MENDFUNC(2,frem1_rr,(FRW d, FR s)) - MIDFUNC(2,fmul_rr,(FRW d, FR s)) +MIDFUNC(2,fmul_rr,(FRW d, FR s)) { s=f_readreg(s); d=f_rmw(d);