X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fnew_dynarec%2Fpatches%2Ftrace_drc_chk;h=93ca59802e05197fa2d3b1cc3ad2bf77df6b6be1;hb=37387d8b2b8b9705ca42bd7582ed48d88aeafb9b;hp=d1fc6e96e603df94b5a6e9d4dadf947c8710de42;hpb=a151a8d8331cf743eabeab23ce52e9b7726239e5;p=pcsx_rearmed.git diff --git a/libpcsxcore/new_dynarec/patches/trace_drc_chk b/libpcsxcore/new_dynarec/patches/trace_drc_chk index d1fc6e96..93ca5980 100644 --- a/libpcsxcore/new_dynarec/patches/trace_drc_chk +++ b/libpcsxcore/new_dynarec/patches/trace_drc_chk @@ -1,8 +1,8 @@ diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S -index d32dc0b..e52dde8 100644 +index 1d8cefa..528929f 100644 --- a/libpcsxcore/new_dynarec/linkage_arm.S +++ b/libpcsxcore/new_dynarec/linkage_arm.S -@@ -442,7 +442,7 @@ FUNCTION(cc_interrupt): +@@ -438,7 +438,7 @@ FUNCTION(cc_interrupt): str r1, [fp, #LO_pending_exception] and r2, r2, r10, lsr #17 add r3, fp, #LO_restore_candidate @@ -11,34 +11,7 @@ index d32dc0b..e52dde8 100644 @@ str r10, [fp, #LO_reg_cop0+36] /* Count */ ldr r4, [r2, r3] mov r10, lr -@@ -530,7 +530,7 @@ FUNCTION(jump_syscall_hle): - mov r1, #0 /* in delay slot */ - add r2, r2, r10 - mov r0, #0x20 /* cause */ -- str r2, [fp, #LO_cycle] /* PCSX cycle counter */ -+@@@ str r2, [fp, #LO_cycle] /* PCSX cycle counter */ - bl psxException - - /* note: psxException might do recursive recompiler call from it's HLE code, -@@ -551,7 +551,7 @@ FUNCTION(jump_hlecall): - str r0, [fp, #LO_pcaddr] - add r2, r2, r10 - adr lr, pcsx_return -- str r2, [fp, #LO_cycle] /* PCSX cycle counter */ -+@@@ str r2, [fp, #LO_cycle] /* PCSX cycle counter */ - bx r1 - .size jump_hlecall, .-jump_hlecall - -@@ -561,7 +561,7 @@ FUNCTION(jump_intcall): - str r0, [fp, #LO_pcaddr] - add r2, r2, r10 - adr lr, pcsx_return -- str r2, [fp, #LO_cycle] /* PCSX cycle counter */ -+@@@ str r2, [fp, #LO_cycle] /* PCSX cycle counter */ - b execI - .size jump_hlecall, .-jump_hlecall - -@@ -570,7 +570,7 @@ FUNCTION(new_dyna_leave): +@@ -528,7 +528,7 @@ FUNCTION(new_dyna_leave): ldr r0, [fp, #LO_last_count] add r12, fp, #28 add r10, r0, r10 @@ -47,7 +20,7 @@ index d32dc0b..e52dde8 100644 ldmfd sp!, {r4, r5, r6, r7, r8, r9, sl, fp, ip, pc} .size new_dyna_leave, .-new_dyna_leave -@@ -687,7 +687,7 @@ FUNCTION(new_dyna_start): +@@ -645,7 +645,7 @@ FUNCTION(new_dyna_start): \readop r0, [r1, r3, lsl #\tab_shift] .endif movcc pc, lr @@ -56,7 +29,7 @@ index d32dc0b..e52dde8 100644 bx r1 .endm -@@ -722,7 +722,7 @@ FUNCTION(jump_handler_read32): +@@ -680,7 +680,7 @@ FUNCTION(jump_handler_read32): mov r0, r1 add r2, r2, r12 push {r2, lr} @@ -65,7 +38,7 @@ index d32dc0b..e52dde8 100644 blx r3 ldr r0, [fp, #LO_next_interupt] -@@ -750,7 +750,7 @@ FUNCTION(jump_handler_write_h): +@@ -708,7 +708,7 @@ FUNCTION(jump_handler_write_h): add r2, r2, r12 mov r0, r1 push {r2, lr} @@ -74,27 +47,44 @@ index d32dc0b..e52dde8 100644 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 7df82b4..79298e4 100644 +--- a/libpcsxcore/new_dynarec/linkage_arm64.S ++++ b/libpcsxcore/new_dynarec/linkage_arm64.S +@@ -123,7 +123,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 +@@ -231,7 +231,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] +@@ -249,7 +249,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 6d7069d..586a6db 100644 +index 2f77516..21481bc 100644 --- a/libpcsxcore/new_dynarec/new_dynarec.c +++ b/libpcsxcore/new_dynarec/new_dynarec.c -@@ -38,10 +38,10 @@ static int sceBlock; - #include "../psxhle.h" //emulator interface - #include "emu_if.h" //emulator interface - --//#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__ -@@ -362,6 +362,9 @@ static u_int get_vpage(u_int vaddr) +@@ -521,6 +521,9 @@ static int doesnt_expire_soon(void *tcaddr) // This is called from the recompiled JR/JALR instructions - void *get_addr(u_int vaddr) + void noinline *get_addr(u_int vaddr) { +#ifdef DRC_DBG +printf("get_addr %08x, pc=%08x\n", vaddr, psxRegs.pc); @@ -102,132 +92,112 @@ index 6d7069d..586a6db 100644 u_int page=get_page(vaddr); u_int vpage=get_vpage(vaddr); struct ll_entry *head; -@@ -4403,13 +4406,15 @@ void do_cc(int i,signed char i_regmap[],int *adj,int addr,int taken,int invert) - } +@@ -4790,13 +4793,15 @@ void do_cc(int i,signed char i_regmap[],int *adj,int addr,int taken,int invert) + #endif emit_addimm_and_set_flags(cycles,HOST_CCREG); - jaddr=(int)out; + jaddr=out; - emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); ++ //emit_jns(0); ++ emit_jmp(0); } else { emit_cmpimm(HOST_CCREG,-CLOCK_ADJUST(count+2)); - jaddr=(int)out; + jaddr=out; - emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); ++ //emit_jns(0); ++ emit_jmp(0); } - add_stub(CC_STUB,jaddr,idle?idle:(int)out,(*adj==0||invert||idle)?0:(count+2),i,addr,taken,0); + add_stub(CC_STUB,jaddr,idle?idle:out,(*adj==0||invert||idle)?0:(count+2),i,addr,taken,0); } -@@ -4884,7 +4889,8 @@ void rjump_assemble(int i,struct regstat *i_regs) +@@ -5204,7 +5209,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].is32,branch_regs[i].dirty,-1); ++ emit_jmp(0); + //load_regs_bt(branch_regs[i].regmap,branch_regs[i].dirty,-1); #ifdef USE_MINI_HT - if(rs1[i]==31) { -@@ -5034,7 +5040,8 @@ void cjump_assemble(int i,struct regstat *i_regs) + if(dops[i].rs1==31) { +@@ -5309,7 +5315,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); - int jaddr=(int)out; + void *jaddr=out; - emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); - add_stub(CC_STUB,jaddr,(int)out,0,i,start+i*4+8,NOTTAKEN,0); ++ //emit_jns(0); ++ emit_jmp(0); + add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0); } else { -@@ -5300,7 +5307,8 @@ void cjump_assemble(int i,struct regstat *i_regs) +@@ -5496,7 +5503,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); - int jaddr=(int)out; + void *jaddr=out; - emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); - add_stub(CC_STUB,jaddr,(int)out,0,i,start+i*4+8,NOTTAKEN,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); } -@@ -5309,7 +5317,8 @@ void cjump_assemble(int i,struct regstat *i_regs) +@@ -5505,7 +5513,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); - int jaddr=(int)out; + void *jaddr=out; - emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); - add_stub(CC_STUB,jaddr,(int)out,0,i,start+i*4+8,likely[i]?NULLDS:NOTTAKEN,0); ++ //emit_jns(0); ++ emit_jmp(0); + add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0); } } -@@ -5419,7 +5428,8 @@ void sjump_assemble(int i,struct regstat *i_regs) +@@ -5607,7 +5616,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); - int jaddr=(int)out; + void *jaddr=out; - emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); - add_stub(CC_STUB,jaddr,(int)out,0,i,start+i*4+8,NOTTAKEN,0); ++ //emit_jns(0); ++ emit_jmp(0); + add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0); } else { -@@ -5628,7 +5638,8 @@ 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); - int jaddr=(int)out; -- emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); - add_stub(CC_STUB,jaddr,(int)out,0,i,start+i*4+8,NOTTAKEN,0); - emit_storereg(CCREG,HOST_CCREG); - } -@@ -5637,7 +5648,8 @@ void sjump_assemble(int i,struct regstat *i_regs) - assert(cc==HOST_CCREG); - emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),cc); - int jaddr=(int)out; -- emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); - add_stub(CC_STUB,jaddr,(int)out,0,i,start+i*4+8,likely[i]?NULLDS:NOTTAKEN,0); - } - } -@@ -5833,7 +5845,8 @@ void fjump_assemble(int i,struct regstat *i_regs) +@@ -5763,7 +5773,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); - int jaddr=(int)out; + void *jaddr=out; - emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); - add_stub(CC_STUB,jaddr,(int)out,0,i,start+i*4+8,NOTTAKEN,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); } -@@ -5842,7 +5855,8 @@ void fjump_assemble(int i,struct regstat *i_regs) +@@ -5772,7 +5783,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); - int jaddr=(int)out; + void *jaddr=out; - emit_jns(0); -+// emit_jns(0); -+emit_jmp(0); - add_stub(CC_STUB,jaddr,(int)out,0,i,start+i*4+8,likely[i]?NULLDS:NOTTAKEN,0); ++ //emit_jns(0); ++ emit_jmp(0); + add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0); } } -@@ -6463,7 +6477,7 @@ void unneeded_registers(int istart,int iend,int r) +@@ -6211,7 +6223,7 @@ void unneeded_registers(int istart,int iend,int r) // R0 is always unneeded - u|=1;uu|=1; + u|=1; // Save it - unneeded_reg[i]=u; + unneeded_reg[i]=1;//u; - unneeded_reg_upper[i]=uu; gte_unneeded[i]=gte_u; /* -@@ -9676,6 +9690,7 @@ int new_recompile_block(int addr) + printf("ur (%d,%d) %x: ",istart,iend,start+i*4); +@@ -8756,6 +8768,7 @@ int new_recompile_block(u_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) + if (dops[i].is_ujump) literal_pool(1024); else -@@ -10256,7 +10277,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