1 files changed, 76 insertions, 0 deletions
diff --git a/patches/pcsx_rearmed/0002-lookup-verify-dirty-literals.patch b/patches/pcsx_rearmed/0002-lookup-verify-dirty-literals.patch
new file mode 100644
index 0000000..83746c1
--- /dev/null
+++ b/patches/pcsx_rearmed/0002-lookup-verify-dirty-literals.patch
@@ -0,0 +1,76 @@
+From f5c6b3357ecbbc35cefa011dc4a8d9f1d23c87ee Mon Sep 17 00:00:00 2001
+From: neonloop
+Date: Fri, 2 Jul 2021 22:23:41 +0000
+Subject: Always look up verify_dirty literals from offsets
+
+Literals are deduplicated, so there's no guarantee they will be stored
+next to each other, even if they're written sequentially. verify_dirty
+and get_bounds must use the offsets on each instruction, instead of
+assuming values are stored sequentially.
+---
+ libpcsxcore/new_dynarec/arm/assem_arm.c | 38 ++++++++++++++++++++++-----------
+ 1 file changed, 26 insertions(+), 12 deletions(-)
+
+diff --git a/libpcsxcore/new_dynarec/arm/assem_arm.c b/libpcsxcore/new_dynarec/arm/assem_arm.c
+index db1d2af..a373bd3 100644
+--- a/libpcsxcore/new_dynarec/arm/assem_arm.c
++++ b/libpcsxcore/new_dynarec/arm/assem_arm.c
+@@ -241,14 +241,21 @@ static u_int get_clean_addr(int addr)
+ static int verify_dirty(u_int *ptr)
+ {
+   #ifndef HAVE_ARMV7
++  u_int offset;
+   // get from literal pool
+   assert((*ptr&0xFFFF0000)==0xe59f0000);
+-  u_int offset=*ptr&0xfff;
+-  u_int *l_ptr=(void *)ptr+offset+8;
+-  u_int source=l_ptr[0];
+-  u_int copy=l_ptr[1];
+-  u_int len=l_ptr[2];
+-  ptr+=4;
++  offset=*ptr&0xfff;
++  u_int source=*(u_int*)((void *)ptr+offset+8);
++  ptr++;
++  assert((*ptr&0xFFFF0000)==0xe59f0000);
++  offset=*ptr&0xfff;
++  u_int copy=*(u_int*)((void *)ptr+offset+8);
++  ptr++;
++  assert((*ptr&0xFFFF0000)==0xe59f0000);
++  offset=*ptr&0xfff;
++  u_int len=*(u_int*)((void *)ptr+offset+8);
++  ptr++;
++  ptr++;
+   #else
+   // ARMv7 movw/movt
+   assert((*ptr&0xFFF00000)==0xe3000000);
+@@ -285,14 +292,21 @@ static void get_bounds(int addr,u_int *start,u_int *end)
+ {
+   u_int *ptr=(u_int *)addr;
+   #ifndef HAVE_ARMV7
++  u_int offset;
+   // get from literal pool
+   assert((*ptr&0xFFFF0000)==0xe59f0000);
+-  u_int offset=*ptr&0xfff;
+-  u_int *l_ptr=(void *)ptr+offset+8;
+-  u_int source=l_ptr[0];
+-  //u_int copy=l_ptr[1];
+-  u_int len=l_ptr[2];
+-  ptr+=4;
++  offset=*ptr&0xfff;
++  u_int source=*(u_int*)((void *)ptr+offset+8);
++  ptr++;
++  //assert((*ptr&0xFFFF0000)==0xe59f0000);
++  //offset=*ptr&0xfff;
++  //u_int copy=*(u_int*)((void *)ptr+offset+8);
++  ptr++;
++  assert((*ptr&0xFFFF0000)==0xe59f0000);
++  offset=*ptr&0xfff;
++  u_int len=*(u_int*)((void *)ptr+offset+8);
++  ptr++;
++  ptr++;
+   #else
+   // ARMv7 movw/movt
+   assert((*ptr&0xFFF00000)==0xe3000000);
+-- 
+cgit v1.2.3
+