Merge https://github.com/notaz/pcsx_rearmed

2 files changed, 25 insertions, 18 deletions

diff --git a/libpcsxcore/new_dynarec/assem_arm.c b/libpcsxcore/new_dynarec/assem_arm.c
index 8e0c634..3cc3737 100644
--- a/libpcsxcore/new_dynarec/assem_arm.c
+++ b/libpcsxcore/new_dynarec/assem_arm.c
@@ -1169,18 +1169,30 @@ void emit_addimm(u_int rs,int imm,u_int rt)
     }else if(genimm(-imm,&armval)) {
       assem_debug("sub %s,%s,#%d\n",regname[rt],regname[rs],-imm);
       output_w32(0xe2400000|rd_rn_rm(rt,rs,0)|armval);
-    }else if(imm<0) {
-      assert(imm>-65536);
+    #ifdef HAVE_ARMV7
+    }else if(rt!=rs&&(u_int)imm<65536) {
+      emit_movw(imm&0x0000ffff,rt);
+      emit_add(rs,rt,rt);
+    }else if(rt!=rs&&(u_int)-imm<65536) {
+      emit_movw(-imm&0x0000ffff,rt);
+      emit_sub(rs,rt,rt);
+    #endif
+    }else if((u_int)-imm<65536) {
       assem_debug("sub %s,%s,#%d\n",regname[rt],regname[rs],(-imm)&0xFF00);
       assem_debug("sub %s,%s,#%d\n",regname[rt],regname[rt],(-imm)&0xFF);
       output_w32(0xe2400000|rd_rn_imm_shift(rt,rs,(-imm)>>8,8));
       output_w32(0xe2400000|rd_rn_imm_shift(rt,rt,(-imm)&0xff,0));
-    }else{
-      assert(imm<65536);
-      assem_debug("add %s,%s,#%d\n",regname[rt],regname[rs],imm&0xFF00);
-      assem_debug("add %s,%s,#%d\n",regname[rt],regname[rt],imm&0xFF);
-      output_w32(0xe2800000|rd_rn_imm_shift(rt,rs,imm>>8,8));
-      output_w32(0xe2800000|rd_rn_imm_shift(rt,rt,imm&0xff,0));
+    }else {
+      do {
+        int shift = (ffs(imm) - 1) & ~1;
+        int imm8 = imm & (0xff << shift);
+        genimm_checked(imm8,&armval);
+        assem_debug("add %s,%s,#0x%x\n",regname[rt],regname[rs],imm8);
+        output_w32(0xe2800000|rd_rn_rm(rt,rs,0)|armval);
+        rs = rt;
+        imm &= ~imm8;
+      }
+      while (imm != 0);
     }
   }
   else if(rs!=rt) emit_mov(rs,rt);
diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 6277220..14fd911 100644
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -43,7 +43,7 @@ void *psxMap(unsigned long addr, size_t size, int is_fixed,
 		enum psxMapTag tag)
 {
 	int flags = MAP_PRIVATE | MAP_ANONYMOUS;
-	int tried_to_align = 0;
+	int try_ = 0;
 	unsigned long mask;
 	void *req, *ret;
 
@@ -73,15 +73,15 @@ retry:
 			return NULL;
 		}
 
-		if (((addr ^ (long)ret) & 0x00ffffff) && !tried_to_align)
+		if (((addr ^ (unsigned long)ret) & ~0xff000000l) && try_ < 2)
 		{
 			psxUnmap(ret, size, tag);
 
 			// try to use similarly aligned memory instead
 			// (recompiler needs this)
-			mask = (addr - 1) & ~addr & 0x07ffffff;
-			addr = (unsigned long)(ret + mask) & ~mask;
-			tried_to_align = 1;
+			mask = try_ ? 0xffff : 0xffffff;
+			addr = ((unsigned long)ret + mask) & ~mask;
+			try_++;
 			goto retry;
 		}
 	}
@@ -137,13 +137,8 @@ int psxMemInit() {
 
 	psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
 #ifndef RAM_FIXED
-#ifdef __BLACKBERRY_QNX__
 	if (psxM == NULL)
 		psxM = psxMap(0x77000000, 0x00210000, 0, MAP_TAG_RAM);
-#else
-	if (psxM == NULL)
-		psxM = psxMap(0x78000000, 0x00210000, 0, MAP_TAG_RAM);
-#endif
 #endif
 	if (psxM == NULL) {
 		SysMessage(_("mapping main RAM failed"));