diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S index bbc52c3..83c5b08 100644 --- a/libpcsxcore/new_dynarec/linkage_arm.S +++ b/libpcsxcore/new_dynarec/linkage_arm.S @@ -437,7 +437,7 @@ FUNCTION(cc_interrupt): str r1, [fp, #LO_pending_exception] and r2, r2, r10, lsr #17 add r3, fp, #LO_restore_candidate - str r10, [fp, #LO_cycle] /* PCSX cycles */ +@@@ str r10, [fp, #LO_cycle] /* PCSX cycles */ @@ str r10, [fp, #LO_reg_cop0+36] /* Count */ ldr r4, [r2, r3] mov r10, lr @@ -527,7 +527,7 @@ FUNCTION(new_dyna_leave): ldr r0, [fp, #LO_last_count] add r12, fp, #28 add r10, r0, r10 - str r10, [fp, #LO_cycle] +@@@ str r10, [fp, #LO_cycle] ldmfd sp!, {r4, r5, r6, r7, r8, r9, sl, fp, ip, pc} .size new_dyna_leave, .-new_dyna_leave @@ -644,7 +644,7 @@ FUNCTION(new_dyna_start): \readop r0, [r1, r3, lsl #\tab_shift] .endif movcc pc, lr - str r2, [fp, #LO_cycle] +@@@ str r2, [fp, #LO_cycle] bx r1 .endm @@ -679,7 +679,7 @@ FUNCTION(jump_handler_read32): mov r0, r1 add r2, r2, r12 push {r2, lr} - str r2, [fp, #LO_cycle] +@@@ str r2, [fp, #LO_cycle] blx r3 ldr r0, [fp, #LO_next_interupt] @@ -707,7 +707,7 @@ FUNCTION(jump_handler_write_h): add r2, r2, r12 mov r0, r1 push {r2, lr} - str r2, [fp, #LO_cycle] +@@@ str r2, [fp, #LO_cycle] blx r3 ldr r0, [fp, #LO_next_interupt] diff --git a/libpcsxcore/new_dynarec/linkage_arm64.S b/libpcsxcore/new_dynarec/linkage_arm64.S index 698bd78..798abea 100644 --- a/libpcsxcore/new_dynarec/linkage_arm64.S +++ b/libpcsxcore/new_dynarec/linkage_arm64.S @@ -119,7 +119,7 @@ FUNCTION(cc_interrupt): str wzr, [rFP, #LO_pending_exception] and w2, w2, rCC, lsr #17 add x3, rFP, #LO_restore_candidate - str rCC, [rFP, #LO_cycle] /* PCSX cycles */ +## str rCC, [rFP, #LO_cycle] /* PCSX cycles */ # str rCC, [rFP, #LO_reg_cop0+36] /* Count */ ldr w19, [x3, w2, uxtw] mov x21, lr @@ -227,7 +227,7 @@ FUNCTION(new_dyna_start): FUNCTION(new_dyna_leave): ldr w0, [rFP, #LO_last_count] add rCC, rCC, w0 - str rCC, [rFP, #LO_cycle] +## str rCC, [rFP, #LO_cycle] ldp x19, x20, [sp, #16*1] ldp x21, x22, [sp, #16*2] ldp x23, x24, [sp, #16*3] @@ -245,7 +245,7 @@ FUNCTION(new_dyna_leave): /* w0 = adddr/data, x1 = rhandler, w2 = cycles, x3 = whandler */ ldr w4, [rFP, #LO_last_count] add w4, w4, w2 - str w4, [rFP, #LO_cycle] +## str w4, [rFP, #LO_cycle] .endm .macro memhandler_post diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c index 1452db3..8200e44 100644 --- a/libpcsxcore/new_dynarec/new_dynarec.c +++ b/libpcsxcore/new_dynarec/new_dynarec.c @@ -44,10 +44,10 @@ static int sceBlock; #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) #endif -//#define DISASM -//#define assem_debug printf +#define DISASM +#define assem_debug printf //#define inv_debug printf -#define assem_debug(...) +//#define assem_debug(...) #define inv_debug(...) #ifdef __i386__ @@ -423,6 +423,9 @@ static int doesnt_expire_soon(void *tcaddr) // This is called from the recompiled JR/JALR instructions void noinline *get_addr(u_int vaddr) { +#ifdef DRC_DBG +printf("get_addr %08x, pc=%08x\n", vaddr, psxRegs.pc); +#endif u_int page=get_page(vaddr); u_int vpage=get_vpage(vaddr); struct ll_entry *head; @@ -4393,13 +4396,15 @@ void do_cc(int i,signed char i_regmap[],int *adj,int addr,int taken,int invert) } emit_addimm_and_set_flags(cycles,HOST_CCREG); jaddr=out; - emit_jns(0); + //emit_jns(0); + emit_jmp(0); } else { emit_cmpimm(HOST_CCREG,-CLOCK_ADJUST(count+2)); jaddr=out; - emit_jns(0); + //emit_jns(0); + emit_jmp(0); } add_stub(CC_STUB,jaddr,idle?idle:out,(*adj==0||invert||idle)?0:(count+2),i,addr,taken,0); } @@ -4807,7 +4812,8 @@ static void rjump_assemble(int i,struct regstat *i_regs) // special case for RFE emit_jmp(0); else - emit_jns(0); + //emit_jns(0); + emit_jmp(0); //load_regs_bt(branch_regs[i].regmap,branch_regs[i].dirty,-1); #ifdef USE_MINI_HT if(rs1[i]==31) { @@ -4912,7 +4918,8 @@ static void cjump_assemble(int i,struct regstat *i_regs) else if(nop) { emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),cc); void *jaddr=out; - emit_jns(0); + //emit_jns(0); + emit_jmp(0); add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0); } else { @@ -5099,7 +5106,8 @@ static void cjump_assemble(int i,struct regstat *i_regs) emit_loadreg(CCREG,HOST_CCREG); emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),HOST_CCREG); void *jaddr=out; - emit_jns(0); + //emit_jns(0); + emit_jmp(0); add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0); emit_storereg(CCREG,HOST_CCREG); } @@ -5108,7 +5116,8 @@ static void cjump_assemble(int i,struct regstat *i_regs) assert(cc==HOST_CCREG); emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),cc); void *jaddr=out; - emit_jns(0); + //emit_jns(0); + emit_jmp(0); add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,likely[i]?NULLDS:NOTTAKEN,0); } } @@ -5210,7 +5219,8 @@ static void sjump_assemble(int i,struct regstat *i_regs) else if(nevertaken) { emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),cc); void *jaddr=out; - emit_jns(0); + //emit_jns(0); + emit_jmp(0); add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0); } else { @@ -5366,7 +5376,8 @@ static void sjump_assemble(int i,struct regstat *i_regs) emit_loadreg(CCREG,HOST_CCREG); emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),HOST_CCREG); void *jaddr=out; - emit_jns(0); + //emit_jns(0); + emit_jmp(0); add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0); emit_storereg(CCREG,HOST_CCREG); } @@ -5375,7 +5386,8 @@ static void sjump_assemble(int i,struct regstat *i_regs) assert(cc==HOST_CCREG); emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),cc); void *jaddr=out; - emit_jns(0); + //emit_jns(0); + emit_jmp(0); add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,likely[i]?NULLDS:NOTTAKEN,0); } } @@ -5863,7 +5875,7 @@ void unneeded_registers(int istart,int iend,int r) // R0 is always unneeded u|=1; // Save it - unneeded_reg[i]=u; + unneeded_reg[i]=1;//u; gte_unneeded[i]=gte_u; /* printf("ur (%d,%d) %x: ",istart,iend,start+i*4); @@ -8387,6 +8399,7 @@ int new_recompile_block(int addr) // This allocates registers (if possible) one instruction prior // to use, which can avoid a load-use penalty on certain CPUs. +#if 0 for(i=0;i>16)==0x1000) literal_pool(1024); else @@ -8950,7 +8969,7 @@ int new_recompile_block(int addr) } } // External Branch Targets (jump_in) - if(copy+slen*4>(void *)shadow+sizeof(shadow)) copy=shadow; + if(copy+slen*4>(void *)shadow+sizeof(shadow)) {copy=shadow;printf("shadow overflow\n");} for(i=0;i