notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: update according to interpreter (2)
[pcsx_rearmed.git]
/
libpcsxcore
/
new_dynarec
/
patches
/
trace_drc_chk
diff --git
a/libpcsxcore/new_dynarec/patches/trace_drc_chk
b/libpcsxcore/new_dynarec/patches/trace_drc_chk
index
12eeb8a
..
8de3ba1
100644
(file)
--- 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/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c
diff --git a/libpcsxcore/new_dynarec/new_dynarec.c b/libpcsxcore/new_dynarec/new_dynarec.c
-index 2
821d466..b3c7ea2f
100644
+index 2
d3348e8..a85d2cd4
100644
--- a/libpcsxcore/new_dynarec/new_dynarec.c
+++ b/libpcsxcore/new_dynarec/new_dynarec.c
--- a/libpcsxcore/new_dynarec/new_dynarec.c
+++ b/libpcsxcore/new_dynarec/new_dynarec.c
-@@ -31
1,7 +311,7 @@ static struct decoded_insn
+@@ -31
8,7 +318,7 @@ static struct compile_info
int new_dynarec_hacks_old;
int new_dynarec_did_compile;
int new_dynarec_hacks_old;
int new_dynarec_did_compile;
@@
-11,7
+11,7
@@
index 2821d466..b3c7ea2f 100644
extern int cycle_count; // ... until end of the timeslice, counts -N -> 0
extern int last_count; // last absolute target, often = next_interupt
extern int cycle_count; // ... until end of the timeslice, counts -N -> 0
extern int last_count; // last absolute target, often = next_interupt
-@@ -59
3,6 +593
,7 @@ static int cycle_multiplier_active;
+@@ -59
8,6 +598
,7 @@ static int cycle_multiplier_active;
static int CLOCK_ADJUST(int x)
{
static int CLOCK_ADJUST(int x)
{
@@
-19,7
+19,7
@@
index 2821d466..b3c7ea2f 100644
int m = cycle_multiplier_active;
int s = (x >> 31) | 1;
return (x * m + s * 50) / 100;
int m = cycle_multiplier_active;
int s = (x >> 31) | 1;
return (x * m + s * 50) / 100;
-@@ -7
45,6 +746
,9 @@ static void *try_restore_block(u_int vaddr, u_int start_page, u_int end_page)
+@@ -7
52,6 +753
,9 @@ static void *try_restore_block(u_int vaddr, u_int start_page, u_int end_page)
// This is called from the recompiled JR/JALR instructions
static void noinline *get_addr(u_int vaddr, int can_compile)
{
// This is called from the recompiled JR/JALR instructions
static void noinline *get_addr(u_int vaddr, int can_compile)
{
@@
-29,7
+29,7
@@
index 2821d466..b3c7ea2f 100644
u_int start_page = get_page_prev(vaddr);
u_int i, page, end_page = get_page(vaddr);
void *found_clean = NULL;
u_int start_page = get_page_prev(vaddr);
u_int i, page, end_page = get_page(vaddr);
void *found_clean = NULL;
-@@ -71
43,7 +7147
,7 @@ static noinline void pass2_unneeded_regs(int istart,int iend,int r)
+@@ -71
64,7 +7168
,7 @@ static noinline void pass2_unneeded_regs(int istart,int iend,int r)
// R0 is always unneeded
u|=1;
// Save it
// R0 is always unneeded
u|=1;
// Save it
@@
-38,7
+38,7
@@
index 2821d466..b3c7ea2f 100644
gte_unneeded[i]=gte_u;
/*
printf("ur (%d,%d) %x: ",istart,iend,start+i*4);
gte_unneeded[i]=gte_u;
/*
printf("ur (%d,%d) %x: ",istart,iend,start+i*4);
-@@ -8
292,6 +8296
,7 @@ static noinline void pass5a_preallocate1(void)
+@@ -8
315,6 +8319
,7 @@ static noinline void pass5a_preallocate1(void)
static noinline void pass5b_preallocate2(void)
{
int i, hr;
static noinline void pass5b_preallocate2(void)
{
int i, hr;
@@
-46,19
+46,22
@@
index 2821d466..b3c7ea2f 100644
for(i=0;i<slen-1;i++)
{
if (!i || !dops[i-1].is_jump)
for(i=0;i<slen-1;i++)
{
if (!i || !dops[i-1].is_jump)
-@@ -91
02,6 +9107,11
@@ static int new_recompile_block(u_int addr)
+@@ -91
24,6 +9129,14
@@ static int new_recompile_block(u_int addr)
load_reg(regs[i].regmap_entry,regs[i].regmap,INVCP);
load_reg(regs[i].regmap_entry,regs[i].regmap,INVCP);
- ds = assemble(i, ®s[i], c
cadj[i]
);
+ ds = assemble(i, ®s[i], c
info[i].ccadj
);
+#ifdef DRC_DBG
+ // write-out non-consts, consts are likely different because of get_final_value()
+#ifdef DRC_DBG
+ // write-out non-consts, consts are likely different because of get_final_value()
-+ if (!dops[i].is_jump)
-+ wb_dirtys(regs[i].regmap,regs[i].dirty&~regs[i].loadedconst);
++ if (regs[i].dirty & ~regs[i].loadedconst) {
++ assem_debug("/ drc_dbg_wb\n");
++ wb_dirtys(regs[i].regmap, regs[i].dirty & ~regs[i].loadedconst);
++ assem_debug("\\ drc_dbg_wb\n");
++ }
+#endif
if (dops[i].is_ujump)
literal_pool(1024);
+#endif
if (dops[i].is_ujump)
literal_pool(1024);
-@@ -9
292,6 +9302
,10 @@ static int new_recompile_block(u_int addr)
+@@ -9
316,6 +9329
,10 @@ static int new_recompile_block(u_int addr)
#ifdef ASSEM_PRINT
fflush(stdout);
#ifdef ASSEM_PRINT
fflush(stdout);