[pcsx_rearmed.git] / libpcsxcore / new_dynarec / patches / trace_drc_chk

diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S
index fcb4e1a..e2547c4 100644
--- a/libpcsxcore/new_dynarec/linkage_arm.S
+++ b/libpcsxcore/new_dynarec/linkage_arm.S
@@ -439,7 +439,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
@@ -519,7 +519,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,
@@ -540,7 +540,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
 
@@ -550,7 +550,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
 
@@ -559,7 +559,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
 
@@ -676,7 +676,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
 
@@ -711,7 +711,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]
@@ -739,7 +739,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 060ac48..e3007d3 100644
--- a/libpcsxcore/new_dynarec/linkage_arm64.S
+++ b/libpcsxcore/new_dynarec/linkage_arm64.S
@@ -131,7 +131,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
@@ -254,7 +254,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]
@@ -272,7 +272,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 e7b55b6..caa06d0 100644
--- a/libpcsxcore/new_dynarec/new_dynarec.c
+++ b/libpcsxcore/new_dynarec/new_dynarec.c
@@ -43,10 +43,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__
@@ -424,6 +424,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;
@@ -4221,13 +4224,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);
 }
@@ -4635,7 +4640,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) {
@@ -4737,7 +4743,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 {
@@ -4924,7 +4931,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);
       }
@@ -4933,7 +4941,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);
       }
     }
@@ -5032,7 +5041,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 {
@@ -5188,7 +5198,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);
       }
@@ -5197,7 +5208,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);
       }
     }
@@ -5685,7 +5697,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);
@@ -8209,6 +8221,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<slen-1;i++)
   {
     if(!i||(itype[i-1]!=UJUMP&&itype[i-1]!=CJUMP&&itype[i-1]!=SJUMP&&itype[i-1]!=RJUMP))
@@ -8365,6 +8378,7 @@ int new_recompile_block(int addr)
       }
     }
   }
+#endif
 
   /* Pass 6 - Optimize clean/dirty state */
   clean_registers(0,slen-1,1);
@@ -8659,6 +8673,11 @@ int new_recompile_block(int addr)
         case SPAN:
           pagespan_assemble(i,&regs[i]);break;
       }
+
+#ifdef DRC_DBG
+      if(itype[i]!=UJUMP&&itype[i]!=CJUMP&&itype[i]!=SJUMP&&itype[i]!=RJUMP)
+        wb_dirtys(regs[i].regmap,regs[i].dirty);
+#endif
       if(itype[i]==UJUMP||itype[i]==RJUMP||(source[i]>>16)==0x1000)
         literal_pool(1024);
       else
@@ -8767,7 +8786,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<slen;i++)
   {
     if(bt[i]||i==0)
@@ -8882,6 +8901,10 @@ int new_recompile_block(int addr)
     }
     expirep=(expirep+1)&65535;
   }
+#ifdef DRC_DBG
+printf("new_recompile_block done\n");
+fflush(stdout);
+#endif
   return 0;
 }
