diff --git a/Makefile b/Makefile index cd1240ad..87c7a7f1 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ DEFS += `xml2-config --cflags` DEFS += -DAMIBERRY -DARMV6_ASSEMBLY ifndef DEBUG - CFLAGS += -std=gnu++14 -Ofast -frename-registers + CFLAGS += -std=gnu++14 -Ofast -frename-registers -falign-functions=16 else CFLAGS += -std=gnu++14 -g -rdynamic -funwind-tables -mapcs-frame -DDEBUG -Wl,--export-dynamic endif @@ -226,7 +226,7 @@ endif LDFLAGS += -lpthread -lz -lpng -lrt -lxml2 -lFLAC -lmpg123 -ldl -lmpeg2convert -lmpeg2 -ASFLAGS += $(CPU_FLAGS) +ASFLAGS += $(CPU_FLAGS) -falign-functions=16 export CFLAGS += $(SDL_CFLAGS) $(CPU_FLAGS) $(DEFS) $(EXTRA_CFLAGS) -DGCCCONSTFUNC="__attribute__((const))" -pipe -Wno-shift-overflow -Wno-narrowing export CXXFLAGS += $(CFLAGS) diff --git a/src/archivers/lha/slide.cpp b/src/archivers/lha/slide.cpp index f5efe524..77e23cab 100644 --- a/src/archivers/lha/slide.cpp +++ b/src/archivers/lha/slide.cpp @@ -10,11 +10,6 @@ #include "lha.h" -#ifdef DEBUG -FILE *fout = NULL; -static int noslide = 1; -#endif - /* ------------------------------------------------------------------------ */ static unsigned long encoded_origsize; @@ -80,11 +75,6 @@ int decode(struct interfacing *lhinterface) unsigned char *dtext; -#ifdef DEBUG - fout = fopen("de", "wt"); - if (fout == NULL) exit(1); -#endif - infile = lhinterface->infile; outfile = lhinterface->outfile; dicbit = lhinterface->dicbit; @@ -107,9 +97,6 @@ int decode(struct interfacing *lhinterface) while (lhcount < origsize) { c = decode_set.decode_c(); if (c <= UCHAR_MAX) { -#ifdef DEBUG - fprintf(fout, "%u C %02X\n", lhcount, c); -#endif dtext[loc++] = c; if (loc == dicsiz) { fwrite_crc(dtext, dicsiz, outfile); @@ -120,25 +107,16 @@ int decode(struct interfacing *lhinterface) else { j = c - offset; i = (loc - decode_set.decode_p() - 1) & dicsiz1; -#ifdef DEBUG - fprintf(fout, "%u M %u %u ", lhcount, (loc-1-i) & dicsiz1, j); -#endif lhcount += j; for (k = 0; k < j; k++) { c = dtext[(i + k) & dicsiz1]; -#ifdef DEBUG - fprintf(fout, "%02X ", c & 0xff); -#endif dtext[loc++] = c; if (loc == dicsiz) { fwrite_crc(dtext, dicsiz, outfile); loc = 0; } } -#ifdef DEBUG - fprintf(fout, "\n"); -#endif } } if (loc != 0) { diff --git a/src/blkdev_cdimage.cpp b/src/blkdev_cdimage.cpp index 17496056..ebe84b2a 100644 --- a/src/blkdev_cdimage.cpp +++ b/src/blkdev_cdimage.cpp @@ -1196,7 +1196,7 @@ static int parsemds (struct cdunit *cdu, struct zfile *zmds, const TCHAR *img) goto end; head = (MDS_Header*)mds; - if (!memcmp (&head, MEDIA_DESCRIPTOR, strlen (MEDIA_DESCRIPTOR))) + if (!memcmp (head, MEDIA_DESCRIPTOR, strlen (MEDIA_DESCRIPTOR))) goto end; if (head->version[0] != 1) { write_log (_T("unsupported MDS version %d, only v.1 supported\n"), head->version[0]); diff --git a/src/jit/codegen_arm.cpp b/src/jit/codegen_arm.cpp index 731a0805..6db8370e 100644 --- a/src/jit/codegen_arm.cpp +++ b/src/jit/codegen_arm.cpp @@ -82,11 +82,11 @@ extern void __clear_cache (char*, char*); //#define REG_DATAPTR R10_INDEX -#define REG_PC_PRE R0_INDEX /* The register we use for preloading regs.pc_p */ #define REG_PC_TMP R1_INDEX /* Another register that is not the above */ +#define R_MEMSTART 10 #define R_REGSTRUCT 11 -uae_s8 always_used[]={2,3,R_REGSTRUCT,12,-1}; // r2, r3 and r12 are work register in emitted code +uae_s8 always_used[]={2,3,R_MEMSTART,R_REGSTRUCT,12,-1}; // r2, r3 and r12 are work register in emitted code uae_u8 call_saved[]={0,0,0,0, 1,1,1,1, 1,1,1,1, 0,1,1,1}; @@ -241,11 +241,11 @@ LOWFUNC(WRITE,READ,2,compemu_raw_cmp_l_mi,(MEMR d, IMM s)) #ifdef ARMV6T2 if(d >= (uae_u32) ®s && d < ((uae_u32) ®s) + sizeof(struct regstruct)) { + uae_s32 idx = d - (uae_u32) & regs; + LDR_rRI(REG_WORK1, R_REGSTRUCT, idx); MOVW_ri16(REG_WORK2, s); if(s >> 16) MOVT_ri16(REG_WORK2, s >> 16); - uae_s32 idx = d - (uae_u32) & regs; - LDR_rRI(REG_WORK1, R_REGSTRUCT, idx); } else { MOVW_ri16(REG_WORK1, d); MOVT_ri16(REG_WORK1, d >> 16); @@ -666,7 +666,7 @@ STATIC_INLINE void compemu_raw_branch(IMM d) } -// Optimize access to struct regstruct with r11 +// Optimize access to struct regstruct with r11 and memory with r10 LOWFUNC(NONE,NONE,1,compemu_raw_init_r_regstruct,(IMM s)) { @@ -677,6 +677,8 @@ LOWFUNC(NONE,NONE,1,compemu_raw_init_r_regstruct,(IMM s)) uae_s32 offs = data_long_offs(s); LDR_rRI(R_REGSTRUCT, RPC_INDEX, offs); #endif + uae_s32 offsmem = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; + LDR_rRI(R_MEMSTART, R_REGSTRUCT, offsmem); } LENDFUNC(NONE,NONE,1,compemu_raw_init_r_regstruct,(IMM s)) @@ -1122,24 +1124,22 @@ LENDFUNC(NONE,NONE,3,raw_fpowx_rr,(uae_u32 x, FW d, FR s)) LOWFUNC(NONE,WRITE,2,raw_fp_from_exten_mr,(RR4 adr, FR s)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - VMOVi_to_ARM_rd(REG_WORK1, s, 1); // get high part of double VCMP64_d0(s); VMRS_CPSR(); #ifdef ARMV6T2 - BEQ_i(20); // iszero + BEQ_i(19); // iszero #else - BEQ_i(21); + BEQ_i(20); #endif UBFX_rrii(REG_WORK2, REG_WORK1, 20, 11); // get exponent MOVW_ri16(REG_WORK3, 2047); CMP_rr(REG_WORK2, REG_WORK3); #ifdef ARMV6T2 - BEQ_i(13); // isnan + BEQ_i(12); // isnan #else - BEQ_i(14); + BEQ_i(13); #endif MOVW_ri16(REG_WORK3, 15360); // diff of bias between double and long double @@ -1147,8 +1147,7 @@ LOWFUNC(NONE,WRITE,2,raw_fp_from_exten_mr,(RR4 adr, FR s)) AND_rri(REG_WORK1, REG_WORK1, 0x80000000); // extract sign ORR_rrrLSLi(REG_WORK2, REG_WORK1, REG_WORK2, 16); // merge sign and exponent - LDR_rRI(REG_WORK3, R_REGSTRUCT, offs); - ADD_rrr(REG_WORK3, adr, REG_WORK3); + ADD_rrr(REG_WORK3, adr, R_MEMSTART); REV_rr(REG_WORK2, REG_WORK2); STRH_rR(REG_WORK2, REG_WORK3); // write exponent @@ -1159,11 +1158,11 @@ LOWFUNC(NONE,WRITE,2,raw_fp_from_exten_mr,(RR4 adr, FR s)) ORR_rri(REG_WORK1, REG_WORK1, 0x80); // insert explicit 1 #ifdef ARMV6T2 STRD_rRI(REG_WORK1, REG_WORK3, 4); - B_i(9); // end_of_op + B_i(8); // end_of_op #else STR_rRI(REG_WORK1, REG_WORK3, 4); STR_rRI(REG_WORK2, REG_WORK3, 8); - B_i(10); + B_i(9); #endif // isnan @@ -1175,8 +1174,7 @@ LOWFUNC(NONE,WRITE,2,raw_fp_from_exten_mr,(RR4 adr, FR s)) CC_AND_rri(NATIVE_CC_EQ, REG_WORK1, REG_WORK1, 0x80000000); // extract sign CC_MOV_ri(NATIVE_CC_EQ, REG_WORK2, 0); - LDR_rRI(REG_WORK3, R_REGSTRUCT, offs); - ADD_rrr(REG_WORK3, adr, REG_WORK3); + ADD_rrr(REG_WORK3, adr, R_MEMSTART); REV_rr(REG_WORK1, REG_WORK1); #ifdef ARMV6T2 @@ -1194,10 +1192,7 @@ LENDFUNC(NONE,WRITE,2,raw_fp_from_exten_mr,(RR4 adr, FR s)) LOWFUNC(NONE,READ,2,raw_fp_to_exten_rm,(FW d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - - LDR_rRI(REG_WORK3, R_REGSTRUCT, offs); - ADD_rrr(REG_WORK3, adr, REG_WORK3); + ADD_rrr(REG_WORK3, adr, R_MEMSTART); #ifdef ARMV6T2 LDRD_rRI(REG_WORK1, REG_WORK3, 4); @@ -1244,10 +1239,7 @@ LENDFUNC(NONE,READ,2,raw_fp_to_exten_rm,(FW d, RR4 adr)) LOWFUNC(NONE,WRITE,2,raw_fp_from_double_mr,(RR4 adr, FR s)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - - LDR_rRI(REG_WORK3, R_REGSTRUCT, offs); - ADD_rrr(REG_WORK3, adr, REG_WORK3); + ADD_rrr(REG_WORK3, adr, R_MEMSTART); VREV64_8_dd(SCRATCH_F64_1, s); VSTR64_dRi(SCRATCH_F64_1, REG_WORK3, 0); @@ -1256,10 +1248,7 @@ LENDFUNC(NONE,WRITE,2,raw_fp_from_double_mr,(RR4 adr, FR s)) LOWFUNC(NONE,READ,2,raw_fp_to_double_rm,(FW d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - - LDR_rRI(REG_WORK3, R_REGSTRUCT, offs); - ADD_rrr(REG_WORK3, adr, REG_WORK3); + ADD_rrr(REG_WORK3, adr, R_MEMSTART); VLDR64_dRi(d, REG_WORK3, 0); VREV64_8_dd(d, d); diff --git a/src/jit/compemu.cpp b/src/jit/compemu.cpp index 8c8448cf..69bd55ad 100644 --- a/src/jit/compemu.cpp +++ b/src/jit/compemu.cpp @@ -51,11 +51,11 @@ uae_u32 REGPARAM2 op_10_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -70,11 +70,11 @@ uae_u32 REGPARAM2 op_18_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -91,11 +91,11 @@ uae_u32 REGPARAM2 op_20_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -111,11 +111,11 @@ uae_u32 REGPARAM2 op_28_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -129,13 +129,13 @@ uae_u32 REGPARAM2 op_30_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -150,11 +150,11 @@ uae_u32 REGPARAM2 op_38_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -169,11 +169,11 @@ uae_u32 REGPARAM2 op_39_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -218,11 +218,11 @@ uae_u32 REGPARAM2 op_50_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -237,11 +237,11 @@ uae_u32 REGPARAM2 op_58_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -258,11 +258,11 @@ uae_u32 REGPARAM2 op_60_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -278,11 +278,11 @@ uae_u32 REGPARAM2 op_68_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -296,13 +296,13 @@ uae_u32 REGPARAM2 op_70_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -317,11 +317,11 @@ uae_u32 REGPARAM2 op_78_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -336,11 +336,11 @@ uae_u32 REGPARAM2 op_79_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -371,11 +371,11 @@ uae_u32 REGPARAM2 op_90_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -390,11 +390,11 @@ uae_u32 REGPARAM2 op_98_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -411,11 +411,11 @@ uae_u32 REGPARAM2 op_a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -431,11 +431,11 @@ uae_u32 REGPARAM2 op_a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -449,13 +449,13 @@ uae_u32 REGPARAM2 op_b0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -470,11 +470,11 @@ uae_u32 REGPARAM2 op_b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -489,11 +489,11 @@ uae_u32 REGPARAM2 op_b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -524,7 +524,7 @@ uae_u32 REGPARAM2 op_110_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -542,7 +542,7 @@ uae_u32 REGPARAM2 op_118_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -562,7 +562,7 @@ uae_u32 REGPARAM2 op_120_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -581,7 +581,7 @@ uae_u32 REGPARAM2 op_128_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -598,9 +598,9 @@ uae_u32 REGPARAM2 op_130_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -618,7 +618,7 @@ uae_u32 REGPARAM2 op_138_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -636,7 +636,7 @@ uae_u32 REGPARAM2 op_139_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -657,7 +657,7 @@ uae_u32 REGPARAM2 op_13a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -677,9 +677,9 @@ uae_u32 REGPARAM2 op_13b_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -729,11 +729,11 @@ uae_u32 REGPARAM2 op_150_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -748,11 +748,11 @@ uae_u32 REGPARAM2 op_158_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -769,11 +769,11 @@ uae_u32 REGPARAM2 op_160_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -789,11 +789,11 @@ uae_u32 REGPARAM2 op_168_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -807,13 +807,13 @@ uae_u32 REGPARAM2 op_170_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -828,11 +828,11 @@ uae_u32 REGPARAM2 op_178_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -847,11 +847,11 @@ uae_u32 REGPARAM2 op_179_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -882,11 +882,11 @@ uae_u32 REGPARAM2 op_190_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -901,11 +901,11 @@ uae_u32 REGPARAM2 op_198_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -922,11 +922,11 @@ uae_u32 REGPARAM2 op_1a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -942,11 +942,11 @@ uae_u32 REGPARAM2 op_1a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -960,13 +960,13 @@ uae_u32 REGPARAM2 op_1b0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -981,11 +981,11 @@ uae_u32 REGPARAM2 op_1b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1000,11 +1000,11 @@ uae_u32 REGPARAM2 op_1b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1035,11 +1035,11 @@ uae_u32 REGPARAM2 op_1d0_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1054,11 +1054,11 @@ uae_u32 REGPARAM2 op_1d8_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -1075,11 +1075,11 @@ uae_u32 REGPARAM2 op_1e0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1095,11 +1095,11 @@ uae_u32 REGPARAM2 op_1e8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1113,13 +1113,13 @@ uae_u32 REGPARAM2 op_1f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1134,11 +1134,11 @@ uae_u32 REGPARAM2 op_1f8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1153,11 +1153,11 @@ uae_u32 REGPARAM2 op_1f9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1188,11 +1188,11 @@ uae_u32 REGPARAM2 op_210_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1207,11 +1207,11 @@ uae_u32 REGPARAM2 op_218_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -1228,11 +1228,11 @@ uae_u32 REGPARAM2 op_220_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1248,11 +1248,11 @@ uae_u32 REGPARAM2 op_228_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1266,13 +1266,13 @@ uae_u32 REGPARAM2 op_230_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1287,11 +1287,11 @@ uae_u32 REGPARAM2 op_238_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1306,11 +1306,11 @@ uae_u32 REGPARAM2 op_239_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1355,11 +1355,11 @@ uae_u32 REGPARAM2 op_250_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1374,11 +1374,11 @@ uae_u32 REGPARAM2 op_258_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -1395,11 +1395,11 @@ uae_u32 REGPARAM2 op_260_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1415,11 +1415,11 @@ uae_u32 REGPARAM2 op_268_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1433,13 +1433,13 @@ uae_u32 REGPARAM2 op_270_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1454,11 +1454,11 @@ uae_u32 REGPARAM2 op_278_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1473,11 +1473,11 @@ uae_u32 REGPARAM2 op_279_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1508,11 +1508,11 @@ uae_u32 REGPARAM2 op_290_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1527,11 +1527,11 @@ uae_u32 REGPARAM2 op_298_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -1548,11 +1548,11 @@ uae_u32 REGPARAM2 op_2a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1568,11 +1568,11 @@ uae_u32 REGPARAM2 op_2a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1586,13 +1586,13 @@ uae_u32 REGPARAM2 op_2b0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1607,11 +1607,11 @@ uae_u32 REGPARAM2 op_2b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1626,11 +1626,11 @@ uae_u32 REGPARAM2 op_2b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1662,12 +1662,12 @@ uae_u32 REGPARAM2 op_410_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1682,12 +1682,12 @@ uae_u32 REGPARAM2 op_418_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -1704,12 +1704,12 @@ uae_u32 REGPARAM2 op_420_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1725,12 +1725,12 @@ uae_u32 REGPARAM2 op_428_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1744,14 +1744,14 @@ uae_u32 REGPARAM2 op_430_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1766,12 +1766,12 @@ uae_u32 REGPARAM2 op_438_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1786,12 +1786,12 @@ uae_u32 REGPARAM2 op_439_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1823,12 +1823,12 @@ uae_u32 REGPARAM2 op_450_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1843,12 +1843,12 @@ uae_u32 REGPARAM2 op_458_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -1865,12 +1865,12 @@ uae_u32 REGPARAM2 op_460_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1886,12 +1886,12 @@ uae_u32 REGPARAM2 op_468_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1905,14 +1905,14 @@ uae_u32 REGPARAM2 op_470_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1927,12 +1927,12 @@ uae_u32 REGPARAM2 op_478_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1947,12 +1947,12 @@ uae_u32 REGPARAM2 op_479_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -1984,12 +1984,12 @@ uae_u32 REGPARAM2 op_490_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2004,12 +2004,12 @@ uae_u32 REGPARAM2 op_498_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -2026,12 +2026,12 @@ uae_u32 REGPARAM2 op_4a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2047,12 +2047,12 @@ uae_u32 REGPARAM2 op_4a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2066,14 +2066,14 @@ uae_u32 REGPARAM2 op_4b0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2088,12 +2088,12 @@ uae_u32 REGPARAM2 op_4b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2108,12 +2108,12 @@ uae_u32 REGPARAM2 op_4b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2145,12 +2145,12 @@ uae_u32 REGPARAM2 op_610_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2165,12 +2165,12 @@ uae_u32 REGPARAM2 op_618_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -2187,12 +2187,12 @@ uae_u32 REGPARAM2 op_620_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2208,12 +2208,12 @@ uae_u32 REGPARAM2 op_628_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2227,14 +2227,14 @@ uae_u32 REGPARAM2 op_630_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2249,12 +2249,12 @@ uae_u32 REGPARAM2 op_638_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2269,12 +2269,12 @@ uae_u32 REGPARAM2 op_639_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2306,12 +2306,12 @@ uae_u32 REGPARAM2 op_650_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2326,12 +2326,12 @@ uae_u32 REGPARAM2 op_658_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -2348,12 +2348,12 @@ uae_u32 REGPARAM2 op_660_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2369,12 +2369,12 @@ uae_u32 REGPARAM2 op_668_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2388,14 +2388,14 @@ uae_u32 REGPARAM2 op_670_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2410,12 +2410,12 @@ uae_u32 REGPARAM2 op_678_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2430,12 +2430,12 @@ uae_u32 REGPARAM2 op_679_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2467,12 +2467,12 @@ uae_u32 REGPARAM2 op_690_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2487,12 +2487,12 @@ uae_u32 REGPARAM2 op_698_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -2509,12 +2509,12 @@ uae_u32 REGPARAM2 op_6a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2530,12 +2530,12 @@ uae_u32 REGPARAM2 op_6a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2549,14 +2549,14 @@ uae_u32 REGPARAM2 op_6b0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2571,12 +2571,12 @@ uae_u32 REGPARAM2 op_6b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2591,12 +2591,12 @@ uae_u32 REGPARAM2 op_6b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2627,7 +2627,7 @@ uae_u32 REGPARAM2 op_810_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -2645,7 +2645,7 @@ uae_u32 REGPARAM2 op_818_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -2665,7 +2665,7 @@ uae_u32 REGPARAM2 op_820_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -2684,7 +2684,7 @@ uae_u32 REGPARAM2 op_828_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -2701,9 +2701,9 @@ uae_u32 REGPARAM2 op_830_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -2721,7 +2721,7 @@ uae_u32 REGPARAM2 op_838_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -2739,7 +2739,7 @@ uae_u32 REGPARAM2 op_839_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -2760,7 +2760,7 @@ uae_u32 REGPARAM2 op_83a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -2780,9 +2780,9 @@ uae_u32 REGPARAM2 op_83b_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BTST_b(dst,src); live_flags(); @@ -2816,11 +2816,11 @@ uae_u32 REGPARAM2 op_850_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2835,11 +2835,11 @@ uae_u32 REGPARAM2 op_858_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -2856,11 +2856,11 @@ uae_u32 REGPARAM2 op_860_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2876,11 +2876,11 @@ uae_u32 REGPARAM2 op_868_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2894,13 +2894,13 @@ uae_u32 REGPARAM2 op_870_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2915,11 +2915,11 @@ uae_u32 REGPARAM2 op_878_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2934,11 +2934,11 @@ uae_u32 REGPARAM2 op_879_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCHG_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2969,11 +2969,11 @@ uae_u32 REGPARAM2 op_890_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -2988,11 +2988,11 @@ uae_u32 REGPARAM2 op_898_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -3009,11 +3009,11 @@ uae_u32 REGPARAM2 op_8a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3029,11 +3029,11 @@ uae_u32 REGPARAM2 op_8a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3047,13 +3047,13 @@ uae_u32 REGPARAM2 op_8b0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3068,11 +3068,11 @@ uae_u32 REGPARAM2 op_8b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3087,11 +3087,11 @@ uae_u32 REGPARAM2 op_8b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BCLR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3122,11 +3122,11 @@ uae_u32 REGPARAM2 op_8d0_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3141,11 +3141,11 @@ uae_u32 REGPARAM2 op_8d8_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -3162,11 +3162,11 @@ uae_u32 REGPARAM2 op_8e0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3182,11 +3182,11 @@ uae_u32 REGPARAM2 op_8e8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3200,13 +3200,13 @@ uae_u32 REGPARAM2 op_8f0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3221,11 +3221,11 @@ uae_u32 REGPARAM2 op_8f8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3240,11 +3240,11 @@ uae_u32 REGPARAM2 op_8f9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); make_flags_live(); jff_BSET_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3275,11 +3275,11 @@ uae_u32 REGPARAM2 op_a10_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3294,11 +3294,11 @@ uae_u32 REGPARAM2 op_a18_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -3315,11 +3315,11 @@ uae_u32 REGPARAM2 op_a20_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3335,11 +3335,11 @@ uae_u32 REGPARAM2 op_a28_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3353,13 +3353,13 @@ uae_u32 REGPARAM2 op_a30_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3374,11 +3374,11 @@ uae_u32 REGPARAM2 op_a38_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3393,11 +3393,11 @@ uae_u32 REGPARAM2 op_a39_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3442,11 +3442,11 @@ uae_u32 REGPARAM2 op_a50_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3461,11 +3461,11 @@ uae_u32 REGPARAM2 op_a58_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -3482,11 +3482,11 @@ uae_u32 REGPARAM2 op_a60_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3502,11 +3502,11 @@ uae_u32 REGPARAM2 op_a68_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3520,13 +3520,13 @@ uae_u32 REGPARAM2 op_a70_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3541,11 +3541,11 @@ uae_u32 REGPARAM2 op_a78_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3560,11 +3560,11 @@ uae_u32 REGPARAM2 op_a79_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3595,11 +3595,11 @@ uae_u32 REGPARAM2 op_a90_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3614,11 +3614,11 @@ uae_u32 REGPARAM2 op_a98_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -3635,11 +3635,11 @@ uae_u32 REGPARAM2 op_aa0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3655,11 +3655,11 @@ uae_u32 REGPARAM2 op_aa8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3673,13 +3673,13 @@ uae_u32 REGPARAM2 op_ab0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3694,11 +3694,11 @@ uae_u32 REGPARAM2 op_ab8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3713,11 +3713,11 @@ uae_u32 REGPARAM2 op_ab9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -3752,7 +3752,7 @@ uae_u32 REGPARAM2 op_c10_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -3771,7 +3771,7 @@ uae_u32 REGPARAM2 op_c18_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -3792,7 +3792,7 @@ uae_u32 REGPARAM2 op_c20_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -3812,7 +3812,7 @@ uae_u32 REGPARAM2 op_c28_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -3830,9 +3830,9 @@ uae_u32 REGPARAM2 op_c30_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -3851,7 +3851,7 @@ uae_u32 REGPARAM2 op_c38_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -3870,7 +3870,7 @@ uae_u32 REGPARAM2 op_c39_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -3892,7 +3892,7 @@ uae_u32 REGPARAM2 op_c3a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -3913,9 +3913,9 @@ uae_u32 REGPARAM2 op_c3b_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -3951,7 +3951,7 @@ uae_u32 REGPARAM2 op_c50_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -3970,7 +3970,7 @@ uae_u32 REGPARAM2 op_c58_0_comp_ff(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -3991,7 +3991,7 @@ uae_u32 REGPARAM2 op_c60_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -4011,7 +4011,7 @@ uae_u32 REGPARAM2 op_c68_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -4029,9 +4029,9 @@ uae_u32 REGPARAM2 op_c70_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -4050,7 +4050,7 @@ uae_u32 REGPARAM2 op_c78_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -4069,7 +4069,7 @@ uae_u32 REGPARAM2 op_c79_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -4091,7 +4091,7 @@ uae_u32 REGPARAM2 op_c7a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -4112,9 +4112,9 @@ uae_u32 REGPARAM2 op_c7b_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -4150,7 +4150,7 @@ uae_u32 REGPARAM2 op_c90_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -4169,7 +4169,7 @@ uae_u32 REGPARAM2 op_c98_0_comp_ff(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -4190,7 +4190,7 @@ uae_u32 REGPARAM2 op_ca0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -4210,7 +4210,7 @@ uae_u32 REGPARAM2 op_ca8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -4228,9 +4228,9 @@ uae_u32 REGPARAM2 op_cb0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -4249,7 +4249,7 @@ uae_u32 REGPARAM2 op_cb8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -4268,7 +4268,7 @@ uae_u32 REGPARAM2 op_cb9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -4290,7 +4290,7 @@ uae_u32 REGPARAM2 op_cba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -4311,9 +4311,9 @@ uae_u32 REGPARAM2 op_cbb_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -4347,7 +4347,7 @@ uae_u32 REGPARAM2 op_1010_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_b(dst, src); @@ -4365,7 +4365,7 @@ uae_u32 REGPARAM2 op_1018_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -4385,7 +4385,7 @@ uae_u32 REGPARAM2 op_1020_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_b(dst, src); @@ -4404,7 +4404,7 @@ uae_u32 REGPARAM2 op_1028_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_b(dst, src); @@ -4421,9 +4421,9 @@ uae_u32 REGPARAM2 op_1030_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_b(dst, src); @@ -4441,7 +4441,7 @@ uae_u32 REGPARAM2 op_1038_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_b(dst, src); @@ -4459,7 +4459,7 @@ uae_u32 REGPARAM2 op_1039_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_b(dst, src); @@ -4479,7 +4479,7 @@ uae_u32 REGPARAM2 op_103a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_b(dst, src); @@ -4498,9 +4498,9 @@ uae_u32 REGPARAM2 op_103b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_b(dst, src); @@ -4537,7 +4537,7 @@ uae_u32 REGPARAM2 op_1080_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4551,12 +4551,12 @@ uae_u32 REGPARAM2 op_1090_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4570,13 +4570,13 @@ uae_u32 REGPARAM2 op_1098_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4591,12 +4591,12 @@ uae_u32 REGPARAM2 op_10a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4611,12 +4611,12 @@ uae_u32 REGPARAM2 op_10a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4629,14 +4629,14 @@ uae_u32 REGPARAM2 op_10b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4650,12 +4650,12 @@ uae_u32 REGPARAM2 op_10b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4669,12 +4669,12 @@ uae_u32 REGPARAM2 op_10b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4690,12 +4690,12 @@ uae_u32 REGPARAM2 op_10ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4710,14 +4710,14 @@ uae_u32 REGPARAM2 op_10bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4734,7 +4734,7 @@ uae_u32 REGPARAM2 op_10bc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4751,7 +4751,7 @@ uae_u32 REGPARAM2 op_10c0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4766,12 +4766,12 @@ uae_u32 REGPARAM2 op_10d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4786,13 +4786,13 @@ uae_u32 REGPARAM2 op_10d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4808,12 +4808,12 @@ uae_u32 REGPARAM2 op_10e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4829,12 +4829,12 @@ uae_u32 REGPARAM2 op_10e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4848,14 +4848,14 @@ uae_u32 REGPARAM2 op_10f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4870,12 +4870,12 @@ uae_u32 REGPARAM2 op_10f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4890,12 +4890,12 @@ uae_u32 REGPARAM2 op_10f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4912,12 +4912,12 @@ uae_u32 REGPARAM2 op_10fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4933,14 +4933,14 @@ uae_u32 REGPARAM2 op_10fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4958,7 +4958,7 @@ uae_u32 REGPARAM2 op_10fc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -4977,7 +4977,7 @@ uae_u32 REGPARAM2 op_1100_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -4991,13 +4991,13 @@ uae_u32 REGPARAM2 op_1110_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5011,14 +5011,14 @@ uae_u32 REGPARAM2 op_1118_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5033,13 +5033,13 @@ uae_u32 REGPARAM2 op_1120_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5054,13 +5054,13 @@ uae_u32 REGPARAM2 op_1128_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5073,15 +5073,15 @@ uae_u32 REGPARAM2 op_1130_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5095,13 +5095,13 @@ uae_u32 REGPARAM2 op_1138_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5115,13 +5115,13 @@ uae_u32 REGPARAM2 op_1139_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5137,13 +5137,13 @@ uae_u32 REGPARAM2 op_113a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5158,15 +5158,15 @@ uae_u32 REGPARAM2 op_113b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5184,7 +5184,7 @@ uae_u32 REGPARAM2 op_113c_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5202,7 +5202,7 @@ uae_u32 REGPARAM2 op_1140_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5216,13 +5216,13 @@ uae_u32 REGPARAM2 op_1150_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5236,14 +5236,14 @@ uae_u32 REGPARAM2 op_1158_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5258,13 +5258,13 @@ uae_u32 REGPARAM2 op_1160_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5279,13 +5279,13 @@ uae_u32 REGPARAM2 op_1168_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5298,15 +5298,15 @@ uae_u32 REGPARAM2 op_1170_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5320,13 +5320,13 @@ uae_u32 REGPARAM2 op_1178_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5340,13 +5340,13 @@ uae_u32 REGPARAM2 op_1179_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5362,13 +5362,13 @@ uae_u32 REGPARAM2 op_117a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5383,15 +5383,15 @@ uae_u32 REGPARAM2 op_117b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5409,7 +5409,7 @@ uae_u32 REGPARAM2 op_117c_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5423,11 +5423,11 @@ uae_u32 REGPARAM2 op_1180_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5441,13 +5441,13 @@ uae_u32 REGPARAM2 op_1190_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5461,14 +5461,14 @@ uae_u32 REGPARAM2 op_1198_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5483,13 +5483,13 @@ uae_u32 REGPARAM2 op_11a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5504,13 +5504,13 @@ uae_u32 REGPARAM2 op_11a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5523,15 +5523,15 @@ uae_u32 REGPARAM2 op_11b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5545,13 +5545,13 @@ uae_u32 REGPARAM2 op_11b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5565,13 +5565,13 @@ uae_u32 REGPARAM2 op_11b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5587,13 +5587,13 @@ uae_u32 REGPARAM2 op_11ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5608,15 +5608,15 @@ uae_u32 REGPARAM2 op_11bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5630,11 +5630,11 @@ uae_u32 REGPARAM2 op_11bc_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5651,7 +5651,7 @@ uae_u32 REGPARAM2 op_11c0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5664,13 +5664,13 @@ uae_u32 REGPARAM2 op_11d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5683,14 +5683,14 @@ uae_u32 REGPARAM2 op_11d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5704,13 +5704,13 @@ uae_u32 REGPARAM2 op_11e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5724,13 +5724,13 @@ uae_u32 REGPARAM2 op_11e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5742,15 +5742,15 @@ uae_u32 REGPARAM2 op_11f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5763,13 +5763,13 @@ uae_u32 REGPARAM2 op_11f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5782,13 +5782,13 @@ uae_u32 REGPARAM2 op_11f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5803,13 +5803,13 @@ uae_u32 REGPARAM2 op_11fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5823,15 +5823,15 @@ uae_u32 REGPARAM2 op_11fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5848,7 +5848,7 @@ uae_u32 REGPARAM2 op_11fc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5865,7 +5865,7 @@ uae_u32 REGPARAM2 op_13c0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5878,13 +5878,13 @@ uae_u32 REGPARAM2 op_13d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5897,14 +5897,14 @@ uae_u32 REGPARAM2 op_13d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5918,13 +5918,13 @@ uae_u32 REGPARAM2 op_13e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5938,13 +5938,13 @@ uae_u32 REGPARAM2 op_13e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5956,15 +5956,15 @@ uae_u32 REGPARAM2 op_13f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5977,13 +5977,13 @@ uae_u32 REGPARAM2 op_13f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -5996,13 +5996,13 @@ uae_u32 REGPARAM2 op_13f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6017,13 +6017,13 @@ uae_u32 REGPARAM2 op_13fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6037,15 +6037,15 @@ uae_u32 REGPARAM2 op_13fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6062,7 +6062,7 @@ uae_u32 REGPARAM2 op_13fc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_b(src); live_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6108,7 +6108,7 @@ uae_u32 REGPARAM2 op_2010_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_l(dst, src); @@ -6126,7 +6126,7 @@ uae_u32 REGPARAM2 op_2018_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -6146,7 +6146,7 @@ uae_u32 REGPARAM2 op_2020_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_l(dst, src); @@ -6165,7 +6165,7 @@ uae_u32 REGPARAM2 op_2028_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_l(dst, src); @@ -6182,9 +6182,9 @@ uae_u32 REGPARAM2 op_2030_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_l(dst, src); @@ -6202,7 +6202,7 @@ uae_u32 REGPARAM2 op_2038_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_l(dst, src); @@ -6220,7 +6220,7 @@ uae_u32 REGPARAM2 op_2039_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_l(dst, src); @@ -6240,7 +6240,7 @@ uae_u32 REGPARAM2 op_203a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_l(dst, src); @@ -6259,9 +6259,9 @@ uae_u32 REGPARAM2 op_203b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_l(dst, src); @@ -6323,7 +6323,7 @@ uae_u32 REGPARAM2 op_2050_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -6339,7 +6339,7 @@ uae_u32 REGPARAM2 op_2058_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg+8; jnf_MOVEA_l(dst, src); @@ -6357,7 +6357,7 @@ uae_u32 REGPARAM2 op_2060_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -6374,7 +6374,7 @@ uae_u32 REGPARAM2 op_2068_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -6389,9 +6389,9 @@ uae_u32 REGPARAM2 op_2070_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -6407,7 +6407,7 @@ uae_u32 REGPARAM2 op_2078_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -6423,7 +6423,7 @@ uae_u32 REGPARAM2 op_2079_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -6441,7 +6441,7 @@ uae_u32 REGPARAM2 op_207a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -6458,9 +6458,9 @@ uae_u32 REGPARAM2 op_207b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -6493,7 +6493,7 @@ uae_u32 REGPARAM2 op_2080_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6510,7 +6510,7 @@ uae_u32 REGPARAM2 op_2088_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6524,12 +6524,12 @@ uae_u32 REGPARAM2 op_2090_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6543,13 +6543,13 @@ uae_u32 REGPARAM2 op_2098_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6564,12 +6564,12 @@ uae_u32 REGPARAM2 op_20a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6584,12 +6584,12 @@ uae_u32 REGPARAM2 op_20a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6602,14 +6602,14 @@ uae_u32 REGPARAM2 op_20b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6623,12 +6623,12 @@ uae_u32 REGPARAM2 op_20b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6642,12 +6642,12 @@ uae_u32 REGPARAM2 op_20b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6663,12 +6663,12 @@ uae_u32 REGPARAM2 op_20ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6683,14 +6683,14 @@ uae_u32 REGPARAM2 op_20bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6707,7 +6707,7 @@ uae_u32 REGPARAM2 op_20bc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6724,7 +6724,7 @@ uae_u32 REGPARAM2 op_20c0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6746,7 +6746,7 @@ uae_u32 REGPARAM2 op_20c8_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6761,12 +6761,12 @@ uae_u32 REGPARAM2 op_20d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6781,13 +6781,13 @@ uae_u32 REGPARAM2 op_20d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6803,12 +6803,12 @@ uae_u32 REGPARAM2 op_20e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6824,12 +6824,12 @@ uae_u32 REGPARAM2 op_20e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6843,14 +6843,14 @@ uae_u32 REGPARAM2 op_20f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6865,12 +6865,12 @@ uae_u32 REGPARAM2 op_20f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6885,12 +6885,12 @@ uae_u32 REGPARAM2 op_20f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6907,12 +6907,12 @@ uae_u32 REGPARAM2 op_20fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6928,14 +6928,14 @@ uae_u32 REGPARAM2 op_20fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6953,7 +6953,7 @@ uae_u32 REGPARAM2 op_20fc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -6972,7 +6972,7 @@ uae_u32 REGPARAM2 op_2100_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -6994,7 +6994,7 @@ uae_u32 REGPARAM2 op_2108_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7008,13 +7008,13 @@ uae_u32 REGPARAM2 op_2110_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7028,14 +7028,14 @@ uae_u32 REGPARAM2 op_2118_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7050,13 +7050,13 @@ uae_u32 REGPARAM2 op_2120_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7071,13 +7071,13 @@ uae_u32 REGPARAM2 op_2128_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7090,15 +7090,15 @@ uae_u32 REGPARAM2 op_2130_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7112,13 +7112,13 @@ uae_u32 REGPARAM2 op_2138_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7132,13 +7132,13 @@ uae_u32 REGPARAM2 op_2139_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7154,13 +7154,13 @@ uae_u32 REGPARAM2 op_213a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7175,15 +7175,15 @@ uae_u32 REGPARAM2 op_213b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7201,7 +7201,7 @@ uae_u32 REGPARAM2 op_213c_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7219,7 +7219,7 @@ uae_u32 REGPARAM2 op_2140_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7237,7 +7237,7 @@ uae_u32 REGPARAM2 op_2148_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7251,13 +7251,13 @@ uae_u32 REGPARAM2 op_2150_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7271,14 +7271,14 @@ uae_u32 REGPARAM2 op_2158_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7293,13 +7293,13 @@ uae_u32 REGPARAM2 op_2160_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7314,13 +7314,13 @@ uae_u32 REGPARAM2 op_2168_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7333,15 +7333,15 @@ uae_u32 REGPARAM2 op_2170_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7355,13 +7355,13 @@ uae_u32 REGPARAM2 op_2178_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7375,13 +7375,13 @@ uae_u32 REGPARAM2 op_2179_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7397,13 +7397,13 @@ uae_u32 REGPARAM2 op_217a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7418,15 +7418,15 @@ uae_u32 REGPARAM2 op_217b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7444,7 +7444,7 @@ uae_u32 REGPARAM2 op_217c_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7458,11 +7458,11 @@ uae_u32 REGPARAM2 op_2180_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7476,11 +7476,11 @@ uae_u32 REGPARAM2 op_2188_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg+8; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7494,13 +7494,13 @@ uae_u32 REGPARAM2 op_2190_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7514,14 +7514,14 @@ uae_u32 REGPARAM2 op_2198_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7539,13 +7539,13 @@ uae_u32 REGPARAM2 op_21a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7560,13 +7560,13 @@ uae_u32 REGPARAM2 op_21a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7579,15 +7579,15 @@ uae_u32 REGPARAM2 op_21b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7601,13 +7601,13 @@ uae_u32 REGPARAM2 op_21b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7621,13 +7621,13 @@ uae_u32 REGPARAM2 op_21b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7643,13 +7643,13 @@ uae_u32 REGPARAM2 op_21ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7664,15 +7664,15 @@ uae_u32 REGPARAM2 op_21bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7686,11 +7686,11 @@ uae_u32 REGPARAM2 op_21bc_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7707,7 +7707,7 @@ uae_u32 REGPARAM2 op_21c0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7724,7 +7724,7 @@ uae_u32 REGPARAM2 op_21c8_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7737,13 +7737,13 @@ uae_u32 REGPARAM2 op_21d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7756,14 +7756,14 @@ uae_u32 REGPARAM2 op_21d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7777,13 +7777,13 @@ uae_u32 REGPARAM2 op_21e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7797,13 +7797,13 @@ uae_u32 REGPARAM2 op_21e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7815,15 +7815,15 @@ uae_u32 REGPARAM2 op_21f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7836,13 +7836,13 @@ uae_u32 REGPARAM2 op_21f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7855,13 +7855,13 @@ uae_u32 REGPARAM2 op_21f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7876,13 +7876,13 @@ uae_u32 REGPARAM2 op_21fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7896,15 +7896,15 @@ uae_u32 REGPARAM2 op_21fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7921,7 +7921,7 @@ uae_u32 REGPARAM2 op_21fc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7938,7 +7938,7 @@ uae_u32 REGPARAM2 op_23c0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7955,7 +7955,7 @@ uae_u32 REGPARAM2 op_23c8_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7968,13 +7968,13 @@ uae_u32 REGPARAM2 op_23d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -7987,14 +7987,14 @@ uae_u32 REGPARAM2 op_23d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8008,13 +8008,13 @@ uae_u32 REGPARAM2 op_23e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8028,13 +8028,13 @@ uae_u32 REGPARAM2 op_23e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8046,15 +8046,15 @@ uae_u32 REGPARAM2 op_23f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8067,13 +8067,13 @@ uae_u32 REGPARAM2 op_23f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8086,13 +8086,13 @@ uae_u32 REGPARAM2 op_23f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8107,13 +8107,13 @@ uae_u32 REGPARAM2 op_23fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8127,15 +8127,15 @@ uae_u32 REGPARAM2 op_23fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8152,7 +8152,7 @@ uae_u32 REGPARAM2 op_23fc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_l(src); live_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8198,7 +8198,7 @@ uae_u32 REGPARAM2 op_3010_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_w(dst, src); @@ -8216,7 +8216,7 @@ uae_u32 REGPARAM2 op_3018_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -8236,7 +8236,7 @@ uae_u32 REGPARAM2 op_3020_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_w(dst, src); @@ -8255,7 +8255,7 @@ uae_u32 REGPARAM2 op_3028_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_w(dst, src); @@ -8272,9 +8272,9 @@ uae_u32 REGPARAM2 op_3030_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_w(dst, src); @@ -8292,7 +8292,7 @@ uae_u32 REGPARAM2 op_3038_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_w(dst, src); @@ -8310,7 +8310,7 @@ uae_u32 REGPARAM2 op_3039_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_w(dst, src); @@ -8330,7 +8330,7 @@ uae_u32 REGPARAM2 op_303a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_w(dst, src); @@ -8349,9 +8349,9 @@ uae_u32 REGPARAM2 op_303b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_MOVE_w(dst, src); @@ -8413,7 +8413,7 @@ uae_u32 REGPARAM2 op_3050_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -8429,7 +8429,7 @@ uae_u32 REGPARAM2 op_3058_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg+8; jnf_MOVEA_w(dst, src); @@ -8447,7 +8447,7 @@ uae_u32 REGPARAM2 op_3060_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -8464,7 +8464,7 @@ uae_u32 REGPARAM2 op_3068_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -8479,9 +8479,9 @@ uae_u32 REGPARAM2 op_3070_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -8497,7 +8497,7 @@ uae_u32 REGPARAM2 op_3078_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -8513,7 +8513,7 @@ uae_u32 REGPARAM2 op_3079_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -8531,7 +8531,7 @@ uae_u32 REGPARAM2 op_307a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -8548,9 +8548,9 @@ uae_u32 REGPARAM2 op_307b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -8583,7 +8583,7 @@ uae_u32 REGPARAM2 op_3080_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8600,7 +8600,7 @@ uae_u32 REGPARAM2 op_3088_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8614,12 +8614,12 @@ uae_u32 REGPARAM2 op_3090_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8633,13 +8633,13 @@ uae_u32 REGPARAM2 op_3098_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8654,12 +8654,12 @@ uae_u32 REGPARAM2 op_30a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8674,12 +8674,12 @@ uae_u32 REGPARAM2 op_30a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8692,14 +8692,14 @@ uae_u32 REGPARAM2 op_30b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8713,12 +8713,12 @@ uae_u32 REGPARAM2 op_30b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8732,12 +8732,12 @@ uae_u32 REGPARAM2 op_30b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8753,12 +8753,12 @@ uae_u32 REGPARAM2 op_30ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8773,14 +8773,14 @@ uae_u32 REGPARAM2 op_30bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8797,7 +8797,7 @@ uae_u32 REGPARAM2 op_30bc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -8814,7 +8814,7 @@ uae_u32 REGPARAM2 op_30c0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -8836,7 +8836,7 @@ uae_u32 REGPARAM2 op_30c8_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -8851,12 +8851,12 @@ uae_u32 REGPARAM2 op_30d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -8871,13 +8871,13 @@ uae_u32 REGPARAM2 op_30d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -8893,12 +8893,12 @@ uae_u32 REGPARAM2 op_30e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -8914,12 +8914,12 @@ uae_u32 REGPARAM2 op_30e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -8933,14 +8933,14 @@ uae_u32 REGPARAM2 op_30f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -8955,12 +8955,12 @@ uae_u32 REGPARAM2 op_30f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -8975,12 +8975,12 @@ uae_u32 REGPARAM2 op_30f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -8997,12 +8997,12 @@ uae_u32 REGPARAM2 op_30fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -9018,14 +9018,14 @@ uae_u32 REGPARAM2 op_30fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -9043,7 +9043,7 @@ uae_u32 REGPARAM2 op_30fc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -9062,7 +9062,7 @@ uae_u32 REGPARAM2 op_3100_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9084,7 +9084,7 @@ uae_u32 REGPARAM2 op_3108_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9098,13 +9098,13 @@ uae_u32 REGPARAM2 op_3110_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9118,14 +9118,14 @@ uae_u32 REGPARAM2 op_3118_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9140,13 +9140,13 @@ uae_u32 REGPARAM2 op_3120_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9161,13 +9161,13 @@ uae_u32 REGPARAM2 op_3128_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9180,15 +9180,15 @@ uae_u32 REGPARAM2 op_3130_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9202,13 +9202,13 @@ uae_u32 REGPARAM2 op_3138_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9222,13 +9222,13 @@ uae_u32 REGPARAM2 op_3139_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9244,13 +9244,13 @@ uae_u32 REGPARAM2 op_313a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9265,15 +9265,15 @@ uae_u32 REGPARAM2 op_313b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9291,7 +9291,7 @@ uae_u32 REGPARAM2 op_313c_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9309,7 +9309,7 @@ uae_u32 REGPARAM2 op_3140_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9327,7 +9327,7 @@ uae_u32 REGPARAM2 op_3148_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9341,13 +9341,13 @@ uae_u32 REGPARAM2 op_3150_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9361,14 +9361,14 @@ uae_u32 REGPARAM2 op_3158_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9383,13 +9383,13 @@ uae_u32 REGPARAM2 op_3160_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9404,13 +9404,13 @@ uae_u32 REGPARAM2 op_3168_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9423,15 +9423,15 @@ uae_u32 REGPARAM2 op_3170_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9445,13 +9445,13 @@ uae_u32 REGPARAM2 op_3178_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9465,13 +9465,13 @@ uae_u32 REGPARAM2 op_3179_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9487,13 +9487,13 @@ uae_u32 REGPARAM2 op_317a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9508,15 +9508,15 @@ uae_u32 REGPARAM2 op_317b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9534,7 +9534,7 @@ uae_u32 REGPARAM2 op_317c_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9548,11 +9548,11 @@ uae_u32 REGPARAM2 op_3180_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9566,11 +9566,11 @@ uae_u32 REGPARAM2 op_3188_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg+8; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9584,13 +9584,13 @@ uae_u32 REGPARAM2 op_3190_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9604,14 +9604,14 @@ uae_u32 REGPARAM2 op_3198_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9626,13 +9626,13 @@ uae_u32 REGPARAM2 op_31a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9647,13 +9647,13 @@ uae_u32 REGPARAM2 op_31a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9666,15 +9666,15 @@ uae_u32 REGPARAM2 op_31b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9688,13 +9688,13 @@ uae_u32 REGPARAM2 op_31b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9708,13 +9708,13 @@ uae_u32 REGPARAM2 op_31b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9730,13 +9730,13 @@ uae_u32 REGPARAM2 op_31ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9751,15 +9751,15 @@ uae_u32 REGPARAM2 op_31bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9773,11 +9773,11 @@ uae_u32 REGPARAM2 op_31bc_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9794,7 +9794,7 @@ uae_u32 REGPARAM2 op_31c0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9811,7 +9811,7 @@ uae_u32 REGPARAM2 op_31c8_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9824,13 +9824,13 @@ uae_u32 REGPARAM2 op_31d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9843,14 +9843,14 @@ uae_u32 REGPARAM2 op_31d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9864,13 +9864,13 @@ uae_u32 REGPARAM2 op_31e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9884,13 +9884,13 @@ uae_u32 REGPARAM2 op_31e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9902,15 +9902,15 @@ uae_u32 REGPARAM2 op_31f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9923,13 +9923,13 @@ uae_u32 REGPARAM2 op_31f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9942,13 +9942,13 @@ uae_u32 REGPARAM2 op_31f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9963,13 +9963,13 @@ uae_u32 REGPARAM2 op_31fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -9983,15 +9983,15 @@ uae_u32 REGPARAM2 op_31fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10008,7 +10008,7 @@ uae_u32 REGPARAM2 op_31fc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10025,7 +10025,7 @@ uae_u32 REGPARAM2 op_33c0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10042,7 +10042,7 @@ uae_u32 REGPARAM2 op_33c8_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10055,13 +10055,13 @@ uae_u32 REGPARAM2 op_33d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10074,14 +10074,14 @@ uae_u32 REGPARAM2 op_33d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10095,13 +10095,13 @@ uae_u32 REGPARAM2 op_33e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10115,13 +10115,13 @@ uae_u32 REGPARAM2 op_33e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10133,15 +10133,15 @@ uae_u32 REGPARAM2 op_33f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10154,13 +10154,13 @@ uae_u32 REGPARAM2 op_33f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10173,13 +10173,13 @@ uae_u32 REGPARAM2 op_33f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10194,13 +10194,13 @@ uae_u32 REGPARAM2 op_33fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10214,15 +10214,15 @@ uae_u32 REGPARAM2 op_33fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10239,7 +10239,7 @@ uae_u32 REGPARAM2 op_33fc_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_TST_w(src); live_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10267,12 +10267,12 @@ uae_u32 REGPARAM2 op_4010_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); make_flags_live(); jff_NEGX_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10285,12 +10285,12 @@ uae_u32 REGPARAM2 op_4018_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); make_flags_live(); jff_NEGX_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -10305,12 +10305,12 @@ uae_u32 REGPARAM2 op_4020_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); make_flags_live(); jff_NEGX_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10324,12 +10324,12 @@ uae_u32 REGPARAM2 op_4028_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); make_flags_live(); jff_NEGX_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10341,14 +10341,14 @@ uae_u32 REGPARAM2 op_4030_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); make_flags_live(); jff_NEGX_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10361,12 +10361,12 @@ uae_u32 REGPARAM2 op_4038_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); make_flags_live(); jff_NEGX_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10379,12 +10379,12 @@ uae_u32 REGPARAM2 op_4039_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); make_flags_live(); jff_NEGX_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10412,12 +10412,12 @@ uae_u32 REGPARAM2 op_4050_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); make_flags_live(); jff_NEGX_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10430,12 +10430,12 @@ uae_u32 REGPARAM2 op_4058_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); make_flags_live(); jff_NEGX_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -10450,12 +10450,12 @@ uae_u32 REGPARAM2 op_4060_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); make_flags_live(); jff_NEGX_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10469,12 +10469,12 @@ uae_u32 REGPARAM2 op_4068_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); make_flags_live(); jff_NEGX_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10486,14 +10486,14 @@ uae_u32 REGPARAM2 op_4070_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); make_flags_live(); jff_NEGX_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10506,12 +10506,12 @@ uae_u32 REGPARAM2 op_4078_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); make_flags_live(); jff_NEGX_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10524,12 +10524,12 @@ uae_u32 REGPARAM2 op_4079_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); make_flags_live(); jff_NEGX_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10557,12 +10557,12 @@ uae_u32 REGPARAM2 op_4090_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); make_flags_live(); jff_NEGX_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10575,12 +10575,12 @@ uae_u32 REGPARAM2 op_4098_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); make_flags_live(); jff_NEGX_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); arm_ADD_l_ri8(srcreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -10595,12 +10595,12 @@ uae_u32 REGPARAM2 op_40a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); make_flags_live(); jff_NEGX_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10614,12 +10614,12 @@ uae_u32 REGPARAM2 op_40a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); make_flags_live(); jff_NEGX_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10631,14 +10631,14 @@ uae_u32 REGPARAM2 op_40b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); make_flags_live(); jff_NEGX_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10651,12 +10651,12 @@ uae_u32 REGPARAM2 op_40b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); make_flags_live(); jff_NEGX_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10669,12 +10669,12 @@ uae_u32 REGPARAM2 op_40b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); make_flags_live(); jff_NEGX_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10718,7 +10718,7 @@ uae_u32 REGPARAM2 op_41f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int dst=dstreg+8; if(dstreg+8!=srca) mov_l_rr(dstreg+8,srca); @@ -10783,7 +10783,7 @@ uae_u32 REGPARAM2 op_41fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int dst=dstreg+8; if(dstreg+8!=srca) mov_l_rr(dstreg+8,srca); @@ -10816,7 +10816,7 @@ uae_u32 REGPARAM2 op_4210_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10832,7 +10832,7 @@ uae_u32 REGPARAM2 op_4218_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -10850,7 +10850,7 @@ uae_u32 REGPARAM2 op_4220_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10867,7 +10867,7 @@ uae_u32 REGPARAM2 op_4228_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10879,12 +10879,12 @@ uae_u32 REGPARAM2 op_4230_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; dont_care_flags(); jff_CLR_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10900,7 +10900,7 @@ uae_u32 REGPARAM2 op_4238_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10916,7 +10916,7 @@ uae_u32 REGPARAM2 op_4239_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10946,7 +10946,7 @@ uae_u32 REGPARAM2 op_4250_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10962,7 +10962,7 @@ uae_u32 REGPARAM2 op_4258_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -10980,7 +10980,7 @@ uae_u32 REGPARAM2 op_4260_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -10997,7 +10997,7 @@ uae_u32 REGPARAM2 op_4268_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11009,12 +11009,12 @@ uae_u32 REGPARAM2 op_4270_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; dont_care_flags(); jff_CLR_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11030,7 +11030,7 @@ uae_u32 REGPARAM2 op_4278_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11046,7 +11046,7 @@ uae_u32 REGPARAM2 op_4279_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11076,7 +11076,7 @@ uae_u32 REGPARAM2 op_4290_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11092,7 +11092,7 @@ uae_u32 REGPARAM2 op_4298_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); arm_ADD_l_ri8(srcreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -11110,7 +11110,7 @@ uae_u32 REGPARAM2 op_42a0_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11127,7 +11127,7 @@ uae_u32 REGPARAM2 op_42a8_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11139,12 +11139,12 @@ uae_u32 REGPARAM2 op_42b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; dont_care_flags(); jff_CLR_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11160,7 +11160,7 @@ uae_u32 REGPARAM2 op_42b8_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11176,7 +11176,7 @@ uae_u32 REGPARAM2 op_42b9_0_comp_ff(uae_u32 opcode) dont_care_flags(); jff_CLR_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11206,11 +11206,11 @@ uae_u32 REGPARAM2 op_4410_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jff_NEG_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11223,11 +11223,11 @@ uae_u32 REGPARAM2 op_4418_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jff_NEG_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -11242,11 +11242,11 @@ uae_u32 REGPARAM2 op_4420_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jff_NEG_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11260,11 +11260,11 @@ uae_u32 REGPARAM2 op_4428_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jff_NEG_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11276,13 +11276,13 @@ uae_u32 REGPARAM2 op_4430_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jff_NEG_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11295,11 +11295,11 @@ uae_u32 REGPARAM2 op_4438_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jff_NEG_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11312,11 +11312,11 @@ uae_u32 REGPARAM2 op_4439_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jff_NEG_b(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11343,11 +11343,11 @@ uae_u32 REGPARAM2 op_4450_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_NEG_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11360,11 +11360,11 @@ uae_u32 REGPARAM2 op_4458_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_NEG_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -11379,11 +11379,11 @@ uae_u32 REGPARAM2 op_4460_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_NEG_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11397,11 +11397,11 @@ uae_u32 REGPARAM2 op_4468_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_NEG_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11413,13 +11413,13 @@ uae_u32 REGPARAM2 op_4470_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_NEG_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11432,11 +11432,11 @@ uae_u32 REGPARAM2 op_4478_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_NEG_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11449,11 +11449,11 @@ uae_u32 REGPARAM2 op_4479_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_NEG_w(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11480,11 +11480,11 @@ uae_u32 REGPARAM2 op_4490_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jff_NEG_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11497,11 +11497,11 @@ uae_u32 REGPARAM2 op_4498_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jff_NEG_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); arm_ADD_l_ri8(srcreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -11516,11 +11516,11 @@ uae_u32 REGPARAM2 op_44a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jff_NEG_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11534,11 +11534,11 @@ uae_u32 REGPARAM2 op_44a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jff_NEG_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11550,13 +11550,13 @@ uae_u32 REGPARAM2 op_44b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jff_NEG_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11569,11 +11569,11 @@ uae_u32 REGPARAM2 op_44b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jff_NEG_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11586,11 +11586,11 @@ uae_u32 REGPARAM2 op_44b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jff_NEG_l(src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11617,11 +11617,11 @@ uae_u32 REGPARAM2 op_4610_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_NOT_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11634,11 +11634,11 @@ uae_u32 REGPARAM2 op_4618_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_NOT_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -11653,11 +11653,11 @@ uae_u32 REGPARAM2 op_4620_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_NOT_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11671,11 +11671,11 @@ uae_u32 REGPARAM2 op_4628_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_NOT_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11687,13 +11687,13 @@ uae_u32 REGPARAM2 op_4630_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_NOT_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11706,11 +11706,11 @@ uae_u32 REGPARAM2 op_4638_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_NOT_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11723,11 +11723,11 @@ uae_u32 REGPARAM2 op_4639_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_NOT_b(src); live_flags(); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11754,11 +11754,11 @@ uae_u32 REGPARAM2 op_4650_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_NOT_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11771,11 +11771,11 @@ uae_u32 REGPARAM2 op_4658_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_NOT_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -11790,11 +11790,11 @@ uae_u32 REGPARAM2 op_4660_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_NOT_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11808,11 +11808,11 @@ uae_u32 REGPARAM2 op_4668_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_NOT_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11824,13 +11824,13 @@ uae_u32 REGPARAM2 op_4670_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_NOT_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11843,11 +11843,11 @@ uae_u32 REGPARAM2 op_4678_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_NOT_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11860,11 +11860,11 @@ uae_u32 REGPARAM2 op_4679_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_NOT_w(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11891,11 +11891,11 @@ uae_u32 REGPARAM2 op_4690_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_NOT_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11908,11 +11908,11 @@ uae_u32 REGPARAM2 op_4698_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_NOT_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); arm_ADD_l_ri8(srcreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -11927,11 +11927,11 @@ uae_u32 REGPARAM2 op_46a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_NOT_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11945,11 +11945,11 @@ uae_u32 REGPARAM2 op_46a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_NOT_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11961,13 +11961,13 @@ uae_u32 REGPARAM2 op_46b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_NOT_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11980,11 +11980,11 @@ uae_u32 REGPARAM2 op_46b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_NOT_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -11997,11 +11997,11 @@ uae_u32 REGPARAM2 op_46b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_NOT_l(src); live_flags(); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -12016,7 +12016,7 @@ uae_u32 REGPARAM2 op_4808_0_comp_ff(uae_u32 opcode) int offs = scratchie++; mov_l_ri(offs,comp_get_ilong((m68k_pc_offset+=4)-4)); sub_l_ri(15,4); - writelong_clobber(15,src,scratchie); + writelong_clobber(15,src); mov_l_rr(src,15); arm_ADD_l(15,offs); if(srcreg+8!=src) @@ -12055,7 +12055,7 @@ if (srcreg==7) dodgy=1; arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -12074,7 +12074,7 @@ if (srcreg==7) dodgy=1; arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -12088,12 +12088,12 @@ uae_u32 REGPARAM2 op_4870_0_comp_ff(uae_u32 opcode) int dodgy=0; if (srcreg==7) dodgy=1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); { int dsta=dodgy?scratchie++:7+8; arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -12110,7 +12110,7 @@ uae_u32 REGPARAM2 op_4878_0_comp_ff(uae_u32 opcode) arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -12127,7 +12127,7 @@ uae_u32 REGPARAM2 op_4879_0_comp_ff(uae_u32 opcode) arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -12146,7 +12146,7 @@ uae_u32 REGPARAM2 op_487a_0_comp_ff(uae_u32 opcode) arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -12161,12 +12161,12 @@ uae_u32 REGPARAM2 op_487b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; { mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); { int dsta=dodgy?scratchie++:7+8; arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); }} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -12198,7 +12198,7 @@ uae_u32 REGPARAM2 op_4890_0_comp_ff(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -12208,7 +12208,7 @@ uae_u32 REGPARAM2 op_4890_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -12229,7 +12229,7 @@ uae_u32 REGPARAM2 op_48a0_0_comp_ff(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { offset-=2; @@ -12240,7 +12240,7 @@ uae_u32 REGPARAM2 op_48a0_0_comp_ff(uae_u32 opcode) for (i=0;i<16;i++) { if ((mask>>i)&1) { arm_SUB_l_ri8(srca,2); - writeword(srca,15-i,scratchie); + writeword(srca,15-i); } } mov_l_rr(8+dstreg,srca); } @@ -12262,7 +12262,7 @@ uae_u32 REGPARAM2 op_48a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -12272,7 +12272,7 @@ uae_u32 REGPARAM2 op_48a8_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -12292,9 +12292,9 @@ uae_u32 REGPARAM2 op_48b0_0_comp_ff(uae_u32 opcode) int tmp=scratchie++; signed char offset=0; int srca=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -12304,7 +12304,7 @@ uae_u32 REGPARAM2 op_48b0_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -12325,7 +12325,7 @@ uae_u32 REGPARAM2 op_48b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -12335,7 +12335,7 @@ uae_u32 REGPARAM2 op_48b8_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -12356,7 +12356,7 @@ uae_u32 REGPARAM2 op_48b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -12366,7 +12366,7 @@ uae_u32 REGPARAM2 op_48b9_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -12401,7 +12401,7 @@ uae_u32 REGPARAM2 op_48d0_0_comp_ff(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -12411,7 +12411,7 @@ uae_u32 REGPARAM2 op_48d0_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -12432,7 +12432,7 @@ uae_u32 REGPARAM2 op_48e0_0_comp_ff(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { offset-=4; @@ -12443,7 +12443,7 @@ uae_u32 REGPARAM2 op_48e0_0_comp_ff(uae_u32 opcode) for (i=0;i<16;i++) { if ((mask>>i)&1) { arm_SUB_l_ri8(srca,4); - writelong(srca,15-i,scratchie); + writelong(srca,15-i); } } mov_l_rr(8+dstreg,srca); } @@ -12465,7 +12465,7 @@ uae_u32 REGPARAM2 op_48e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -12475,7 +12475,7 @@ uae_u32 REGPARAM2 op_48e8_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -12495,9 +12495,9 @@ uae_u32 REGPARAM2 op_48f0_0_comp_ff(uae_u32 opcode) int tmp=scratchie++; signed char offset=0; int srca=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -12507,7 +12507,7 @@ uae_u32 REGPARAM2 op_48f0_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -12528,7 +12528,7 @@ uae_u32 REGPARAM2 op_48f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -12538,7 +12538,7 @@ uae_u32 REGPARAM2 op_48f8_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -12559,7 +12559,7 @@ uae_u32 REGPARAM2 op_48f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -12569,7 +12569,7 @@ uae_u32 REGPARAM2 op_48f9_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -12613,7 +12613,7 @@ uae_u32 REGPARAM2 op_4a10_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_TST_b(src); live_flags(); @@ -12629,7 +12629,7 @@ uae_u32 REGPARAM2 op_4a18_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_TST_b(src); live_flags(); @@ -12647,7 +12647,7 @@ uae_u32 REGPARAM2 op_4a20_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_TST_b(src); live_flags(); @@ -12664,7 +12664,7 @@ uae_u32 REGPARAM2 op_4a28_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_TST_b(src); live_flags(); @@ -12679,9 +12679,9 @@ uae_u32 REGPARAM2 op_4a30_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_TST_b(src); live_flags(); @@ -12697,7 +12697,7 @@ uae_u32 REGPARAM2 op_4a38_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_TST_b(src); live_flags(); @@ -12713,7 +12713,7 @@ uae_u32 REGPARAM2 op_4a39_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_TST_b(src); live_flags(); @@ -12731,7 +12731,7 @@ uae_u32 REGPARAM2 op_4a3a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_TST_b(src); live_flags(); @@ -12748,9 +12748,9 @@ uae_u32 REGPARAM2 op_4a3b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jff_TST_b(src); live_flags(); @@ -12808,7 +12808,7 @@ uae_u32 REGPARAM2 op_4a50_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_TST_w(src); live_flags(); @@ -12824,7 +12824,7 @@ uae_u32 REGPARAM2 op_4a58_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_TST_w(src); live_flags(); @@ -12842,7 +12842,7 @@ uae_u32 REGPARAM2 op_4a60_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_TST_w(src); live_flags(); @@ -12859,7 +12859,7 @@ uae_u32 REGPARAM2 op_4a68_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_TST_w(src); live_flags(); @@ -12874,9 +12874,9 @@ uae_u32 REGPARAM2 op_4a70_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_TST_w(src); live_flags(); @@ -12892,7 +12892,7 @@ uae_u32 REGPARAM2 op_4a78_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_TST_w(src); live_flags(); @@ -12908,7 +12908,7 @@ uae_u32 REGPARAM2 op_4a79_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_TST_w(src); live_flags(); @@ -12926,7 +12926,7 @@ uae_u32 REGPARAM2 op_4a7a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_TST_w(src); live_flags(); @@ -12943,9 +12943,9 @@ uae_u32 REGPARAM2 op_4a7b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jff_TST_w(src); live_flags(); @@ -13003,7 +13003,7 @@ uae_u32 REGPARAM2 op_4a90_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_TST_l(src); live_flags(); @@ -13019,7 +13019,7 @@ uae_u32 REGPARAM2 op_4a98_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_TST_l(src); live_flags(); @@ -13037,7 +13037,7 @@ uae_u32 REGPARAM2 op_4aa0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_TST_l(src); live_flags(); @@ -13054,7 +13054,7 @@ uae_u32 REGPARAM2 op_4aa8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_TST_l(src); live_flags(); @@ -13069,9 +13069,9 @@ uae_u32 REGPARAM2 op_4ab0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_TST_l(src); live_flags(); @@ -13087,7 +13087,7 @@ uae_u32 REGPARAM2 op_4ab8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_TST_l(src); live_flags(); @@ -13103,7 +13103,7 @@ uae_u32 REGPARAM2 op_4ab9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_TST_l(src); live_flags(); @@ -13121,7 +13121,7 @@ uae_u32 REGPARAM2 op_4aba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_TST_l(src); live_flags(); @@ -13138,9 +13138,9 @@ uae_u32 REGPARAM2 op_4abb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jff_TST_l(src); live_flags(); @@ -13201,7 +13201,7 @@ uae_u32 REGPARAM2 op_4c10_0_comp_ff(uae_u32 opcode) int r2=(extra>>12)&7; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -13232,7 +13232,7 @@ uae_u32 REGPARAM2 op_4c18_0_comp_ff(uae_u32 opcode) int r2=(extra>>12)&7; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (extra & 0x0400) { int r3=(extra & 7); @@ -13265,7 +13265,7 @@ uae_u32 REGPARAM2 op_4c20_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -13297,7 +13297,7 @@ uae_u32 REGPARAM2 op_4c28_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -13327,9 +13327,9 @@ uae_u32 REGPARAM2 op_4c30_0_comp_ff(uae_u32 opcode) uae_u16 extra=comp_get_iword((m68k_pc_offset+=2)-2); int r2=(extra>>12)&7; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -13360,7 +13360,7 @@ uae_u32 REGPARAM2 op_4c38_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -13391,7 +13391,7 @@ uae_u32 REGPARAM2 op_4c39_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -13425,7 +13425,7 @@ uae_u32 REGPARAM2 op_4c3a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -13458,9 +13458,9 @@ uae_u32 REGPARAM2 op_4c3b_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -13559,7 +13559,7 @@ uae_u32 REGPARAM2 op_4c50_0_comp_ff(uae_u32 opcode) int r3=extra&7; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -13594,7 +13594,7 @@ uae_u32 REGPARAM2 op_4c58_0_comp_ff(uae_u32 opcode) int r3=extra&7; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); register_possible_exception(); if (extra & 0x0400) { @@ -13631,7 +13631,7 @@ uae_u32 REGPARAM2 op_4c60_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -13667,7 +13667,7 @@ uae_u32 REGPARAM2 op_4c68_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -13701,9 +13701,9 @@ uae_u32 REGPARAM2 op_4c70_0_comp_ff(uae_u32 opcode) int r2=(extra>>12)&7; int r3=extra&7; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -13738,7 +13738,7 @@ uae_u32 REGPARAM2 op_4c78_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -13773,7 +13773,7 @@ uae_u32 REGPARAM2 op_4c79_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -13811,7 +13811,7 @@ uae_u32 REGPARAM2 op_4c7a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -13848,9 +13848,9 @@ uae_u32 REGPARAM2 op_4c7b_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -13914,7 +13914,7 @@ uae_u32 REGPARAM2 op_4c90_0_comp_ff(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -13925,7 +13925,7 @@ uae_u32 REGPARAM2 op_4c90_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -13946,9 +13946,10 @@ uae_u32 REGPARAM2 op_4c98_0_comp_ff(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { + if(srca != i) jnf_MVMEL_w(i,native,offset); offset+=2; } @@ -13958,7 +13959,7 @@ uae_u32 REGPARAM2 op_4c98_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -13981,7 +13982,7 @@ uae_u32 REGPARAM2 op_4ca8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -13992,7 +13993,7 @@ uae_u32 REGPARAM2 op_4ca8_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -14012,9 +14013,9 @@ uae_u32 REGPARAM2 op_4cb0_0_comp_ff(uae_u32 opcode) int i; signed char offset=0; int srca=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -14025,7 +14026,7 @@ uae_u32 REGPARAM2 op_4cb0_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -14046,7 +14047,7 @@ uae_u32 REGPARAM2 op_4cb8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -14057,7 +14058,7 @@ uae_u32 REGPARAM2 op_4cb8_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -14078,7 +14079,7 @@ uae_u32 REGPARAM2 op_4cb9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -14089,7 +14090,7 @@ uae_u32 REGPARAM2 op_4cb9_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -14113,7 +14114,7 @@ uae_u32 REGPARAM2 op_4cba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -14124,7 +14125,7 @@ uae_u32 REGPARAM2 op_4cba_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -14147,9 +14148,9 @@ uae_u32 REGPARAM2 op_4cbb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -14160,7 +14161,7 @@ uae_u32 REGPARAM2 op_4cbb_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -14181,7 +14182,7 @@ uae_u32 REGPARAM2 op_4cd0_0_comp_ff(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -14192,7 +14193,7 @@ uae_u32 REGPARAM2 op_4cd0_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -14213,9 +14214,10 @@ uae_u32 REGPARAM2 op_4cd8_0_comp_ff(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { + if(srca != i) jnf_MVMEL_l(i,native,offset); offset+=4; } @@ -14225,7 +14227,7 @@ uae_u32 REGPARAM2 op_4cd8_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -14248,7 +14250,7 @@ uae_u32 REGPARAM2 op_4ce8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -14259,7 +14261,7 @@ uae_u32 REGPARAM2 op_4ce8_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -14279,9 +14281,9 @@ uae_u32 REGPARAM2 op_4cf0_0_comp_ff(uae_u32 opcode) int i; signed char offset=0; int srca=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -14292,7 +14294,7 @@ uae_u32 REGPARAM2 op_4cf0_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -14313,7 +14315,7 @@ uae_u32 REGPARAM2 op_4cf8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -14324,7 +14326,7 @@ uae_u32 REGPARAM2 op_4cf8_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -14345,7 +14347,7 @@ uae_u32 REGPARAM2 op_4cf9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -14356,7 +14358,7 @@ uae_u32 REGPARAM2 op_4cf9_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -14380,7 +14382,7 @@ uae_u32 REGPARAM2 op_4cfa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -14391,7 +14393,7 @@ uae_u32 REGPARAM2 op_4cfa_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -14414,9 +14416,9 @@ uae_u32 REGPARAM2 op_4cfb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -14427,7 +14429,7 @@ uae_u32 REGPARAM2 op_4cfb_0_comp_ff(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -14446,7 +14448,7 @@ uae_u32 REGPARAM2 op_4e50_0_comp_ff(uae_u32 opcode) int offs = scratchie++; mov_l_ri(offs,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); sub_l_ri(15,4); - writelong_clobber(15,src,scratchie); + writelong_clobber(15,src); mov_l_rr(src,15); arm_ADD_l(15,offs); if(srcreg+8!=src) @@ -14463,7 +14465,7 @@ uae_u32 REGPARAM2 op_4e58_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg+8; mov_l_rr(15,src); - readlong(15,src,scratchie); + readlong(15,src); arm_ADD_l_ri8(15,4); if(srcreg+8!=src) mov_l_rr(srcreg+8,src); @@ -14489,9 +14491,9 @@ uae_u32 REGPARAM2 op_4e74_0_comp_ff(uae_u32 opcode) mov_l_ri(offs,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); arm_ADD_l_ri8(offs,4); { int newad=scratchie++; - readlong(15,newad,scratchie); + readlong(15,newad); mov_l_mr((uintptr)®s.pc,newad); - get_n_addr_jmp(newad,PC_P,scratchie); + get_n_addr_jmp(newad,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; arm_ADD_l(15,offs); @@ -14505,9 +14507,9 @@ uae_u32 REGPARAM2 op_4e75_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int newad=scratchie++; - readlong(15,newad,scratchie); + readlong(15,newad); mov_l_mr((uintptr)®s.pc,newad); - get_n_addr_jmp(newad,PC_P,scratchie); + get_n_addr_jmp(newad,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; arm_ADD_l_ri8(15,4); @@ -14526,9 +14528,9 @@ uae_u32 REGPARAM2 op_4e90_0_comp_ff(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14547,9 +14549,9 @@ uae_u32 REGPARAM2 op_4ea8_0_comp_ff(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14563,14 +14565,14 @@ uae_u32 REGPARAM2 op_4eb0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); { uae_u32 retadd=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14588,9 +14590,9 @@ uae_u32 REGPARAM2 op_4eb8_0_comp_ff(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14608,9 +14610,9 @@ uae_u32 REGPARAM2 op_4eb9_0_comp_ff(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14630,9 +14632,9 @@ uae_u32 REGPARAM2 op_4eba_0_comp_ff(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14648,14 +14650,14 @@ uae_u32 REGPARAM2 op_4ebb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); { uae_u32 retadd=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14670,7 +14672,7 @@ uae_u32 REGPARAM2 op_4ed0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14686,7 +14688,7 @@ uae_u32 REGPARAM2 op_4ee8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14700,9 +14702,9 @@ uae_u32 REGPARAM2 op_4ef0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14717,7 +14719,7 @@ uae_u32 REGPARAM2 op_4ef8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14732,7 +14734,7 @@ uae_u32 REGPARAM2 op_4ef9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14749,7 +14751,7 @@ uae_u32 REGPARAM2 op_4efa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14765,9 +14767,9 @@ uae_u32 REGPARAM2 op_4efb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -14803,12 +14805,12 @@ uae_u32 REGPARAM2 op_5010_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -14824,12 +14826,12 @@ uae_u32 REGPARAM2 op_5018_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -14847,12 +14849,12 @@ uae_u32 REGPARAM2 op_5020_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -14869,12 +14871,12 @@ uae_u32 REGPARAM2 op_5028_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -14889,14 +14891,14 @@ uae_u32 REGPARAM2 op_5030_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -14912,12 +14914,12 @@ uae_u32 REGPARAM2 op_5038_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -14933,12 +14935,12 @@ uae_u32 REGPARAM2 op_5039_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -14987,12 +14989,12 @@ uae_u32 REGPARAM2 op_5050_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15008,12 +15010,12 @@ uae_u32 REGPARAM2 op_5058_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -15031,12 +15033,12 @@ uae_u32 REGPARAM2 op_5060_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15053,12 +15055,12 @@ uae_u32 REGPARAM2 op_5068_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15073,14 +15075,14 @@ uae_u32 REGPARAM2 op_5070_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15096,12 +15098,12 @@ uae_u32 REGPARAM2 op_5078_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15117,12 +15119,12 @@ uae_u32 REGPARAM2 op_5079_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15171,12 +15173,12 @@ uae_u32 REGPARAM2 op_5090_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15192,12 +15194,12 @@ uae_u32 REGPARAM2 op_5098_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -15215,12 +15217,12 @@ uae_u32 REGPARAM2 op_50a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15240,12 +15242,12 @@ uae_u32 REGPARAM2 op_50a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15260,14 +15262,14 @@ uae_u32 REGPARAM2 op_50b0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15283,12 +15285,12 @@ uae_u32 REGPARAM2 op_50b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15304,12 +15306,12 @@ uae_u32 REGPARAM2 op_50b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15353,7 +15355,7 @@ uae_u32 REGPARAM2 op_50d0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15367,7 +15369,7 @@ uae_u32 REGPARAM2 op_50d8_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -15383,7 +15385,7 @@ uae_u32 REGPARAM2 op_50e0_0_comp_ff(uae_u32 opcode) arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15398,7 +15400,7 @@ uae_u32 REGPARAM2 op_50e8_0_comp_ff(uae_u32 opcode) lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15410,10 +15412,10 @@ uae_u32 REGPARAM2 op_50f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15427,7 +15429,7 @@ uae_u32 REGPARAM2 op_50f8_0_comp_ff(uae_u32 opcode) mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15441,7 +15443,7 @@ uae_u32 REGPARAM2 op_50f9_0_comp_ff(uae_u32 opcode) mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15475,12 +15477,12 @@ uae_u32 REGPARAM2 op_5110_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15496,12 +15498,12 @@ uae_u32 REGPARAM2 op_5118_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -15519,12 +15521,12 @@ uae_u32 REGPARAM2 op_5120_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15541,12 +15543,12 @@ uae_u32 REGPARAM2 op_5128_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15561,14 +15563,14 @@ uae_u32 REGPARAM2 op_5130_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15584,12 +15586,12 @@ uae_u32 REGPARAM2 op_5138_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15605,12 +15607,12 @@ uae_u32 REGPARAM2 op_5139_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15659,12 +15661,12 @@ uae_u32 REGPARAM2 op_5150_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15680,12 +15682,12 @@ uae_u32 REGPARAM2 op_5158_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -15703,12 +15705,12 @@ uae_u32 REGPARAM2 op_5160_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15725,12 +15727,12 @@ uae_u32 REGPARAM2 op_5168_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15745,14 +15747,14 @@ uae_u32 REGPARAM2 op_5170_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15768,12 +15770,12 @@ uae_u32 REGPARAM2 op_5178_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15789,12 +15791,12 @@ uae_u32 REGPARAM2 op_5179_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15843,12 +15845,12 @@ uae_u32 REGPARAM2 op_5190_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15864,12 +15866,12 @@ uae_u32 REGPARAM2 op_5198_0_comp_ff(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -15887,12 +15889,12 @@ uae_u32 REGPARAM2 op_51a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15909,12 +15911,12 @@ uae_u32 REGPARAM2 op_51a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15929,14 +15931,14 @@ uae_u32 REGPARAM2 op_51b0_0_comp_ff(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15952,12 +15954,12 @@ uae_u32 REGPARAM2 op_51b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -15973,12 +15975,12 @@ uae_u32 REGPARAM2 op_51b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16027,7 +16029,7 @@ uae_u32 REGPARAM2 op_51d0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16041,7 +16043,7 @@ uae_u32 REGPARAM2 op_51d8_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -16057,7 +16059,7 @@ uae_u32 REGPARAM2 op_51e0_0_comp_ff(uae_u32 opcode) arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16072,7 +16074,7 @@ uae_u32 REGPARAM2 op_51e8_0_comp_ff(uae_u32 opcode) lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16084,10 +16086,10 @@ uae_u32 REGPARAM2 op_51f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16101,7 +16103,7 @@ uae_u32 REGPARAM2 op_51f8_0_comp_ff(uae_u32 opcode) mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16115,7 +16117,7 @@ uae_u32 REGPARAM2 op_51f9_0_comp_ff(uae_u32 opcode) mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16166,7 +16168,7 @@ uae_u32 REGPARAM2 op_52d0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16181,7 +16183,7 @@ uae_u32 REGPARAM2 op_52d8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -16198,7 +16200,7 @@ uae_u32 REGPARAM2 op_52e0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16214,7 +16216,7 @@ uae_u32 REGPARAM2 op_52e8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16226,11 +16228,11 @@ uae_u32 REGPARAM2 op_52f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16245,7 +16247,7 @@ uae_u32 REGPARAM2 op_52f8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16260,7 +16262,7 @@ uae_u32 REGPARAM2 op_52f9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16311,7 +16313,7 @@ uae_u32 REGPARAM2 op_53d0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16326,7 +16328,7 @@ uae_u32 REGPARAM2 op_53d8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -16343,7 +16345,7 @@ uae_u32 REGPARAM2 op_53e0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16359,7 +16361,7 @@ uae_u32 REGPARAM2 op_53e8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16371,11 +16373,11 @@ uae_u32 REGPARAM2 op_53f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16390,7 +16392,7 @@ uae_u32 REGPARAM2 op_53f8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16405,7 +16407,7 @@ uae_u32 REGPARAM2 op_53f9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16456,7 +16458,7 @@ uae_u32 REGPARAM2 op_54d0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16471,7 +16473,7 @@ uae_u32 REGPARAM2 op_54d8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -16488,7 +16490,7 @@ uae_u32 REGPARAM2 op_54e0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16504,7 +16506,7 @@ uae_u32 REGPARAM2 op_54e8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16516,11 +16518,11 @@ uae_u32 REGPARAM2 op_54f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16535,7 +16537,7 @@ uae_u32 REGPARAM2 op_54f8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16550,7 +16552,7 @@ uae_u32 REGPARAM2 op_54f9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16601,7 +16603,7 @@ uae_u32 REGPARAM2 op_55d0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16616,7 +16618,7 @@ uae_u32 REGPARAM2 op_55d8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -16633,7 +16635,7 @@ uae_u32 REGPARAM2 op_55e0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16649,7 +16651,7 @@ uae_u32 REGPARAM2 op_55e8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16661,11 +16663,11 @@ uae_u32 REGPARAM2 op_55f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16680,7 +16682,7 @@ uae_u32 REGPARAM2 op_55f8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16695,7 +16697,7 @@ uae_u32 REGPARAM2 op_55f9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16746,7 +16748,7 @@ uae_u32 REGPARAM2 op_56d0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16761,7 +16763,7 @@ uae_u32 REGPARAM2 op_56d8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -16778,7 +16780,7 @@ uae_u32 REGPARAM2 op_56e0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16794,7 +16796,7 @@ uae_u32 REGPARAM2 op_56e8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16806,11 +16808,11 @@ uae_u32 REGPARAM2 op_56f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16825,7 +16827,7 @@ uae_u32 REGPARAM2 op_56f8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16840,7 +16842,7 @@ uae_u32 REGPARAM2 op_56f9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16891,7 +16893,7 @@ uae_u32 REGPARAM2 op_57d0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16906,7 +16908,7 @@ uae_u32 REGPARAM2 op_57d8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -16923,7 +16925,7 @@ uae_u32 REGPARAM2 op_57e0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16939,7 +16941,7 @@ uae_u32 REGPARAM2 op_57e8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16951,11 +16953,11 @@ uae_u32 REGPARAM2 op_57f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16970,7 +16972,7 @@ uae_u32 REGPARAM2 op_57f8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -16985,7 +16987,7 @@ uae_u32 REGPARAM2 op_57f9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17036,7 +17038,7 @@ uae_u32 REGPARAM2 op_58d0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17051,7 +17053,7 @@ uae_u32 REGPARAM2 op_58d8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -17068,7 +17070,7 @@ uae_u32 REGPARAM2 op_58e0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17084,7 +17086,7 @@ uae_u32 REGPARAM2 op_58e8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17096,11 +17098,11 @@ uae_u32 REGPARAM2 op_58f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17115,7 +17117,7 @@ uae_u32 REGPARAM2 op_58f8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17130,7 +17132,7 @@ uae_u32 REGPARAM2 op_58f9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17181,7 +17183,7 @@ uae_u32 REGPARAM2 op_59d0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17196,7 +17198,7 @@ uae_u32 REGPARAM2 op_59d8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -17213,7 +17215,7 @@ uae_u32 REGPARAM2 op_59e0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17229,7 +17231,7 @@ uae_u32 REGPARAM2 op_59e8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17241,11 +17243,11 @@ uae_u32 REGPARAM2 op_59f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17260,7 +17262,7 @@ uae_u32 REGPARAM2 op_59f8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17275,7 +17277,7 @@ uae_u32 REGPARAM2 op_59f9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17326,7 +17328,7 @@ uae_u32 REGPARAM2 op_5ad0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17341,7 +17343,7 @@ uae_u32 REGPARAM2 op_5ad8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -17358,7 +17360,7 @@ uae_u32 REGPARAM2 op_5ae0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17374,7 +17376,7 @@ uae_u32 REGPARAM2 op_5ae8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17386,11 +17388,11 @@ uae_u32 REGPARAM2 op_5af0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17405,7 +17407,7 @@ uae_u32 REGPARAM2 op_5af8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17420,7 +17422,7 @@ uae_u32 REGPARAM2 op_5af9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17471,7 +17473,7 @@ uae_u32 REGPARAM2 op_5bd0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17486,7 +17488,7 @@ uae_u32 REGPARAM2 op_5bd8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -17503,7 +17505,7 @@ uae_u32 REGPARAM2 op_5be0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17519,7 +17521,7 @@ uae_u32 REGPARAM2 op_5be8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17531,11 +17533,11 @@ uae_u32 REGPARAM2 op_5bf0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17550,7 +17552,7 @@ uae_u32 REGPARAM2 op_5bf8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17565,7 +17567,7 @@ uae_u32 REGPARAM2 op_5bf9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17616,7 +17618,7 @@ uae_u32 REGPARAM2 op_5cd0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17631,7 +17633,7 @@ uae_u32 REGPARAM2 op_5cd8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -17648,7 +17650,7 @@ uae_u32 REGPARAM2 op_5ce0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17664,7 +17666,7 @@ uae_u32 REGPARAM2 op_5ce8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17676,11 +17678,11 @@ uae_u32 REGPARAM2 op_5cf0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17695,7 +17697,7 @@ uae_u32 REGPARAM2 op_5cf8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17710,7 +17712,7 @@ uae_u32 REGPARAM2 op_5cf9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17761,7 +17763,7 @@ uae_u32 REGPARAM2 op_5dd0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17776,7 +17778,7 @@ uae_u32 REGPARAM2 op_5dd8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -17793,7 +17795,7 @@ uae_u32 REGPARAM2 op_5de0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17809,7 +17811,7 @@ uae_u32 REGPARAM2 op_5de8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17821,11 +17823,11 @@ uae_u32 REGPARAM2 op_5df0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17840,7 +17842,7 @@ uae_u32 REGPARAM2 op_5df8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17855,7 +17857,7 @@ uae_u32 REGPARAM2 op_5df9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17906,7 +17908,7 @@ uae_u32 REGPARAM2 op_5ed0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17921,7 +17923,7 @@ uae_u32 REGPARAM2 op_5ed8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -17938,7 +17940,7 @@ uae_u32 REGPARAM2 op_5ee0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17954,7 +17956,7 @@ uae_u32 REGPARAM2 op_5ee8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17966,11 +17968,11 @@ uae_u32 REGPARAM2 op_5ef0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -17985,7 +17987,7 @@ uae_u32 REGPARAM2 op_5ef8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -18000,7 +18002,7 @@ uae_u32 REGPARAM2 op_5ef9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -18051,7 +18053,7 @@ uae_u32 REGPARAM2 op_5fd0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -18066,7 +18068,7 @@ uae_u32 REGPARAM2 op_5fd8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -18083,7 +18085,7 @@ uae_u32 REGPARAM2 op_5fe0_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -18099,7 +18101,7 @@ uae_u32 REGPARAM2 op_5fe8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -18111,11 +18113,11 @@ uae_u32 REGPARAM2 op_5ff0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -18130,7 +18132,7 @@ uae_u32 REGPARAM2 op_5ff8_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -18145,7 +18147,7 @@ uae_u32 REGPARAM2 op_5ff9_0_comp_ff(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -18222,7 +18224,7 @@ uae_u32 REGPARAM2 op_6100_0_comp_ff(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); arm_ADD_l_ri(src,m68k_pc_offset_thisinst+2); m68k_pc_offset=0; arm_ADD_l(PC_P,src); @@ -18243,7 +18245,7 @@ uae_u32 REGPARAM2 op_6101_0_comp_ff(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); arm_ADD_l_ri(src,m68k_pc_offset_thisinst+2); m68k_pc_offset=0; arm_ADD_l(PC_P,src); @@ -18263,7 +18265,7 @@ uae_u32 REGPARAM2 op_61ff_0_comp_ff(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); arm_ADD_l_ri(src,m68k_pc_offset_thisinst+2); m68k_pc_offset=0; arm_ADD_l(PC_P,src); @@ -19121,7 +19123,7 @@ uae_u32 REGPARAM2 op_8010_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_b(dst,src); @@ -19139,7 +19141,7 @@ uae_u32 REGPARAM2 op_8018_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -19159,7 +19161,7 @@ uae_u32 REGPARAM2 op_8020_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_b(dst,src); @@ -19178,7 +19180,7 @@ uae_u32 REGPARAM2 op_8028_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_b(dst,src); @@ -19195,9 +19197,9 @@ uae_u32 REGPARAM2 op_8030_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_b(dst,src); @@ -19215,7 +19217,7 @@ uae_u32 REGPARAM2 op_8038_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_b(dst,src); @@ -19233,7 +19235,7 @@ uae_u32 REGPARAM2 op_8039_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_b(dst,src); @@ -19253,7 +19255,7 @@ uae_u32 REGPARAM2 op_803a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_b(dst,src); @@ -19272,9 +19274,9 @@ uae_u32 REGPARAM2 op_803b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_b(dst,src); @@ -19324,7 +19326,7 @@ uae_u32 REGPARAM2 op_8050_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_w(dst,src); @@ -19342,7 +19344,7 @@ uae_u32 REGPARAM2 op_8058_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -19362,7 +19364,7 @@ uae_u32 REGPARAM2 op_8060_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_w(dst,src); @@ -19381,7 +19383,7 @@ uae_u32 REGPARAM2 op_8068_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_w(dst,src); @@ -19398,9 +19400,9 @@ uae_u32 REGPARAM2 op_8070_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_w(dst,src); @@ -19418,7 +19420,7 @@ uae_u32 REGPARAM2 op_8078_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_w(dst,src); @@ -19436,7 +19438,7 @@ uae_u32 REGPARAM2 op_8079_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_w(dst,src); @@ -19456,7 +19458,7 @@ uae_u32 REGPARAM2 op_807a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_w(dst,src); @@ -19475,9 +19477,9 @@ uae_u32 REGPARAM2 op_807b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_w(dst,src); @@ -19527,7 +19529,7 @@ uae_u32 REGPARAM2 op_8090_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_l(dst,src); @@ -19545,7 +19547,7 @@ uae_u32 REGPARAM2 op_8098_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -19565,7 +19567,7 @@ uae_u32 REGPARAM2 op_80a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_l(dst,src); @@ -19584,7 +19586,7 @@ uae_u32 REGPARAM2 op_80a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_l(dst,src); @@ -19601,9 +19603,9 @@ uae_u32 REGPARAM2 op_80b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_l(dst,src); @@ -19621,7 +19623,7 @@ uae_u32 REGPARAM2 op_80b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_l(dst,src); @@ -19639,7 +19641,7 @@ uae_u32 REGPARAM2 op_80b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_l(dst,src); @@ -19659,7 +19661,7 @@ uae_u32 REGPARAM2 op_80ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_l(dst,src); @@ -19678,9 +19680,9 @@ uae_u32 REGPARAM2 op_80bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_OR_l(dst,src); @@ -19741,7 +19743,7 @@ uae_u32 REGPARAM2 op_80d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVU(dst,src); @@ -19765,7 +19767,7 @@ uae_u32 REGPARAM2 op_80d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; register_possible_exception(); @@ -19791,7 +19793,7 @@ uae_u32 REGPARAM2 op_80e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVU(dst,src); @@ -19816,7 +19818,7 @@ uae_u32 REGPARAM2 op_80e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVU(dst,src); @@ -19839,9 +19841,9 @@ uae_u32 REGPARAM2 op_80f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVU(dst,src); @@ -19865,7 +19867,7 @@ uae_u32 REGPARAM2 op_80f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVU(dst,src); @@ -19889,7 +19891,7 @@ uae_u32 REGPARAM2 op_80f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVU(dst,src); @@ -19915,7 +19917,7 @@ uae_u32 REGPARAM2 op_80fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVU(dst,src); @@ -19940,9 +19942,9 @@ uae_u32 REGPARAM2 op_80fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVU(dst,src); @@ -19984,11 +19986,11 @@ uae_u32 REGPARAM2 op_8110_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20003,11 +20005,11 @@ uae_u32 REGPARAM2 op_8118_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -20024,11 +20026,11 @@ uae_u32 REGPARAM2 op_8120_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20044,11 +20046,11 @@ uae_u32 REGPARAM2 op_8128_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20062,13 +20064,13 @@ uae_u32 REGPARAM2 op_8130_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20083,11 +20085,11 @@ uae_u32 REGPARAM2 op_8138_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20102,11 +20104,11 @@ uae_u32 REGPARAM2 op_8139_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_OR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20121,11 +20123,11 @@ uae_u32 REGPARAM2 op_8150_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20140,11 +20142,11 @@ uae_u32 REGPARAM2 op_8158_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -20161,11 +20163,11 @@ uae_u32 REGPARAM2 op_8160_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20181,11 +20183,11 @@ uae_u32 REGPARAM2 op_8168_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20199,13 +20201,13 @@ uae_u32 REGPARAM2 op_8170_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20220,11 +20222,11 @@ uae_u32 REGPARAM2 op_8178_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20239,11 +20241,11 @@ uae_u32 REGPARAM2 op_8179_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_OR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20258,11 +20260,11 @@ uae_u32 REGPARAM2 op_8190_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20277,11 +20279,11 @@ uae_u32 REGPARAM2 op_8198_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -20298,11 +20300,11 @@ uae_u32 REGPARAM2 op_81a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20318,11 +20320,11 @@ uae_u32 REGPARAM2 op_81a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20336,13 +20338,13 @@ uae_u32 REGPARAM2 op_81b0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20357,11 +20359,11 @@ uae_u32 REGPARAM2 op_81b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20376,11 +20378,11 @@ uae_u32 REGPARAM2 op_81b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_OR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -20421,7 +20423,7 @@ uae_u32 REGPARAM2 op_81d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVS(dst,src); @@ -20445,7 +20447,7 @@ uae_u32 REGPARAM2 op_81d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; register_possible_exception(); @@ -20471,7 +20473,7 @@ uae_u32 REGPARAM2 op_81e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVS(dst,src); @@ -20496,7 +20498,7 @@ uae_u32 REGPARAM2 op_81e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVS(dst,src); @@ -20519,9 +20521,9 @@ uae_u32 REGPARAM2 op_81f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVS(dst,src); @@ -20545,7 +20547,7 @@ uae_u32 REGPARAM2 op_81f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVS(dst,src); @@ -20569,7 +20571,7 @@ uae_u32 REGPARAM2 op_81f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVS(dst,src); @@ -20595,7 +20597,7 @@ uae_u32 REGPARAM2 op_81fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVS(dst,src); @@ -20620,9 +20622,9 @@ uae_u32 REGPARAM2 op_81fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jff_DIVS(dst,src); @@ -20680,7 +20682,7 @@ uae_u32 REGPARAM2 op_9010_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_b(dst,src); @@ -20699,7 +20701,7 @@ uae_u32 REGPARAM2 op_9018_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -20720,7 +20722,7 @@ uae_u32 REGPARAM2 op_9020_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_b(dst,src); @@ -20740,7 +20742,7 @@ uae_u32 REGPARAM2 op_9028_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_b(dst,src); @@ -20758,9 +20760,9 @@ uae_u32 REGPARAM2 op_9030_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_b(dst,src); @@ -20779,7 +20781,7 @@ uae_u32 REGPARAM2 op_9038_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_b(dst,src); @@ -20798,7 +20800,7 @@ uae_u32 REGPARAM2 op_9039_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_b(dst,src); @@ -20819,7 +20821,7 @@ uae_u32 REGPARAM2 op_903a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_b(dst,src); @@ -20839,9 +20841,9 @@ uae_u32 REGPARAM2 op_903b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_b(dst,src); @@ -20911,7 +20913,7 @@ uae_u32 REGPARAM2 op_9050_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_w(dst,src); @@ -20930,7 +20932,7 @@ uae_u32 REGPARAM2 op_9058_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -20951,7 +20953,7 @@ uae_u32 REGPARAM2 op_9060_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_w(dst,src); @@ -20971,7 +20973,7 @@ uae_u32 REGPARAM2 op_9068_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_w(dst,src); @@ -20989,9 +20991,9 @@ uae_u32 REGPARAM2 op_9070_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_w(dst,src); @@ -21010,7 +21012,7 @@ uae_u32 REGPARAM2 op_9078_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_w(dst,src); @@ -21029,7 +21031,7 @@ uae_u32 REGPARAM2 op_9079_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_w(dst,src); @@ -21050,7 +21052,7 @@ uae_u32 REGPARAM2 op_907a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_w(dst,src); @@ -21070,9 +21072,9 @@ uae_u32 REGPARAM2 op_907b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_w(dst,src); @@ -21142,7 +21144,7 @@ uae_u32 REGPARAM2 op_9090_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_l(dst,src); @@ -21161,7 +21163,7 @@ uae_u32 REGPARAM2 op_9098_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -21182,7 +21184,7 @@ uae_u32 REGPARAM2 op_90a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_l(dst,src); @@ -21202,7 +21204,7 @@ uae_u32 REGPARAM2 op_90a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_l(dst,src); @@ -21220,9 +21222,9 @@ uae_u32 REGPARAM2 op_90b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_l(dst,src); @@ -21241,7 +21243,7 @@ uae_u32 REGPARAM2 op_90b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_l(dst,src); @@ -21260,7 +21262,7 @@ uae_u32 REGPARAM2 op_90b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_l(dst,src); @@ -21281,7 +21283,7 @@ uae_u32 REGPARAM2 op_90ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_l(dst,src); @@ -21301,9 +21303,9 @@ uae_u32 REGPARAM2 op_90bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_SUB_l(dst,src); @@ -21367,7 +21369,7 @@ uae_u32 REGPARAM2 op_90d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -21383,7 +21385,7 @@ uae_u32 REGPARAM2 op_90d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg+8; jnf_SUBA_w(dst, src); @@ -21401,7 +21403,7 @@ uae_u32 REGPARAM2 op_90e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -21418,7 +21420,7 @@ uae_u32 REGPARAM2 op_90e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -21433,9 +21435,9 @@ uae_u32 REGPARAM2 op_90f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -21451,7 +21453,7 @@ uae_u32 REGPARAM2 op_90f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -21467,7 +21469,7 @@ uae_u32 REGPARAM2 op_90f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -21485,7 +21487,7 @@ uae_u32 REGPARAM2 op_90fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -21502,9 +21504,9 @@ uae_u32 REGPARAM2 op_90fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -21553,17 +21555,17 @@ uae_u32 REGPARAM2 op_9108_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); make_flags_live(); jff_SUBX_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21578,12 +21580,12 @@ uae_u32 REGPARAM2 op_9110_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21598,12 +21600,12 @@ uae_u32 REGPARAM2 op_9118_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -21620,12 +21622,12 @@ uae_u32 REGPARAM2 op_9120_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21641,12 +21643,12 @@ uae_u32 REGPARAM2 op_9128_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21660,14 +21662,14 @@ uae_u32 REGPARAM2 op_9130_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21682,12 +21684,12 @@ uae_u32 REGPARAM2 op_9138_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21702,12 +21704,12 @@ uae_u32 REGPARAM2 op_9139_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_SUB_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21740,17 +21742,17 @@ uae_u32 REGPARAM2 op_9148_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); make_flags_live(); jff_SUBX_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21765,12 +21767,12 @@ uae_u32 REGPARAM2 op_9150_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21785,12 +21787,12 @@ uae_u32 REGPARAM2 op_9158_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -21807,12 +21809,12 @@ uae_u32 REGPARAM2 op_9160_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21828,12 +21830,12 @@ uae_u32 REGPARAM2 op_9168_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21847,14 +21849,14 @@ uae_u32 REGPARAM2 op_9170_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21869,12 +21871,12 @@ uae_u32 REGPARAM2 op_9178_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21889,12 +21891,12 @@ uae_u32 REGPARAM2 op_9179_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_SUB_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21927,17 +21929,17 @@ uae_u32 REGPARAM2 op_9188_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); make_flags_live(); jff_SUBX_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21952,12 +21954,12 @@ uae_u32 REGPARAM2 op_9190_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -21972,12 +21974,12 @@ uae_u32 REGPARAM2 op_9198_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -21994,12 +21996,12 @@ uae_u32 REGPARAM2 op_91a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -22015,12 +22017,12 @@ uae_u32 REGPARAM2 op_91a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -22034,14 +22036,14 @@ uae_u32 REGPARAM2 op_91b0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -22056,12 +22058,12 @@ uae_u32 REGPARAM2 op_91b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -22076,12 +22078,12 @@ uae_u32 REGPARAM2 op_91b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_SUB_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -22123,7 +22125,7 @@ uae_u32 REGPARAM2 op_91d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -22139,7 +22141,7 @@ uae_u32 REGPARAM2 op_91d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg+8; jnf_SUBA_l(dst, src); @@ -22157,7 +22159,7 @@ uae_u32 REGPARAM2 op_91e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -22174,7 +22176,7 @@ uae_u32 REGPARAM2 op_91e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -22189,9 +22191,9 @@ uae_u32 REGPARAM2 op_91f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -22207,7 +22209,7 @@ uae_u32 REGPARAM2 op_91f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -22223,7 +22225,7 @@ uae_u32 REGPARAM2 op_91f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -22241,7 +22243,7 @@ uae_u32 REGPARAM2 op_91fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -22258,9 +22260,9 @@ uae_u32 REGPARAM2 op_91fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -22307,7 +22309,7 @@ uae_u32 REGPARAM2 op_b010_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_b(dst,src); @@ -22326,7 +22328,7 @@ uae_u32 REGPARAM2 op_b018_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -22347,7 +22349,7 @@ uae_u32 REGPARAM2 op_b020_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_b(dst,src); @@ -22367,7 +22369,7 @@ uae_u32 REGPARAM2 op_b028_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_b(dst,src); @@ -22385,9 +22387,9 @@ uae_u32 REGPARAM2 op_b030_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_b(dst,src); @@ -22406,7 +22408,7 @@ uae_u32 REGPARAM2 op_b038_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_b(dst,src); @@ -22425,7 +22427,7 @@ uae_u32 REGPARAM2 op_b039_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_b(dst,src); @@ -22446,7 +22448,7 @@ uae_u32 REGPARAM2 op_b03a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_b(dst,src); @@ -22466,9 +22468,9 @@ uae_u32 REGPARAM2 op_b03b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_b(dst,src); @@ -22538,7 +22540,7 @@ uae_u32 REGPARAM2 op_b050_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_w(dst,src); @@ -22557,7 +22559,7 @@ uae_u32 REGPARAM2 op_b058_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -22578,7 +22580,7 @@ uae_u32 REGPARAM2 op_b060_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_w(dst,src); @@ -22598,7 +22600,7 @@ uae_u32 REGPARAM2 op_b068_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_w(dst,src); @@ -22616,9 +22618,9 @@ uae_u32 REGPARAM2 op_b070_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_w(dst,src); @@ -22637,7 +22639,7 @@ uae_u32 REGPARAM2 op_b078_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_w(dst,src); @@ -22656,7 +22658,7 @@ uae_u32 REGPARAM2 op_b079_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_w(dst,src); @@ -22677,7 +22679,7 @@ uae_u32 REGPARAM2 op_b07a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_w(dst,src); @@ -22697,9 +22699,9 @@ uae_u32 REGPARAM2 op_b07b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_w(dst,src); @@ -22769,7 +22771,7 @@ uae_u32 REGPARAM2 op_b090_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_l(dst,src); @@ -22788,7 +22790,7 @@ uae_u32 REGPARAM2 op_b098_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -22809,7 +22811,7 @@ uae_u32 REGPARAM2 op_b0a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_l(dst,src); @@ -22832,7 +22834,7 @@ uae_u32 REGPARAM2 op_b0a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_l(dst,src); @@ -22850,9 +22852,9 @@ uae_u32 REGPARAM2 op_b0b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_l(dst,src); @@ -22871,7 +22873,7 @@ uae_u32 REGPARAM2 op_b0b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_l(dst,src); @@ -22890,7 +22892,7 @@ uae_u32 REGPARAM2 op_b0b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_l(dst,src); @@ -22911,7 +22913,7 @@ uae_u32 REGPARAM2 op_b0ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_l(dst,src); @@ -22931,9 +22933,9 @@ uae_u32 REGPARAM2 op_b0bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_CMP_l(dst,src); @@ -23003,7 +23005,7 @@ uae_u32 REGPARAM2 op_b0d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_w(dst,src); @@ -23022,7 +23024,7 @@ uae_u32 REGPARAM2 op_b0d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg+8; dont_care_flags(); @@ -23043,7 +23045,7 @@ uae_u32 REGPARAM2 op_b0e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_w(dst,src); @@ -23063,7 +23065,7 @@ uae_u32 REGPARAM2 op_b0e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_w(dst,src); @@ -23081,9 +23083,9 @@ uae_u32 REGPARAM2 op_b0f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_w(dst,src); @@ -23102,7 +23104,7 @@ uae_u32 REGPARAM2 op_b0f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_w(dst,src); @@ -23121,7 +23123,7 @@ uae_u32 REGPARAM2 op_b0f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_w(dst,src); @@ -23142,7 +23144,7 @@ uae_u32 REGPARAM2 op_b0fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_w(dst,src); @@ -23162,9 +23164,9 @@ uae_u32 REGPARAM2 op_b0fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_w(dst,src); @@ -23216,11 +23218,11 @@ uae_u32 REGPARAM2 op_b108_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_CMP_b(dst,src); live_flags(); @@ -23240,11 +23242,11 @@ uae_u32 REGPARAM2 op_b110_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23259,11 +23261,11 @@ uae_u32 REGPARAM2 op_b118_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -23280,11 +23282,11 @@ uae_u32 REGPARAM2 op_b120_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23300,11 +23302,11 @@ uae_u32 REGPARAM2 op_b128_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23318,13 +23320,13 @@ uae_u32 REGPARAM2 op_b130_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23339,11 +23341,11 @@ uae_u32 REGPARAM2 op_b138_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23358,11 +23360,11 @@ uae_u32 REGPARAM2 op_b139_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_EOR_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23392,11 +23394,11 @@ uae_u32 REGPARAM2 op_b148_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_CMP_w(dst,src); live_flags(); @@ -23416,11 +23418,11 @@ uae_u32 REGPARAM2 op_b150_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23435,11 +23437,11 @@ uae_u32 REGPARAM2 op_b158_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -23456,11 +23458,11 @@ uae_u32 REGPARAM2 op_b160_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23476,11 +23478,11 @@ uae_u32 REGPARAM2 op_b168_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23494,13 +23496,13 @@ uae_u32 REGPARAM2 op_b170_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23515,11 +23517,11 @@ uae_u32 REGPARAM2 op_b178_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23534,11 +23536,11 @@ uae_u32 REGPARAM2 op_b179_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_EOR_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23568,11 +23570,11 @@ uae_u32 REGPARAM2 op_b188_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_CMP_l(dst,src); live_flags(); @@ -23592,11 +23594,11 @@ uae_u32 REGPARAM2 op_b190_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23611,11 +23613,11 @@ uae_u32 REGPARAM2 op_b198_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -23632,11 +23634,11 @@ uae_u32 REGPARAM2 op_b1a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23652,11 +23654,11 @@ uae_u32 REGPARAM2 op_b1a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23670,13 +23672,13 @@ uae_u32 REGPARAM2 op_b1b0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23691,11 +23693,11 @@ uae_u32 REGPARAM2 op_b1b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23710,11 +23712,11 @@ uae_u32 REGPARAM2 op_b1b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_EOR_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -23762,7 +23764,7 @@ uae_u32 REGPARAM2 op_b1d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_l(dst,src); @@ -23781,7 +23783,7 @@ uae_u32 REGPARAM2 op_b1d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg+8; dont_care_flags(); @@ -23802,7 +23804,7 @@ uae_u32 REGPARAM2 op_b1e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_l(dst,src); @@ -23822,7 +23824,7 @@ uae_u32 REGPARAM2 op_b1e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_l(dst,src); @@ -23840,9 +23842,9 @@ uae_u32 REGPARAM2 op_b1f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_l(dst,src); @@ -23861,7 +23863,7 @@ uae_u32 REGPARAM2 op_b1f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_l(dst,src); @@ -23880,7 +23882,7 @@ uae_u32 REGPARAM2 op_b1f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_l(dst,src); @@ -23901,7 +23903,7 @@ uae_u32 REGPARAM2 op_b1fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_l(dst,src); @@ -23921,9 +23923,9 @@ uae_u32 REGPARAM2 op_b1fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); jff_CMPA_l(dst,src); @@ -23975,7 +23977,7 @@ uae_u32 REGPARAM2 op_c010_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_b(dst,src); @@ -23993,7 +23995,7 @@ uae_u32 REGPARAM2 op_c018_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -24013,7 +24015,7 @@ uae_u32 REGPARAM2 op_c020_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_b(dst,src); @@ -24032,7 +24034,7 @@ uae_u32 REGPARAM2 op_c028_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_b(dst,src); @@ -24049,9 +24051,9 @@ uae_u32 REGPARAM2 op_c030_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_b(dst,src); @@ -24069,7 +24071,7 @@ uae_u32 REGPARAM2 op_c038_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_b(dst,src); @@ -24087,7 +24089,7 @@ uae_u32 REGPARAM2 op_c039_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_b(dst,src); @@ -24107,7 +24109,7 @@ uae_u32 REGPARAM2 op_c03a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_b(dst,src); @@ -24126,9 +24128,9 @@ uae_u32 REGPARAM2 op_c03b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_b(dst,src); @@ -24178,7 +24180,7 @@ uae_u32 REGPARAM2 op_c050_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_w(dst,src); @@ -24196,7 +24198,7 @@ uae_u32 REGPARAM2 op_c058_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -24216,7 +24218,7 @@ uae_u32 REGPARAM2 op_c060_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_w(dst,src); @@ -24235,7 +24237,7 @@ uae_u32 REGPARAM2 op_c068_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_w(dst,src); @@ -24252,9 +24254,9 @@ uae_u32 REGPARAM2 op_c070_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_w(dst,src); @@ -24272,7 +24274,7 @@ uae_u32 REGPARAM2 op_c078_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_w(dst,src); @@ -24290,7 +24292,7 @@ uae_u32 REGPARAM2 op_c079_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_w(dst,src); @@ -24310,7 +24312,7 @@ uae_u32 REGPARAM2 op_c07a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_w(dst,src); @@ -24329,9 +24331,9 @@ uae_u32 REGPARAM2 op_c07b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_w(dst,src); @@ -24381,7 +24383,7 @@ uae_u32 REGPARAM2 op_c090_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_l(dst,src); @@ -24399,7 +24401,7 @@ uae_u32 REGPARAM2 op_c098_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -24419,7 +24421,7 @@ uae_u32 REGPARAM2 op_c0a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_l(dst,src); @@ -24438,7 +24440,7 @@ uae_u32 REGPARAM2 op_c0a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_l(dst,src); @@ -24455,9 +24457,9 @@ uae_u32 REGPARAM2 op_c0b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_l(dst,src); @@ -24475,7 +24477,7 @@ uae_u32 REGPARAM2 op_c0b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_l(dst,src); @@ -24493,7 +24495,7 @@ uae_u32 REGPARAM2 op_c0b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_l(dst,src); @@ -24513,7 +24515,7 @@ uae_u32 REGPARAM2 op_c0ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_l(dst,src); @@ -24532,9 +24534,9 @@ uae_u32 REGPARAM2 op_c0bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_AND_l(dst,src); @@ -24585,7 +24587,7 @@ uae_u32 REGPARAM2 op_c0d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULU(dst,src); live_flags(); @@ -24603,7 +24605,7 @@ uae_u32 REGPARAM2 op_c0d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; jff_MULU(dst,src); @@ -24623,7 +24625,7 @@ uae_u32 REGPARAM2 op_c0e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULU(dst,src); live_flags(); @@ -24642,7 +24644,7 @@ uae_u32 REGPARAM2 op_c0e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULU(dst,src); live_flags(); @@ -24659,9 +24661,9 @@ uae_u32 REGPARAM2 op_c0f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULU(dst,src); live_flags(); @@ -24679,7 +24681,7 @@ uae_u32 REGPARAM2 op_c0f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULU(dst,src); live_flags(); @@ -24697,7 +24699,7 @@ uae_u32 REGPARAM2 op_c0f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULU(dst,src); live_flags(); @@ -24717,7 +24719,7 @@ uae_u32 REGPARAM2 op_c0fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULU(dst,src); live_flags(); @@ -24736,9 +24738,9 @@ uae_u32 REGPARAM2 op_c0fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULU(dst,src); live_flags(); @@ -24772,11 +24774,11 @@ uae_u32 REGPARAM2 op_c110_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -24791,11 +24793,11 @@ uae_u32 REGPARAM2 op_c118_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -24812,11 +24814,11 @@ uae_u32 REGPARAM2 op_c120_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -24832,11 +24834,11 @@ uae_u32 REGPARAM2 op_c128_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -24850,13 +24852,13 @@ uae_u32 REGPARAM2 op_c130_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -24871,11 +24873,11 @@ uae_u32 REGPARAM2 op_c138_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -24890,11 +24892,11 @@ uae_u32 REGPARAM2 op_c139_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_AND_b(dst,src); live_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -24947,11 +24949,11 @@ uae_u32 REGPARAM2 op_c150_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -24966,11 +24968,11 @@ uae_u32 REGPARAM2 op_c158_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -24987,11 +24989,11 @@ uae_u32 REGPARAM2 op_c160_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25007,11 +25009,11 @@ uae_u32 REGPARAM2 op_c168_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25025,13 +25027,13 @@ uae_u32 REGPARAM2 op_c170_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25046,11 +25048,11 @@ uae_u32 REGPARAM2 op_c178_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25065,11 +25067,11 @@ uae_u32 REGPARAM2 op_c179_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_AND_w(dst,src); live_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25103,11 +25105,11 @@ uae_u32 REGPARAM2 op_c190_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25122,11 +25124,11 @@ uae_u32 REGPARAM2 op_c198_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -25143,11 +25145,11 @@ uae_u32 REGPARAM2 op_c1a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25163,11 +25165,11 @@ uae_u32 REGPARAM2 op_c1a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25181,13 +25183,13 @@ uae_u32 REGPARAM2 op_c1b0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25202,11 +25204,11 @@ uae_u32 REGPARAM2 op_c1b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25221,11 +25223,11 @@ uae_u32 REGPARAM2 op_c1b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_AND_l(dst,src); live_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -25256,7 +25258,7 @@ uae_u32 REGPARAM2 op_c1d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULS(dst,src); live_flags(); @@ -25274,7 +25276,7 @@ uae_u32 REGPARAM2 op_c1d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; jff_MULS(dst,src); @@ -25294,7 +25296,7 @@ uae_u32 REGPARAM2 op_c1e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULS(dst,src); live_flags(); @@ -25313,7 +25315,7 @@ uae_u32 REGPARAM2 op_c1e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULS(dst,src); live_flags(); @@ -25330,9 +25332,9 @@ uae_u32 REGPARAM2 op_c1f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULS(dst,src); live_flags(); @@ -25350,7 +25352,7 @@ uae_u32 REGPARAM2 op_c1f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULS(dst,src); live_flags(); @@ -25368,7 +25370,7 @@ uae_u32 REGPARAM2 op_c1f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULS(dst,src); live_flags(); @@ -25388,7 +25390,7 @@ uae_u32 REGPARAM2 op_c1fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULS(dst,src); live_flags(); @@ -25407,9 +25409,9 @@ uae_u32 REGPARAM2 op_c1fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jff_MULS(dst,src); live_flags(); @@ -25459,7 +25461,7 @@ uae_u32 REGPARAM2 op_d010_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_b(dst,src); @@ -25478,7 +25480,7 @@ uae_u32 REGPARAM2 op_d018_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -25499,7 +25501,7 @@ uae_u32 REGPARAM2 op_d020_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_b(dst,src); @@ -25519,7 +25521,7 @@ uae_u32 REGPARAM2 op_d028_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_b(dst,src); @@ -25537,9 +25539,9 @@ uae_u32 REGPARAM2 op_d030_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_b(dst,src); @@ -25558,7 +25560,7 @@ uae_u32 REGPARAM2 op_d038_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_b(dst,src); @@ -25577,7 +25579,7 @@ uae_u32 REGPARAM2 op_d039_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_b(dst,src); @@ -25598,7 +25600,7 @@ uae_u32 REGPARAM2 op_d03a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_b(dst,src); @@ -25618,9 +25620,9 @@ uae_u32 REGPARAM2 op_d03b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_b(dst,src); @@ -25690,7 +25692,7 @@ uae_u32 REGPARAM2 op_d050_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_w(dst,src); @@ -25709,7 +25711,7 @@ uae_u32 REGPARAM2 op_d058_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -25730,7 +25732,7 @@ uae_u32 REGPARAM2 op_d060_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_w(dst,src); @@ -25750,7 +25752,7 @@ uae_u32 REGPARAM2 op_d068_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_w(dst,src); @@ -25768,9 +25770,9 @@ uae_u32 REGPARAM2 op_d070_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_w(dst,src); @@ -25789,7 +25791,7 @@ uae_u32 REGPARAM2 op_d078_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_w(dst,src); @@ -25808,7 +25810,7 @@ uae_u32 REGPARAM2 op_d079_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_w(dst,src); @@ -25829,7 +25831,7 @@ uae_u32 REGPARAM2 op_d07a_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_w(dst,src); @@ -25849,9 +25851,9 @@ uae_u32 REGPARAM2 op_d07b_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_w(dst,src); @@ -25921,7 +25923,7 @@ uae_u32 REGPARAM2 op_d090_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_l(dst,src); @@ -25940,7 +25942,7 @@ uae_u32 REGPARAM2 op_d098_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -25961,7 +25963,7 @@ uae_u32 REGPARAM2 op_d0a0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_l(dst,src); @@ -25981,7 +25983,7 @@ uae_u32 REGPARAM2 op_d0a8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_l(dst,src); @@ -25999,9 +26001,9 @@ uae_u32 REGPARAM2 op_d0b0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_l(dst,src); @@ -26020,7 +26022,7 @@ uae_u32 REGPARAM2 op_d0b8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_l(dst,src); @@ -26039,7 +26041,7 @@ uae_u32 REGPARAM2 op_d0b9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_l(dst,src); @@ -26060,7 +26062,7 @@ uae_u32 REGPARAM2 op_d0ba_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_l(dst,src); @@ -26080,9 +26082,9 @@ uae_u32 REGPARAM2 op_d0bb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jff_ADD_l(dst,src); @@ -26146,7 +26148,7 @@ uae_u32 REGPARAM2 op_d0d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26162,7 +26164,7 @@ uae_u32 REGPARAM2 op_d0d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg+8; jnf_ADDA_w(dst, src); @@ -26180,7 +26182,7 @@ uae_u32 REGPARAM2 op_d0e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26197,7 +26199,7 @@ uae_u32 REGPARAM2 op_d0e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26212,9 +26214,9 @@ uae_u32 REGPARAM2 op_d0f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26230,7 +26232,7 @@ uae_u32 REGPARAM2 op_d0f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26246,7 +26248,7 @@ uae_u32 REGPARAM2 op_d0f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26264,7 +26266,7 @@ uae_u32 REGPARAM2 op_d0fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26281,9 +26283,9 @@ uae_u32 REGPARAM2 op_d0fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26332,17 +26334,17 @@ uae_u32 REGPARAM2 op_d108_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); make_flags_live(); jff_ADDX_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26357,12 +26359,12 @@ uae_u32 REGPARAM2 op_d110_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26377,12 +26379,12 @@ uae_u32 REGPARAM2 op_d118_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -26399,12 +26401,12 @@ uae_u32 REGPARAM2 op_d120_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26420,12 +26422,12 @@ uae_u32 REGPARAM2 op_d128_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26439,14 +26441,14 @@ uae_u32 REGPARAM2 op_d130_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26461,12 +26463,12 @@ uae_u32 REGPARAM2 op_d138_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26481,12 +26483,12 @@ uae_u32 REGPARAM2 op_d139_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jff_ADD_b(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26519,17 +26521,17 @@ uae_u32 REGPARAM2 op_d148_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); make_flags_live(); jff_ADDX_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26544,12 +26546,12 @@ uae_u32 REGPARAM2 op_d150_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26564,12 +26566,12 @@ uae_u32 REGPARAM2 op_d158_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -26586,12 +26588,12 @@ uae_u32 REGPARAM2 op_d160_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26607,12 +26609,12 @@ uae_u32 REGPARAM2 op_d168_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26626,14 +26628,14 @@ uae_u32 REGPARAM2 op_d170_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26648,12 +26650,12 @@ uae_u32 REGPARAM2 op_d178_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26668,12 +26670,12 @@ uae_u32 REGPARAM2 op_d179_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jff_ADD_w(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26706,17 +26708,17 @@ uae_u32 REGPARAM2 op_d188_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); make_flags_live(); jff_ADDX_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26731,12 +26733,12 @@ uae_u32 REGPARAM2 op_d190_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26751,12 +26753,12 @@ uae_u32 REGPARAM2 op_d198_0_comp_ff(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -26773,12 +26775,12 @@ uae_u32 REGPARAM2 op_d1a0_0_comp_ff(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26794,12 +26796,12 @@ uae_u32 REGPARAM2 op_d1a8_0_comp_ff(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26813,14 +26815,14 @@ uae_u32 REGPARAM2 op_d1b0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26835,12 +26837,12 @@ uae_u32 REGPARAM2 op_d1b8_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26855,12 +26857,12 @@ uae_u32 REGPARAM2 op_d1b9_0_comp_ff(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jff_ADD_l(dst,src); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -26902,7 +26904,7 @@ uae_u32 REGPARAM2 op_d1d0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26918,7 +26920,7 @@ uae_u32 REGPARAM2 op_d1d8_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg+8; jnf_ADDA_l(dst, src); @@ -26936,7 +26938,7 @@ uae_u32 REGPARAM2 op_d1e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26953,7 +26955,7 @@ uae_u32 REGPARAM2 op_d1e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26968,9 +26970,9 @@ uae_u32 REGPARAM2 op_d1f0_0_comp_ff(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -26986,7 +26988,7 @@ uae_u32 REGPARAM2 op_d1f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -27002,7 +27004,7 @@ uae_u32 REGPARAM2 op_d1f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -27020,7 +27022,7 @@ uae_u32 REGPARAM2 op_d1fa_0_comp_ff(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -27037,9 +27039,9 @@ uae_u32 REGPARAM2 op_d1fb_0_comp_ff(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -27073,7 +27075,6 @@ uae_u32 REGPARAM2 op_e000_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSRQ.B #,Dn */ @@ -27090,7 +27091,24 @@ uae_u32 REGPARAM2 op_e008_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; +return 0; +} +/* ROXRQ.B #,Dn */ +uae_u32 REGPARAM2 op_e010_0_comp_ff(uae_u32 opcode) +{ + uae_s32 srcreg = imm8_table[((opcode >> 9) & 7)]; + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt = scratchie++; + mov_l_ri(cnt,srcreg); + int data=dstreg; + make_flags_live(); + jff_ROXR_b(data,cnt); + live_flags(); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* RORQ.B #,Dn */ @@ -27108,7 +27126,6 @@ uae_u32 REGPARAM2 op_e018_0_comp_ff(uae_u32 opcode) jff_ROR_b(data,cnt); live_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASR.B Dn,Dn */ @@ -27119,17 +27136,12 @@ uae_u32 REGPARAM2 op_e020_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_ASR_b_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSR.B Dn,Dn */ @@ -27140,17 +27152,29 @@ uae_u32 REGPARAM2 op_e028_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_LSR_b_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); +return 0; +} +/* ROXR.B Dn,Dn */ +uae_u32 REGPARAM2 op_e030_0_comp_ff(uae_u32 opcode) +{ + uae_s32 srcreg = ((opcode >> 9) & 7); + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt=srcreg; + int data=dstreg; + make_flags_live(); + jff_ROXR_b(data,cnt); + live_flags(); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROR.B Dn,Dn */ @@ -27161,17 +27185,12 @@ uae_u32 REGPARAM2 op_e038_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jff_ROR_b(data,cnt); live_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASRQ.W #,Dn */ @@ -27188,7 +27207,6 @@ uae_u32 REGPARAM2 op_e040_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } #endif @@ -27208,7 +27226,24 @@ uae_u32 REGPARAM2 op_e048_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; +return 0; +} +/* ROXRQ.W #,Dn */ +uae_u32 REGPARAM2 op_e050_0_comp_ff(uae_u32 opcode) +{ + uae_s32 srcreg = imm8_table[((opcode >> 9) & 7)]; + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt = scratchie++; + mov_l_ri(cnt,srcreg); + int data=dstreg; + make_flags_live(); + jff_ROXR_w(data,cnt); + live_flags(); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* RORQ.W #,Dn */ @@ -27226,7 +27261,6 @@ uae_u32 REGPARAM2 op_e058_0_comp_ff(uae_u32 opcode) jff_ROR_w(data,cnt); live_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASR.W Dn,Dn */ @@ -27237,17 +27271,12 @@ uae_u32 REGPARAM2 op_e060_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_ASR_w_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSR.W Dn,Dn */ @@ -27258,17 +27287,29 @@ uae_u32 REGPARAM2 op_e068_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_LSR_w_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); +return 0; +} +/* ROXR.W Dn,Dn */ +uae_u32 REGPARAM2 op_e070_0_comp_ff(uae_u32 opcode) +{ + uae_s32 srcreg = ((opcode >> 9) & 7); + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt=srcreg; + int data=dstreg; + make_flags_live(); + jff_ROXR_w(data,cnt); + live_flags(); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROR.W Dn,Dn */ @@ -27279,17 +27320,12 @@ uae_u32 REGPARAM2 op_e078_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jff_ROR_w(data,cnt); live_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASRQ.L #,Dn */ @@ -27306,7 +27342,6 @@ uae_u32 REGPARAM2 op_e080_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSRQ.L #,Dn */ @@ -27323,7 +27358,24 @@ uae_u32 REGPARAM2 op_e088_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; +return 0; +} +/* ROXRQ.L #,Dn */ +uae_u32 REGPARAM2 op_e090_0_comp_ff(uae_u32 opcode) +{ + uae_s32 srcreg = imm8_table[((opcode >> 9) & 7)]; + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt = scratchie++; + mov_l_ri(cnt,srcreg); + int data=dstreg; + make_flags_live(); + jff_ROXR_l(data,cnt); + live_flags(); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* RORQ.L #,Dn */ @@ -27341,7 +27393,6 @@ uae_u32 REGPARAM2 op_e098_0_comp_ff(uae_u32 opcode) jff_ROR_l(data,cnt); live_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASR.L Dn,Dn */ @@ -27352,17 +27403,12 @@ uae_u32 REGPARAM2 op_e0a0_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_ASR_l_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSR.L Dn,Dn */ @@ -27373,17 +27419,29 @@ uae_u32 REGPARAM2 op_e0a8_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_LSR_l_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); +return 0; +} +/* ROXR.L Dn,Dn */ +uae_u32 REGPARAM2 op_e0b0_0_comp_ff(uae_u32 opcode) +{ + uae_s32 srcreg = ((opcode >> 9) & 7); + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt=srcreg; + int data=dstreg; + make_flags_live(); + jff_ROXR_l(data,cnt); + live_flags(); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROR.L Dn,Dn */ @@ -27394,17 +27452,12 @@ uae_u32 REGPARAM2 op_e0b8_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jff_ROR_l(data,cnt); live_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASRW.W (An) */ @@ -27417,10 +27470,10 @@ uae_u32 REGPARAM2 op_e0d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -27434,10 +27487,10 @@ uae_u32 REGPARAM2 op_e0d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -27453,10 +27506,10 @@ uae_u32 REGPARAM2 op_e0e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -27471,10 +27524,10 @@ uae_u32 REGPARAM2 op_e0e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -27487,12 +27540,12 @@ uae_u32 REGPARAM2 op_e0f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -27506,10 +27559,10 @@ uae_u32 REGPARAM2 op_e0f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -27523,10 +27576,10 @@ uae_u32 REGPARAM2 op_e0f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -27544,7 +27597,6 @@ uae_u32 REGPARAM2 op_e100_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSLQ.B #,Dn */ @@ -27561,7 +27613,6 @@ uae_u32 REGPARAM2 op_e108_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROXLQ.B #,Dn */ @@ -27580,7 +27631,6 @@ uae_u32 REGPARAM2 op_e110_0_comp_ff(uae_u32 opcode) jff_ROXL_b(data,cnt); live_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROLQ.B #,Dn */ @@ -27598,7 +27648,6 @@ uae_u32 REGPARAM2 op_e118_0_comp_ff(uae_u32 opcode) jff_ROL_b(data,cnt); live_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASL.B Dn,Dn */ @@ -27609,17 +27658,12 @@ uae_u32 REGPARAM2 op_e120_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_ASL_b_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSL.B Dn,Dn */ @@ -27630,17 +27674,12 @@ uae_u32 REGPARAM2 op_e128_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_LSL_b_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROXL.B Dn,Dn */ @@ -27651,18 +27690,13 @@ uae_u32 REGPARAM2 op_e130_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; make_flags_live(); jff_ROXL_b(data,cnt); live_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROL.B Dn,Dn */ @@ -27673,17 +27707,12 @@ uae_u32 REGPARAM2 op_e138_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jff_ROL_b(data,cnt); live_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASLQ.W #,Dn */ @@ -27700,7 +27729,6 @@ uae_u32 REGPARAM2 op_e140_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSLQ.W #,Dn */ @@ -27717,7 +27745,6 @@ uae_u32 REGPARAM2 op_e148_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROXLQ.W #,Dn */ @@ -27736,7 +27763,6 @@ uae_u32 REGPARAM2 op_e150_0_comp_ff(uae_u32 opcode) jff_ROXL_w(data,cnt); live_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROLQ.W #,Dn */ @@ -27754,7 +27780,6 @@ uae_u32 REGPARAM2 op_e158_0_comp_ff(uae_u32 opcode) jff_ROL_w(data,cnt); live_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASL.W Dn,Dn */ @@ -27765,17 +27790,12 @@ uae_u32 REGPARAM2 op_e160_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_ASL_w_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSL.W Dn,Dn */ @@ -27786,17 +27806,12 @@ uae_u32 REGPARAM2 op_e168_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_LSL_w_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROXL.W Dn,Dn */ @@ -27807,18 +27822,13 @@ uae_u32 REGPARAM2 op_e170_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; make_flags_live(); jff_ROXL_w(data,cnt); live_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROL.W Dn,Dn */ @@ -27829,17 +27839,12 @@ uae_u32 REGPARAM2 op_e178_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jff_ROL_w(data,cnt); live_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASLQ.L #,Dn */ @@ -27856,7 +27861,6 @@ uae_u32 REGPARAM2 op_e180_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSLQ.L #,Dn */ @@ -27873,7 +27877,6 @@ uae_u32 REGPARAM2 op_e188_0_comp_ff(uae_u32 opcode) live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROXLQ.L #,Dn */ @@ -27892,7 +27895,6 @@ uae_u32 REGPARAM2 op_e190_0_comp_ff(uae_u32 opcode) jff_ROXL_l(data,cnt); live_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROLQ.L #,Dn */ @@ -27910,7 +27912,6 @@ uae_u32 REGPARAM2 op_e198_0_comp_ff(uae_u32 opcode) jff_ROL_l(data,cnt); live_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASL.L Dn,Dn */ @@ -27921,17 +27922,12 @@ uae_u32 REGPARAM2 op_e1a0_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_ASL_l_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSL.L Dn,Dn */ @@ -27942,17 +27938,12 @@ uae_u32 REGPARAM2 op_e1a8_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jff_LSL_l_reg(data,srcreg); live_flags(); if (!(needed_flags & FLAG_CZNV)) dont_care_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROXL.L Dn,Dn */ @@ -27963,18 +27954,13 @@ uae_u32 REGPARAM2 op_e1b0_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; make_flags_live(); jff_ROXL_l(data,cnt); live_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROL.L Dn,Dn */ @@ -27985,17 +27971,12 @@ uae_u32 REGPARAM2 op_e1b8_0_comp_ff(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jff_ROL_l(data,cnt); live_flags(); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASLW.W (An) */ @@ -28008,10 +27989,10 @@ uae_u32 REGPARAM2 op_e1d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28025,10 +28006,10 @@ uae_u32 REGPARAM2 op_e1d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -28044,10 +28025,10 @@ uae_u32 REGPARAM2 op_e1e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28062,10 +28043,10 @@ uae_u32 REGPARAM2 op_e1e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28078,12 +28059,12 @@ uae_u32 REGPARAM2 op_e1f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28097,10 +28078,10 @@ uae_u32 REGPARAM2 op_e1f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28114,10 +28095,10 @@ uae_u32 REGPARAM2 op_e1f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ASLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28131,10 +28112,10 @@ uae_u32 REGPARAM2 op_e2d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28148,10 +28129,10 @@ uae_u32 REGPARAM2 op_e2d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -28167,10 +28148,10 @@ uae_u32 REGPARAM2 op_e2e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28185,10 +28166,10 @@ uae_u32 REGPARAM2 op_e2e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28201,12 +28182,12 @@ uae_u32 REGPARAM2 op_e2f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28220,10 +28201,10 @@ uae_u32 REGPARAM2 op_e2f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28237,10 +28218,10 @@ uae_u32 REGPARAM2 op_e2f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSRW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28254,10 +28235,10 @@ uae_u32 REGPARAM2 op_e3d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28271,10 +28252,10 @@ uae_u32 REGPARAM2 op_e3d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -28290,10 +28271,10 @@ uae_u32 REGPARAM2 op_e3e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28308,10 +28289,10 @@ uae_u32 REGPARAM2 op_e3e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28324,12 +28305,12 @@ uae_u32 REGPARAM2 op_e3f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28343,10 +28324,10 @@ uae_u32 REGPARAM2 op_e3f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28360,10 +28341,10 @@ uae_u32 REGPARAM2 op_e3f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_LSLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28377,10 +28358,10 @@ uae_u32 REGPARAM2 op_e6d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_RORW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28394,10 +28375,10 @@ uae_u32 REGPARAM2 op_e6d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_RORW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -28413,10 +28394,10 @@ uae_u32 REGPARAM2 op_e6e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_RORW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28431,10 +28412,10 @@ uae_u32 REGPARAM2 op_e6e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_RORW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28447,12 +28428,12 @@ uae_u32 REGPARAM2 op_e6f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_RORW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28466,10 +28447,10 @@ uae_u32 REGPARAM2 op_e6f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_RORW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28483,10 +28464,10 @@ uae_u32 REGPARAM2 op_e6f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_RORW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28500,10 +28481,10 @@ uae_u32 REGPARAM2 op_e7d0_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ROLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28517,10 +28498,10 @@ uae_u32 REGPARAM2 op_e7d8_0_comp_ff(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ROLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -28536,10 +28517,10 @@ uae_u32 REGPARAM2 op_e7e0_0_comp_ff(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ROLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28554,10 +28535,10 @@ uae_u32 REGPARAM2 op_e7e8_0_comp_ff(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ROLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28570,12 +28551,12 @@ uae_u32 REGPARAM2 op_e7f0_0_comp_ff(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ROLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28589,10 +28570,10 @@ uae_u32 REGPARAM2 op_e7f8_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ROLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -28606,10 +28587,10 @@ uae_u32 REGPARAM2 op_e7f9_0_comp_ff(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jff_ROLW(src); live_flags(); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29126,10 +29107,10 @@ uae_u32 REGPARAM2 op_10_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29144,10 +29125,10 @@ uae_u32 REGPARAM2 op_18_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29164,10 +29145,10 @@ uae_u32 REGPARAM2 op_20_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29183,10 +29164,10 @@ uae_u32 REGPARAM2 op_28_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29200,12 +29181,12 @@ uae_u32 REGPARAM2 op_30_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29220,10 +29201,10 @@ uae_u32 REGPARAM2 op_38_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29238,10 +29219,10 @@ uae_u32 REGPARAM2 op_39_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29282,10 +29263,10 @@ uae_u32 REGPARAM2 op_50_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29300,10 +29281,10 @@ uae_u32 REGPARAM2 op_58_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29320,10 +29301,10 @@ uae_u32 REGPARAM2 op_60_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29339,10 +29320,10 @@ uae_u32 REGPARAM2 op_68_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29356,12 +29337,12 @@ uae_u32 REGPARAM2 op_70_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29376,10 +29357,10 @@ uae_u32 REGPARAM2 op_78_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29394,10 +29375,10 @@ uae_u32 REGPARAM2 op_79_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29427,10 +29408,10 @@ uae_u32 REGPARAM2 op_90_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29445,10 +29426,10 @@ uae_u32 REGPARAM2 op_98_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29465,10 +29446,10 @@ uae_u32 REGPARAM2 op_a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29484,10 +29465,10 @@ uae_u32 REGPARAM2 op_a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29501,12 +29482,12 @@ uae_u32 REGPARAM2 op_b0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29521,10 +29502,10 @@ uae_u32 REGPARAM2 op_b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29539,10 +29520,10 @@ uae_u32 REGPARAM2 op_b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29571,7 +29552,7 @@ uae_u32 REGPARAM2 op_110_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29587,7 +29568,7 @@ uae_u32 REGPARAM2 op_118_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -29605,7 +29586,7 @@ uae_u32 REGPARAM2 op_120_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29622,7 +29603,7 @@ uae_u32 REGPARAM2 op_128_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29637,9 +29618,9 @@ uae_u32 REGPARAM2 op_130_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29655,7 +29636,7 @@ uae_u32 REGPARAM2 op_138_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29671,7 +29652,7 @@ uae_u32 REGPARAM2 op_139_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29690,7 +29671,7 @@ uae_u32 REGPARAM2 op_13a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29708,9 +29689,9 @@ uae_u32 REGPARAM2 op_13b_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29755,10 +29736,10 @@ uae_u32 REGPARAM2 op_150_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29773,10 +29754,10 @@ uae_u32 REGPARAM2 op_158_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29793,10 +29774,10 @@ uae_u32 REGPARAM2 op_160_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29812,10 +29793,10 @@ uae_u32 REGPARAM2 op_168_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29829,12 +29810,12 @@ uae_u32 REGPARAM2 op_170_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29849,10 +29830,10 @@ uae_u32 REGPARAM2 op_178_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29867,10 +29848,10 @@ uae_u32 REGPARAM2 op_179_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29900,10 +29881,10 @@ uae_u32 REGPARAM2 op_190_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29918,10 +29899,10 @@ uae_u32 REGPARAM2 op_198_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -29938,10 +29919,10 @@ uae_u32 REGPARAM2 op_1a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29957,10 +29938,10 @@ uae_u32 REGPARAM2 op_1a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29974,12 +29955,12 @@ uae_u32 REGPARAM2 op_1b0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -29994,10 +29975,10 @@ uae_u32 REGPARAM2 op_1b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30012,10 +29993,10 @@ uae_u32 REGPARAM2 op_1b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30045,10 +30026,10 @@ uae_u32 REGPARAM2 op_1d0_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30063,10 +30044,10 @@ uae_u32 REGPARAM2 op_1d8_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -30083,10 +30064,10 @@ uae_u32 REGPARAM2 op_1e0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30102,10 +30083,10 @@ uae_u32 REGPARAM2 op_1e8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30119,12 +30100,12 @@ uae_u32 REGPARAM2 op_1f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30139,10 +30120,10 @@ uae_u32 REGPARAM2 op_1f8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30157,10 +30138,10 @@ uae_u32 REGPARAM2 op_1f9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30190,10 +30171,10 @@ uae_u32 REGPARAM2 op_210_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30208,10 +30189,10 @@ uae_u32 REGPARAM2 op_218_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -30228,10 +30209,10 @@ uae_u32 REGPARAM2 op_220_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30247,10 +30228,10 @@ uae_u32 REGPARAM2 op_228_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30264,12 +30245,12 @@ uae_u32 REGPARAM2 op_230_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30284,10 +30265,10 @@ uae_u32 REGPARAM2 op_238_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30302,10 +30283,10 @@ uae_u32 REGPARAM2 op_239_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30346,10 +30327,10 @@ uae_u32 REGPARAM2 op_250_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30364,10 +30345,10 @@ uae_u32 REGPARAM2 op_258_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -30384,10 +30365,10 @@ uae_u32 REGPARAM2 op_260_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30403,10 +30384,10 @@ uae_u32 REGPARAM2 op_268_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30420,12 +30401,12 @@ uae_u32 REGPARAM2 op_270_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30440,10 +30421,10 @@ uae_u32 REGPARAM2 op_278_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30458,10 +30439,10 @@ uae_u32 REGPARAM2 op_279_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30491,10 +30472,10 @@ uae_u32 REGPARAM2 op_290_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30509,10 +30490,10 @@ uae_u32 REGPARAM2 op_298_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -30529,10 +30510,10 @@ uae_u32 REGPARAM2 op_2a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30548,10 +30529,10 @@ uae_u32 REGPARAM2 op_2a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30565,12 +30546,12 @@ uae_u32 REGPARAM2 op_2b0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30585,10 +30566,10 @@ uae_u32 REGPARAM2 op_2b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30603,10 +30584,10 @@ uae_u32 REGPARAM2 op_2b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30636,10 +30617,10 @@ uae_u32 REGPARAM2 op_410_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30654,10 +30635,10 @@ uae_u32 REGPARAM2 op_418_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -30674,10 +30655,10 @@ uae_u32 REGPARAM2 op_420_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30693,10 +30674,10 @@ uae_u32 REGPARAM2 op_428_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30710,12 +30691,12 @@ uae_u32 REGPARAM2 op_430_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30730,10 +30711,10 @@ uae_u32 REGPARAM2 op_438_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30748,10 +30729,10 @@ uae_u32 REGPARAM2 op_439_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30781,10 +30762,10 @@ uae_u32 REGPARAM2 op_450_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30799,10 +30780,10 @@ uae_u32 REGPARAM2 op_458_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -30819,10 +30800,10 @@ uae_u32 REGPARAM2 op_460_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30838,10 +30819,10 @@ uae_u32 REGPARAM2 op_468_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30855,12 +30836,12 @@ uae_u32 REGPARAM2 op_470_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30875,10 +30856,10 @@ uae_u32 REGPARAM2 op_478_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30893,10 +30874,10 @@ uae_u32 REGPARAM2 op_479_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30926,10 +30907,10 @@ uae_u32 REGPARAM2 op_490_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30944,10 +30925,10 @@ uae_u32 REGPARAM2 op_498_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -30964,10 +30945,10 @@ uae_u32 REGPARAM2 op_4a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -30983,10 +30964,10 @@ uae_u32 REGPARAM2 op_4a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31000,12 +30981,12 @@ uae_u32 REGPARAM2 op_4b0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31020,10 +31001,10 @@ uae_u32 REGPARAM2 op_4b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31038,10 +31019,10 @@ uae_u32 REGPARAM2 op_4b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31071,10 +31052,10 @@ uae_u32 REGPARAM2 op_610_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31089,10 +31070,10 @@ uae_u32 REGPARAM2 op_618_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31109,10 +31090,10 @@ uae_u32 REGPARAM2 op_620_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31128,10 +31109,10 @@ uae_u32 REGPARAM2 op_628_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31145,12 +31126,12 @@ uae_u32 REGPARAM2 op_630_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31165,10 +31146,10 @@ uae_u32 REGPARAM2 op_638_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31183,10 +31164,10 @@ uae_u32 REGPARAM2 op_639_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31216,10 +31197,10 @@ uae_u32 REGPARAM2 op_650_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31234,10 +31215,10 @@ uae_u32 REGPARAM2 op_658_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31254,10 +31235,10 @@ uae_u32 REGPARAM2 op_660_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31273,10 +31254,10 @@ uae_u32 REGPARAM2 op_668_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31290,12 +31271,12 @@ uae_u32 REGPARAM2 op_670_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31310,10 +31291,10 @@ uae_u32 REGPARAM2 op_678_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31328,10 +31309,10 @@ uae_u32 REGPARAM2 op_679_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31361,10 +31342,10 @@ uae_u32 REGPARAM2 op_690_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31379,10 +31360,10 @@ uae_u32 REGPARAM2 op_698_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31399,10 +31380,10 @@ uae_u32 REGPARAM2 op_6a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31418,10 +31399,10 @@ uae_u32 REGPARAM2 op_6a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31435,12 +31416,12 @@ uae_u32 REGPARAM2 op_6b0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31455,10 +31436,10 @@ uae_u32 REGPARAM2 op_6b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31473,10 +31454,10 @@ uae_u32 REGPARAM2 op_6b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31505,7 +31486,7 @@ uae_u32 REGPARAM2 op_810_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31521,7 +31502,7 @@ uae_u32 REGPARAM2 op_818_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -31539,7 +31520,7 @@ uae_u32 REGPARAM2 op_820_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31556,7 +31537,7 @@ uae_u32 REGPARAM2 op_828_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31571,9 +31552,9 @@ uae_u32 REGPARAM2 op_830_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31589,7 +31570,7 @@ uae_u32 REGPARAM2 op_838_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31605,7 +31586,7 @@ uae_u32 REGPARAM2 op_839_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31624,7 +31605,7 @@ uae_u32 REGPARAM2 op_83a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31642,9 +31623,9 @@ uae_u32 REGPARAM2 op_83b_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31675,10 +31656,10 @@ uae_u32 REGPARAM2 op_850_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31693,10 +31674,10 @@ uae_u32 REGPARAM2 op_858_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31713,10 +31694,10 @@ uae_u32 REGPARAM2 op_860_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31732,10 +31713,10 @@ uae_u32 REGPARAM2 op_868_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31749,12 +31730,12 @@ uae_u32 REGPARAM2 op_870_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31769,10 +31750,10 @@ uae_u32 REGPARAM2 op_878_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31787,10 +31768,10 @@ uae_u32 REGPARAM2 op_879_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCHG_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31820,10 +31801,10 @@ uae_u32 REGPARAM2 op_890_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31838,10 +31819,10 @@ uae_u32 REGPARAM2 op_898_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -31858,10 +31839,10 @@ uae_u32 REGPARAM2 op_8a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31877,10 +31858,10 @@ uae_u32 REGPARAM2 op_8a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31894,12 +31875,12 @@ uae_u32 REGPARAM2 op_8b0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31914,10 +31895,10 @@ uae_u32 REGPARAM2 op_8b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31932,10 +31913,10 @@ uae_u32 REGPARAM2 op_8b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BCLR_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31965,10 +31946,10 @@ uae_u32 REGPARAM2 op_8d0_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -31983,10 +31964,10 @@ uae_u32 REGPARAM2 op_8d8_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -32003,10 +31984,10 @@ uae_u32 REGPARAM2 op_8e0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32022,10 +32003,10 @@ uae_u32 REGPARAM2 op_8e8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32039,12 +32020,12 @@ uae_u32 REGPARAM2 op_8f0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32059,10 +32040,10 @@ uae_u32 REGPARAM2 op_8f8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32077,10 +32058,10 @@ uae_u32 REGPARAM2 op_8f9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); jnf_BSET_b(dst,src); dont_care_flags(); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32110,10 +32091,10 @@ uae_u32 REGPARAM2 op_a10_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32128,10 +32109,10 @@ uae_u32 REGPARAM2 op_a18_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -32148,10 +32129,10 @@ uae_u32 REGPARAM2 op_a20_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32167,10 +32148,10 @@ uae_u32 REGPARAM2 op_a28_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32184,12 +32165,12 @@ uae_u32 REGPARAM2 op_a30_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32204,10 +32185,10 @@ uae_u32 REGPARAM2 op_a38_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32222,10 +32203,10 @@ uae_u32 REGPARAM2 op_a39_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32266,10 +32247,10 @@ uae_u32 REGPARAM2 op_a50_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32284,10 +32265,10 @@ uae_u32 REGPARAM2 op_a58_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -32304,10 +32285,10 @@ uae_u32 REGPARAM2 op_a60_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32323,10 +32304,10 @@ uae_u32 REGPARAM2 op_a68_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32340,12 +32321,12 @@ uae_u32 REGPARAM2 op_a70_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32360,10 +32341,10 @@ uae_u32 REGPARAM2 op_a78_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32378,10 +32359,10 @@ uae_u32 REGPARAM2 op_a79_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32411,10 +32392,10 @@ uae_u32 REGPARAM2 op_a90_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32429,10 +32410,10 @@ uae_u32 REGPARAM2 op_a98_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -32449,10 +32430,10 @@ uae_u32 REGPARAM2 op_aa0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32468,10 +32449,10 @@ uae_u32 REGPARAM2 op_aa8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32485,12 +32466,12 @@ uae_u32 REGPARAM2 op_ab0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32505,10 +32486,10 @@ uae_u32 REGPARAM2 op_ab8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32523,10 +32504,10 @@ uae_u32 REGPARAM2 op_ab9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -32559,7 +32540,7 @@ uae_u32 REGPARAM2 op_c10_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32576,7 +32557,7 @@ uae_u32 REGPARAM2 op_c18_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); @@ -32595,7 +32576,7 @@ uae_u32 REGPARAM2 op_c20_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32613,7 +32594,7 @@ uae_u32 REGPARAM2 op_c28_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32629,9 +32610,9 @@ uae_u32 REGPARAM2 op_c30_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32648,7 +32629,7 @@ uae_u32 REGPARAM2 op_c38_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32665,7 +32646,7 @@ uae_u32 REGPARAM2 op_c39_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32685,7 +32666,7 @@ uae_u32 REGPARAM2 op_c3a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32704,9 +32685,9 @@ uae_u32 REGPARAM2 op_c3b_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32738,7 +32719,7 @@ uae_u32 REGPARAM2 op_c50_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32755,7 +32736,7 @@ uae_u32 REGPARAM2 op_c58_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ arm_ADD_l_ri8(dstreg+8,2); @@ -32774,7 +32755,7 @@ uae_u32 REGPARAM2 op_c60_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32792,7 +32773,7 @@ uae_u32 REGPARAM2 op_c68_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32808,9 +32789,9 @@ uae_u32 REGPARAM2 op_c70_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32827,7 +32808,7 @@ uae_u32 REGPARAM2 op_c78_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32844,7 +32825,7 @@ uae_u32 REGPARAM2 op_c79_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32864,7 +32845,7 @@ uae_u32 REGPARAM2 op_c7a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32883,9 +32864,9 @@ uae_u32 REGPARAM2 op_c7b_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32917,7 +32898,7 @@ uae_u32 REGPARAM2 op_c90_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32934,7 +32915,7 @@ uae_u32 REGPARAM2 op_c98_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ arm_ADD_l_ri8(dstreg+8,4); @@ -32953,7 +32934,7 @@ uae_u32 REGPARAM2 op_ca0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32971,7 +32952,7 @@ uae_u32 REGPARAM2 op_ca8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -32987,9 +32968,9 @@ uae_u32 REGPARAM2 op_cb0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -33006,7 +32987,7 @@ uae_u32 REGPARAM2 op_cb8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -33023,7 +33004,7 @@ uae_u32 REGPARAM2 op_cb9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -33043,7 +33024,7 @@ uae_u32 REGPARAM2 op_cba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -33062,9 +33043,9 @@ uae_u32 REGPARAM2 op_cbb_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -33095,7 +33076,7 @@ uae_u32 REGPARAM2 op_1010_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_b(dst, src); @@ -33112,7 +33093,7 @@ uae_u32 REGPARAM2 op_1018_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -33131,7 +33112,7 @@ uae_u32 REGPARAM2 op_1020_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_b(dst, src); @@ -33149,7 +33130,7 @@ uae_u32 REGPARAM2 op_1028_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_b(dst, src); @@ -33165,9 +33146,9 @@ uae_u32 REGPARAM2 op_1030_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_b(dst, src); @@ -33184,7 +33165,7 @@ uae_u32 REGPARAM2 op_1038_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_b(dst, src); @@ -33201,7 +33182,7 @@ uae_u32 REGPARAM2 op_1039_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_b(dst, src); @@ -33220,7 +33201,7 @@ uae_u32 REGPARAM2 op_103a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_b(dst, src); @@ -33238,9 +33219,9 @@ uae_u32 REGPARAM2 op_103b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_b(dst, src); @@ -33273,7 +33254,7 @@ uae_u32 REGPARAM2 op_1080_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33287,10 +33268,10 @@ uae_u32 REGPARAM2 op_1090_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33304,11 +33285,11 @@ uae_u32 REGPARAM2 op_1098_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33323,10 +33304,10 @@ uae_u32 REGPARAM2 op_10a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33341,10 +33322,10 @@ uae_u32 REGPARAM2 op_10a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33357,12 +33338,12 @@ uae_u32 REGPARAM2 op_10b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33376,10 +33357,10 @@ uae_u32 REGPARAM2 op_10b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33393,10 +33374,10 @@ uae_u32 REGPARAM2 op_10b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33412,10 +33393,10 @@ uae_u32 REGPARAM2 op_10ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33430,12 +33411,12 @@ uae_u32 REGPARAM2 op_10bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33450,7 +33431,7 @@ uae_u32 REGPARAM2 op_10bc_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33465,7 +33446,7 @@ uae_u32 REGPARAM2 op_10c0_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33480,10 +33461,10 @@ uae_u32 REGPARAM2 op_10d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33498,11 +33479,11 @@ uae_u32 REGPARAM2 op_10d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33518,10 +33499,10 @@ uae_u32 REGPARAM2 op_10e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33537,10 +33518,10 @@ uae_u32 REGPARAM2 op_10e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33554,12 +33535,12 @@ uae_u32 REGPARAM2 op_10f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33574,10 +33555,10 @@ uae_u32 REGPARAM2 op_10f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33592,10 +33573,10 @@ uae_u32 REGPARAM2 op_10f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33612,10 +33593,10 @@ uae_u32 REGPARAM2 op_10fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33631,12 +33612,12 @@ uae_u32 REGPARAM2 op_10fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33652,7 +33633,7 @@ uae_u32 REGPARAM2 op_10fc_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -33669,7 +33650,7 @@ uae_u32 REGPARAM2 op_1100_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33683,11 +33664,11 @@ uae_u32 REGPARAM2 op_1110_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33701,12 +33682,12 @@ uae_u32 REGPARAM2 op_1118_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33721,11 +33702,11 @@ uae_u32 REGPARAM2 op_1120_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33740,11 +33721,11 @@ uae_u32 REGPARAM2 op_1128_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33757,13 +33738,13 @@ uae_u32 REGPARAM2 op_1130_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33777,11 +33758,11 @@ uae_u32 REGPARAM2 op_1138_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33795,11 +33776,11 @@ uae_u32 REGPARAM2 op_1139_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33815,11 +33796,11 @@ uae_u32 REGPARAM2 op_113a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33834,13 +33815,13 @@ uae_u32 REGPARAM2 op_113b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33856,7 +33837,7 @@ uae_u32 REGPARAM2 op_113c_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33872,7 +33853,7 @@ uae_u32 REGPARAM2 op_1140_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33886,11 +33867,11 @@ uae_u32 REGPARAM2 op_1150_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33904,12 +33885,12 @@ uae_u32 REGPARAM2 op_1158_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33924,11 +33905,11 @@ uae_u32 REGPARAM2 op_1160_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33943,11 +33924,11 @@ uae_u32 REGPARAM2 op_1168_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33960,13 +33941,13 @@ uae_u32 REGPARAM2 op_1170_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33980,11 +33961,11 @@ uae_u32 REGPARAM2 op_1178_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -33998,11 +33979,11 @@ uae_u32 REGPARAM2 op_1179_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34018,11 +33999,11 @@ uae_u32 REGPARAM2 op_117a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34037,13 +34018,13 @@ uae_u32 REGPARAM2 op_117b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34059,7 +34040,7 @@ uae_u32 REGPARAM2 op_117c_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34073,9 +34054,9 @@ uae_u32 REGPARAM2 op_1180_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34089,11 +34070,11 @@ uae_u32 REGPARAM2 op_1190_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34107,12 +34088,12 @@ uae_u32 REGPARAM2 op_1198_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34127,11 +34108,11 @@ uae_u32 REGPARAM2 op_11a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34146,11 +34127,11 @@ uae_u32 REGPARAM2 op_11a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34163,13 +34144,13 @@ uae_u32 REGPARAM2 op_11b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34183,11 +34164,11 @@ uae_u32 REGPARAM2 op_11b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34201,11 +34182,11 @@ uae_u32 REGPARAM2 op_11b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34221,11 +34202,11 @@ uae_u32 REGPARAM2 op_11ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34240,13 +34221,13 @@ uae_u32 REGPARAM2 op_11bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34260,9 +34241,9 @@ uae_u32 REGPARAM2 op_11bc_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s8)comp_get_ibyte((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34277,7 +34258,7 @@ uae_u32 REGPARAM2 op_11c0_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34290,11 +34271,11 @@ uae_u32 REGPARAM2 op_11d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34307,12 +34288,12 @@ uae_u32 REGPARAM2 op_11d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34326,11 +34307,11 @@ uae_u32 REGPARAM2 op_11e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34344,11 +34325,11 @@ uae_u32 REGPARAM2 op_11e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34360,13 +34341,13 @@ uae_u32 REGPARAM2 op_11f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34379,11 +34360,11 @@ uae_u32 REGPARAM2 op_11f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34396,11 +34377,11 @@ uae_u32 REGPARAM2 op_11f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34415,11 +34396,11 @@ uae_u32 REGPARAM2 op_11fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34433,13 +34414,13 @@ uae_u32 REGPARAM2 op_11fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34454,7 +34435,7 @@ uae_u32 REGPARAM2 op_11fc_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34469,7 +34450,7 @@ uae_u32 REGPARAM2 op_13c0_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34482,11 +34463,11 @@ uae_u32 REGPARAM2 op_13d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34499,12 +34480,12 @@ uae_u32 REGPARAM2 op_13d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34518,11 +34499,11 @@ uae_u32 REGPARAM2 op_13e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34536,11 +34517,11 @@ uae_u32 REGPARAM2 op_13e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34552,13 +34533,13 @@ uae_u32 REGPARAM2 op_13f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34571,11 +34552,11 @@ uae_u32 REGPARAM2 op_13f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34588,11 +34569,11 @@ uae_u32 REGPARAM2 op_13f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34607,11 +34588,11 @@ uae_u32 REGPARAM2 op_13fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34625,13 +34606,13 @@ uae_u32 REGPARAM2 op_13fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34646,7 +34627,7 @@ uae_u32 REGPARAM2 op_13fc_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writebyte(dsta,src,scratchie); + writebyte(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -34690,7 +34671,7 @@ uae_u32 REGPARAM2 op_2010_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_l(dst, src); @@ -34707,7 +34688,7 @@ uae_u32 REGPARAM2 op_2018_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -34726,7 +34707,7 @@ uae_u32 REGPARAM2 op_2020_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_l(dst, src); @@ -34744,7 +34725,7 @@ uae_u32 REGPARAM2 op_2028_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_l(dst, src); @@ -34760,9 +34741,9 @@ uae_u32 REGPARAM2 op_2030_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_l(dst, src); @@ -34779,7 +34760,7 @@ uae_u32 REGPARAM2 op_2038_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_l(dst, src); @@ -34796,7 +34777,7 @@ uae_u32 REGPARAM2 op_2039_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_l(dst, src); @@ -34815,7 +34796,7 @@ uae_u32 REGPARAM2 op_203a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_l(dst, src); @@ -34833,9 +34814,9 @@ uae_u32 REGPARAM2 op_203b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_l(dst, src); @@ -34895,7 +34876,7 @@ uae_u32 REGPARAM2 op_2050_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -34911,7 +34892,7 @@ uae_u32 REGPARAM2 op_2058_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg+8; jnf_MOVEA_l(dst, src); @@ -34929,7 +34910,7 @@ uae_u32 REGPARAM2 op_2060_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -34946,7 +34927,7 @@ uae_u32 REGPARAM2 op_2068_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -34961,9 +34942,9 @@ uae_u32 REGPARAM2 op_2070_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -34979,7 +34960,7 @@ uae_u32 REGPARAM2 op_2078_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -34995,7 +34976,7 @@ uae_u32 REGPARAM2 op_2079_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -35013,7 +34994,7 @@ uae_u32 REGPARAM2 op_207a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -35030,9 +35011,9 @@ uae_u32 REGPARAM2 op_207b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_MOVEA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -35063,7 +35044,7 @@ uae_u32 REGPARAM2 op_2080_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35078,7 +35059,7 @@ uae_u32 REGPARAM2 op_2088_0_comp_nf(uae_u32 opcode) int src=srcreg+8; int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35092,10 +35073,10 @@ uae_u32 REGPARAM2 op_2090_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35109,11 +35090,11 @@ uae_u32 REGPARAM2 op_2098_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35128,10 +35109,10 @@ uae_u32 REGPARAM2 op_20a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35146,10 +35127,10 @@ uae_u32 REGPARAM2 op_20a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35162,12 +35143,12 @@ uae_u32 REGPARAM2 op_20b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35181,10 +35162,10 @@ uae_u32 REGPARAM2 op_20b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35198,10 +35179,10 @@ uae_u32 REGPARAM2 op_20b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35217,10 +35198,10 @@ uae_u32 REGPARAM2 op_20ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35235,12 +35216,12 @@ uae_u32 REGPARAM2 op_20bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35255,7 +35236,7 @@ uae_u32 REGPARAM2 op_20bc_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35270,7 +35251,7 @@ uae_u32 REGPARAM2 op_20c0_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35290,7 +35271,7 @@ uae_u32 REGPARAM2 op_20c8_0_comp_nf(uae_u32 opcode) } int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35305,10 +35286,10 @@ uae_u32 REGPARAM2 op_20d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35323,11 +35304,11 @@ uae_u32 REGPARAM2 op_20d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35343,10 +35324,10 @@ uae_u32 REGPARAM2 op_20e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35362,10 +35343,10 @@ uae_u32 REGPARAM2 op_20e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35379,12 +35360,12 @@ uae_u32 REGPARAM2 op_20f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35399,10 +35380,10 @@ uae_u32 REGPARAM2 op_20f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35417,10 +35398,10 @@ uae_u32 REGPARAM2 op_20f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35437,10 +35418,10 @@ uae_u32 REGPARAM2 op_20fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35456,12 +35437,12 @@ uae_u32 REGPARAM2 op_20fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35477,7 +35458,7 @@ uae_u32 REGPARAM2 op_20fc_0_comp_nf(uae_u32 opcode) mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=dstreg+8; dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -35494,7 +35475,7 @@ uae_u32 REGPARAM2 op_2100_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35514,7 +35495,7 @@ uae_u32 REGPARAM2 op_2108_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35528,11 +35509,11 @@ uae_u32 REGPARAM2 op_2110_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35546,12 +35527,12 @@ uae_u32 REGPARAM2 op_2118_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35566,11 +35547,11 @@ uae_u32 REGPARAM2 op_2120_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35585,11 +35566,11 @@ uae_u32 REGPARAM2 op_2128_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35602,13 +35583,13 @@ uae_u32 REGPARAM2 op_2130_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35622,11 +35603,11 @@ uae_u32 REGPARAM2 op_2138_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35640,11 +35621,11 @@ uae_u32 REGPARAM2 op_2139_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35660,11 +35641,11 @@ uae_u32 REGPARAM2 op_213a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35679,13 +35660,13 @@ uae_u32 REGPARAM2 op_213b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35701,7 +35682,7 @@ uae_u32 REGPARAM2 op_213c_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35717,7 +35698,7 @@ uae_u32 REGPARAM2 op_2140_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35733,7 +35714,7 @@ uae_u32 REGPARAM2 op_2148_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35747,11 +35728,11 @@ uae_u32 REGPARAM2 op_2150_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35765,12 +35746,12 @@ uae_u32 REGPARAM2 op_2158_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35785,11 +35766,11 @@ uae_u32 REGPARAM2 op_2160_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35804,11 +35785,11 @@ uae_u32 REGPARAM2 op_2168_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35821,13 +35802,13 @@ uae_u32 REGPARAM2 op_2170_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35841,11 +35822,11 @@ uae_u32 REGPARAM2 op_2178_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35859,11 +35840,11 @@ uae_u32 REGPARAM2 op_2179_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35879,11 +35860,11 @@ uae_u32 REGPARAM2 op_217a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35898,13 +35879,13 @@ uae_u32 REGPARAM2 op_217b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35920,7 +35901,7 @@ uae_u32 REGPARAM2 op_217c_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35934,9 +35915,9 @@ uae_u32 REGPARAM2 op_2180_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35950,9 +35931,9 @@ uae_u32 REGPARAM2 op_2188_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg+8; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35966,11 +35947,11 @@ uae_u32 REGPARAM2 op_2190_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -35984,12 +35965,12 @@ uae_u32 REGPARAM2 op_2198_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36007,11 +35988,11 @@ uae_u32 REGPARAM2 op_21a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36026,11 +36007,11 @@ uae_u32 REGPARAM2 op_21a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36043,13 +36024,13 @@ uae_u32 REGPARAM2 op_21b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36063,11 +36044,11 @@ uae_u32 REGPARAM2 op_21b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36081,11 +36062,11 @@ uae_u32 REGPARAM2 op_21b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36101,11 +36082,11 @@ uae_u32 REGPARAM2 op_21ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36120,13 +36101,13 @@ uae_u32 REGPARAM2 op_21bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36140,9 +36121,9 @@ uae_u32 REGPARAM2 op_21bc_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,comp_get_ilong((m68k_pc_offset+=4)-4)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36157,7 +36138,7 @@ uae_u32 REGPARAM2 op_21c0_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36172,7 +36153,7 @@ uae_u32 REGPARAM2 op_21c8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36185,11 +36166,11 @@ uae_u32 REGPARAM2 op_21d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36202,12 +36183,12 @@ uae_u32 REGPARAM2 op_21d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36221,11 +36202,11 @@ uae_u32 REGPARAM2 op_21e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36239,11 +36220,11 @@ uae_u32 REGPARAM2 op_21e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36255,13 +36236,13 @@ uae_u32 REGPARAM2 op_21f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36274,11 +36255,11 @@ uae_u32 REGPARAM2 op_21f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36291,11 +36272,11 @@ uae_u32 REGPARAM2 op_21f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36310,11 +36291,11 @@ uae_u32 REGPARAM2 op_21fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36328,13 +36309,13 @@ uae_u32 REGPARAM2 op_21fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36349,7 +36330,7 @@ uae_u32 REGPARAM2 op_21fc_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36364,7 +36345,7 @@ uae_u32 REGPARAM2 op_23c0_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36379,7 +36360,7 @@ uae_u32 REGPARAM2 op_23c8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36392,11 +36373,11 @@ uae_u32 REGPARAM2 op_23d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36409,12 +36390,12 @@ uae_u32 REGPARAM2 op_23d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36428,11 +36409,11 @@ uae_u32 REGPARAM2 op_23e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36446,11 +36427,11 @@ uae_u32 REGPARAM2 op_23e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36462,13 +36443,13 @@ uae_u32 REGPARAM2 op_23f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36481,11 +36462,11 @@ uae_u32 REGPARAM2 op_23f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36498,11 +36479,11 @@ uae_u32 REGPARAM2 op_23f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36517,11 +36498,11 @@ uae_u32 REGPARAM2 op_23fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36535,13 +36516,13 @@ uae_u32 REGPARAM2 op_23fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36556,7 +36537,7 @@ uae_u32 REGPARAM2 op_23fc_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writelong(dsta,src,scratchie); + writelong(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36600,7 +36581,7 @@ uae_u32 REGPARAM2 op_3010_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_w(dst, src); @@ -36617,7 +36598,7 @@ uae_u32 REGPARAM2 op_3018_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -36636,7 +36617,7 @@ uae_u32 REGPARAM2 op_3020_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_w(dst, src); @@ -36654,7 +36635,7 @@ uae_u32 REGPARAM2 op_3028_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_w(dst, src); @@ -36670,9 +36651,9 @@ uae_u32 REGPARAM2 op_3030_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_w(dst, src); @@ -36689,7 +36670,7 @@ uae_u32 REGPARAM2 op_3038_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_w(dst, src); @@ -36706,7 +36687,7 @@ uae_u32 REGPARAM2 op_3039_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_w(dst, src); @@ -36725,7 +36706,7 @@ uae_u32 REGPARAM2 op_303a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_w(dst, src); @@ -36743,9 +36724,9 @@ uae_u32 REGPARAM2 op_303b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_MOVE_w(dst, src); @@ -36805,7 +36786,7 @@ uae_u32 REGPARAM2 op_3050_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -36821,7 +36802,7 @@ uae_u32 REGPARAM2 op_3058_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg+8; jnf_MOVEA_w(dst, src); @@ -36839,7 +36820,7 @@ uae_u32 REGPARAM2 op_3060_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -36856,7 +36837,7 @@ uae_u32 REGPARAM2 op_3068_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -36871,9 +36852,9 @@ uae_u32 REGPARAM2 op_3070_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -36889,7 +36870,7 @@ uae_u32 REGPARAM2 op_3078_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -36905,7 +36886,7 @@ uae_u32 REGPARAM2 op_3079_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -36923,7 +36904,7 @@ uae_u32 REGPARAM2 op_307a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -36940,9 +36921,9 @@ uae_u32 REGPARAM2 op_307b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_MOVEA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -36973,7 +36954,7 @@ uae_u32 REGPARAM2 op_3080_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -36988,7 +36969,7 @@ uae_u32 REGPARAM2 op_3088_0_comp_nf(uae_u32 opcode) int src=srcreg+8; int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37002,10 +36983,10 @@ uae_u32 REGPARAM2 op_3090_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37019,11 +37000,11 @@ uae_u32 REGPARAM2 op_3098_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37038,10 +37019,10 @@ uae_u32 REGPARAM2 op_30a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37056,10 +37037,10 @@ uae_u32 REGPARAM2 op_30a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37072,12 +37053,12 @@ uae_u32 REGPARAM2 op_30b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37091,10 +37072,10 @@ uae_u32 REGPARAM2 op_30b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37108,10 +37089,10 @@ uae_u32 REGPARAM2 op_30b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37127,10 +37108,10 @@ uae_u32 REGPARAM2 op_30ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37145,12 +37126,12 @@ uae_u32 REGPARAM2 op_30bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37165,7 +37146,7 @@ uae_u32 REGPARAM2 op_30bc_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37180,7 +37161,7 @@ uae_u32 REGPARAM2 op_30c0_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37200,7 +37181,7 @@ uae_u32 REGPARAM2 op_30c8_0_comp_nf(uae_u32 opcode) } int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37215,10 +37196,10 @@ uae_u32 REGPARAM2 op_30d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37233,11 +37214,11 @@ uae_u32 REGPARAM2 op_30d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37253,10 +37234,10 @@ uae_u32 REGPARAM2 op_30e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37272,10 +37253,10 @@ uae_u32 REGPARAM2 op_30e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37289,12 +37270,12 @@ uae_u32 REGPARAM2 op_30f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37309,10 +37290,10 @@ uae_u32 REGPARAM2 op_30f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37327,10 +37308,10 @@ uae_u32 REGPARAM2 op_30f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37347,10 +37328,10 @@ uae_u32 REGPARAM2 op_30fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37366,12 +37347,12 @@ uae_u32 REGPARAM2 op_30fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37387,7 +37368,7 @@ uae_u32 REGPARAM2 op_30fc_0_comp_nf(uae_u32 opcode) mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=dstreg+8; dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -37404,7 +37385,7 @@ uae_u32 REGPARAM2 op_3100_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37424,7 +37405,7 @@ uae_u32 REGPARAM2 op_3108_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37438,11 +37419,11 @@ uae_u32 REGPARAM2 op_3110_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37456,12 +37437,12 @@ uae_u32 REGPARAM2 op_3118_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37476,11 +37457,11 @@ uae_u32 REGPARAM2 op_3120_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37495,11 +37476,11 @@ uae_u32 REGPARAM2 op_3128_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37512,13 +37493,13 @@ uae_u32 REGPARAM2 op_3130_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37532,11 +37513,11 @@ uae_u32 REGPARAM2 op_3138_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37550,11 +37531,11 @@ uae_u32 REGPARAM2 op_3139_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37570,11 +37551,11 @@ uae_u32 REGPARAM2 op_313a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37589,13 +37570,13 @@ uae_u32 REGPARAM2 op_313b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37611,7 +37592,7 @@ uae_u32 REGPARAM2 op_313c_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37627,7 +37608,7 @@ uae_u32 REGPARAM2 op_3140_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37643,7 +37624,7 @@ uae_u32 REGPARAM2 op_3148_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37657,11 +37638,11 @@ uae_u32 REGPARAM2 op_3150_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37675,12 +37656,12 @@ uae_u32 REGPARAM2 op_3158_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37695,11 +37676,11 @@ uae_u32 REGPARAM2 op_3160_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37714,11 +37695,11 @@ uae_u32 REGPARAM2 op_3168_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37731,13 +37712,13 @@ uae_u32 REGPARAM2 op_3170_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37751,11 +37732,11 @@ uae_u32 REGPARAM2 op_3178_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37769,11 +37750,11 @@ uae_u32 REGPARAM2 op_3179_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37789,11 +37770,11 @@ uae_u32 REGPARAM2 op_317a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37808,13 +37789,13 @@ uae_u32 REGPARAM2 op_317b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37830,7 +37811,7 @@ uae_u32 REGPARAM2 op_317c_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37844,9 +37825,9 @@ uae_u32 REGPARAM2 op_3180_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37860,9 +37841,9 @@ uae_u32 REGPARAM2 op_3188_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg+8; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37876,11 +37857,11 @@ uae_u32 REGPARAM2 op_3190_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37894,12 +37875,12 @@ uae_u32 REGPARAM2 op_3198_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37914,11 +37895,11 @@ uae_u32 REGPARAM2 op_31a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37933,11 +37914,11 @@ uae_u32 REGPARAM2 op_31a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37950,13 +37931,13 @@ uae_u32 REGPARAM2 op_31b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37970,11 +37951,11 @@ uae_u32 REGPARAM2 op_31b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -37988,11 +37969,11 @@ uae_u32 REGPARAM2 op_31b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38008,11 +37989,11 @@ uae_u32 REGPARAM2 op_31ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38027,13 +38008,13 @@ uae_u32 REGPARAM2 op_31bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38047,9 +38028,9 @@ uae_u32 REGPARAM2 op_31bc_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38064,7 +38045,7 @@ uae_u32 REGPARAM2 op_31c0_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38079,7 +38060,7 @@ uae_u32 REGPARAM2 op_31c8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38092,11 +38073,11 @@ uae_u32 REGPARAM2 op_31d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38109,12 +38090,12 @@ uae_u32 REGPARAM2 op_31d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38128,11 +38109,11 @@ uae_u32 REGPARAM2 op_31e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38146,11 +38127,11 @@ uae_u32 REGPARAM2 op_31e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38162,13 +38143,13 @@ uae_u32 REGPARAM2 op_31f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38181,11 +38162,11 @@ uae_u32 REGPARAM2 op_31f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38198,11 +38179,11 @@ uae_u32 REGPARAM2 op_31f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38217,11 +38198,11 @@ uae_u32 REGPARAM2 op_31fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38235,13 +38216,13 @@ uae_u32 REGPARAM2 op_31fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38256,7 +38237,7 @@ uae_u32 REGPARAM2 op_31fc_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38271,7 +38252,7 @@ uae_u32 REGPARAM2 op_33c0_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38286,7 +38267,7 @@ uae_u32 REGPARAM2 op_33c8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38299,11 +38280,11 @@ uae_u32 REGPARAM2 op_33d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38316,12 +38297,12 @@ uae_u32 REGPARAM2 op_33d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38335,11 +38316,11 @@ uae_u32 REGPARAM2 op_33e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38353,11 +38334,11 @@ uae_u32 REGPARAM2 op_33e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38369,13 +38350,13 @@ uae_u32 REGPARAM2 op_33f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38388,11 +38369,11 @@ uae_u32 REGPARAM2 op_33f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38405,11 +38386,11 @@ uae_u32 REGPARAM2 op_33f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38424,11 +38405,11 @@ uae_u32 REGPARAM2 op_33fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38442,13 +38423,13 @@ uae_u32 REGPARAM2 op_33fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38463,7 +38444,7 @@ uae_u32 REGPARAM2 op_33fc_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ dont_care_flags(); - writeword(dsta,src,scratchie); + writeword(dsta,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38488,9 +38469,9 @@ uae_u32 REGPARAM2 op_4010_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEGX_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38503,9 +38484,9 @@ uae_u32 REGPARAM2 op_4018_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEGX_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -38520,9 +38501,9 @@ uae_u32 REGPARAM2 op_4020_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEGX_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38536,9 +38517,9 @@ uae_u32 REGPARAM2 op_4028_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEGX_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38550,11 +38531,11 @@ uae_u32 REGPARAM2 op_4030_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEGX_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38567,9 +38548,9 @@ uae_u32 REGPARAM2 op_4038_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEGX_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38582,9 +38563,9 @@ uae_u32 REGPARAM2 op_4039_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEGX_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38609,9 +38590,9 @@ uae_u32 REGPARAM2 op_4050_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEGX_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38624,9 +38605,9 @@ uae_u32 REGPARAM2 op_4058_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEGX_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -38641,9 +38622,9 @@ uae_u32 REGPARAM2 op_4060_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEGX_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38657,9 +38638,9 @@ uae_u32 REGPARAM2 op_4068_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEGX_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38671,11 +38652,11 @@ uae_u32 REGPARAM2 op_4070_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEGX_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38688,9 +38669,9 @@ uae_u32 REGPARAM2 op_4078_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEGX_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38703,9 +38684,9 @@ uae_u32 REGPARAM2 op_4079_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEGX_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38730,9 +38711,9 @@ uae_u32 REGPARAM2 op_4090_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEGX_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38745,9 +38726,9 @@ uae_u32 REGPARAM2 op_4098_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEGX_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); arm_ADD_l_ri8(srcreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -38762,9 +38743,9 @@ uae_u32 REGPARAM2 op_40a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEGX_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38778,9 +38759,9 @@ uae_u32 REGPARAM2 op_40a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEGX_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38792,11 +38773,11 @@ uae_u32 REGPARAM2 op_40b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEGX_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38809,9 +38790,9 @@ uae_u32 REGPARAM2 op_40b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEGX_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38824,9 +38805,9 @@ uae_u32 REGPARAM2 op_40b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEGX_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38870,7 +38851,7 @@ uae_u32 REGPARAM2 op_41f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int dst=dstreg+8; if(dstreg+8!=srca) mov_l_rr(dstreg+8,srca); @@ -38935,7 +38916,7 @@ uae_u32 REGPARAM2 op_41fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int dst=dstreg+8; if(dstreg+8!=srca) mov_l_rr(dstreg+8,srca); @@ -38966,7 +38947,7 @@ uae_u32 REGPARAM2 op_4210_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -38981,7 +38962,7 @@ uae_u32 REGPARAM2 op_4218_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -38998,7 +38979,7 @@ uae_u32 REGPARAM2 op_4220_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39014,7 +38995,7 @@ uae_u32 REGPARAM2 op_4228_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39026,11 +39007,11 @@ uae_u32 REGPARAM2 op_4230_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; dont_care_flags(); jnf_CLR_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39045,7 +39026,7 @@ uae_u32 REGPARAM2 op_4238_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39060,7 +39041,7 @@ uae_u32 REGPARAM2 op_4239_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39088,7 +39069,7 @@ uae_u32 REGPARAM2 op_4250_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39103,7 +39084,7 @@ uae_u32 REGPARAM2 op_4258_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -39120,7 +39101,7 @@ uae_u32 REGPARAM2 op_4260_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39136,7 +39117,7 @@ uae_u32 REGPARAM2 op_4268_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39148,11 +39129,11 @@ uae_u32 REGPARAM2 op_4270_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; dont_care_flags(); jnf_CLR_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39167,7 +39148,7 @@ uae_u32 REGPARAM2 op_4278_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39182,7 +39163,7 @@ uae_u32 REGPARAM2 op_4279_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39210,7 +39191,7 @@ uae_u32 REGPARAM2 op_4290_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39225,7 +39206,7 @@ uae_u32 REGPARAM2 op_4298_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); arm_ADD_l_ri8(srcreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -39242,7 +39223,7 @@ uae_u32 REGPARAM2 op_42a0_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39258,7 +39239,7 @@ uae_u32 REGPARAM2 op_42a8_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39270,11 +39251,11 @@ uae_u32 REGPARAM2 op_42b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; dont_care_flags(); jnf_CLR_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39289,7 +39270,7 @@ uae_u32 REGPARAM2 op_42b8_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39304,7 +39285,7 @@ uae_u32 REGPARAM2 op_42b9_0_comp_nf(uae_u32 opcode) int src=scratchie++; dont_care_flags(); jnf_CLR_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39332,9 +39313,9 @@ uae_u32 REGPARAM2 op_4410_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEG_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39347,9 +39328,9 @@ uae_u32 REGPARAM2 op_4418_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEG_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -39364,9 +39345,9 @@ uae_u32 REGPARAM2 op_4420_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEG_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39380,9 +39361,9 @@ uae_u32 REGPARAM2 op_4428_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEG_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39394,11 +39375,11 @@ uae_u32 REGPARAM2 op_4430_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEG_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39411,9 +39392,9 @@ uae_u32 REGPARAM2 op_4438_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEG_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39426,9 +39407,9 @@ uae_u32 REGPARAM2 op_4439_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); jnf_NEG_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39453,9 +39434,9 @@ uae_u32 REGPARAM2 op_4450_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEG_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39468,9 +39449,9 @@ uae_u32 REGPARAM2 op_4458_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEG_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -39485,9 +39466,9 @@ uae_u32 REGPARAM2 op_4460_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEG_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39501,9 +39482,9 @@ uae_u32 REGPARAM2 op_4468_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEG_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39515,11 +39496,11 @@ uae_u32 REGPARAM2 op_4470_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEG_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39532,9 +39513,9 @@ uae_u32 REGPARAM2 op_4478_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEG_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39547,9 +39528,9 @@ uae_u32 REGPARAM2 op_4479_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_NEG_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39574,9 +39555,9 @@ uae_u32 REGPARAM2 op_4490_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEG_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39589,9 +39570,9 @@ uae_u32 REGPARAM2 op_4498_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEG_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); arm_ADD_l_ri8(srcreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -39606,9 +39587,9 @@ uae_u32 REGPARAM2 op_44a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEG_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39622,9 +39603,9 @@ uae_u32 REGPARAM2 op_44a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEG_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39636,11 +39617,11 @@ uae_u32 REGPARAM2 op_44b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEG_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39653,9 +39634,9 @@ uae_u32 REGPARAM2 op_44b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEG_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39668,9 +39649,9 @@ uae_u32 REGPARAM2 op_44b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); jnf_NEG_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39696,10 +39677,10 @@ uae_u32 REGPARAM2 op_4610_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jnf_NOT_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39712,10 +39693,10 @@ uae_u32 REGPARAM2 op_4618_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jnf_NOT_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -39730,10 +39711,10 @@ uae_u32 REGPARAM2 op_4620_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jnf_NOT_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39747,10 +39728,10 @@ uae_u32 REGPARAM2 op_4628_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jnf_NOT_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39762,12 +39743,12 @@ uae_u32 REGPARAM2 op_4630_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jnf_NOT_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39780,10 +39761,10 @@ uae_u32 REGPARAM2 op_4638_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jnf_NOT_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39796,10 +39777,10 @@ uae_u32 REGPARAM2 op_4639_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); jnf_NOT_b(src); - writebyte(srca,src,scratchie); + writebyte(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39825,10 +39806,10 @@ uae_u32 REGPARAM2 op_4650_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jnf_NOT_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39841,10 +39822,10 @@ uae_u32 REGPARAM2 op_4658_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jnf_NOT_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -39859,10 +39840,10 @@ uae_u32 REGPARAM2 op_4660_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jnf_NOT_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39876,10 +39857,10 @@ uae_u32 REGPARAM2 op_4668_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jnf_NOT_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39891,12 +39872,12 @@ uae_u32 REGPARAM2 op_4670_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jnf_NOT_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39909,10 +39890,10 @@ uae_u32 REGPARAM2 op_4678_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jnf_NOT_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39925,10 +39906,10 @@ uae_u32 REGPARAM2 op_4679_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); jnf_NOT_w(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39954,10 +39935,10 @@ uae_u32 REGPARAM2 op_4690_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jnf_NOT_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -39970,10 +39951,10 @@ uae_u32 REGPARAM2 op_4698_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jnf_NOT_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); arm_ADD_l_ri8(srcreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -39988,10 +39969,10 @@ uae_u32 REGPARAM2 op_46a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jnf_NOT_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40005,10 +39986,10 @@ uae_u32 REGPARAM2 op_46a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jnf_NOT_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40020,12 +40001,12 @@ uae_u32 REGPARAM2 op_46b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jnf_NOT_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40038,10 +40019,10 @@ uae_u32 REGPARAM2 op_46b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jnf_NOT_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40054,10 +40035,10 @@ uae_u32 REGPARAM2 op_46b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); jnf_NOT_l(src); - writelong(srca,src,scratchie); + writelong(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40072,7 +40053,7 @@ uae_u32 REGPARAM2 op_4808_0_comp_nf(uae_u32 opcode) int offs = scratchie++; mov_l_ri(offs,comp_get_ilong((m68k_pc_offset+=4)-4)); sub_l_ri(15,4); - writelong_clobber(15,src,scratchie); + writelong_clobber(15,src); mov_l_rr(src,15); arm_ADD_l(15,offs); if(srcreg+8!=src) @@ -40109,7 +40090,7 @@ if (srcreg==7) dodgy=1; arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40128,7 +40109,7 @@ if (srcreg==7) dodgy=1; arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40142,12 +40123,12 @@ uae_u32 REGPARAM2 op_4870_0_comp_nf(uae_u32 opcode) int dodgy=0; if (srcreg==7) dodgy=1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); { int dsta=dodgy?scratchie++:7+8; arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40164,7 +40145,7 @@ uae_u32 REGPARAM2 op_4878_0_comp_nf(uae_u32 opcode) arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40181,7 +40162,7 @@ uae_u32 REGPARAM2 op_4879_0_comp_nf(uae_u32 opcode) arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40200,7 +40181,7 @@ uae_u32 REGPARAM2 op_487a_0_comp_nf(uae_u32 opcode) arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40215,12 +40196,12 @@ uae_u32 REGPARAM2 op_487b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; { mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); { int dsta=dodgy?scratchie++:7+8; arm_SUB_l_ri8(7+8,4); if (dodgy) mov_l_rr(dsta,8+7); - writelong(dsta,srca,scratchie); + writelong(dsta,srca); }} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -40251,7 +40232,7 @@ uae_u32 REGPARAM2 op_4890_0_comp_nf(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -40261,7 +40242,7 @@ uae_u32 REGPARAM2 op_4890_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -40282,7 +40263,7 @@ uae_u32 REGPARAM2 op_48a0_0_comp_nf(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { offset-=2; @@ -40293,7 +40274,7 @@ uae_u32 REGPARAM2 op_48a0_0_comp_nf(uae_u32 opcode) for (i=0;i<16;i++) { if ((mask>>i)&1) { arm_SUB_l_ri8(srca,2); - writeword(srca,15-i,scratchie); + writeword(srca,15-i); } } mov_l_rr(8+dstreg,srca); } @@ -40315,7 +40296,7 @@ uae_u32 REGPARAM2 op_48a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -40325,7 +40306,7 @@ uae_u32 REGPARAM2 op_48a8_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -40345,9 +40326,9 @@ uae_u32 REGPARAM2 op_48b0_0_comp_nf(uae_u32 opcode) int tmp=scratchie++; signed char offset=0; int srca=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -40357,7 +40338,7 @@ uae_u32 REGPARAM2 op_48b0_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -40378,7 +40359,7 @@ uae_u32 REGPARAM2 op_48b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -40388,7 +40369,7 @@ uae_u32 REGPARAM2 op_48b8_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -40409,7 +40390,7 @@ uae_u32 REGPARAM2 op_48b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_w(native,i,offset); @@ -40419,7 +40400,7 @@ uae_u32 REGPARAM2 op_48b9_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writeword(tmp,i,scratchie); + writeword(tmp,i); arm_ADD_l_ri8(tmp,2); } } } @@ -40453,7 +40434,7 @@ uae_u32 REGPARAM2 op_48d0_0_comp_nf(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -40463,7 +40444,7 @@ uae_u32 REGPARAM2 op_48d0_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -40484,7 +40465,7 @@ uae_u32 REGPARAM2 op_48e0_0_comp_nf(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { offset-=4; @@ -40495,7 +40476,7 @@ uae_u32 REGPARAM2 op_48e0_0_comp_nf(uae_u32 opcode) for (i=0;i<16;i++) { if ((mask>>i)&1) { arm_SUB_l_ri8(srca,4); - writelong(srca,15-i,scratchie); + writelong(srca,15-i); } } mov_l_rr(8+dstreg,srca); } @@ -40517,7 +40498,7 @@ uae_u32 REGPARAM2 op_48e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -40527,7 +40508,7 @@ uae_u32 REGPARAM2 op_48e8_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -40547,9 +40528,9 @@ uae_u32 REGPARAM2 op_48f0_0_comp_nf(uae_u32 opcode) int tmp=scratchie++; signed char offset=0; int srca=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -40559,7 +40540,7 @@ uae_u32 REGPARAM2 op_48f0_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -40580,7 +40561,7 @@ uae_u32 REGPARAM2 op_48f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -40590,7 +40571,7 @@ uae_u32 REGPARAM2 op_48f8_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -40611,7 +40592,7 @@ uae_u32 REGPARAM2 op_48f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMLE_l(native,i,offset); @@ -40621,7 +40602,7 @@ uae_u32 REGPARAM2 op_48f9_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - writelong(tmp,i,scratchie); + writelong(tmp,i); arm_ADD_l_ri8(tmp,4); } } } @@ -40662,7 +40643,7 @@ uae_u32 REGPARAM2 op_4a10_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40676,7 +40657,7 @@ uae_u32 REGPARAM2 op_4a18_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -40692,7 +40673,7 @@ uae_u32 REGPARAM2 op_4a20_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40707,7 +40688,7 @@ uae_u32 REGPARAM2 op_4a28_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40720,9 +40701,9 @@ uae_u32 REGPARAM2 op_4a30_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40736,7 +40717,7 @@ uae_u32 REGPARAM2 op_4a38_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40750,7 +40731,7 @@ uae_u32 REGPARAM2 op_4a39_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40766,7 +40747,7 @@ uae_u32 REGPARAM2 op_4a3a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40781,9 +40762,9 @@ uae_u32 REGPARAM2 op_4a3b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40833,7 +40814,7 @@ uae_u32 REGPARAM2 op_4a50_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40847,7 +40828,7 @@ uae_u32 REGPARAM2 op_4a58_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -40863,7 +40844,7 @@ uae_u32 REGPARAM2 op_4a60_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40878,7 +40859,7 @@ uae_u32 REGPARAM2 op_4a68_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40891,9 +40872,9 @@ uae_u32 REGPARAM2 op_4a70_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40907,7 +40888,7 @@ uae_u32 REGPARAM2 op_4a78_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40921,7 +40902,7 @@ uae_u32 REGPARAM2 op_4a79_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40937,7 +40918,7 @@ uae_u32 REGPARAM2 op_4a7a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -40952,9 +40933,9 @@ uae_u32 REGPARAM2 op_4a7b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -41004,7 +40985,7 @@ uae_u32 REGPARAM2 op_4a90_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -41018,7 +40999,7 @@ uae_u32 REGPARAM2 op_4a98_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); arm_ADD_l_ri8(srcreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -41034,7 +41015,7 @@ uae_u32 REGPARAM2 op_4aa0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -41049,7 +41030,7 @@ uae_u32 REGPARAM2 op_4aa8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -41062,9 +41043,9 @@ uae_u32 REGPARAM2 op_4ab0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -41078,7 +41059,7 @@ uae_u32 REGPARAM2 op_4ab8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -41092,7 +41073,7 @@ uae_u32 REGPARAM2 op_4ab9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -41108,7 +41089,7 @@ uae_u32 REGPARAM2 op_4aba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -41123,9 +41104,9 @@ uae_u32 REGPARAM2 op_4abb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); dont_care_flags(); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -41181,7 +41162,7 @@ uae_u32 REGPARAM2 op_4c10_0_comp_nf(uae_u32 opcode) int r2=(extra>>12)&7; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -41211,7 +41192,7 @@ uae_u32 REGPARAM2 op_4c18_0_comp_nf(uae_u32 opcode) int r2=(extra>>12)&7; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (extra & 0x0400) { int r3=(extra & 7); @@ -41243,7 +41224,7 @@ uae_u32 REGPARAM2 op_4c20_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -41274,7 +41255,7 @@ uae_u32 REGPARAM2 op_4c28_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -41303,9 +41284,9 @@ uae_u32 REGPARAM2 op_4c30_0_comp_nf(uae_u32 opcode) uae_u16 extra=comp_get_iword((m68k_pc_offset+=2)-2); int r2=(extra>>12)&7; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -41335,7 +41316,7 @@ uae_u32 REGPARAM2 op_4c38_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -41365,7 +41346,7 @@ uae_u32 REGPARAM2 op_4c39_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -41398,7 +41379,7 @@ uae_u32 REGPARAM2 op_4c3a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -41430,9 +41411,9 @@ uae_u32 REGPARAM2 op_4c3b_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); if (extra & 0x0400) { int r3=(extra & 7); mov_l_rr(r3,dst); @@ -41528,7 +41509,7 @@ uae_u32 REGPARAM2 op_4c50_0_comp_nf(uae_u32 opcode) int r3=extra&7; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -41562,7 +41543,7 @@ uae_u32 REGPARAM2 op_4c58_0_comp_nf(uae_u32 opcode) int r3=extra&7; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); register_possible_exception(); if (extra & 0x0400) { @@ -41598,7 +41579,7 @@ uae_u32 REGPARAM2 op_4c60_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -41633,7 +41614,7 @@ uae_u32 REGPARAM2 op_4c68_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -41666,9 +41647,9 @@ uae_u32 REGPARAM2 op_4c70_0_comp_nf(uae_u32 opcode) int r2=(extra>>12)&7; int r3=extra&7; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -41702,7 +41683,7 @@ uae_u32 REGPARAM2 op_4c78_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -41736,7 +41717,7 @@ uae_u32 REGPARAM2 op_4c79_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -41773,7 +41754,7 @@ uae_u32 REGPARAM2 op_4c7a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(dsta,address+PC16off); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -41809,9 +41790,9 @@ uae_u32 REGPARAM2 op_4c7b_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); register_possible_exception(); if (extra & 0x0400) { FAIL(1); @@ -41873,7 +41854,7 @@ uae_u32 REGPARAM2 op_4c90_0_comp_nf(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -41884,7 +41865,7 @@ uae_u32 REGPARAM2 op_4c90_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -41905,9 +41886,10 @@ uae_u32 REGPARAM2 op_4c98_0_comp_nf(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { + if(srca != i) jnf_MVMEL_w(i,native,offset); offset+=2; } @@ -41917,7 +41899,7 @@ uae_u32 REGPARAM2 op_4c98_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -41940,7 +41922,7 @@ uae_u32 REGPARAM2 op_4ca8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -41951,7 +41933,7 @@ uae_u32 REGPARAM2 op_4ca8_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -41971,9 +41953,9 @@ uae_u32 REGPARAM2 op_4cb0_0_comp_nf(uae_u32 opcode) int i; signed char offset=0; int srca=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -41984,7 +41966,7 @@ uae_u32 REGPARAM2 op_4cb0_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -42005,7 +41987,7 @@ uae_u32 REGPARAM2 op_4cb8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -42016,7 +41998,7 @@ uae_u32 REGPARAM2 op_4cb8_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -42037,7 +42019,7 @@ uae_u32 REGPARAM2 op_4cb9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -42048,7 +42030,7 @@ uae_u32 REGPARAM2 op_4cb9_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -42072,7 +42054,7 @@ uae_u32 REGPARAM2 op_4cba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -42083,7 +42065,7 @@ uae_u32 REGPARAM2 op_4cba_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -42106,9 +42088,9 @@ uae_u32 REGPARAM2 op_4cbb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_w(i,native,offset); @@ -42119,7 +42101,7 @@ uae_u32 REGPARAM2 op_4cbb_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readword(tmp,i,scratchie); + readword(tmp,i); arm_ADD_l_ri8(tmp,2); } } @@ -42140,7 +42122,7 @@ uae_u32 REGPARAM2 op_4cd0_0_comp_nf(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -42151,7 +42133,7 @@ uae_u32 REGPARAM2 op_4cd0_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -42172,9 +42154,10 @@ uae_u32 REGPARAM2 op_4cd8_0_comp_nf(uae_u32 opcode) signed char offset=0; int srca=dstreg+8; if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { + if(srca != i) jnf_MVMEL_l(i,native,offset); offset+=4; } @@ -42184,7 +42167,7 @@ uae_u32 REGPARAM2 op_4cd8_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -42207,7 +42190,7 @@ uae_u32 REGPARAM2 op_4ce8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -42218,7 +42201,7 @@ uae_u32 REGPARAM2 op_4ce8_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -42238,9 +42221,9 @@ uae_u32 REGPARAM2 op_4cf0_0_comp_nf(uae_u32 opcode) int i; signed char offset=0; int srca=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -42251,7 +42234,7 @@ uae_u32 REGPARAM2 op_4cf0_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -42272,7 +42255,7 @@ uae_u32 REGPARAM2 op_4cf8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -42283,7 +42266,7 @@ uae_u32 REGPARAM2 op_4cf8_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -42304,7 +42287,7 @@ uae_u32 REGPARAM2 op_4cf9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -42315,7 +42298,7 @@ uae_u32 REGPARAM2 op_4cf9_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -42339,7 +42322,7 @@ uae_u32 REGPARAM2 op_4cfa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -42350,7 +42333,7 @@ uae_u32 REGPARAM2 op_4cfa_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -42373,9 +42356,9 @@ uae_u32 REGPARAM2 op_4cfb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); if (!special_mem) { - get_n_addr(srca,native,scratchie); + get_n_addr(srca,native); for (i=0;i<16;i++) { if ((mask>>i)&1) { jnf_MVMEL_l(i,native,offset); @@ -42386,7 +42369,7 @@ uae_u32 REGPARAM2 op_4cfb_0_comp_nf(uae_u32 opcode) mov_l_rr(tmp,srca); for (i=0;i<16;i++) { if ((mask>>i)&1) { - readlong(tmp,i,scratchie); + readlong(tmp,i); arm_ADD_l_ri8(tmp,4); } } @@ -42405,7 +42388,7 @@ uae_u32 REGPARAM2 op_4e50_0_comp_nf(uae_u32 opcode) int offs = scratchie++; mov_l_ri(offs,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); sub_l_ri(15,4); - writelong_clobber(15,src,scratchie); + writelong_clobber(15,src); mov_l_rr(src,15); arm_ADD_l(15,offs); if(srcreg+8!=src) @@ -42422,7 +42405,7 @@ uae_u32 REGPARAM2 op_4e58_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg+8; mov_l_rr(15,src); - readlong(15,src,scratchie); + readlong(15,src); arm_ADD_l_ri8(15,4); if(srcreg+8!=src) mov_l_rr(srcreg+8,src); @@ -42448,9 +42431,9 @@ uae_u32 REGPARAM2 op_4e74_0_comp_nf(uae_u32 opcode) mov_l_ri(offs,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); arm_ADD_l_ri8(offs,4); { int newad=scratchie++; - readlong(15,newad,scratchie); + readlong(15,newad); mov_l_mr((uintptr)®s.pc,newad); - get_n_addr_jmp(newad,PC_P,scratchie); + get_n_addr_jmp(newad,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; arm_ADD_l(15,offs); @@ -42464,9 +42447,9 @@ uae_u32 REGPARAM2 op_4e75_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int newad=scratchie++; - readlong(15,newad,scratchie); + readlong(15,newad); mov_l_mr((uintptr)®s.pc,newad); - get_n_addr_jmp(newad,PC_P,scratchie); + get_n_addr_jmp(newad,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; arm_ADD_l_ri8(15,4); @@ -42485,9 +42468,9 @@ uae_u32 REGPARAM2 op_4e90_0_comp_nf(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42506,9 +42489,9 @@ uae_u32 REGPARAM2 op_4ea8_0_comp_nf(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42522,14 +42505,14 @@ uae_u32 REGPARAM2 op_4eb0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); { uae_u32 retadd=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42547,9 +42530,9 @@ uae_u32 REGPARAM2 op_4eb8_0_comp_nf(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42567,9 +42550,9 @@ uae_u32 REGPARAM2 op_4eb9_0_comp_nf(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42589,9 +42572,9 @@ uae_u32 REGPARAM2 op_4eba_0_comp_nf(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42607,14 +42590,14 @@ uae_u32 REGPARAM2 op_4ebb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); { uae_u32 retadd=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; } if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42629,7 +42612,7 @@ uae_u32 REGPARAM2 op_4ed0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42645,7 +42628,7 @@ uae_u32 REGPARAM2 op_4ee8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42659,9 +42642,9 @@ uae_u32 REGPARAM2 op_4ef0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42676,7 +42659,7 @@ uae_u32 REGPARAM2 op_4ef8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42691,7 +42674,7 @@ uae_u32 REGPARAM2 op_4ef9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42708,7 +42691,7 @@ uae_u32 REGPARAM2 op_4efa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42724,9 +42707,9 @@ uae_u32 REGPARAM2 op_4efb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); mov_l_mr((uintptr)®s.pc,srca); - get_n_addr_jmp(srca,PC_P,scratchie); + get_n_addr_jmp(srca,PC_P); mov_l_mr((uintptr)®s.pc_oldp,PC_P); m68k_pc_offset=0; if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -42760,10 +42743,10 @@ uae_u32 REGPARAM2 op_5010_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -42779,10 +42762,10 @@ uae_u32 REGPARAM2 op_5018_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -42800,10 +42783,10 @@ uae_u32 REGPARAM2 op_5020_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -42820,10 +42803,10 @@ uae_u32 REGPARAM2 op_5028_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -42838,12 +42821,12 @@ uae_u32 REGPARAM2 op_5030_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -42859,10 +42842,10 @@ uae_u32 REGPARAM2 op_5038_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -42878,10 +42861,10 @@ uae_u32 REGPARAM2 op_5039_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -42928,10 +42911,10 @@ uae_u32 REGPARAM2 op_5050_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -42947,10 +42930,10 @@ uae_u32 REGPARAM2 op_5058_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -42968,10 +42951,10 @@ uae_u32 REGPARAM2 op_5060_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -42988,10 +42971,10 @@ uae_u32 REGPARAM2 op_5068_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43006,12 +42989,12 @@ uae_u32 REGPARAM2 op_5070_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43027,10 +43010,10 @@ uae_u32 REGPARAM2 op_5078_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43046,10 +43029,10 @@ uae_u32 REGPARAM2 op_5079_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43096,10 +43079,10 @@ uae_u32 REGPARAM2 op_5090_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43115,10 +43098,10 @@ uae_u32 REGPARAM2 op_5098_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -43136,10 +43119,10 @@ uae_u32 REGPARAM2 op_50a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43159,10 +43142,10 @@ uae_u32 REGPARAM2 op_50a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43177,12 +43160,12 @@ uae_u32 REGPARAM2 op_50b0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43198,10 +43181,10 @@ uae_u32 REGPARAM2 op_50b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43217,10 +43200,10 @@ uae_u32 REGPARAM2 op_50b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43264,7 +43247,7 @@ uae_u32 REGPARAM2 op_50d0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43278,7 +43261,7 @@ uae_u32 REGPARAM2 op_50d8_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -43294,7 +43277,7 @@ uae_u32 REGPARAM2 op_50e0_0_comp_nf(uae_u32 opcode) arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43309,7 +43292,7 @@ uae_u32 REGPARAM2 op_50e8_0_comp_nf(uae_u32 opcode) lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43321,10 +43304,10 @@ uae_u32 REGPARAM2 op_50f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43338,7 +43321,7 @@ uae_u32 REGPARAM2 op_50f8_0_comp_nf(uae_u32 opcode) mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43352,7 +43335,7 @@ uae_u32 REGPARAM2 op_50f9_0_comp_nf(uae_u32 opcode) mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int val = scratchie++; mov_b_ri(val, 0xff); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43384,10 +43367,10 @@ uae_u32 REGPARAM2 op_5110_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43403,10 +43386,10 @@ uae_u32 REGPARAM2 op_5118_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -43424,10 +43407,10 @@ uae_u32 REGPARAM2 op_5120_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43444,10 +43427,10 @@ uae_u32 REGPARAM2 op_5128_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43462,12 +43445,12 @@ uae_u32 REGPARAM2 op_5130_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43483,10 +43466,10 @@ uae_u32 REGPARAM2 op_5138_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43502,10 +43485,10 @@ uae_u32 REGPARAM2 op_5139_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43552,10 +43535,10 @@ uae_u32 REGPARAM2 op_5150_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43571,10 +43554,10 @@ uae_u32 REGPARAM2 op_5158_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -43592,10 +43575,10 @@ uae_u32 REGPARAM2 op_5160_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43612,10 +43595,10 @@ uae_u32 REGPARAM2 op_5168_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43630,12 +43613,12 @@ uae_u32 REGPARAM2 op_5170_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43651,10 +43634,10 @@ uae_u32 REGPARAM2 op_5178_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43670,10 +43653,10 @@ uae_u32 REGPARAM2 op_5179_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43720,10 +43703,10 @@ uae_u32 REGPARAM2 op_5190_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43739,10 +43722,10 @@ uae_u32 REGPARAM2 op_5198_0_comp_nf(uae_u32 opcode) mov_l_ri(src,srcreg); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -43760,10 +43743,10 @@ uae_u32 REGPARAM2 op_51a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43780,10 +43763,10 @@ uae_u32 REGPARAM2 op_51a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43798,12 +43781,12 @@ uae_u32 REGPARAM2 op_51b0_0_comp_nf(uae_u32 opcode) int src = scratchie++; mov_l_ri(src,srcreg); int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43819,10 +43802,10 @@ uae_u32 REGPARAM2 op_51b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43838,10 +43821,10 @@ uae_u32 REGPARAM2 op_51b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43890,7 +43873,7 @@ uae_u32 REGPARAM2 op_51d0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43904,7 +43887,7 @@ uae_u32 REGPARAM2 op_51d8_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -43920,7 +43903,7 @@ uae_u32 REGPARAM2 op_51e0_0_comp_nf(uae_u32 opcode) arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43935,7 +43918,7 @@ uae_u32 REGPARAM2 op_51e8_0_comp_nf(uae_u32 opcode) lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43947,10 +43930,10 @@ uae_u32 REGPARAM2 op_51f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43964,7 +43947,7 @@ uae_u32 REGPARAM2 op_51f8_0_comp_nf(uae_u32 opcode) mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -43978,7 +43961,7 @@ uae_u32 REGPARAM2 op_51f9_0_comp_nf(uae_u32 opcode) mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int val = scratchie++; mov_b_ri(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44029,7 +44012,7 @@ uae_u32 REGPARAM2 op_52d0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44044,7 +44027,7 @@ uae_u32 REGPARAM2 op_52d8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -44061,7 +44044,7 @@ uae_u32 REGPARAM2 op_52e0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44077,7 +44060,7 @@ uae_u32 REGPARAM2 op_52e8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44089,11 +44072,11 @@ uae_u32 REGPARAM2 op_52f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44108,7 +44091,7 @@ uae_u32 REGPARAM2 op_52f8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44123,7 +44106,7 @@ uae_u32 REGPARAM2 op_52f9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 8); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44174,7 +44157,7 @@ uae_u32 REGPARAM2 op_53d0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44189,7 +44172,7 @@ uae_u32 REGPARAM2 op_53d8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -44206,7 +44189,7 @@ uae_u32 REGPARAM2 op_53e0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44222,7 +44205,7 @@ uae_u32 REGPARAM2 op_53e8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44234,11 +44217,11 @@ uae_u32 REGPARAM2 op_53f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44253,7 +44236,7 @@ uae_u32 REGPARAM2 op_53f8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44268,7 +44251,7 @@ uae_u32 REGPARAM2 op_53f9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 9); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44319,7 +44302,7 @@ uae_u32 REGPARAM2 op_54d0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44334,7 +44317,7 @@ uae_u32 REGPARAM2 op_54d8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -44351,7 +44334,7 @@ uae_u32 REGPARAM2 op_54e0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44367,7 +44350,7 @@ uae_u32 REGPARAM2 op_54e8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44379,11 +44362,11 @@ uae_u32 REGPARAM2 op_54f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44398,7 +44381,7 @@ uae_u32 REGPARAM2 op_54f8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44413,7 +44396,7 @@ uae_u32 REGPARAM2 op_54f9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 3); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44464,7 +44447,7 @@ uae_u32 REGPARAM2 op_55d0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44479,7 +44462,7 @@ uae_u32 REGPARAM2 op_55d8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -44496,7 +44479,7 @@ uae_u32 REGPARAM2 op_55e0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44512,7 +44495,7 @@ uae_u32 REGPARAM2 op_55e8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44524,11 +44507,11 @@ uae_u32 REGPARAM2 op_55f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44543,7 +44526,7 @@ uae_u32 REGPARAM2 op_55f8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44558,7 +44541,7 @@ uae_u32 REGPARAM2 op_55f9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 2); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44609,7 +44592,7 @@ uae_u32 REGPARAM2 op_56d0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44624,7 +44607,7 @@ uae_u32 REGPARAM2 op_56d8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -44641,7 +44624,7 @@ uae_u32 REGPARAM2 op_56e0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44657,7 +44640,7 @@ uae_u32 REGPARAM2 op_56e8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44669,11 +44652,11 @@ uae_u32 REGPARAM2 op_56f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44688,7 +44671,7 @@ uae_u32 REGPARAM2 op_56f8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44703,7 +44686,7 @@ uae_u32 REGPARAM2 op_56f9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 1); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44754,7 +44737,7 @@ uae_u32 REGPARAM2 op_57d0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44769,7 +44752,7 @@ uae_u32 REGPARAM2 op_57d8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -44786,7 +44769,7 @@ uae_u32 REGPARAM2 op_57e0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44802,7 +44785,7 @@ uae_u32 REGPARAM2 op_57e8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44814,11 +44797,11 @@ uae_u32 REGPARAM2 op_57f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44833,7 +44816,7 @@ uae_u32 REGPARAM2 op_57f8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44848,7 +44831,7 @@ uae_u32 REGPARAM2 op_57f9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 0); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44899,7 +44882,7 @@ uae_u32 REGPARAM2 op_58d0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44914,7 +44897,7 @@ uae_u32 REGPARAM2 op_58d8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -44931,7 +44914,7 @@ uae_u32 REGPARAM2 op_58e0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44947,7 +44930,7 @@ uae_u32 REGPARAM2 op_58e8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44959,11 +44942,11 @@ uae_u32 REGPARAM2 op_58f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44978,7 +44961,7 @@ uae_u32 REGPARAM2 op_58f8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -44993,7 +44976,7 @@ uae_u32 REGPARAM2 op_58f9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 7); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45044,7 +45027,7 @@ uae_u32 REGPARAM2 op_59d0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45059,7 +45042,7 @@ uae_u32 REGPARAM2 op_59d8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -45076,7 +45059,7 @@ uae_u32 REGPARAM2 op_59e0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45092,7 +45075,7 @@ uae_u32 REGPARAM2 op_59e8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45104,11 +45087,11 @@ uae_u32 REGPARAM2 op_59f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45123,7 +45106,7 @@ uae_u32 REGPARAM2 op_59f8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45138,7 +45121,7 @@ uae_u32 REGPARAM2 op_59f9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 6); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45189,7 +45172,7 @@ uae_u32 REGPARAM2 op_5ad0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45204,7 +45187,7 @@ uae_u32 REGPARAM2 op_5ad8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -45221,7 +45204,7 @@ uae_u32 REGPARAM2 op_5ae0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45237,7 +45220,7 @@ uae_u32 REGPARAM2 op_5ae8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45249,11 +45232,11 @@ uae_u32 REGPARAM2 op_5af0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45268,7 +45251,7 @@ uae_u32 REGPARAM2 op_5af8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45283,7 +45266,7 @@ uae_u32 REGPARAM2 op_5af9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 5); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45334,7 +45317,7 @@ uae_u32 REGPARAM2 op_5bd0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45349,7 +45332,7 @@ uae_u32 REGPARAM2 op_5bd8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -45366,7 +45349,7 @@ uae_u32 REGPARAM2 op_5be0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45382,7 +45365,7 @@ uae_u32 REGPARAM2 op_5be8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45394,11 +45377,11 @@ uae_u32 REGPARAM2 op_5bf0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45413,7 +45396,7 @@ uae_u32 REGPARAM2 op_5bf8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45428,7 +45411,7 @@ uae_u32 REGPARAM2 op_5bf9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 4); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45479,7 +45462,7 @@ uae_u32 REGPARAM2 op_5cd0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45494,7 +45477,7 @@ uae_u32 REGPARAM2 op_5cd8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -45511,7 +45494,7 @@ uae_u32 REGPARAM2 op_5ce0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45527,7 +45510,7 @@ uae_u32 REGPARAM2 op_5ce8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45539,11 +45522,11 @@ uae_u32 REGPARAM2 op_5cf0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45558,7 +45541,7 @@ uae_u32 REGPARAM2 op_5cf8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45573,7 +45556,7 @@ uae_u32 REGPARAM2 op_5cf9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 10); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45624,7 +45607,7 @@ uae_u32 REGPARAM2 op_5dd0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45639,7 +45622,7 @@ uae_u32 REGPARAM2 op_5dd8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -45656,7 +45639,7 @@ uae_u32 REGPARAM2 op_5de0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45672,7 +45655,7 @@ uae_u32 REGPARAM2 op_5de8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45684,11 +45667,11 @@ uae_u32 REGPARAM2 op_5df0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45703,7 +45686,7 @@ uae_u32 REGPARAM2 op_5df8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45718,7 +45701,7 @@ uae_u32 REGPARAM2 op_5df9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 11); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45769,7 +45752,7 @@ uae_u32 REGPARAM2 op_5ed0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45784,7 +45767,7 @@ uae_u32 REGPARAM2 op_5ed8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -45801,7 +45784,7 @@ uae_u32 REGPARAM2 op_5ee0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45817,7 +45800,7 @@ uae_u32 REGPARAM2 op_5ee8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45829,11 +45812,11 @@ uae_u32 REGPARAM2 op_5ef0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45848,7 +45831,7 @@ uae_u32 REGPARAM2 op_5ef8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45863,7 +45846,7 @@ uae_u32 REGPARAM2 op_5ef9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 12); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45914,7 +45897,7 @@ uae_u32 REGPARAM2 op_5fd0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45929,7 +45912,7 @@ uae_u32 REGPARAM2 op_5fd8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -45946,7 +45929,7 @@ uae_u32 REGPARAM2 op_5fe0_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45962,7 +45945,7 @@ uae_u32 REGPARAM2 op_5fe8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45974,11 +45957,11 @@ uae_u32 REGPARAM2 op_5ff0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -45993,7 +45976,7 @@ uae_u32 REGPARAM2 op_5ff8_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -46008,7 +45991,7 @@ uae_u32 REGPARAM2 op_5ff9_0_comp_nf(uae_u32 opcode) int val = scratchie++; make_flags_live(); jnf_SCC(val, 13); - writebyte(srca,val,scratchie); + writebyte(srca,val); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -46085,7 +46068,7 @@ uae_u32 REGPARAM2 op_6100_0_comp_nf(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); arm_ADD_l_ri(src,m68k_pc_offset_thisinst+2); m68k_pc_offset=0; arm_ADD_l(PC_P,src); @@ -46106,7 +46089,7 @@ uae_u32 REGPARAM2 op_6101_0_comp_nf(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); arm_ADD_l_ri(src,m68k_pc_offset_thisinst+2); m68k_pc_offset=0; arm_ADD_l(PC_P,src); @@ -46126,7 +46109,7 @@ uae_u32 REGPARAM2 op_61ff_0_comp_nf(uae_u32 opcode) int ret=scratchie++; mov_l_ri(ret,retadd); sub_l_ri(15,4); - writelong_clobber(15,ret,scratchie); + writelong_clobber(15,ret); arm_ADD_l_ri(src,m68k_pc_offset_thisinst+2); m68k_pc_offset=0; arm_ADD_l(PC_P,src); @@ -46982,7 +46965,7 @@ uae_u32 REGPARAM2 op_8010_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_b(dst,src); @@ -46999,7 +46982,7 @@ uae_u32 REGPARAM2 op_8018_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -47018,7 +47001,7 @@ uae_u32 REGPARAM2 op_8020_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_b(dst,src); @@ -47036,7 +47019,7 @@ uae_u32 REGPARAM2 op_8028_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_b(dst,src); @@ -47052,9 +47035,9 @@ uae_u32 REGPARAM2 op_8030_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_b(dst,src); @@ -47071,7 +47054,7 @@ uae_u32 REGPARAM2 op_8038_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_b(dst,src); @@ -47088,7 +47071,7 @@ uae_u32 REGPARAM2 op_8039_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_b(dst,src); @@ -47107,7 +47090,7 @@ uae_u32 REGPARAM2 op_803a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_b(dst,src); @@ -47125,9 +47108,9 @@ uae_u32 REGPARAM2 op_803b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_b(dst,src); @@ -47174,7 +47157,7 @@ uae_u32 REGPARAM2 op_8050_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_w(dst,src); @@ -47191,7 +47174,7 @@ uae_u32 REGPARAM2 op_8058_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -47210,7 +47193,7 @@ uae_u32 REGPARAM2 op_8060_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_w(dst,src); @@ -47228,7 +47211,7 @@ uae_u32 REGPARAM2 op_8068_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_w(dst,src); @@ -47244,9 +47227,9 @@ uae_u32 REGPARAM2 op_8070_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_w(dst,src); @@ -47263,7 +47246,7 @@ uae_u32 REGPARAM2 op_8078_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_w(dst,src); @@ -47280,7 +47263,7 @@ uae_u32 REGPARAM2 op_8079_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_w(dst,src); @@ -47299,7 +47282,7 @@ uae_u32 REGPARAM2 op_807a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_w(dst,src); @@ -47317,9 +47300,9 @@ uae_u32 REGPARAM2 op_807b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_w(dst,src); @@ -47366,7 +47349,7 @@ uae_u32 REGPARAM2 op_8090_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_l(dst,src); @@ -47383,7 +47366,7 @@ uae_u32 REGPARAM2 op_8098_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -47402,7 +47385,7 @@ uae_u32 REGPARAM2 op_80a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_l(dst,src); @@ -47420,7 +47403,7 @@ uae_u32 REGPARAM2 op_80a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_l(dst,src); @@ -47436,9 +47419,9 @@ uae_u32 REGPARAM2 op_80b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_l(dst,src); @@ -47455,7 +47438,7 @@ uae_u32 REGPARAM2 op_80b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_l(dst,src); @@ -47472,7 +47455,7 @@ uae_u32 REGPARAM2 op_80b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_l(dst,src); @@ -47491,7 +47474,7 @@ uae_u32 REGPARAM2 op_80ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_l(dst,src); @@ -47509,9 +47492,9 @@ uae_u32 REGPARAM2 op_80bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_OR_l(dst,src); @@ -47569,7 +47552,7 @@ uae_u32 REGPARAM2 op_80d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVU(dst,src); @@ -47592,7 +47575,7 @@ uae_u32 REGPARAM2 op_80d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; register_possible_exception(); @@ -47617,7 +47600,7 @@ uae_u32 REGPARAM2 op_80e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVU(dst,src); @@ -47641,7 +47624,7 @@ uae_u32 REGPARAM2 op_80e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVU(dst,src); @@ -47663,9 +47646,9 @@ uae_u32 REGPARAM2 op_80f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVU(dst,src); @@ -47688,7 +47671,7 @@ uae_u32 REGPARAM2 op_80f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVU(dst,src); @@ -47711,7 +47694,7 @@ uae_u32 REGPARAM2 op_80f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVU(dst,src); @@ -47736,7 +47719,7 @@ uae_u32 REGPARAM2 op_80fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVU(dst,src); @@ -47760,9 +47743,9 @@ uae_u32 REGPARAM2 op_80fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVU(dst,src); @@ -47802,10 +47785,10 @@ uae_u32 REGPARAM2 op_8110_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -47820,10 +47803,10 @@ uae_u32 REGPARAM2 op_8118_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -47840,10 +47823,10 @@ uae_u32 REGPARAM2 op_8120_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -47859,10 +47842,10 @@ uae_u32 REGPARAM2 op_8128_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -47876,12 +47859,12 @@ uae_u32 REGPARAM2 op_8130_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -47896,10 +47879,10 @@ uae_u32 REGPARAM2 op_8138_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -47914,10 +47897,10 @@ uae_u32 REGPARAM2 op_8139_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_OR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -47932,10 +47915,10 @@ uae_u32 REGPARAM2 op_8150_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -47950,10 +47933,10 @@ uae_u32 REGPARAM2 op_8158_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -47970,10 +47953,10 @@ uae_u32 REGPARAM2 op_8160_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -47989,10 +47972,10 @@ uae_u32 REGPARAM2 op_8168_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48006,12 +47989,12 @@ uae_u32 REGPARAM2 op_8170_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48026,10 +48009,10 @@ uae_u32 REGPARAM2 op_8178_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48044,10 +48027,10 @@ uae_u32 REGPARAM2 op_8179_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_OR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48062,10 +48045,10 @@ uae_u32 REGPARAM2 op_8190_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48080,10 +48063,10 @@ uae_u32 REGPARAM2 op_8198_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -48100,10 +48083,10 @@ uae_u32 REGPARAM2 op_81a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48119,10 +48102,10 @@ uae_u32 REGPARAM2 op_81a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48136,12 +48119,12 @@ uae_u32 REGPARAM2 op_81b0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48156,10 +48139,10 @@ uae_u32 REGPARAM2 op_81b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48174,10 +48157,10 @@ uae_u32 REGPARAM2 op_81b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_OR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -48217,7 +48200,7 @@ uae_u32 REGPARAM2 op_81d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVS(dst,src); @@ -48240,7 +48223,7 @@ uae_u32 REGPARAM2 op_81d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; register_possible_exception(); @@ -48265,7 +48248,7 @@ uae_u32 REGPARAM2 op_81e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVS(dst,src); @@ -48289,7 +48272,7 @@ uae_u32 REGPARAM2 op_81e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVS(dst,src); @@ -48311,9 +48294,9 @@ uae_u32 REGPARAM2 op_81f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVS(dst,src); @@ -48336,7 +48319,7 @@ uae_u32 REGPARAM2 op_81f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVS(dst,src); @@ -48359,7 +48342,7 @@ uae_u32 REGPARAM2 op_81f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVS(dst,src); @@ -48384,7 +48367,7 @@ uae_u32 REGPARAM2 op_81fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVS(dst,src); @@ -48408,9 +48391,9 @@ uae_u32 REGPARAM2 op_81fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; register_possible_exception(); jnf_DIVS(dst,src); @@ -48464,7 +48447,7 @@ uae_u32 REGPARAM2 op_9010_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_b(dst,src); @@ -48481,7 +48464,7 @@ uae_u32 REGPARAM2 op_9018_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -48500,7 +48483,7 @@ uae_u32 REGPARAM2 op_9020_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_b(dst,src); @@ -48518,7 +48501,7 @@ uae_u32 REGPARAM2 op_9028_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_b(dst,src); @@ -48534,9 +48517,9 @@ uae_u32 REGPARAM2 op_9030_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_b(dst,src); @@ -48553,7 +48536,7 @@ uae_u32 REGPARAM2 op_9038_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_b(dst,src); @@ -48570,7 +48553,7 @@ uae_u32 REGPARAM2 op_9039_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_b(dst,src); @@ -48589,7 +48572,7 @@ uae_u32 REGPARAM2 op_903a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_b(dst,src); @@ -48607,9 +48590,9 @@ uae_u32 REGPARAM2 op_903b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_b(dst,src); @@ -48671,7 +48654,7 @@ uae_u32 REGPARAM2 op_9050_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_w(dst,src); @@ -48688,7 +48671,7 @@ uae_u32 REGPARAM2 op_9058_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -48707,7 +48690,7 @@ uae_u32 REGPARAM2 op_9060_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_w(dst,src); @@ -48725,7 +48708,7 @@ uae_u32 REGPARAM2 op_9068_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_w(dst,src); @@ -48741,9 +48724,9 @@ uae_u32 REGPARAM2 op_9070_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_w(dst,src); @@ -48760,7 +48743,7 @@ uae_u32 REGPARAM2 op_9078_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_w(dst,src); @@ -48777,7 +48760,7 @@ uae_u32 REGPARAM2 op_9079_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_w(dst,src); @@ -48796,7 +48779,7 @@ uae_u32 REGPARAM2 op_907a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_w(dst,src); @@ -48814,9 +48797,9 @@ uae_u32 REGPARAM2 op_907b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_w(dst,src); @@ -48878,7 +48861,7 @@ uae_u32 REGPARAM2 op_9090_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_l(dst,src); @@ -48895,7 +48878,7 @@ uae_u32 REGPARAM2 op_9098_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -48914,7 +48897,7 @@ uae_u32 REGPARAM2 op_90a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_l(dst,src); @@ -48932,7 +48915,7 @@ uae_u32 REGPARAM2 op_90a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_l(dst,src); @@ -48948,9 +48931,9 @@ uae_u32 REGPARAM2 op_90b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_l(dst,src); @@ -48967,7 +48950,7 @@ uae_u32 REGPARAM2 op_90b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_l(dst,src); @@ -48984,7 +48967,7 @@ uae_u32 REGPARAM2 op_90b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_l(dst,src); @@ -49003,7 +48986,7 @@ uae_u32 REGPARAM2 op_90ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_l(dst,src); @@ -49021,9 +49004,9 @@ uae_u32 REGPARAM2 op_90bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_SUB_l(dst,src); @@ -49083,7 +49066,7 @@ uae_u32 REGPARAM2 op_90d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49099,7 +49082,7 @@ uae_u32 REGPARAM2 op_90d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg+8; jnf_SUBA_w(dst, src); @@ -49117,7 +49100,7 @@ uae_u32 REGPARAM2 op_90e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49134,7 +49117,7 @@ uae_u32 REGPARAM2 op_90e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49149,9 +49132,9 @@ uae_u32 REGPARAM2 op_90f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49167,7 +49150,7 @@ uae_u32 REGPARAM2 op_90f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49183,7 +49166,7 @@ uae_u32 REGPARAM2 op_90f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49201,7 +49184,7 @@ uae_u32 REGPARAM2 op_90fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49218,9 +49201,9 @@ uae_u32 REGPARAM2 op_90fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_SUBA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49266,14 +49249,14 @@ uae_u32 REGPARAM2 op_9108_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUBX_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49288,10 +49271,10 @@ uae_u32 REGPARAM2 op_9110_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49306,10 +49289,10 @@ uae_u32 REGPARAM2 op_9118_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -49326,10 +49309,10 @@ uae_u32 REGPARAM2 op_9120_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49345,10 +49328,10 @@ uae_u32 REGPARAM2 op_9128_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49362,12 +49345,12 @@ uae_u32 REGPARAM2 op_9130_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49382,10 +49365,10 @@ uae_u32 REGPARAM2 op_9138_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49400,10 +49383,10 @@ uae_u32 REGPARAM2 op_9139_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_SUB_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49433,14 +49416,14 @@ uae_u32 REGPARAM2 op_9148_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUBX_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49455,10 +49438,10 @@ uae_u32 REGPARAM2 op_9150_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49473,10 +49456,10 @@ uae_u32 REGPARAM2 op_9158_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -49493,10 +49476,10 @@ uae_u32 REGPARAM2 op_9160_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49512,10 +49495,10 @@ uae_u32 REGPARAM2 op_9168_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49529,12 +49512,12 @@ uae_u32 REGPARAM2 op_9170_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49549,10 +49532,10 @@ uae_u32 REGPARAM2 op_9178_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49567,10 +49550,10 @@ uae_u32 REGPARAM2 op_9179_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_SUB_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49600,14 +49583,14 @@ uae_u32 REGPARAM2 op_9188_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUBX_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49622,10 +49605,10 @@ uae_u32 REGPARAM2 op_9190_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49640,10 +49623,10 @@ uae_u32 REGPARAM2 op_9198_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -49660,10 +49643,10 @@ uae_u32 REGPARAM2 op_91a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49679,10 +49662,10 @@ uae_u32 REGPARAM2 op_91a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49696,12 +49679,12 @@ uae_u32 REGPARAM2 op_91b0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49716,10 +49699,10 @@ uae_u32 REGPARAM2 op_91b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49734,10 +49717,10 @@ uae_u32 REGPARAM2 op_91b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_SUB_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -49779,7 +49762,7 @@ uae_u32 REGPARAM2 op_91d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49795,7 +49778,7 @@ uae_u32 REGPARAM2 op_91d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg+8; jnf_SUBA_l(dst, src); @@ -49813,7 +49796,7 @@ uae_u32 REGPARAM2 op_91e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49830,7 +49813,7 @@ uae_u32 REGPARAM2 op_91e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49845,9 +49828,9 @@ uae_u32 REGPARAM2 op_91f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49863,7 +49846,7 @@ uae_u32 REGPARAM2 op_91f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49879,7 +49862,7 @@ uae_u32 REGPARAM2 op_91f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49897,7 +49880,7 @@ uae_u32 REGPARAM2 op_91fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49914,9 +49897,9 @@ uae_u32 REGPARAM2 op_91fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_SUBA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -49961,7 +49944,7 @@ uae_u32 REGPARAM2 op_b010_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -49978,7 +49961,7 @@ uae_u32 REGPARAM2 op_b018_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -49997,7 +49980,7 @@ uae_u32 REGPARAM2 op_b020_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50015,7 +49998,7 @@ uae_u32 REGPARAM2 op_b028_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50031,9 +50014,9 @@ uae_u32 REGPARAM2 op_b030_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50050,7 +50033,7 @@ uae_u32 REGPARAM2 op_b038_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50067,7 +50050,7 @@ uae_u32 REGPARAM2 op_b039_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50086,7 +50069,7 @@ uae_u32 REGPARAM2 op_b03a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50104,9 +50087,9 @@ uae_u32 REGPARAM2 op_b03b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50168,7 +50151,7 @@ uae_u32 REGPARAM2 op_b050_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50185,7 +50168,7 @@ uae_u32 REGPARAM2 op_b058_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -50204,7 +50187,7 @@ uae_u32 REGPARAM2 op_b060_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50222,7 +50205,7 @@ uae_u32 REGPARAM2 op_b068_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50238,9 +50221,9 @@ uae_u32 REGPARAM2 op_b070_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50257,7 +50240,7 @@ uae_u32 REGPARAM2 op_b078_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50274,7 +50257,7 @@ uae_u32 REGPARAM2 op_b079_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50293,7 +50276,7 @@ uae_u32 REGPARAM2 op_b07a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50311,9 +50294,9 @@ uae_u32 REGPARAM2 op_b07b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50375,7 +50358,7 @@ uae_u32 REGPARAM2 op_b090_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50392,7 +50375,7 @@ uae_u32 REGPARAM2 op_b098_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -50411,7 +50394,7 @@ uae_u32 REGPARAM2 op_b0a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50432,7 +50415,7 @@ uae_u32 REGPARAM2 op_b0a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50448,9 +50431,9 @@ uae_u32 REGPARAM2 op_b0b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50467,7 +50450,7 @@ uae_u32 REGPARAM2 op_b0b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50484,7 +50467,7 @@ uae_u32 REGPARAM2 op_b0b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50503,7 +50486,7 @@ uae_u32 REGPARAM2 op_b0ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50521,9 +50504,9 @@ uae_u32 REGPARAM2 op_b0bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50585,7 +50568,7 @@ uae_u32 REGPARAM2 op_b0d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50602,7 +50585,7 @@ uae_u32 REGPARAM2 op_b0d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg+8; dont_care_flags(); @@ -50621,7 +50604,7 @@ uae_u32 REGPARAM2 op_b0e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50639,7 +50622,7 @@ uae_u32 REGPARAM2 op_b0e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50655,9 +50638,9 @@ uae_u32 REGPARAM2 op_b0f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50674,7 +50657,7 @@ uae_u32 REGPARAM2 op_b0f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50691,7 +50674,7 @@ uae_u32 REGPARAM2 op_b0f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50710,7 +50693,7 @@ uae_u32 REGPARAM2 op_b0fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50728,9 +50711,9 @@ uae_u32 REGPARAM2 op_b0fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -50777,11 +50760,11 @@ uae_u32 REGPARAM2 op_b108_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); @@ -50799,10 +50782,10 @@ uae_u32 REGPARAM2 op_b110_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -50817,10 +50800,10 @@ uae_u32 REGPARAM2 op_b118_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -50837,10 +50820,10 @@ uae_u32 REGPARAM2 op_b120_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -50856,10 +50839,10 @@ uae_u32 REGPARAM2 op_b128_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -50873,12 +50856,12 @@ uae_u32 REGPARAM2 op_b130_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -50893,10 +50876,10 @@ uae_u32 REGPARAM2 op_b138_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -50911,10 +50894,10 @@ uae_u32 REGPARAM2 op_b139_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_EOR_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -50943,11 +50926,11 @@ uae_u32 REGPARAM2 op_b148_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ arm_ADD_l_ri8(dstreg+8,2); @@ -50965,10 +50948,10 @@ uae_u32 REGPARAM2 op_b150_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -50983,10 +50966,10 @@ uae_u32 REGPARAM2 op_b158_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -51003,10 +50986,10 @@ uae_u32 REGPARAM2 op_b160_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51022,10 +51005,10 @@ uae_u32 REGPARAM2 op_b168_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51039,12 +51022,12 @@ uae_u32 REGPARAM2 op_b170_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51059,10 +51042,10 @@ uae_u32 REGPARAM2 op_b178_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51077,10 +51060,10 @@ uae_u32 REGPARAM2 op_b179_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_EOR_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51109,11 +51092,11 @@ uae_u32 REGPARAM2 op_b188_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); /* Weird --- CMP with noflags ;-) */ arm_ADD_l_ri8(dstreg+8,4); @@ -51131,10 +51114,10 @@ uae_u32 REGPARAM2 op_b190_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51149,10 +51132,10 @@ uae_u32 REGPARAM2 op_b198_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -51169,10 +51152,10 @@ uae_u32 REGPARAM2 op_b1a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51188,10 +51171,10 @@ uae_u32 REGPARAM2 op_b1a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51205,12 +51188,12 @@ uae_u32 REGPARAM2 op_b1b0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51225,10 +51208,10 @@ uae_u32 REGPARAM2 op_b1b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51243,10 +51226,10 @@ uae_u32 REGPARAM2 op_b1b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_EOR_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -51290,7 +51273,7 @@ uae_u32 REGPARAM2 op_b1d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -51307,7 +51290,7 @@ uae_u32 REGPARAM2 op_b1d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg+8; dont_care_flags(); @@ -51326,7 +51309,7 @@ uae_u32 REGPARAM2 op_b1e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -51344,7 +51327,7 @@ uae_u32 REGPARAM2 op_b1e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -51360,9 +51343,9 @@ uae_u32 REGPARAM2 op_b1f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -51379,7 +51362,7 @@ uae_u32 REGPARAM2 op_b1f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -51396,7 +51379,7 @@ uae_u32 REGPARAM2 op_b1f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -51415,7 +51398,7 @@ uae_u32 REGPARAM2 op_b1fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -51433,9 +51416,9 @@ uae_u32 REGPARAM2 op_b1fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; dont_care_flags(); /* Weird --- CMP with noflags ;-) */ @@ -51482,7 +51465,7 @@ uae_u32 REGPARAM2 op_c010_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_b(dst,src); @@ -51499,7 +51482,7 @@ uae_u32 REGPARAM2 op_c018_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -51518,7 +51501,7 @@ uae_u32 REGPARAM2 op_c020_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_b(dst,src); @@ -51536,7 +51519,7 @@ uae_u32 REGPARAM2 op_c028_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_b(dst,src); @@ -51552,9 +51535,9 @@ uae_u32 REGPARAM2 op_c030_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_b(dst,src); @@ -51571,7 +51554,7 @@ uae_u32 REGPARAM2 op_c038_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_b(dst,src); @@ -51588,7 +51571,7 @@ uae_u32 REGPARAM2 op_c039_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_b(dst,src); @@ -51607,7 +51590,7 @@ uae_u32 REGPARAM2 op_c03a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_b(dst,src); @@ -51625,9 +51608,9 @@ uae_u32 REGPARAM2 op_c03b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_b(dst,src); @@ -51674,7 +51657,7 @@ uae_u32 REGPARAM2 op_c050_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_w(dst,src); @@ -51691,7 +51674,7 @@ uae_u32 REGPARAM2 op_c058_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -51710,7 +51693,7 @@ uae_u32 REGPARAM2 op_c060_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_w(dst,src); @@ -51728,7 +51711,7 @@ uae_u32 REGPARAM2 op_c068_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_w(dst,src); @@ -51744,9 +51727,9 @@ uae_u32 REGPARAM2 op_c070_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_w(dst,src); @@ -51763,7 +51746,7 @@ uae_u32 REGPARAM2 op_c078_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_w(dst,src); @@ -51780,7 +51763,7 @@ uae_u32 REGPARAM2 op_c079_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_w(dst,src); @@ -51799,7 +51782,7 @@ uae_u32 REGPARAM2 op_c07a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_w(dst,src); @@ -51817,9 +51800,9 @@ uae_u32 REGPARAM2 op_c07b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_w(dst,src); @@ -51866,7 +51849,7 @@ uae_u32 REGPARAM2 op_c090_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_l(dst,src); @@ -51883,7 +51866,7 @@ uae_u32 REGPARAM2 op_c098_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -51902,7 +51885,7 @@ uae_u32 REGPARAM2 op_c0a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_l(dst,src); @@ -51920,7 +51903,7 @@ uae_u32 REGPARAM2 op_c0a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_l(dst,src); @@ -51936,9 +51919,9 @@ uae_u32 REGPARAM2 op_c0b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_l(dst,src); @@ -51955,7 +51938,7 @@ uae_u32 REGPARAM2 op_c0b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_l(dst,src); @@ -51972,7 +51955,7 @@ uae_u32 REGPARAM2 op_c0b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_l(dst,src); @@ -51991,7 +51974,7 @@ uae_u32 REGPARAM2 op_c0ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_l(dst,src); @@ -52009,9 +51992,9 @@ uae_u32 REGPARAM2 op_c0bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_AND_l(dst,src); @@ -52059,7 +52042,7 @@ uae_u32 REGPARAM2 op_c0d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULU(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52076,7 +52059,7 @@ uae_u32 REGPARAM2 op_c0d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; jnf_MULU(dst,src); @@ -52095,7 +52078,7 @@ uae_u32 REGPARAM2 op_c0e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULU(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52113,7 +52096,7 @@ uae_u32 REGPARAM2 op_c0e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULU(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52129,9 +52112,9 @@ uae_u32 REGPARAM2 op_c0f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULU(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52148,7 +52131,7 @@ uae_u32 REGPARAM2 op_c0f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULU(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52165,7 +52148,7 @@ uae_u32 REGPARAM2 op_c0f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULU(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52184,7 +52167,7 @@ uae_u32 REGPARAM2 op_c0fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULU(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52202,9 +52185,9 @@ uae_u32 REGPARAM2 op_c0fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULU(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52236,10 +52219,10 @@ uae_u32 REGPARAM2 op_c110_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52254,10 +52237,10 @@ uae_u32 REGPARAM2 op_c118_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -52274,10 +52257,10 @@ uae_u32 REGPARAM2 op_c120_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52293,10 +52276,10 @@ uae_u32 REGPARAM2 op_c128_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52310,12 +52293,12 @@ uae_u32 REGPARAM2 op_c130_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52330,10 +52313,10 @@ uae_u32 REGPARAM2 op_c138_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52348,10 +52331,10 @@ uae_u32 REGPARAM2 op_c139_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_AND_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52404,10 +52387,10 @@ uae_u32 REGPARAM2 op_c150_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52422,10 +52405,10 @@ uae_u32 REGPARAM2 op_c158_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -52442,10 +52425,10 @@ uae_u32 REGPARAM2 op_c160_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52461,10 +52444,10 @@ uae_u32 REGPARAM2 op_c168_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52478,12 +52461,12 @@ uae_u32 REGPARAM2 op_c170_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52498,10 +52481,10 @@ uae_u32 REGPARAM2 op_c178_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52516,10 +52499,10 @@ uae_u32 REGPARAM2 op_c179_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_AND_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52553,10 +52536,10 @@ uae_u32 REGPARAM2 op_c190_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52571,10 +52554,10 @@ uae_u32 REGPARAM2 op_c198_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -52591,10 +52574,10 @@ uae_u32 REGPARAM2 op_c1a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52610,10 +52593,10 @@ uae_u32 REGPARAM2 op_c1a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52627,12 +52610,12 @@ uae_u32 REGPARAM2 op_c1b0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52647,10 +52630,10 @@ uae_u32 REGPARAM2 op_c1b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52665,10 +52648,10 @@ uae_u32 REGPARAM2 op_c1b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_AND_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -52698,7 +52681,7 @@ uae_u32 REGPARAM2 op_c1d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULS(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52715,7 +52698,7 @@ uae_u32 REGPARAM2 op_c1d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; jnf_MULS(dst,src); @@ -52734,7 +52717,7 @@ uae_u32 REGPARAM2 op_c1e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULS(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52752,7 +52735,7 @@ uae_u32 REGPARAM2 op_c1e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULS(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52768,9 +52751,9 @@ uae_u32 REGPARAM2 op_c1f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULS(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52787,7 +52770,7 @@ uae_u32 REGPARAM2 op_c1f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULS(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52804,7 +52787,7 @@ uae_u32 REGPARAM2 op_c1f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULS(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52823,7 +52806,7 @@ uae_u32 REGPARAM2 op_c1fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULS(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52841,9 +52824,9 @@ uae_u32 REGPARAM2 op_c1fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; jnf_MULS(dst,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -52889,7 +52872,7 @@ uae_u32 REGPARAM2 op_d010_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_b(dst,src); @@ -52906,7 +52889,7 @@ uae_u32 REGPARAM2 op_d018_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); arm_ADD_l_ri8(srcreg+8,areg_byteinc[srcreg]); int dst=dstreg; dont_care_flags(); @@ -52925,7 +52908,7 @@ uae_u32 REGPARAM2 op_d020_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_b(dst,src); @@ -52943,7 +52926,7 @@ uae_u32 REGPARAM2 op_d028_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_b(dst,src); @@ -52959,9 +52942,9 @@ uae_u32 REGPARAM2 op_d030_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_b(dst,src); @@ -52978,7 +52961,7 @@ uae_u32 REGPARAM2 op_d038_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_b(dst,src); @@ -52995,7 +52978,7 @@ uae_u32 REGPARAM2 op_d039_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_b(dst,src); @@ -53014,7 +52997,7 @@ uae_u32 REGPARAM2 op_d03a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_b(dst,src); @@ -53032,9 +53015,9 @@ uae_u32 REGPARAM2 op_d03b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_b(dst,src); @@ -53096,7 +53079,7 @@ uae_u32 REGPARAM2 op_d050_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_w(dst,src); @@ -53113,7 +53096,7 @@ uae_u32 REGPARAM2 op_d058_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg; dont_care_flags(); @@ -53132,7 +53115,7 @@ uae_u32 REGPARAM2 op_d060_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_w(dst,src); @@ -53150,7 +53133,7 @@ uae_u32 REGPARAM2 op_d068_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_w(dst,src); @@ -53166,9 +53149,9 @@ uae_u32 REGPARAM2 op_d070_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_w(dst,src); @@ -53185,7 +53168,7 @@ uae_u32 REGPARAM2 op_d078_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_w(dst,src); @@ -53202,7 +53185,7 @@ uae_u32 REGPARAM2 op_d079_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_w(dst,src); @@ -53221,7 +53204,7 @@ uae_u32 REGPARAM2 op_d07a_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_w(dst,src); @@ -53239,9 +53222,9 @@ uae_u32 REGPARAM2 op_d07b_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_w(dst,src); @@ -53303,7 +53286,7 @@ uae_u32 REGPARAM2 op_d090_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_l(dst,src); @@ -53320,7 +53303,7 @@ uae_u32 REGPARAM2 op_d098_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg; dont_care_flags(); @@ -53339,7 +53322,7 @@ uae_u32 REGPARAM2 op_d0a0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_l(dst,src); @@ -53357,7 +53340,7 @@ uae_u32 REGPARAM2 op_d0a8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_l(dst,src); @@ -53373,9 +53356,9 @@ uae_u32 REGPARAM2 op_d0b0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_l(dst,src); @@ -53392,7 +53375,7 @@ uae_u32 REGPARAM2 op_d0b8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_l(dst,src); @@ -53409,7 +53392,7 @@ uae_u32 REGPARAM2 op_d0b9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_l(dst,src); @@ -53428,7 +53411,7 @@ uae_u32 REGPARAM2 op_d0ba_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_l(dst,src); @@ -53446,9 +53429,9 @@ uae_u32 REGPARAM2 op_d0bb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg; dont_care_flags(); jnf_ADD_l(dst,src); @@ -53508,7 +53491,7 @@ uae_u32 REGPARAM2 op_d0d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -53524,7 +53507,7 @@ uae_u32 REGPARAM2 op_d0d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); arm_ADD_l_ri8(srcreg+8,2); int dst=dstreg+8; jnf_ADDA_w(dst, src); @@ -53542,7 +53525,7 @@ uae_u32 REGPARAM2 op_d0e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -53559,7 +53542,7 @@ uae_u32 REGPARAM2 op_d0e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -53574,9 +53557,9 @@ uae_u32 REGPARAM2 op_d0f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -53592,7 +53575,7 @@ uae_u32 REGPARAM2 op_d0f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -53608,7 +53591,7 @@ uae_u32 REGPARAM2 op_d0f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -53626,7 +53609,7 @@ uae_u32 REGPARAM2 op_d0fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -53643,9 +53626,9 @@ uae_u32 REGPARAM2 op_d0fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dst=dstreg+8; jnf_ADDA_w(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -53691,14 +53674,14 @@ uae_u32 REGPARAM2 op_d108_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,areg_byteinc[srcreg]); int src=scratchie++; - readbyte(srca,src,scratchie); + readbyte(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADDX_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53713,10 +53696,10 @@ uae_u32 REGPARAM2 op_d110_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53731,10 +53714,10 @@ uae_u32 REGPARAM2 op_d118_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); arm_ADD_l_ri8(dstreg+8,areg_byteinc[dstreg]); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -53751,10 +53734,10 @@ uae_u32 REGPARAM2 op_d120_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,areg_byteinc[dstreg]); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53770,10 +53753,10 @@ uae_u32 REGPARAM2 op_d128_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53787,12 +53770,12 @@ uae_u32 REGPARAM2 op_d130_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53807,10 +53790,10 @@ uae_u32 REGPARAM2 op_d138_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53825,10 +53808,10 @@ uae_u32 REGPARAM2 op_d139_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readbyte(dsta,dst,scratchie); + readbyte(dsta,dst); dont_care_flags(); jnf_ADD_b(dst,src); - writebyte(dsta,dst,scratchie); + writebyte(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53858,14 +53841,14 @@ uae_u32 REGPARAM2 op_d148_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADDX_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53880,10 +53863,10 @@ uae_u32 REGPARAM2 op_d150_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53898,10 +53881,10 @@ uae_u32 REGPARAM2 op_d158_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); arm_ADD_l_ri8(dstreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -53918,10 +53901,10 @@ uae_u32 REGPARAM2 op_d160_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,2); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53937,10 +53920,10 @@ uae_u32 REGPARAM2 op_d168_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53954,12 +53937,12 @@ uae_u32 REGPARAM2 op_d170_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53974,10 +53957,10 @@ uae_u32 REGPARAM2 op_d178_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -53992,10 +53975,10 @@ uae_u32 REGPARAM2 op_d179_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readword(dsta,dst,scratchie); + readword(dsta,dst); dont_care_flags(); jnf_ADD_w(dst,src); - writeword(dsta,dst,scratchie); + writeword(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54025,14 +54008,14 @@ uae_u32 REGPARAM2 op_d188_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADDX_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54047,10 +54030,10 @@ uae_u32 REGPARAM2 op_d190_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54065,10 +54048,10 @@ uae_u32 REGPARAM2 op_d198_0_comp_nf(uae_u32 opcode) int src=srcreg; int dsta=dstreg+8; int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); arm_ADD_l_ri8(dstreg+8,4); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -54085,10 +54068,10 @@ uae_u32 REGPARAM2 op_d1a0_0_comp_nf(uae_u32 opcode) int dsta=dstreg+8; arm_SUB_l_ri8(dstreg+8,4); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54104,10 +54087,10 @@ uae_u32 REGPARAM2 op_d1a8_0_comp_nf(uae_u32 opcode) int dsta=scratchie++; lea_l_brr(dsta,8+dstreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54121,12 +54104,12 @@ uae_u32 REGPARAM2 op_d1b0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int src=srcreg; int dsta=scratchie++; - calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta,scratchie); + calc_disp_ea_020(dstreg+8,comp_get_iword((m68k_pc_offset+=2)-2),dsta); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54141,10 +54124,10 @@ uae_u32 REGPARAM2 op_d1b8_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54159,10 +54142,10 @@ uae_u32 REGPARAM2 op_d1b9_0_comp_nf(uae_u32 opcode) int dsta = scratchie++; mov_l_ri(dsta,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int dst=scratchie++; - readlong(dsta,dst,scratchie); + readlong(dsta,dst); dont_care_flags(); jnf_ADD_l(dst,src); - writelong(dsta,dst,scratchie); + writelong(dsta,dst); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54204,7 +54187,7 @@ uae_u32 REGPARAM2 op_d1d0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -54220,7 +54203,7 @@ uae_u32 REGPARAM2 op_d1d8_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; int srca=srcreg+8; int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); arm_ADD_l_ri8(srcreg+8,4); int dst=dstreg+8; jnf_ADDA_l(dst, src); @@ -54238,7 +54221,7 @@ uae_u32 REGPARAM2 op_d1e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,4); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -54255,7 +54238,7 @@ uae_u32 REGPARAM2 op_d1e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -54270,9 +54253,9 @@ uae_u32 REGPARAM2 op_d1f0_0_comp_nf(uae_u32 opcode) m68k_pc_offset+=2; uae_u8 scratchie=S1; int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -54288,7 +54271,7 @@ uae_u32 REGPARAM2 op_d1f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -54304,7 +54287,7 @@ uae_u32 REGPARAM2 op_d1f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -54322,7 +54305,7 @@ uae_u32 REGPARAM2 op_d1fa_0_comp_nf(uae_u32 opcode) uae_s32 PC16off = (uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2); mov_l_ri(srca,address+PC16off); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -54339,9 +54322,9 @@ uae_u32 REGPARAM2 op_d1fb_0_comp_nf(uae_u32 opcode) int srca=scratchie++; uae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset; mov_l_ri(pctmp,address); - calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(pctmp,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readlong(srca,src,scratchie); + readlong(srca,src); int dst=dstreg+8; jnf_ADDA_l(dst, src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); @@ -54373,7 +54356,6 @@ uae_u32 REGPARAM2 op_e000_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ASR_b_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSRQ.B #,Dn */ @@ -54388,7 +54370,22 @@ uae_u32 REGPARAM2 op_e008_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_LSR_b_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; +return 0; +} +/* ROXRQ.B #,Dn */ +uae_u32 REGPARAM2 op_e010_0_comp_nf(uae_u32 opcode) +{ + uae_s32 srcreg = imm8_table[((opcode >> 9) & 7)]; + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt = scratchie++; + mov_l_ri(cnt,srcreg); + int data=dstreg; + jnf_ROXR_b(data,cnt); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* RORQ.B #,Dn */ @@ -54405,7 +54402,6 @@ uae_u32 REGPARAM2 op_e018_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ROR_b(data,cnt); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASR.B Dn,Dn */ @@ -54416,15 +54412,10 @@ uae_u32 REGPARAM2 op_e020_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_ASR_b_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSR.B Dn,Dn */ @@ -54435,15 +54426,25 @@ uae_u32 REGPARAM2 op_e028_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_LSR_b_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); +return 0; +} +/* ROXR.B Dn,Dn */ +uae_u32 REGPARAM2 op_e030_0_comp_nf(uae_u32 opcode) +{ + uae_s32 srcreg = ((opcode >> 9) & 7); + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt=srcreg; + int data=dstreg; + jnf_ROXR_b(data,cnt); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROR.B Dn,Dn */ @@ -54454,16 +54455,11 @@ uae_u32 REGPARAM2 op_e038_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jnf_ROR_b(data,cnt); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASRQ.W #,Dn */ @@ -54478,7 +54474,6 @@ uae_u32 REGPARAM2 op_e040_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ASR_w_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } #endif @@ -54496,7 +54491,22 @@ uae_u32 REGPARAM2 op_e048_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_LSR_w_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; +return 0; +} +/* ROXRQ.W #,Dn */ +uae_u32 REGPARAM2 op_e050_0_comp_nf(uae_u32 opcode) +{ + uae_s32 srcreg = imm8_table[((opcode >> 9) & 7)]; + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt = scratchie++; + mov_l_ri(cnt,srcreg); + int data=dstreg; + jnf_ROXR_w(data,cnt); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* RORQ.W #,Dn */ @@ -54513,7 +54523,6 @@ uae_u32 REGPARAM2 op_e058_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ROR_w(data,cnt); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASR.W Dn,Dn */ @@ -54524,15 +54533,10 @@ uae_u32 REGPARAM2 op_e060_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_ASR_w_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSR.W Dn,Dn */ @@ -54543,15 +54547,25 @@ uae_u32 REGPARAM2 op_e068_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_LSR_w_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); +return 0; +} +/* ROXR.W Dn,Dn */ +uae_u32 REGPARAM2 op_e070_0_comp_nf(uae_u32 opcode) +{ + uae_s32 srcreg = ((opcode >> 9) & 7); + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt=srcreg; + int data=dstreg; + jnf_ROXR_w(data,cnt); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROR.W Dn,Dn */ @@ -54562,16 +54576,11 @@ uae_u32 REGPARAM2 op_e078_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jnf_ROR_w(data,cnt); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASRQ.L #,Dn */ @@ -54586,7 +54595,6 @@ uae_u32 REGPARAM2 op_e080_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ASR_l_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSRQ.L #,Dn */ @@ -54601,7 +54609,22 @@ uae_u32 REGPARAM2 op_e088_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_LSR_l_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; +return 0; +} +/* ROXRQ.L #,Dn */ +uae_u32 REGPARAM2 op_e090_0_comp_nf(uae_u32 opcode) +{ + uae_s32 srcreg = imm8_table[((opcode >> 9) & 7)]; + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt = scratchie++; + mov_l_ri(cnt,srcreg); + int data=dstreg; + jnf_ROXR_l(data,cnt); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* RORQ.L #,Dn */ @@ -54618,7 +54641,6 @@ uae_u32 REGPARAM2 op_e098_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ROR_l(data,cnt); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASR.L Dn,Dn */ @@ -54629,15 +54651,10 @@ uae_u32 REGPARAM2 op_e0a0_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_ASR_l_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSR.L Dn,Dn */ @@ -54648,15 +54665,25 @@ uae_u32 REGPARAM2 op_e0a8_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_LSR_l_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); +return 0; +} +/* ROXR.L Dn,Dn */ +uae_u32 REGPARAM2 op_e0b0_0_comp_nf(uae_u32 opcode) +{ + uae_s32 srcreg = ((opcode >> 9) & 7); + uae_u32 dstreg = opcode & 7; + uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; + m68k_pc_offset+=2; + uae_u8 scratchie=S1; + dont_care_flags(); + int cnt=srcreg; + int data=dstreg; + jnf_ROXR_l(data,cnt); + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROR.L Dn,Dn */ @@ -54667,16 +54694,11 @@ uae_u32 REGPARAM2 op_e0b8_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jnf_ROR_l(data,cnt); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASRW.W (An) */ @@ -54689,9 +54711,9 @@ uae_u32 REGPARAM2 op_e0d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54705,9 +54727,9 @@ uae_u32 REGPARAM2 op_e0d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -54723,9 +54745,9 @@ uae_u32 REGPARAM2 op_e0e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54740,9 +54762,9 @@ uae_u32 REGPARAM2 op_e0e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54755,11 +54777,11 @@ uae_u32 REGPARAM2 op_e0f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54773,9 +54795,9 @@ uae_u32 REGPARAM2 op_e0f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54789,9 +54811,9 @@ uae_u32 REGPARAM2 op_e0f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -54807,7 +54829,6 @@ uae_u32 REGPARAM2 op_e100_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_LSL_b_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSLQ.B #,Dn */ @@ -54822,7 +54843,6 @@ uae_u32 REGPARAM2 op_e108_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_LSL_b_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROXLQ.B #,Dn */ @@ -54839,7 +54859,6 @@ uae_u32 REGPARAM2 op_e110_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ROXL_b(data,cnt); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROLQ.B #,Dn */ @@ -54856,7 +54875,6 @@ uae_u32 REGPARAM2 op_e118_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ROL_b(data,cnt); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASL.B Dn,Dn */ @@ -54867,15 +54885,10 @@ uae_u32 REGPARAM2 op_e120_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_LSL_b_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSL.B Dn,Dn */ @@ -54886,15 +54899,10 @@ uae_u32 REGPARAM2 op_e128_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_LSL_b_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROXL.B Dn,Dn */ @@ -54905,16 +54913,11 @@ uae_u32 REGPARAM2 op_e130_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jnf_ROXL_b(data,cnt); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROL.B Dn,Dn */ @@ -54925,16 +54928,11 @@ uae_u32 REGPARAM2 op_e138_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jnf_ROL_b(data,cnt); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASLQ.W #,Dn */ @@ -54949,7 +54947,6 @@ uae_u32 REGPARAM2 op_e140_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_LSL_w_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSLQ.W #,Dn */ @@ -54964,7 +54961,6 @@ uae_u32 REGPARAM2 op_e148_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_LSL_w_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROXLQ.W #,Dn */ @@ -54981,7 +54977,6 @@ uae_u32 REGPARAM2 op_e150_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ROXL_w(data,cnt); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROLQ.W #,Dn */ @@ -54998,7 +54993,6 @@ uae_u32 REGPARAM2 op_e158_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ROL_w(data,cnt); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASL.W Dn,Dn */ @@ -55009,15 +55003,10 @@ uae_u32 REGPARAM2 op_e160_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_LSL_w_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSL.W Dn,Dn */ @@ -55028,15 +55017,10 @@ uae_u32 REGPARAM2 op_e168_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_LSL_w_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROXL.W Dn,Dn */ @@ -55047,16 +55031,11 @@ uae_u32 REGPARAM2 op_e170_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jnf_ROXL_w(data,cnt); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROL.W Dn,Dn */ @@ -55067,16 +55046,11 @@ uae_u32 REGPARAM2 op_e178_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jnf_ROL_w(data,cnt); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASLQ.L #,Dn */ @@ -55091,7 +55065,6 @@ uae_u32 REGPARAM2 op_e180_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_LSL_l_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* LSLQ.L #,Dn */ @@ -55106,7 +55079,6 @@ uae_u32 REGPARAM2 op_e188_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_LSL_l_imm(data,srcreg); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROXLQ.L #,Dn */ @@ -55123,7 +55095,6 @@ uae_u32 REGPARAM2 op_e190_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ROXL_l(data,cnt); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ROLQ.L #,Dn */ @@ -55140,7 +55111,6 @@ uae_u32 REGPARAM2 op_e198_0_comp_nf(uae_u32 opcode) int data=dstreg; jnf_ROL_l(data,cnt); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; return 0; } /* ASL.L Dn,Dn */ @@ -55151,15 +55121,10 @@ uae_u32 REGPARAM2 op_e1a0_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_LSL_l_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* LSL.L Dn,Dn */ @@ -55170,15 +55135,10 @@ uae_u32 REGPARAM2 op_e1a8_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int data=dstreg; jnf_LSL_l_reg(data,srcreg); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROXL.L Dn,Dn */ @@ -55189,16 +55149,11 @@ uae_u32 REGPARAM2 op_e1b0_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jnf_ROXL_l(data,cnt); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ROL.L Dn,Dn */ @@ -55209,16 +55164,11 @@ uae_u32 REGPARAM2 op_e1b8_0_comp_nf(uae_u32 opcode) uae_u32 m68k_pc_offset_thisinst=m68k_pc_offset; m68k_pc_offset+=2; uae_u8 scratchie=S1; -if ((uae_u32)srcreg==(uae_u32)dstreg) { - FAIL(1); - return 0; -} -{ dont_care_flags(); + dont_care_flags(); int cnt=srcreg; int data=dstreg; jnf_ROL_l(data,cnt); -} if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); - if (failure) m68k_pc_offset=m68k_pc_offset_thisinst; + if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } /* ASLW.W (An) */ @@ -55231,9 +55181,9 @@ uae_u32 REGPARAM2 op_e1d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55247,9 +55197,9 @@ uae_u32 REGPARAM2 op_e1d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -55265,9 +55215,9 @@ uae_u32 REGPARAM2 op_e1e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55282,9 +55232,9 @@ uae_u32 REGPARAM2 op_e1e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55297,11 +55247,11 @@ uae_u32 REGPARAM2 op_e1f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55315,9 +55265,9 @@ uae_u32 REGPARAM2 op_e1f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55331,9 +55281,9 @@ uae_u32 REGPARAM2 op_e1f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ASLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55347,9 +55297,9 @@ uae_u32 REGPARAM2 op_e2d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55363,9 +55313,9 @@ uae_u32 REGPARAM2 op_e2d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -55381,9 +55331,9 @@ uae_u32 REGPARAM2 op_e2e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55398,9 +55348,9 @@ uae_u32 REGPARAM2 op_e2e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55413,11 +55363,11 @@ uae_u32 REGPARAM2 op_e2f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55431,9 +55381,9 @@ uae_u32 REGPARAM2 op_e2f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55447,9 +55397,9 @@ uae_u32 REGPARAM2 op_e2f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSRW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55463,9 +55413,9 @@ uae_u32 REGPARAM2 op_e3d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55479,9 +55429,9 @@ uae_u32 REGPARAM2 op_e3d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -55497,9 +55447,9 @@ uae_u32 REGPARAM2 op_e3e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55514,9 +55464,9 @@ uae_u32 REGPARAM2 op_e3e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55529,11 +55479,11 @@ uae_u32 REGPARAM2 op_e3f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55547,9 +55497,9 @@ uae_u32 REGPARAM2 op_e3f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55563,9 +55513,9 @@ uae_u32 REGPARAM2 op_e3f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_LSLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55579,9 +55529,9 @@ uae_u32 REGPARAM2 op_e6d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_RORW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55595,9 +55545,9 @@ uae_u32 REGPARAM2 op_e6d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_RORW(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -55613,9 +55563,9 @@ uae_u32 REGPARAM2 op_e6e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_RORW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55630,9 +55580,9 @@ uae_u32 REGPARAM2 op_e6e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_RORW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55645,11 +55595,11 @@ uae_u32 REGPARAM2 op_e6f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_RORW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55663,9 +55613,9 @@ uae_u32 REGPARAM2 op_e6f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_RORW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55679,9 +55629,9 @@ uae_u32 REGPARAM2 op_e6f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_RORW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55695,9 +55645,9 @@ uae_u32 REGPARAM2 op_e7d0_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ROLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55711,9 +55661,9 @@ uae_u32 REGPARAM2 op_e7d8_0_comp_nf(uae_u32 opcode) dont_care_flags(); int srca=srcreg+8; int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ROLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); arm_ADD_l_ri8(srcreg+8,2); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; @@ -55729,9 +55679,9 @@ uae_u32 REGPARAM2 op_e7e0_0_comp_nf(uae_u32 opcode) int srca=srcreg+8; arm_SUB_l_ri8(srcreg+8,2); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ROLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55746,9 +55696,9 @@ uae_u32 REGPARAM2 op_e7e8_0_comp_nf(uae_u32 opcode) int srca=scratchie++; lea_l_brr(srca,8+srcreg,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ROLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55761,11 +55711,11 @@ uae_u32 REGPARAM2 op_e7f0_0_comp_nf(uae_u32 opcode) uae_u8 scratchie=S1; dont_care_flags(); int srca=scratchie++; - calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca,scratchie); + calc_disp_ea_020(srcreg+8,comp_get_iword((m68k_pc_offset+=2)-2),srca); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ROLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55779,9 +55729,9 @@ uae_u32 REGPARAM2 op_e7f8_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,(uae_s32)(uae_s16)comp_get_iword((m68k_pc_offset+=2)-2)); int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ROLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } @@ -55795,9 +55745,9 @@ uae_u32 REGPARAM2 op_e7f9_0_comp_nf(uae_u32 opcode) int srca = scratchie++; mov_l_ri(srca,comp_get_ilong((m68k_pc_offset+=4)-4)); /* absl */ int src=scratchie++; - readword(srca,src,scratchie); + readword(srca,src); jnf_ROLW(src); - writeword(srca,src,scratchie); + writeword(srca,src); if (m68k_pc_offset>SYNC_PC_OFFSET) sync_m68k_pc(); return 0; } diff --git a/src/jit/compemu.h b/src/jit/compemu.h index 2f8df205..723bc1cd 100644 --- a/src/jit/compemu.h +++ b/src/jit/compemu.h @@ -123,7 +123,7 @@ typedef union { #if defined(CPU_arm) //#define DEBUG_DATA_BUFFER #define ALIGN_NOT_NEEDED -#define N_REGS 11 /* really 16, but 13 to 15 are SP, LR, PC; 12 is scratch reg and 11 holds regs-struct */ +#define N_REGS 10 /* really 16, but 13 to 15 are SP, LR, PC; 12 is scratch reg, 10 holds memstart and 11 holds regs-struct */ #else #define N_REGS 8 /* really only 7, but they are numbered 0,1,2,3,5,6,7 */ #endif @@ -298,17 +298,17 @@ extern int failure; /* Convenience functions exposed to gencomp */ extern uae_u32 m68k_pc_offset; -extern void readbyte(int address, int dest, int tmp); -extern void readword(int address, int dest, int tmp); -extern void readlong(int address, int dest, int tmp); -extern void writebyte(int address, int source, int tmp); -extern void writeword(int address, int source, int tmp); -extern void writelong(int address, int source, int tmp); -extern void writeword_clobber(int address, int source, int tmp); -extern void writelong_clobber(int address, int source, int tmp); -extern void get_n_addr(int address, int dest, int tmp); -extern void get_n_addr_jmp(int address, int dest, int tmp); -extern void calc_disp_ea_020(int base, uae_u32 dp, int target, int tmp); +extern void readbyte(int address, int dest); +extern void readword(int address, int dest); +extern void readlong(int address, int dest); +extern void writebyte(int address, int source); +extern void writeword(int address, int source); +extern void writelong(int address, int source); +extern void writeword_clobber(int address, int source); +extern void writelong_clobber(int address, int source); +extern void get_n_addr(int address, int dest); +extern void get_n_addr_jmp(int address, int dest); +extern void calc_disp_ea_020(int base, uae_u32 dp, int target); #define SYNC_PC_OFFSET 124 extern void sync_m68k_pc(void); extern uae_u32 get_const(int r); diff --git a/src/jit/compemu_fpp.cpp b/src/jit/compemu_fpp.cpp index 0a8ded87..5597101c 100644 --- a/src/jit/compemu_fpp.cpp +++ b/src/jit/compemu_fpp.cpp @@ -77,7 +77,7 @@ STATIC_INLINE int comp_fp_get (uae_u32 opcode, uae_u16 extra, int treg) case 6: /* (d8,An,Xn) or (bd,An,Xn) or ([bd,An,Xn],od) or ([bd,An],Xn,od) */ { uae_u32 dp = comp_get_iword ((m68k_pc_offset += 2) - 2); - calc_disp_ea_020 (reg + 8, dp, S1, S2); + calc_disp_ea_020 (reg + 8, dp, S1); break; } case 7: @@ -173,25 +173,25 @@ STATIC_INLINE int comp_fp_get (uae_u32 opcode, uae_u16 extra, int treg) switch (size) { case 0: /* Long */ - readlong (S1, S2, S3); + readlong (S1, S2); fmov_l_rr (treg, S2); return 2; case 1: /* Single */ - readlong (S1, S2, S3); + readlong (S1, S2); fmov_s_rr (treg, S2); return 1; case 2: /* Long Double */ fp_to_exten_rm (treg, S1); return 0; case 4: /* Word */ - readword (S1, S2, S3); + readword (S1, S2); fmov_w_rr (treg, S2); return 1; case 5: /* Double */ fp_to_double_rm (treg, S1); return 2; case 6: /* Byte */ - readbyte (S1, S2, S3); + readbyte (S1, S2); fmov_b_rr (treg, S2); return 1; default: @@ -251,7 +251,7 @@ STATIC_INLINE int comp_fp_put (uae_u32 opcode, uae_u16 extra) case 6: /* (d8,An,Xn) or (bd,An,Xn) or ([bd,An,Xn],od) or ([bd,An],Xn,od) */ { uae_u32 dp = comp_get_iword ((m68k_pc_offset += 2) - 2); - calc_disp_ea_020 (reg + 8, dp, S1, S2); + calc_disp_ea_020 (reg + 8, dp, S1); break; } case 7: @@ -276,25 +276,25 @@ STATIC_INLINE int comp_fp_put (uae_u32 opcode, uae_u16 extra) switch (size) { case 0: /* Long */ fmov_to_l_rr(S2, sreg); - writelong_clobber (S1, S2, S3); + writelong_clobber (S1, S2); return 0; case 1: /* Single */ fmov_to_s_rr(S2, sreg); - writelong_clobber (S1, S2, S3); + writelong_clobber (S1, S2); return 0; case 2:/* Long Double */ fp_from_exten_mr (S1, sreg); return 0; case 4: /* Word */ fmov_to_w_rr(S2, sreg); - writeword_clobber (S1, S2, S3); + writeword_clobber (S1, S2); return 0; case 5: /* Double */ fp_from_double_mr(S1, sreg); return 0; case 6: /* Byte */ fmov_to_b_rr(S2, sreg); - writebyte (S1, S2, S3); + writebyte (S1, S2); return 0; default: return -1; diff --git a/src/jit/compemu_midfunc_arm.cpp b/src/jit/compemu_midfunc_arm.cpp index 2ddeee3a..fcec7332 100644 --- a/src/jit/compemu_midfunc_arm.cpp +++ b/src/jit/compemu_midfunc_arm.cpp @@ -200,23 +200,55 @@ MIDFUNC(2,mov_l_mi,(IMM d, IMM s)) } MENDFUNC(2,mov_l_mi,(IMM d, IMM s)) -MIDFUNC(2,shll_l_ri,(RW4 r, IMM i)) +MIDFUNC(4,disp_ea20_target_add,(RW4 target, RR4 reg, IMM shift, IMM extend)) { - // Only used in calc_disp_ea_020() -> flags not relevant and never modified - if (!i) - return; - if (isconst(r)) { - live.state[r].val <<= i; + if(isconst(target) && isconst(reg)) { + if(extend) + set_const(target, live.state[target].val + (((uae_s32)(uae_s16)live.state[reg].val) << (shift & 0x1f))); + else + set_const(target, live.state[target].val + (live.state[reg].val << (shift & 0x1f))); return; } - r = rmw(r); - - LSL_rri(r,r, i & 0x1f); - - unlock2(r); + reg = readreg(reg); + target = rmw(target); + + if(extend) { + SIGNED16_REG_2_REG(REG_WORK1, reg); + ADD_rrrLSLi(target, target, REG_WORK1, shift & 0x1f); + } else { + ADD_rrrLSLi(target, target, reg, shift & 0x1f); + } + + unlock2(target); + unlock2(reg); } -MENDFUNC(2,shll_l_ri,(RW4 r, IMM i)) +MENDFUNC(4,disp_ea20_target_add,(RW4 target, RR4 reg, IMM shift, IMM extend)) + +MIDFUNC(4,disp_ea20_target_mov,(W4 target, RR4 reg, IMM shift, IMM extend)) +{ + if(isconst(reg)) { + if(extend) + set_const(target, ((uae_s32)(uae_s16)live.state[reg].val) << (shift & 0x1f)); + else + set_const(target, live.state[reg].val << (shift & 0x1f)); + return; + } + + reg = readreg(reg); + target = writereg(target); + + if(extend) { + SIGNED16_REG_2_REG(REG_WORK1, reg); + LSL_rri(target, REG_WORK1, shift & 0x1f); + } else { + LSL_rri(target, reg, shift & 0x1f); + } + + unlock2(target); + unlock2(reg); +} +MENDFUNC(4,disp_ea20_target_mov,(W4 target, RR4 reg, IMM shift, IMM extend)) MIDFUNC(2,sign_extend_16_rr,(W4 d, RR2 s)) { @@ -478,49 +510,6 @@ MIDFUNC(2,sub_w_ri,(RW2 d, IMM i)) } MENDFUNC(2,sub_w_ri,(RW2 d, IMM i)) -MIDFUNC(3,call_r_02,(RR4 r, RR4 in1, RR4 in2)) -{ - clobber_flags(); - in1 = readreg_specific(in1, REG_PAR1); - in2 = readreg_specific(in2, REG_PAR2); - r = readreg(r); - prepare_for_call_1(); - unlock2(r); - unlock2(in1); - unlock2(in2); - prepare_for_call_2(); - compemu_raw_call_r(r); -} -MENDFUNC(3,call_r_02,(RR4 r, RR4 in1, RR4 in2)) - -MIDFUNC(3,call_r_11,(W4 out1, RR4 r, RR4 in1)) -{ - clobber_flags(); - if (out1 != in1 && out1 != r) { - COMPCALL(forget_about)(out1); - } - - in1 = readreg_specific(in1, REG_PAR1); - r = readreg(r); - prepare_for_call_1(); - - unlock2(in1); - unlock2(r); - - prepare_for_call_2(); - compemu_raw_call_r(r); - - live.nat[REG_RESULT].holds[0] = out1; - live.nat[REG_RESULT].nholds = 1; - live.nat[REG_RESULT].touched = touchcnt++; - - live.state[out1].realreg = REG_RESULT; - live.state[out1].realind = 0; - live.state[out1].val = 0; - live.state[out1].validsize = 4; - set_status(out1, DIRTY); -} -MENDFUNC(3,call_r_11,(W4 out1, RR4 r, RR4 in1)) /* forget_about() takes a mid-layer register */ MIDFUNC(1,forget_about,(W4 r)) diff --git a/src/jit/compemu_midfunc_arm.h b/src/jit/compemu_midfunc_arm.h index 77e1f856..847587c1 100644 --- a/src/jit/compemu_midfunc_arm.h +++ b/src/jit/compemu_midfunc_arm.h @@ -38,8 +38,10 @@ DECLARE_MIDFUNC(arm_ADD_l_ri8(RW4 d, IMM i)); DECLARE_MIDFUNC(arm_SUB_l_ri8(RW4 d, IMM i)); // Emulated midfunc +DECLARE_MIDFUNC(disp_ea20_target_add(RW4 target, RR4 reg, IMM shift, IMM extend)); +DECLARE_MIDFUNC(disp_ea20_target_mov(W4 target, RR4 reg, IMM shift, IMM extend)); + DECLARE_MIDFUNC(mov_l_mi(IMM d, IMM s)); -DECLARE_MIDFUNC(shll_l_ri(RW4 r, IMM i)); DECLARE_MIDFUNC(pop_l(W4 d)); DECLARE_MIDFUNC(push_l(RR4 s)); DECLARE_MIDFUNC(sign_extend_16_rr(W4 d, RR2 s)); @@ -54,8 +56,6 @@ DECLARE_MIDFUNC(mov_l_ri(W4 d, IMM s)); DECLARE_MIDFUNC(mov_b_ri(W1 d, IMM s)); DECLARE_MIDFUNC(sub_l_ri(RW4 d, IMM i)); DECLARE_MIDFUNC(sub_w_ri(RW2 d, IMM i)); -DECLARE_MIDFUNC(call_r_02(RR4 r, RR4 in1, RR4 in2)); -DECLARE_MIDFUNC(call_r_11(W4 out1, RR4 r, RR4 in1)); DECLARE_MIDFUNC(live_flags(void)); DECLARE_MIDFUNC(dont_care_flags(void)); DECLARE_MIDFUNC(make_flags_live(void)); diff --git a/src/jit/compemu_midfunc_arm2.cpp b/src/jit/compemu_midfunc_arm2.cpp index c006d9a3..80c2d9d3 100644 --- a/src/jit/compemu_midfunc_arm2.cpp +++ b/src/jit/compemu_midfunc_arm2.cpp @@ -4064,11 +4064,8 @@ MIDFUNC(2,jnf_MOVE16,(RR4 d, RR4 s)) BIC_rri(s, s, 0x0000000F); BIC_rri(d, d, 0x0000000F); - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK1, R_REGSTRUCT, offs); - - ADD_rrr(s, s, REG_WORK1); - ADD_rrr(d, d, REG_WORK1); + ADD_rrr(s, s, R_MEMSTART); + ADD_rrr(d, d, R_MEMSTART); #ifdef ARMV6T2 LDRD_rR(REG_WORK1, s); @@ -5591,10 +5588,11 @@ MIDFUNC(2,jff_ROXL_b,(RW1 d, RR4 i)) CMP_ri(REG_WORK1, 8); CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 9); TST_rr(REG_WORK1, REG_WORK1); - BNE_i(2); // need to rotate + BNE_i(3); // need to rotate MSR_CPSRf_i(0); - MOVS_rrLSLi(REG_WORK1, d, 24); + AND_rri(REG_WORK1, d, 0xff); // make sure to clear carry + MOVS_rrLSLi(REG_WORK1, REG_WORK1, 24); #ifdef ARMV6T2 B_i(13); // end of op #else @@ -5656,7 +5654,8 @@ MIDFUNC(2,jff_ROXL_w,(RW2 d, RR4 i)) BNE_i(3); // need to rotate MSR_CPSRf_i(0); - MOVS_rrLSLi(REG_WORK1, d, 16); + BIC_rri(REG_WORK1, d, 0x00ff0000); // make sure to clear carry + MOVS_rrLSLi(REG_WORK1, REG_WORK1, 16); #ifdef ARMV6T2 B_i(13); // end of op #else @@ -6037,6 +6036,282 @@ MIDFUNC(1,jff_RORW,(RW2 d)) } MENDFUNC(1,jff_RORW,(RW2 d)) + +/* + * ROXR + * Operand Syntax: Dx, Dy + * #, Dy + * + * Operand Size: 8,16,32 + * + * X Set according to the last bit rotated out of the operand. Unchanged when the rotate count is zero. + * N Set if the most significant bit of the result is set. Cleared otherwise. + * Z Set if the result is zero. Cleared otherwise. + * V Always cleared. + * C Set according to the last bit rotated out of the operand. Cleared when the rotate count is zero. + * + */ +MIDFUNC(2,jnf_ROXR_b,(RW1 d, RR4 i)) +{ + int x = readreg(FLAGX); + INIT_REGS_b(d, i); + + clobber_flags(); + + AND_rri(REG_WORK1, i, 63); + CMP_ri(REG_WORK1, 35); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 36); + CMP_ri(REG_WORK1, 17); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 18); + CMP_ri(REG_WORK1, 8); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 9); + TST_rr(REG_WORK1, REG_WORK1); +#ifdef ARMV6T2 + BEQ_i(4); // end of op +#else + BEQ_i(6); // end of op +#endif + +// need to rotate + AND_rri(REG_WORK2, d, 0xff); // val = val & 0xff + ORR_rrrLSLi(REG_WORK2, REG_WORK2, REG_WORK2, 9); // val = val | (val << 9) + ORR_rrrLSLi(REG_WORK2, REG_WORK2, x, 8); // val = val | (x << 8) + MOV_rrLSRr(REG_WORK2, REG_WORK2, REG_WORK1); // val = val >> cnt + +#ifdef ARMV6T2 + BFI_rrii(d, REG_WORK2, 0, 7); +#else + AND_rri(REG_WORK2, REG_WORK2, 0xff); + BIC_rri(d, d, 0xff); + ORR_rrr(d, d, REG_WORK2); +#endif + +// end of op + + unlock2(x); + EXIT_REGS(d, i); +} +MENDFUNC(2,jnf_ROXR_b,(RW1 d, RR4 i)) + +MIDFUNC(2,jnf_ROXR_w,(RW2 d, RR4 i)) +{ + int x = readreg(FLAGX); + INIT_REGS_w(d, i); + + clobber_flags(); + + AND_rri(REG_WORK1, i, 63); + CMP_ri(REG_WORK1, 33); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 34); + CMP_ri(REG_WORK1, 16); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 17); + TST_rr(REG_WORK1, REG_WORK1); + BEQ_i(5); // end of op + +// need to rotate + BIC_rri(REG_WORK2, d, 0xff000000); + BIC_rri(REG_WORK2, REG_WORK2, 0x00ff0000); // val = val & 0xffff + ORR_rrrLSLi(REG_WORK2, REG_WORK2, REG_WORK2, 17); // val = val | (val << 17) + ORR_rrrLSLi(REG_WORK2, REG_WORK2, x, 16); // val = val | (x << 16) + MOV_rrLSRr(REG_WORK2, REG_WORK2, REG_WORK1); // val = val >> cnt + + PKHTB_rrr(d, d, REG_WORK2); + +// end of op + + unlock2(x); + EXIT_REGS(d, i); +} +MENDFUNC(2,jnf_ROXR_w,(RW2 d, RR4 i)) + +MIDFUNC(2,jnf_ROXR_l,(RW4 d, RR4 i)) +{ + int x = readreg(FLAGX); + INIT_REGS_l(d, i); + + clobber_flags(); + + AND_rri(REG_WORK1, i, 63); + CMP_ri(REG_WORK1, 32); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 33); + TST_rr(REG_WORK1, REG_WORK1); + BEQ_i(6); // end of op + +// need to rotate + CMP_ri(REG_WORK1, 32); + CC_MOV_rrLSRr(NATIVE_CC_NE, REG_WORK2, d, REG_WORK1); + CC_MOV_ri(NATIVE_CC_EQ, REG_WORK2, 0); + + RSB_rri(REG_WORK3, REG_WORK1, 32); + ORR_rrrLSLr(REG_WORK2, REG_WORK2, x, REG_WORK3); + + ADD_rri(REG_WORK3, REG_WORK3, 1); + ORR_rrrLSLr(d, REG_WORK2, d, REG_WORK3); + +// end of op + + unlock2(x); + EXIT_REGS(d, i); +} +MENDFUNC(2,jnf_ROXR_l,(RW4 d, RR4 i)) + +MIDFUNC(2,jff_ROXR_b,(RW1 d, RR4 i)) +{ + INIT_REGS_b(d, i); + int x = rmw(FLAGX); + + AND_rri(REG_WORK1, i, 63); + CMP_ri(REG_WORK1, 35); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 36); + CMP_ri(REG_WORK1, 17); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 18); + CMP_ri(REG_WORK1, 8); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 9); + TST_rr(REG_WORK1, REG_WORK1); + BNE_i(3); // need to rotate + + MSR_CPSRf_i(0); + BIC_rri(REG_WORK1, d, 0x0000ff00); // make sure to clear carry + MOVS_rrLSLi(REG_WORK1, REG_WORK1, 24); +#ifdef ARMV6T2 + B_i(9); // end of op +#else + B_i(12); // end of op +#endif + +// need to rotate + AND_rri(REG_WORK2, d, 0xff); // val = val & 0xff + ORR_rrrLSLi(REG_WORK2, REG_WORK2, REG_WORK2, 9); // val = val | (val << 9) + ORR_rrrLSLi(REG_WORK2, REG_WORK2, x, 8); // val = val | (x << 8) + MSR_CPSRf_i(0); + MOVS_rrLSRr(REG_WORK2, REG_WORK2, REG_WORK1); // val = val >> cnt + + // Duplicate carry + MOV_ri(x, 1); + CC_MOV_ri(NATIVE_CC_CC, x, 0); + + // Calc N and Z +#ifdef ARMV6T2 + BFI_rrii(REG_WORK2, x, 8, 8); // Make sure to set carry (last bit shifted out) +#else + BIC_rri(REG_WORK2, REG_WORK2, 0x100); + ORR_rrrLSLi(REG_WORK2, REG_WORK2, x, 8); +#endif + LSLS_rri(REG_WORK1, REG_WORK2, 24); + +#ifdef ARMV6T2 + BFI_rrii(d, REG_WORK2, 0, 7); +#else + AND_rri(REG_WORK2, REG_WORK2, 0xff); + BIC_rri(d, d, 0xff); + ORR_rrr(d, d, REG_WORK2); +#endif + +// end of op + + unlock2(x); + EXIT_REGS(d, i); +} +MENDFUNC(2,jff_ROXR_b,(RW1 d, RR4 i)) + +MIDFUNC(2,jff_ROXR_w,(RW2 d, RR4 i)) +{ + INIT_REGS_w(d, i); + int x = rmw(FLAGX); + + AND_rri(REG_WORK1, i, 63); + CMP_ri(REG_WORK1, 33); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 34); + CMP_ri(REG_WORK1, 16); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 17); + TST_rr(REG_WORK1, REG_WORK1); + BNE_i(3); // need to rotate + + MSR_CPSRf_i(0); + BIC_rri(REG_WORK1, d, 0x00ff0000); // make sure to clear carry + MOVS_rrLSLi(REG_WORK1, REG_WORK1, 16); +#ifdef ARMV6T2 + B_i(10); // end of op +#else + B_i(11); // end of op +#endif + +// need to rotate + BIC_rri(REG_WORK2, d, 0xff000000); + BIC_rri(REG_WORK2, REG_WORK2, 0x00ff0000); // val = val & 0xffff + ORR_rrrLSLi(REG_WORK2, REG_WORK2, REG_WORK2, 17); // val = val | (val << 17) + ORR_rrrLSLi(REG_WORK2, REG_WORK2, x, 16); // val = val | (x << 16) + MSR_CPSRf_i(0); + MOVS_rrLSRr(REG_WORK2, REG_WORK2, REG_WORK1); // val = val >> cnt + + // Duplicate carry + MOV_ri(x, 1); + CC_MOV_ri(NATIVE_CC_CC, x, 0); + + // Calc N and Z +#ifdef ARMV6T2 + BFI_rrii(REG_WORK2, x, 16, 16); // Make sure to set carry (last bit shifted out) +#else + BIC_rri(REG_WORK2, REG_WORK2, 0x10000); + ORR_rrrLSLi(REG_WORK2, REG_WORK2, x, 16); +#endif + LSLS_rri(REG_WORK1, REG_WORK2, 16); + + PKHTB_rrr(d, d, REG_WORK2); + +// end of op + + unlock2(x); + EXIT_REGS(d, i); +} +MENDFUNC(2,jff_ROXR_w,(RW2 d, RR4 i)) + +MIDFUNC(2,jff_ROXR_l,(RW4 d, RR4 i)) +{ + INIT_REGS_l(d, i); + int x = rmw(FLAGX); + + AND_rri(REG_WORK1, i, 63); + CMP_ri(REG_WORK1, 32); + CC_SUB_rri(NATIVE_CC_GT, REG_WORK1, REG_WORK1, 33); + TST_rr(REG_WORK1, REG_WORK1); + BNE_i(2); // need to rotate + + MSR_CPSRf_i(0); + TST_rr(d, d); + B_i(13); // end of op + +// need to rotate + CMP_ri(REG_WORK1, 32); + BNE_i(3); // rotate 1-31 + +// rotate 32 + MSR_CPSRf_i(0); + LSLS_rri(d, d, 1); + ORRS_rrr(d, d, x); + B_i(5); // duplicate carry + +// rotate 1-31 + MSR_CPSRf_i(0); + MOVS_rrLSRr(REG_WORK2, d, REG_WORK1); + + RSB_rri(REG_WORK3, REG_WORK1, 32); + ORR_rrrLSLr(REG_WORK2, REG_WORK2, x, REG_WORK3); + + ADD_rri(REG_WORK3, REG_WORK3, 1); + ORR_rrrLSLr(d, REG_WORK2, d, REG_WORK3); + + // Duplicate carry + MOV_ri(x, 1); + CC_MOV_ri(NATIVE_CC_CC, x, 0); + +// end of op + + unlock2(x); + EXIT_REGS(d, i); +} +MENDFUNC(2,jff_ROXR_l,(RW4 d, RR4 i)) + /* * SCC * @@ -6654,13 +6929,10 @@ MENDFUNC(1,jff_TST_l,(RR4 s)) */ MIDFUNC(2,jnf_MEM_WRITE_OFF_b,(RR4 adr, RR4 b)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); b = readreg(b); - STRB_rRR(b, adr, REG_WORK2); + STRB_rRR(b, adr, R_MEMSTART); unlock2(b); unlock2(adr); @@ -6669,14 +6941,11 @@ MENDFUNC(2,jnf_MEM_WRITE_OFF_b,(RR4 adr, RR4 b)) MIDFUNC(2,jnf_MEM_WRITE_OFF_w,(RR4 adr, RR4 w)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); w = readreg(w); REV16_rr(REG_WORK1, w); - STRH_rRR(REG_WORK1, adr, REG_WORK2); + STRH_rRR(REG_WORK1, adr, R_MEMSTART); unlock2(w); unlock2(adr); @@ -6685,14 +6954,11 @@ MENDFUNC(2,jnf_MEM_WRITE_OFF_w,(RR4 adr, RR4 w)) MIDFUNC(2,jnf_MEM_WRITE_OFF_l,(RR4 adr, RR4 l)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); l = readreg(l); REV_rr(REG_WORK1, l); - STR_rRR(REG_WORK1, adr, REG_WORK2); + STR_rRR(REG_WORK1, adr, R_MEMSTART); unlock2(l); unlock2(adr); @@ -6702,13 +6968,10 @@ MENDFUNC(2,jnf_MEM_WRITE_OFF_l,(RR4 adr, RR4 l)) MIDFUNC(2,jnf_MEM_READ_OFF_b,(W4 d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); d = writereg(d); - LDRB_rRR(d, adr, REG_WORK2); + LDRB_rRR(d, adr, R_MEMSTART); unlock2(d); unlock2(adr); @@ -6717,13 +6980,10 @@ MENDFUNC(2,jnf_MEM_READ_OFF_b,(W4 d, RR4 adr)) MIDFUNC(2,jnf_MEM_READ_OFF_w,(W4 d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); d = writereg(d); - LDRH_rRR(REG_WORK1, adr, REG_WORK2); + LDRH_rRR(REG_WORK1, adr, R_MEMSTART); REV16_rr(d, REG_WORK1); unlock2(d); @@ -6733,13 +6993,10 @@ MENDFUNC(2,jnf_MEM_READ_OFF_w,(W4 d, RR4 adr)) MIDFUNC(2,jnf_MEM_READ_OFF_l,(W4 d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); d = writereg(d); - LDR_rRR(REG_WORK1, adr, REG_WORK2); + LDR_rRR(REG_WORK1, adr, R_MEMSTART); REV_rr(d, REG_WORK1); unlock2(d); @@ -6750,14 +7007,11 @@ MENDFUNC(2,jnf_MEM_READ_OFF_l,(W4 d, RR4 adr)) MIDFUNC(2,jnf_MEM_WRITE24_OFF_b,(RR4 adr, RR4 b)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); b = readreg(b); BIC_rri(REG_WORK1, adr, 0xff000000); - STRB_rRR(b, REG_WORK1, REG_WORK2); + STRB_rRR(b, REG_WORK1, R_MEMSTART); unlock2(b); unlock2(adr); @@ -6766,15 +7020,12 @@ MENDFUNC(2,jnf_MEM_WRITE24_OFF_b,(RR4 adr, RR4 b)) MIDFUNC(2,jnf_MEM_WRITE24_OFF_w,(RR4 adr, RR4 w)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); w = readreg(w); BIC_rri(REG_WORK1, adr, 0xff000000); REV16_rr(REG_WORK3, w); - STRH_rRR(REG_WORK3, REG_WORK1, REG_WORK2); + STRH_rRR(REG_WORK3, REG_WORK1, R_MEMSTART); unlock2(w); unlock2(adr); @@ -6783,15 +7034,12 @@ MENDFUNC(2,jnf_MEM_WRITE24_OFF_w,(RR4 adr, RR4 w)) MIDFUNC(2,jnf_MEM_WRITE24_OFF_l,(RR4 adr, RR4 l)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); l = readreg(l); BIC_rri(REG_WORK1, adr, 0xff000000); REV_rr(REG_WORK3, l); - STR_rRR(REG_WORK3, REG_WORK1, REG_WORK2); + STR_rRR(REG_WORK3, REG_WORK1, R_MEMSTART); unlock2(l); unlock2(adr); @@ -6801,14 +7049,11 @@ MENDFUNC(2,jnf_MEM_WRITE24_OFF_l,(RR4 adr, RR4 l)) MIDFUNC(2,jnf_MEM_READ24_OFF_b,(W4 d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); d = writereg(d); BIC_rri(REG_WORK1, adr, 0xff000000); - LDRB_rRR(d, REG_WORK1, REG_WORK2); + LDRB_rRR(d, REG_WORK1, R_MEMSTART); unlock2(d); unlock2(adr); @@ -6817,14 +7062,11 @@ MENDFUNC(2,jnf_MEM_READ24_OFF_b,(W4 d, RR4 adr)) MIDFUNC(2,jnf_MEM_READ24_OFF_w,(W4 d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); d = writereg(d); BIC_rri(REG_WORK1, adr, 0xff000000); - LDRH_rRR(REG_WORK1, REG_WORK1, REG_WORK2); + LDRH_rRR(REG_WORK1, REG_WORK1, R_MEMSTART); REV16_rr(d, REG_WORK1); unlock2(d); @@ -6834,14 +7076,11 @@ MENDFUNC(2,jnf_MEM_READ24_OFF_w,(W4 d, RR4 adr)) MIDFUNC(2,jnf_MEM_READ24_OFF_l,(W4 d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); d = writereg(d); BIC_rri(REG_WORK1, adr, 0xff000000); - LDR_rRR(d, REG_WORK1, REG_WORK2); + LDR_rRR(d, REG_WORK1, R_MEMSTART); REV_rr(d, d); unlock2(d); @@ -6852,13 +7091,10 @@ MENDFUNC(2,jnf_MEM_READ24_OFF_l,(W4 d, RR4 adr)) MIDFUNC(2,jnf_MEM_GETADR_OFF,(W4 d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); d = writereg(d); - ADD_rrr(d, adr, REG_WORK2); + ADD_rrr(d, adr, R_MEMSTART); unlock2(d); unlock2(adr); @@ -6867,14 +7103,11 @@ MENDFUNC(2,jnf_MEM_GETADR_OFF,(W4 d, RR4 adr)) MIDFUNC(2,jnf_MEM_GETADR24_OFF,(W4 d, RR4 adr)) { - uae_s32 offs = (uae_u32)&NATMEM_OFFSETX - (uae_u32) ®s; - LDR_rRI(REG_WORK2, R_REGSTRUCT, offs); - adr = readreg(adr); d = writereg(d); BIC_rri(REG_WORK1, adr, 0xff000000); - ADD_rrr(d, REG_WORK1, REG_WORK2); + ADD_rrr(d, REG_WORK1, R_MEMSTART); unlock2(d); unlock2(adr); @@ -6882,10 +7115,17 @@ MIDFUNC(2,jnf_MEM_GETADR24_OFF,(W4 d, RR4 adr)) MENDFUNC(2,jnf_MEM_GETADR24_OFF,(W4 d, RR4 adr)) -MIDFUNC(2,jnf_MEM_GETBANKFUNC,(W4 d, RR4 adr, IMM offset)) +MIDFUNC(3,jnf_MEM_READMEMBANK,(W4 dest, RR4 adr, IMM offset)) { - adr = readreg(adr); - d = writereg(d); + clobber_flags(); + if (dest != adr) { + COMPCALL(forget_about)(dest); + } + + adr = readreg_specific(adr, REG_PAR1); + prepare_for_call_1(); + unlock2(adr); + prepare_for_call_2(); #ifdef ARMV6T2 MOVW_ri16(REG_WORK2, (uae_u32)mem_banks); @@ -6895,10 +7135,47 @@ MIDFUNC(2,jnf_MEM_GETBANKFUNC,(W4 d, RR4 adr, IMM offset)) LDR_rRI(REG_WORK2, RPC_INDEX, offs); #endif LSR_rri(REG_WORK1, adr, 16); - LDR_rRR_LSLi(d, REG_WORK2, REG_WORK1, 2); - LDR_rRI(d, d, offset); - - unlock2(d); - unlock2(adr); + LDR_rRR_LSLi(REG_WORK3, REG_WORK2, REG_WORK1, 2); + LDR_rRI(REG_WORK3, REG_WORK3, offset); + + compemu_raw_call_r(REG_WORK3); + + live.nat[REG_RESULT].holds[0] = dest; + live.nat[REG_RESULT].nholds = 1; + live.nat[REG_RESULT].touched = touchcnt++; + + live.state[dest].realreg = REG_RESULT; + live.state[dest].realind = 0; + live.state[dest].val = 0; + live.state[dest].validsize = 4; + set_status(dest, DIRTY); } -MENDFUNC(2,jnf_MEM_GETBANKFUNC,(W4 d, RR4 adr, IMM offset)) +MENDFUNC(3,jnf_MEM_READMEMBANK,(W4 dest, RR4 adr, IMM offset)) + + +MIDFUNC(3,jnf_MEM_WRITEMEMBANK,(RR4 adr, RR4 source, IMM offset)) +{ + clobber_flags(); + + adr = readreg_specific(adr, REG_PAR1); + source = readreg_specific(source, REG_PAR2); + prepare_for_call_1(); + unlock2(adr); + unlock2(source); + prepare_for_call_2(); + +#ifdef ARMV6T2 + MOVW_ri16(REG_WORK2, (uae_u32)mem_banks); + MOVT_ri16(REG_WORK2, (uae_u32)mem_banks >> 16); +#else + uae_s32 offs = data_long_offs((uae_u32)mem_banks); + LDR_rRI(REG_WORK2, RPC_INDEX, offs); +#endif + LSR_rri(REG_WORK1, adr, 16); + LDR_rRR_LSLi(REG_WORK3, REG_WORK2, REG_WORK1, 2); + LDR_rRI(REG_WORK3, REG_WORK3, offset); + + compemu_raw_call_r(REG_WORK3); +} +MENDFUNC(3,jnf_MEM_WRITEMEMBANK,(RR4 adr, RR4 source, IMM offset)) + diff --git a/src/jit/compemu_midfunc_arm2.h b/src/jit/compemu_midfunc_arm2.h index 6959d4c0..a901f7d2 100644 --- a/src/jit/compemu_midfunc_arm2.h +++ b/src/jit/compemu_midfunc_arm2.h @@ -357,6 +357,14 @@ DECLARE_MIDFUNC(jff_ROR_b(RW1 d, RR4 i)); DECLARE_MIDFUNC(jff_ROR_w(RW2 d, RR4 i)); DECLARE_MIDFUNC(jff_ROR_l(RW4 d, RR4 i)); +// ROXR +DECLARE_MIDFUNC(jnf_ROXR_b(RW1 d, RR4 i)); +DECLARE_MIDFUNC(jnf_ROXR_w(RW2 d, RR4 i)); +DECLARE_MIDFUNC(jnf_ROXR_l(RW4 d, RR4 i)); +DECLARE_MIDFUNC(jff_ROXR_b(RW1 d, RR4 i)); +DECLARE_MIDFUNC(jff_ROXR_w(RW2 d, RR4 i)); +DECLARE_MIDFUNC(jff_ROXR_l(RW4 d, RR4 i)); + // Scc DECLARE_MIDFUNC(jnf_SCC(W1 d, IMM cc)); @@ -412,4 +420,6 @@ DECLARE_MIDFUNC(jnf_MEM_READ24_OFF_l(W4 d, RR4 adr)); DECLARE_MIDFUNC(jnf_MEM_GETADR_OFF(W4 d, RR4 adr)); DECLARE_MIDFUNC(jnf_MEM_GETADR24_OFF(W4 d, RR4 adr)); -DECLARE_MIDFUNC(jnf_MEM_GETBANKFUNC(W4 d, RR4 adr, IMM offset)); + +DECLARE_MIDFUNC(jnf_MEM_READMEMBANK(W4 dest, RR4 adr, IMM offset)); +DECLARE_MIDFUNC(jnf_MEM_WRITEMEMBANK(RR4 adr, RR4 source, IMM offset)); diff --git a/src/jit/compemu_support.cpp b/src/jit/compemu_support.cpp index 3a2c0914..e9372f90 100644 --- a/src/jit/compemu_support.cpp +++ b/src/jit/compemu_support.cpp @@ -1544,7 +1544,7 @@ void freescratch(void) int i; for (i=0; i> 12) & 15; int regd_shift=(dp >> 9) & 3; @@ -1843,11 +1818,7 @@ void calc_disp_ea_020(int base, uae_u32 dp, int target, int tmp) if ((dp & 0x4) == 0) { /* add regd *before* the get_long */ if (!ignorereg) { - if ((dp & 0x800) == 0) - sign_extend_16_rr(target, reg); - else - mov_l_rr(target, reg); - shll_l_ri(target, regd_shift); + disp_ea20_target_mov(target, reg, regd_shift, ((dp & 0x800) == 0)); } else mov_l_ri(target, 0); @@ -1856,7 +1827,7 @@ void calc_disp_ea_020(int base, uae_u32 dp, int target, int tmp) if (!ignorebase) arm_ADD_l(target, base); arm_ADD_l_ri(target, addbase); - if (dp&0x03) readlong(target, target, tmp); + if (dp&0x03) readlong(target, target); } else { /* do the getlong first, then add regd */ if (!ignorebase) { mov_l_rr(target, base); @@ -1864,16 +1835,10 @@ void calc_disp_ea_020(int base, uae_u32 dp, int target, int tmp) } else mov_l_ri(target, addbase); - if (dp&0x03) readlong(target, target, tmp); + if (dp&0x03) readlong(target, target); if (!ignorereg) { - if ((dp & 0x800) == 0) - sign_extend_16_rr(tmp, reg); - else - mov_l_rr(tmp, reg); - shll_l_ri(tmp, regd_shift); - /* tmp is now regd */ - arm_ADD_l(target, tmp); + disp_ea20_target_add(target, reg, regd_shift, ((dp & 0x800) == 0)); } } arm_ADD_l_ri(target, outer); @@ -1887,7 +1852,6 @@ void calc_disp_ea_020(int base, uae_u32 dp, int target, int tmp) lea_l_brr_indexed(target, base, reg, 1 << regd_shift, (uae_s8)dp); } } - forget_about(tmp); } void set_cache_state(int enabled) @@ -2027,7 +1991,6 @@ STATIC_INLINE int block_check_checksum(blockinfo* bi) means we have to move it into the needs-to-be-flushed list */ bi->handler_to_use = bi->handler; set_dhtu(bi, bi->direct_handler); - bi->status = BI_CHECKING; isgood = called_check_checksum(bi) != 0; } diff --git a/src/jit/compstbl.cpp b/src/jit/compstbl.cpp index 4580e2c2..52d80309 100644 --- a/src/jit/compstbl.cpp +++ b/src/jit/compstbl.cpp @@ -1636,27 +1636,27 @@ extern const struct comptbl op_smalltbl_0_comp_ff[] = { { op_d1fc_0_comp_ff, 0x00000002, 53756 }, /* ADDA */ { op_e000_0_comp_ff, 0x00000000, 57344 }, /* ASR */ { op_e008_0_comp_ff, 0x00000000, 57352 }, /* LSR */ -{ NULL, 0x00000008, 57360 }, /* ROXR */ +{ op_e010_0_comp_ff, 0x00000008, 57360 }, /* ROXR */ { op_e018_0_comp_ff, 0x00000000, 57368 }, /* ROR */ { op_e020_0_comp_ff, 0x00000000, 57376 }, /* ASR */ { op_e028_0_comp_ff, 0x00000000, 57384 }, /* LSR */ -{ NULL, 0x00000008, 57392 }, /* ROXR */ +{ op_e030_0_comp_ff, 0x00000008, 57392 }, /* ROXR */ { op_e038_0_comp_ff, 0x00000000, 57400 }, /* ROR */ { op_e040_0_comp_ff, 0x00000000, 57408 }, /* ASR */ { op_e048_0_comp_ff, 0x00000000, 57416 }, /* LSR */ -{ NULL, 0x00000008, 57424 }, /* ROXR */ +{ op_e050_0_comp_ff, 0x00000008, 57424 }, /* ROXR */ { op_e058_0_comp_ff, 0x00000000, 57432 }, /* ROR */ { op_e060_0_comp_ff, 0x00000000, 57440 }, /* ASR */ { op_e068_0_comp_ff, 0x00000000, 57448 }, /* LSR */ -{ NULL, 0x00000008, 57456 }, /* ROXR */ +{ op_e070_0_comp_ff, 0x00000008, 57456 }, /* ROXR */ { op_e078_0_comp_ff, 0x00000000, 57464 }, /* ROR */ { op_e080_0_comp_ff, 0x00000000, 57472 }, /* ASR */ { op_e088_0_comp_ff, 0x00000000, 57480 }, /* LSR */ -{ NULL, 0x00000008, 57488 }, /* ROXR */ +{ op_e090_0_comp_ff, 0x00000008, 57488 }, /* ROXR */ { op_e098_0_comp_ff, 0x00000000, 57496 }, /* ROR */ { op_e0a0_0_comp_ff, 0x00000000, 57504 }, /* ASR */ { op_e0a8_0_comp_ff, 0x00000000, 57512 }, /* LSR */ -{ NULL, 0x00000008, 57520 }, /* ROXR */ +{ op_e0b0_0_comp_ff, 0x00000008, 57520 }, /* ROXR */ { op_e0b8_0_comp_ff, 0x00000000, 57528 }, /* ROR */ { op_e0d0_0_comp_ff, 0x00000000, 57552 }, /* ASRW */ { op_e0d8_0_comp_ff, 0x00000000, 57560 }, /* ASRW */ @@ -3508,27 +3508,27 @@ extern const struct comptbl op_smalltbl_0_comp_nf[] = { { op_d1fc_0_comp_nf, 0x00000002, 53756 }, /* ADDA */ { op_e000_0_comp_nf, 0x00000000, 57344 }, /* ASR */ { op_e008_0_comp_nf, 0x00000000, 57352 }, /* LSR */ -{ NULL, 0x00000008, 57360 }, /* ROXR */ +{ op_e010_0_comp_nf, 0x00000008, 57360 }, /* ROXR */ { op_e018_0_comp_nf, 0x00000000, 57368 }, /* ROR */ { op_e020_0_comp_nf, 0x00000000, 57376 }, /* ASR */ { op_e028_0_comp_nf, 0x00000000, 57384 }, /* LSR */ -{ NULL, 0x00000008, 57392 }, /* ROXR */ +{ op_e030_0_comp_nf, 0x00000008, 57392 }, /* ROXR */ { op_e038_0_comp_nf, 0x00000000, 57400 }, /* ROR */ { op_e040_0_comp_nf, 0x00000000, 57408 }, /* ASR */ { op_e048_0_comp_nf, 0x00000000, 57416 }, /* LSR */ -{ NULL, 0x00000008, 57424 }, /* ROXR */ +{ op_e050_0_comp_nf, 0x00000008, 57424 }, /* ROXR */ { op_e058_0_comp_nf, 0x00000000, 57432 }, /* ROR */ { op_e060_0_comp_nf, 0x00000000, 57440 }, /* ASR */ { op_e068_0_comp_nf, 0x00000000, 57448 }, /* LSR */ -{ NULL, 0x00000008, 57456 }, /* ROXR */ +{ op_e070_0_comp_nf, 0x00000008, 57456 }, /* ROXR */ { op_e078_0_comp_nf, 0x00000000, 57464 }, /* ROR */ { op_e080_0_comp_nf, 0x00000000, 57472 }, /* ASR */ { op_e088_0_comp_nf, 0x00000000, 57480 }, /* LSR */ -{ NULL, 0x00000008, 57488 }, /* ROXR */ +{ op_e090_0_comp_nf, 0x00000008, 57488 }, /* ROXR */ { op_e098_0_comp_nf, 0x00000000, 57496 }, /* ROR */ { op_e0a0_0_comp_nf, 0x00000000, 57504 }, /* ASR */ { op_e0a8_0_comp_nf, 0x00000000, 57512 }, /* LSR */ -{ NULL, 0x00000008, 57520 }, /* ROXR */ +{ op_e0b0_0_comp_nf, 0x00000008, 57520 }, /* ROXR */ { op_e0b8_0_comp_nf, 0x00000000, 57528 }, /* ROR */ { op_e0d0_0_comp_nf, 0x00000000, 57552 }, /* ASRW */ { op_e0d8_0_comp_nf, 0x00000000, 57560 }, /* ASRW */ diff --git a/src/jit/comptbl.h b/src/jit/comptbl.h index 636491c7..05b5beb9 100644 --- a/src/jit/comptbl.h +++ b/src/jit/comptbl.h @@ -1399,21 +1399,27 @@ extern compop_func op_d1fb_0_comp_ff; extern compop_func op_d1fc_0_comp_ff; extern compop_func op_e000_0_comp_ff; extern compop_func op_e008_0_comp_ff; +extern compop_func op_e010_0_comp_ff; extern compop_func op_e018_0_comp_ff; extern compop_func op_e020_0_comp_ff; extern compop_func op_e028_0_comp_ff; +extern compop_func op_e030_0_comp_ff; extern compop_func op_e038_0_comp_ff; extern compop_func op_e040_0_comp_ff; extern compop_func op_e048_0_comp_ff; +extern compop_func op_e050_0_comp_ff; extern compop_func op_e058_0_comp_ff; extern compop_func op_e060_0_comp_ff; extern compop_func op_e068_0_comp_ff; +extern compop_func op_e070_0_comp_ff; extern compop_func op_e078_0_comp_ff; extern compop_func op_e080_0_comp_ff; extern compop_func op_e088_0_comp_ff; +extern compop_func op_e090_0_comp_ff; extern compop_func op_e098_0_comp_ff; extern compop_func op_e0a0_0_comp_ff; extern compop_func op_e0a8_0_comp_ff; +extern compop_func op_e0b0_0_comp_ff; extern compop_func op_e0b8_0_comp_ff; extern compop_func op_e0d0_0_comp_ff; extern compop_func op_e0d8_0_comp_ff; @@ -2907,21 +2913,27 @@ extern compop_func op_d1fb_0_comp_nf; extern compop_func op_d1fc_0_comp_nf; extern compop_func op_e000_0_comp_nf; extern compop_func op_e008_0_comp_nf; +extern compop_func op_e010_0_comp_nf; extern compop_func op_e018_0_comp_nf; extern compop_func op_e020_0_comp_nf; extern compop_func op_e028_0_comp_nf; +extern compop_func op_e030_0_comp_nf; extern compop_func op_e038_0_comp_nf; extern compop_func op_e040_0_comp_nf; extern compop_func op_e048_0_comp_nf; +extern compop_func op_e050_0_comp_nf; extern compop_func op_e058_0_comp_nf; extern compop_func op_e060_0_comp_nf; extern compop_func op_e068_0_comp_nf; +extern compop_func op_e070_0_comp_nf; extern compop_func op_e078_0_comp_nf; extern compop_func op_e080_0_comp_nf; extern compop_func op_e088_0_comp_nf; +extern compop_func op_e090_0_comp_nf; extern compop_func op_e098_0_comp_nf; extern compop_func op_e0a0_0_comp_nf; extern compop_func op_e0a8_0_comp_nf; +extern compop_func op_e0b0_0_comp_nf; extern compop_func op_e0b8_0_comp_nf; extern compop_func op_e0d0_0_comp_nf; extern compop_func op_e0d8_0_comp_nf; diff --git a/src/jit/gencomp_arm.cpp b/src/jit/gencomp_arm.cpp index 1088cf68..39935584 100644 --- a/src/jit/gencomp_arm.cpp +++ b/src/jit/gencomp_arm.cpp @@ -108,7 +108,7 @@ //#define DISABLE_I_ROL //#define DISABLE_I_ROR //#define DISABLE_I_ROXL -#define DISABLE_I_ROXR +//#define DISABLE_I_ROXR //#define DISABLE_I_ASRW //#define DISABLE_I_ASLW //#define DISABLE_I_LSRW @@ -275,32 +275,32 @@ static inline void gen_update_next_handler(void) static void gen_writebyte(const char* address, const char* source) { - comprintf("\twritebyte(%s,%s,scratchie);\n", address, source); + comprintf("\twritebyte(%s,%s);\n", address, source); } static void gen_writeword(const char* address, const char* source) { - comprintf("\twriteword(%s,%s,scratchie);\n", address, source); + comprintf("\twriteword(%s,%s);\n", address, source); } static void gen_writelong(const char* address, const char* source) { - comprintf("\twritelong(%s,%s,scratchie);\n", address, source); + comprintf("\twritelong(%s,%s);\n", address, source); } static void gen_readbyte(const char* address, const char* dest) { - comprintf("\treadbyte(%s,%s,scratchie);\n", address, dest); + comprintf("\treadbyte(%s,%s);\n", address, dest); } static void gen_readword(const char* address, const char* dest) { - comprintf("\treadword(%s,%s,scratchie);\n", address, dest); + comprintf("\treadword(%s,%s);\n", address, dest); } static void gen_readlong(const char* address, const char* dest) { - comprintf("\treadlong(%s,%s,scratchie);\n", address, dest); + comprintf("\treadlong(%s,%s);\n", address, dest); } @@ -443,7 +443,7 @@ static void genamode(amodes mode, const char *reg, wordsizes size, const char *n break; case Ad8r: comprintf("\tint %sa=scratchie++;\n", name); - comprintf("\tcalc_disp_ea_020(%s+8,%s,%sa,scratchie);\n", reg, gen_nextiword(), name); + comprintf("\tcalc_disp_ea_020(%s+8,%s,%sa);\n", reg, gen_nextiword(), name); break; case PC16: @@ -460,7 +460,7 @@ static void genamode(amodes mode, const char *reg, wordsizes size, const char *n start_brace(); comprintf("\tmov_l_ri(pctmp,address);\n"); - comprintf("\tcalc_disp_ea_020(pctmp,%s,%sa,scratchie);\n", gen_nextiword(), name); + comprintf("\tcalc_disp_ea_020(pctmp,%s,%sa);\n", gen_nextiword(), name); break; case absw: comprintf("\tint %sa = scratchie++;\n", name); @@ -659,7 +659,7 @@ static void genamode_new(amodes mode, const char *reg, wordsizes size, const cha break; case Ad8r: comprintf("\tint %sa=scratchie++;\n", name); - comprintf("\tcalc_disp_ea_020(%s+8,%s,%sa,scratchie);\n", reg, gen_nextiword(), name); + comprintf("\tcalc_disp_ea_020(%s+8,%s,%sa);\n", reg, gen_nextiword(), name); break; case PC16: @@ -675,7 +675,7 @@ static void genamode_new(amodes mode, const char *reg, wordsizes size, const cha comprintf("\tuae_u32 address=start_pc+((char *)comp_pc_p-(char *)start_pc_p)+m68k_pc_offset;\n"); comprintf("\tmov_l_ri(pctmp,address);\n"); - comprintf("\tcalc_disp_ea_020(pctmp,%s,%sa,scratchie);\n", gen_nextiword(), name); + comprintf("\tcalc_disp_ea_020(pctmp,%s,%sa);\n", gen_nextiword(), name); break; case absw: comprintf("\tint %sa = scratchie++;\n", name); @@ -1006,18 +1006,22 @@ static void genmovemel(uae_u16 opcode) comprintf("\tif (!special_mem) {\n"); /* Fast but unsafe... */ - comprintf("\tget_n_addr(srca,native,scratchie);\n"); + comprintf("\tget_n_addr(srca,native);\n"); comprintf("\tfor (i=0;i<16;i++) {\n" "\t\tif ((mask>>i)&1) {\n"); switch (table68k[opcode].size) { case sz_long: - comprintf("\t\t\tjnf_MVMEL_l(i,native,offset);\n" - "\t\t\toffset+=4;\n"); + if (table68k[opcode].dmode == Aipi) + comprintf("\t\t\tif(srca != i)\n"); + comprintf("\t\t\tjnf_MVMEL_l(i,native,offset);\n"); + comprintf("\t\t\toffset+=4;\n"); break; case sz_word: - comprintf("\t\t\tjnf_MVMEL_w(i,native,offset);\n" - "\t\t\toffset+=2;\n"); + if (table68k[opcode].dmode == Aipi) + comprintf("\t\t\tif(srca != i)\n"); + comprintf("\t\t\tjnf_MVMEL_w(i,native,offset);\n"); + comprintf("\t\t\toffset+=2;\n"); break; default: abort(); } @@ -1037,11 +1041,11 @@ static void genmovemel(uae_u16 opcode) "\t\t\tif ((mask>>i)&1) {\n"); switch(table68k[opcode].size) { case sz_long: - comprintf("\t\t\t\treadlong(tmp,i,scratchie);\n" + comprintf("\t\t\t\treadlong(tmp,i);\n" "\t\t\t\tarm_ADD_l_ri8(tmp,4);\n"); break; case sz_word: - comprintf("\t\t\t\treadword(tmp,i,scratchie);\n" + comprintf("\t\t\t\treadword(tmp,i);\n" "\t\t\t\tarm_ADD_l_ri8(tmp,2);\n"); break; default: abort(); @@ -1071,7 +1075,7 @@ static void genmovemle(uae_u16 opcode) act of cleverness means that movmle must pay attention to special_mem, or Genetic Species is a rather boring-looking game ;-) */ comprintf("\tif (!special_mem) {\n"); - comprintf("\tget_n_addr(srca,native,scratchie);\n"); + comprintf("\tget_n_addr(srca,native);\n"); if (table68k[opcode].dmode != Apdi) { comprintf("\tfor (i=0;i<16;i++) {\n" @@ -1120,11 +1124,11 @@ static void genmovemle(uae_u16 opcode) "\t\tif ((mask>>i)&1) {\n"); switch(table68k[opcode].size) { case sz_long: - comprintf("\t\t\twritelong(tmp,i,scratchie);\n" + comprintf("\t\t\twritelong(tmp,i);\n" "\t\t\tarm_ADD_l_ri8(tmp,4);\n"); break; case sz_word: - comprintf("\t\t\twriteword(tmp,i,scratchie);\n" + comprintf("\t\t\twriteword(tmp,i);\n" "\t\t\tarm_ADD_l_ri8(tmp,2);\n"); break; default: abort(); @@ -1136,11 +1140,11 @@ static void genmovemle(uae_u16 opcode) switch(table68k[opcode].size) { case sz_long: comprintf("\t\t\tarm_SUB_l_ri8(srca,4);\n" - "\t\t\twritelong(srca,15-i,scratchie);\n"); + "\t\t\twritelong(srca,15-i);\n"); break; case sz_word: comprintf("\t\t\tarm_SUB_l_ri8(srca,2);\n" - "\t\t\twriteword(srca,15-i,scratchie);\n"); + "\t\t\twriteword(srca,15-i);\n"); break; default: abort(); } @@ -1245,14 +1249,6 @@ static void gen_andsr(uae_u32 opcode, struct instr *curi, char* ssize) { static void gen_asl(uae_u32 opcode, struct instr *curi, char* ssize) { (void) opcode; - mayfail; - if (curi->smode == Dreg) { - comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" - " FAIL(1);\n" - " " RETURN "\n" - "} \n"); - start_brace(); - } comprintf("\t dont_care_flags();\n"); genamode_new(curi->smode, "srcreg", curi->size, "", 1, 0); @@ -1297,15 +1293,6 @@ static void gen_aslw(uae_u32 opcode, struct instr *curi, char* ssize) { static void gen_asr(uae_u32 opcode, struct instr *curi, char* ssize) { (void)opcode; - - mayfail; - if (curi->smode == Dreg) { - comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" - " FAIL(1);\n" - " " RETURN "\n" - "} \n"); - start_brace(); - } comprintf("\t dont_care_flags();\n"); genamode_new(curi->smode, "srcreg", curi->size, "", 1, 0); @@ -1664,14 +1651,6 @@ static void gen_ext(uae_u32 opcode, struct instr *curi, char* ssize) { static void gen_lsl(uae_u32 opcode, struct instr *curi, char* ssize) { (void) opcode; - mayfail; - if (curi->smode == Dreg) { - comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" - " FAIL(1);\n" - " " RETURN "\n" - "} \n"); - start_brace(); - } comprintf("\tdont_care_flags();\n"); genamode_new(curi->smode, "srcreg", curi->size, "", 1, 0); @@ -1715,14 +1694,6 @@ static void gen_lslw(uae_u32 opcode, struct instr *curi, char* ssize) { static void gen_lsr(uae_u32 opcode, struct instr *curi, char* ssize) { (void) opcode; - mayfail; - if (curi->smode == Dreg) { - comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" - " FAIL(1);\n" - " " RETURN "\n" - "} \n"); - start_brace(); - } comprintf("\t dont_care_flags();\n"); genamode_new(curi->smode, "srcreg", curi->size, "", 1, 0); @@ -1970,14 +1941,6 @@ static void gen_orsr(uae_u32 opcode, struct instr *curi, char* ssize) { static void gen_rol(uae_u32 opcode, struct instr *curi, char* ssize) { (void) opcode; - mayfail; - if (curi->smode == Dreg) { - comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" - " FAIL(1);\n" - " " RETURN "\n" - "} \n"); - start_brace(); - } comprintf("\t dont_care_flags();\n"); genamode_new(curi->smode, "srcreg", curi->size, "cnt", 1, 0); genamode_new(curi->dmode, "dstreg", curi->size, "data", 1, 0); @@ -2009,14 +1972,6 @@ static void gen_rolw(uae_u32 opcode, struct instr *curi, char* ssize) { static void gen_ror(uae_u32 opcode, struct instr *curi, char* ssize) { (void) opcode; - mayfail; - if (curi->smode == Dreg) { - comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" - " FAIL(1);\n" - " " RETURN "\n" - "} \n"); - start_brace(); - } comprintf("\t dont_care_flags();\n"); genamode_new(curi->smode, "srcreg", curi->size, "cnt", 1, 0); genamode_new(curi->dmode, "dstreg", curi->size, "data", 1, 0); @@ -2048,14 +2003,6 @@ static void gen_rorw(uae_u32 opcode, struct instr *curi, char* ssize) { static void gen_roxl(uae_u32 opcode, struct instr *curi, char* ssize) { (void) opcode; - mayfail; - if (curi->smode == Dreg) { - comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" - " FAIL(1);\n" - " " RETURN "\n" - "} \n"); - start_brace(); - } isaddx; comprintf("\t dont_care_flags();\n"); genamode_new(curi->smode, "srcreg", curi->size, "cnt", 1, 0); @@ -2091,15 +2038,6 @@ static void gen_roxlw(uae_u32 opcode, struct instr *curi, char* ssize) { static void gen_roxr(uae_u32 opcode, struct instr *curi, char* ssize) { (void) opcode; - (void) ssize; - mayfail; - if (curi->smode == Dreg) { - comprintf("if ((uae_u32)srcreg==(uae_u32)dstreg) {\n" - " FAIL(1);\n" - " " RETURN "\n" - "} \n"); - start_brace(); - } isaddx; comprintf("\t dont_care_flags();\n"); genamode_new(curi->smode, "srcreg", curi->size, "cnt", 1, 0); @@ -2597,9 +2535,9 @@ static int gen_opcode(unsigned long int opcode) comprintf("\tarm_ADD_l_ri8(offs,4);\n"); start_brace(); comprintf("\tint newad=scratchie++;\n" - "\treadlong(15,newad,scratchie);\n" + "\treadlong(15,newad);\n" "\tmov_l_mr((uintptr)®s.pc,newad);\n" - "\tget_n_addr_jmp(newad,PC_P,scratchie);\n" + "\tget_n_addr_jmp(newad,PC_P);\n" "\tmov_l_mr((uintptr)®s.pc_oldp,PC_P);\n" "\tm68k_pc_offset=0;\n" "\tarm_ADD_l(15,offs);\n"); @@ -2614,7 +2552,7 @@ static int gen_opcode(unsigned long int opcode) genamode_new(curi->smode, "srcreg", sz_long, "src", 1, 0); genamode_new(curi->dmode, "dstreg", curi->size, "offs", 1, 0); comprintf("\tsub_l_ri(15,4);\n" - "\twritelong_clobber(15,src,scratchie);\n" + "\twritelong_clobber(15,src);\n" "\tmov_l_rr(src,15);\n"); comprintf("\tarm_ADD_l(15,offs);\n"); genastore("src", curi->smode, "srcreg", sz_long, "src"); @@ -2626,7 +2564,7 @@ static int gen_opcode(unsigned long int opcode) #endif genamode_new(curi->smode, "srcreg", curi->size, "src", 1, 0); comprintf("\tmov_l_rr(15,src);\n" - "\treadlong(15,src,scratchie);\n" + "\treadlong(15,src);\n" "\tarm_ADD_l_ri8(15,4);\n"); genastore("src", curi->smode, "srcreg", curi->size, "src"); break; @@ -2636,9 +2574,9 @@ static int gen_opcode(unsigned long int opcode) failure; #endif comprintf("\tint newad=scratchie++;\n" - "\treadlong(15,newad,scratchie);\n" + "\treadlong(15,newad);\n" "\tmov_l_mr((uintptr)®s.pc,newad);\n" - "\tget_n_addr_jmp(newad,PC_P,scratchie);\n" + "\tget_n_addr_jmp(newad,PC_P);\n" "\tmov_l_mr((uintptr)®s.pc_oldp,PC_P);\n" "\tm68k_pc_offset=0;\n" "\tarm_ADD_l_ri8(15,4);\n"); @@ -2668,9 +2606,9 @@ static int gen_opcode(unsigned long int opcode) comprintf("\tint ret=scratchie++;\n" "\tmov_l_ri(ret,retadd);\n" "\tsub_l_ri(15,4);\n" - "\twritelong_clobber(15,ret,scratchie);\n"); + "\twritelong_clobber(15,ret);\n"); comprintf("\tmov_l_mr((uintptr)®s.pc,srca);\n" - "\tget_n_addr_jmp(srca,PC_P,scratchie);\n" + "\tget_n_addr_jmp(srca,PC_P);\n" "\tmov_l_mr((uintptr)®s.pc_oldp,PC_P);\n" "\tm68k_pc_offset=0;\n"); gen_update_next_handler(); @@ -2683,7 +2621,7 @@ static int gen_opcode(unsigned long int opcode) isjump; genamode_new(curi->smode, "srcreg", curi->size, "src", 0, 0); comprintf("\tmov_l_mr((uintptr)®s.pc,srca);\n" - "\tget_n_addr_jmp(srca,PC_P,scratchie);\n" + "\tget_n_addr_jmp(srca,PC_P);\n" "\tmov_l_mr((uintptr)®s.pc_oldp,PC_P);\n" "\tm68k_pc_offset=0;\n"); gen_update_next_handler(); @@ -2702,7 +2640,7 @@ static int gen_opcode(unsigned long int opcode) comprintf("\tint ret=scratchie++;\n" "\tmov_l_ri(ret,retadd);\n" "\tsub_l_ri(15,4);\n" - "\twritelong_clobber(15,ret,scratchie);\n"); + "\twritelong_clobber(15,ret);\n"); comprintf("\tarm_ADD_l_ri(src,m68k_pc_offset_thisinst+2);\n"); comprintf("\tm68k_pc_offset=0;\n"); comprintf("\tarm_ADD_l(PC_P,src);\n"); diff --git a/src/osdep/bsdsocket_host.cpp b/src/osdep/bsdsocket_host.cpp index bbdb3372..faef55cf 100644 --- a/src/osdep/bsdsocket_host.cpp +++ b/src/osdep/bsdsocket_host.cpp @@ -60,7 +60,7 @@ void bsdsock_fake_int_handler(void) #include #include -#define DEBUG_BSDSOCKET +//#define DEBUG_BSDSOCKET #ifdef DEBUG_BSDSOCKET #define DEBUG_LOG write_log #else