Commit	Line	Data
a151a8d8	1	diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S
d1e4ebd9	2	index fcb4e1a..e2547c4 100644
a151a8d8	3	--- a/libpcsxcore/new_dynarec/linkage_arm.S
a151a8d8	4	+++ b/libpcsxcore/new_dynarec/linkage_arm.S
d1e4ebd9	5	@@ -439,7 +439,7 @@ FUNCTION(cc_interrupt):
a151a8d8	6	str r1, [fp, #LO_pending_exception]
	7	and r2, r2, r10, lsr #17
	8	add r3, fp, #LO_restore_candidate
	9	- str r10, [fp, #LO_cycle] /* PCSX cycles */
	10	+@@@ str r10, [fp, #LO_cycle] /* PCSX cycles */
	11	@@ str r10, [fp, #LO_reg_cop0+36] /* Count */
	12	ldr r4, [r2, r3]
	13	mov r10, lr
d1e4ebd9	14	@@ -519,7 +519,7 @@ FUNCTION(jump_syscall_hle):
a151a8d8	15	mov r1, #0 /* in delay slot */
	16	add r2, r2, r10
	17	mov r0, #0x20 /* cause */
	18	- str r2, [fp, #LO_cycle] /* PCSX cycle counter */
	19	+@@@ str r2, [fp, #LO_cycle] /* PCSX cycle counter */
	20	bl psxException
	21
	22	/* note: psxException might do recursive recompiler call from it's HLE code,
d1e4ebd9	23	@@ -540,7 +540,7 @@ FUNCTION(jump_hlecall):
a151a8d8	24	str r0, [fp, #LO_pcaddr]
	25	add r2, r2, r10
	26	adr lr, pcsx_return
	27	- str r2, [fp, #LO_cycle] /* PCSX cycle counter */
	28	+@@@ str r2, [fp, #LO_cycle] /* PCSX cycle counter */
	29	bx r1
	30	.size jump_hlecall, .-jump_hlecall
	31
d1e4ebd9	32	@@ -550,7 +550,7 @@ FUNCTION(jump_intcall):
a151a8d8	33	str r0, [fp, #LO_pcaddr]
	34	add r2, r2, r10
	35	adr lr, pcsx_return
	36	- str r2, [fp, #LO_cycle] /* PCSX cycle counter */
	37	+@@@ str r2, [fp, #LO_cycle] /* PCSX cycle counter */
	38	b execI
	39	.size jump_hlecall, .-jump_hlecall
	40
d1e4ebd9	41	@@ -559,7 +559,7 @@ FUNCTION(new_dyna_leave):
a151a8d8	42	ldr r0, [fp, #LO_last_count]
	43	add r12, fp, #28
	44	add r10, r0, r10
	45	- str r10, [fp, #LO_cycle]
	46	+@@@ str r10, [fp, #LO_cycle]
	47	ldmfd sp!, {r4, r5, r6, r7, r8, r9, sl, fp, ip, pc}
	48	.size new_dyna_leave, .-new_dyna_leave
	49
d1e4ebd9	50	@@ -676,7 +676,7 @@ FUNCTION(new_dyna_start):
a151a8d8	51	\readop r0, [r1, r3, lsl #\tab_shift]
	52	.endif
	53	movcc pc, lr
	54	- str r2, [fp, #LO_cycle]
	55	+@@@ str r2, [fp, #LO_cycle]
	56	bx r1
	57	.endm
	58
d1e4ebd9	59	@@ -711,7 +711,7 @@ FUNCTION(jump_handler_read32):
a151a8d8	60	mov r0, r1
	61	add r2, r2, r12
	62	push {r2, lr}
	63	- str r2, [fp, #LO_cycle]
	64	+@@@ str r2, [fp, #LO_cycle]
	65	blx r3
	66
	67	ldr r0, [fp, #LO_next_interupt]
d1e4ebd9	68	@@ -739,7 +739,7 @@ FUNCTION(jump_handler_write_h):
a151a8d8	69	add r2, r2, r12
	70	mov r0, r1
	71	push {r2, lr}
	72	- str r2, [fp, #LO_cycle]
	73	+@@@ str r2, [fp, #LO_cycle]
	74	blx r3
	75
	76	ldr r0, [fp, #LO_next_interupt]
d1e4ebd9	77	diff --git a/libpcsxcore/new_dynarec/linkage_arm64.S b/libpcsxcore/new_dynarec/linkage_arm64.S
	78	index 060ac48..e3007d3 100644
	79	--- a/libpcsxcore/new_dynarec/linkage_arm64.S
	80	+++ b/libpcsxcore/new_dynarec/linkage_arm64.S
	81	@@ -131,7 +131,7 @@ FUNCTION(cc_interrupt):
	82	str wzr, [rFP, #LO_pending_exception]
	83	and w2, w2, rCC, lsr #17
	84	add x3, rFP, #LO_restore_candidate
	85	- str rCC, [rFP, #LO_cycle] /* PCSX cycles */
	86	+## str rCC, [rFP, #LO_cycle] /* PCSX cycles */
	87	# str rCC, [rFP, #LO_reg_cop0+36] /* Count */
	88	ldr w19, [x3, w2, uxtw]
	89	mov x21, lr
	90	@@ -254,7 +254,7 @@ FUNCTION(new_dyna_start):
	91	FUNCTION(new_dyna_leave):
	92	ldr w0, [rFP, #LO_last_count]
	93	add rCC, rCC, w0
	94	- str rCC, [rFP, #LO_cycle]
	95	+## str rCC, [rFP, #LO_cycle]
	96	ldp x19, x20, [sp, #16*1]
	97	ldp x21, x22, [sp, #16*2]
	98	ldp x23, x24, [sp, #16*3]
	99	@@ -272,7 +272,7 @@ FUNCTION(new_dyna_leave):
	100	/* w0 = adddr/data, x1 = rhandler, w2 = cycles, x3 = whandler */
	101	ldr w4, [rFP, #LO_last_count]
	102	add w4, w4, w2
	103	- str w4, [rFP, #LO_cycle]
	104	+## str w4, [rFP, #LO_cycle]
	105	.endm
	106
	107	.macro memhandler_post
a151a8d8	108	diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c
d1e4ebd9	109	index e7b55b6..caa06d0 100644
a151a8d8	110	--- a/libpcsxcore/new_dynarec/new_dynarec.c
a151a8d8	111	+++ b/libpcsxcore/new_dynarec/new_dynarec.c
d1e4ebd9	112	@@ -43,10 +43,10 @@ static int sceBlock;
	113	#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
	114	#endif
a151a8d8	115
	116	-//#define DISASM
	117	-//#define assem_debug printf
	118	+#define DISASM
	119	+#define assem_debug printf
	120	//#define inv_debug printf
	121	-#define assem_debug(...)
	122	+//#define assem_debug(...)
	123	#define inv_debug(...)
	124
	125	#ifdef __i386__
d1e4ebd9	126	@@ -424,6 +424,9 @@ static int doesnt_expire_soon(void *tcaddr)
a151a8d8	127	// This is called from the recompiled JR/JALR instructions
d1e4ebd9	128	void noinline *get_addr(u_int vaddr)
a151a8d8	129	{
	130	+#ifdef DRC_DBG
	131	+printf("get_addr %08x, pc=%08x\n", vaddr, psxRegs.pc);
	132	+#endif
	133	u_int page=get_page(vaddr);
	134	u_int vpage=get_vpage(vaddr);
	135	struct ll_entry *head;
d1e4ebd9	136	@@ -4221,13 +4224,15 @@ void do_cc(int i,signed char i_regmap[],int *adj,int addr,int taken,int invert)
a151a8d8	137	}
a151a8d8	138	emit_addimm_and_set_flags(cycles,HOST_CCREG);
d1e4ebd9	139	jaddr=out;
a151a8d8	140	- emit_jns(0);
d1e4ebd9	141	+ //emit_jns(0);
d1e4ebd9	142	+ emit_jmp(0);
a151a8d8	143	}
	144	else
	145	{
	146	emit_cmpimm(HOST_CCREG,-CLOCK_ADJUST(count+2));
d1e4ebd9	147	jaddr=out;
a151a8d8	148	- emit_jns(0);
d1e4ebd9	149	+ //emit_jns(0);
d1e4ebd9	150	+ emit_jmp(0);
a151a8d8	151	}
d1e4ebd9	152	add_stub(CC_STUB,jaddr,idle?idle:out,(*adj==0\|\|invert\|\|idle)?0:(count+2),i,addr,taken,0);
a151a8d8	153	}
d1e4ebd9	154	@@ -4635,7 +4640,8 @@ static void rjump_assemble(int i,struct regstat *i_regs)
a151a8d8	155	// special case for RFE
	156	emit_jmp(0);
	157	else
	158	- emit_jns(0);
	159	+ //emit_jns(0);
d1e4ebd9	160	+ emit_jmp(0);
d1e4ebd9	161	//load_regs_bt(branch_regs[i].regmap,branch_regs[i].dirty,-1);
a151a8d8	162	#ifdef USE_MINI_HT
a151a8d8	163	if(rs1[i]==31) {
d1e4ebd9	164	@@ -4737,7 +4743,8 @@ static void cjump_assemble(int i,struct regstat *i_regs)
a151a8d8	165	else if(nop) {
a151a8d8	166	emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),cc);
d1e4ebd9	167	void *jaddr=out;
a151a8d8	168	- emit_jns(0);
d1e4ebd9	169	+ //emit_jns(0);
	170	+ emit_jmp(0);
	171	add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0);
a151a8d8	172	}
a151a8d8	173	else {
d1e4ebd9	174	@@ -4924,7 +4931,8 @@ static void cjump_assemble(int i,struct regstat *i_regs)
a151a8d8	175	emit_loadreg(CCREG,HOST_CCREG);
a151a8d8	176	emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),HOST_CCREG);
d1e4ebd9	177	void *jaddr=out;
a151a8d8	178	- emit_jns(0);
d1e4ebd9	179	+ //emit_jns(0);
	180	+ emit_jmp(0);
	181	add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0);
a151a8d8	182	emit_storereg(CCREG,HOST_CCREG);
a151a8d8	183	}
d1e4ebd9	184	@@ -4933,7 +4941,8 @@ static void cjump_assemble(int i,struct regstat *i_regs)
a151a8d8	185	assert(cc==HOST_CCREG);
a151a8d8	186	emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),cc);
d1e4ebd9	187	void *jaddr=out;
a151a8d8	188	- emit_jns(0);
d1e4ebd9	189	+ //emit_jns(0);
	190	+ emit_jmp(0);
	191	add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,likely[i]?NULLDS:NOTTAKEN,0);
a151a8d8	192	}
a151a8d8	193	}
d1e4ebd9	194	@@ -5032,7 +5041,8 @@ static void sjump_assemble(int i,struct regstat *i_regs)
a151a8d8	195	else if(nevertaken) {
a151a8d8	196	emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),cc);
d1e4ebd9	197	void *jaddr=out;
a151a8d8	198	- emit_jns(0);
d1e4ebd9	199	+ //emit_jns(0);
	200	+ emit_jmp(0);
	201	add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0);
a151a8d8	202	}
a151a8d8	203	else {
d1e4ebd9	204	@@ -5188,7 +5198,8 @@ static void sjump_assemble(int i,struct regstat *i_regs)
a151a8d8	205	emit_loadreg(CCREG,HOST_CCREG);
a151a8d8	206	emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),HOST_CCREG);
d1e4ebd9	207	void *jaddr=out;
a151a8d8	208	- emit_jns(0);
d1e4ebd9	209	+ //emit_jns(0);
	210	+ emit_jmp(0);
	211	add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,NOTTAKEN,0);
a151a8d8	212	emit_storereg(CCREG,HOST_CCREG);
a151a8d8	213	}
d1e4ebd9	214	@@ -5197,7 +5208,8 @@ static void sjump_assemble(int i,struct regstat *i_regs)
a151a8d8	215	assert(cc==HOST_CCREG);
a151a8d8	216	emit_addimm_and_set_flags(CLOCK_ADJUST(ccadj[i]+2),cc);
d1e4ebd9	217	void *jaddr=out;
a151a8d8	218	- emit_jns(0);
d1e4ebd9	219	+ //emit_jns(0);
	220	+ emit_jmp(0);
	221	add_stub(CC_STUB,jaddr,out,0,i,start+i*4+8,likely[i]?NULLDS:NOTTAKEN,0);
a151a8d8	222	}
a151a8d8	223	}
d1e4ebd9	224	@@ -5685,7 +5697,7 @@ void unneeded_registers(int istart,int iend,int r)
a151a8d8	225	// R0 is always unneeded
d1e4ebd9	226	u\|=1;
a151a8d8	227	// Save it
	228	- unneeded_reg[i]=u;
	229	+ unneeded_reg[i]=1;//u;
a151a8d8	230	gte_unneeded[i]=gte_u;
a151a8d8	231	/*
d1e4ebd9	232	printf("ur (%d,%d) %x: ",istart,iend,start+i*4);
d1e4ebd9	233	@@ -8209,6 +8221,7 @@ int new_recompile_block(int addr)
a151a8d8	234
	235	// This allocates registers (if possible) one instruction prior
	236	// to use, which can avoid a load-use penalty on certain CPUs.
	237	+#if 0
	238	for(i=0;i<slen-1;i++)
	239	{
d1e4ebd9	240	if(!i\|\|(itype[i-1]!=UJUMP&&itype[i-1]!=CJUMP&&itype[i-1]!=SJUMP&&itype[i-1]!=RJUMP))
d1e4ebd9	241	@@ -8365,6 +8378,7 @@ int new_recompile_block(int addr)
a151a8d8	242	}
	243	}
	244	}
	245	+#endif
	246
	247	/* Pass 6 - Optimize clean/dirty state */
	248	clean_registers(0,slen-1,1);
d1e4ebd9	249	@@ -8659,6 +8673,11 @@ int new_recompile_block(int addr)
a151a8d8	250	case SPAN:
	251	pagespan_assemble(i,&regs[i]);break;
	252	}
	253	+
	254	+#ifdef DRC_DBG
	255	+ if(itype[i]!=UJUMP&&itype[i]!=CJUMP&&itype[i]!=SJUMP&&itype[i]!=RJUMP)
d1e4ebd9	256	+ wb_dirtys(regs[i].regmap,regs[i].dirty);
a151a8d8	257	+#endif
	258	if(itype[i]==UJUMP\|\|itype[i]==RJUMP\|\|(source[i]>>16)==0x1000)
	259	literal_pool(1024);
	260	else
d1e4ebd9	261	@@ -8767,7 +8786,7 @@ int new_recompile_block(int addr)
a151a8d8	262	}
	263	}
	264	// External Branch Targets (jump_in)
	265	- if(copy+slen4>(void )shadow+sizeof(shadow)) copy=shadow;
	266	+ if(copy+slen4>(void )shadow+sizeof(shadow)) {copy=shadow;printf("shadow overflow\n");}
	267	for(i=0;i<slen;i++)
	268	{
	269	if(bt[i]\|\|i==0)
d1e4ebd9	270	@@ -8882,6 +8901,10 @@ int new_recompile_block(int addr)
a151a8d8	271	}
	272	expirep=(expirep+1)&65535;
	273	}
	274	+#ifdef DRC_DBG
	275	+printf("new_recompile_block done\n");
	276	+fflush(stdout);
	277	+#endif
	278	return 0;
	279	}
	280