enum psxMapTag tag)
{
int flags = MAP_PRIVATE | MAP_ANONYMOUS;
+ int tried_to_align = 0;
+ unsigned long mask;
void *req, *ret;
- if (psxMapHook != NULL)
- return psxMapHook(addr, size, is_fixed, tag);
+retry:
+ if (psxMapHook != NULL) {
+ ret = psxMapHook(addr, size, is_fixed, tag);
+ goto out;
+ }
if (is_fixed)
flags |= MAP_FIXED;
if (ret == MAP_FAILED)
return NULL;
- if (ret != req)
- SysMessage("psxMap: warning: wanted to map @%p, got %p\n",
- req, ret);
+out:
+ if (addr != 0 && ret != (void *)addr) {
+ SysMessage("psxMap: warning: wanted to map @%08x, got %p\n",
+ addr, ret);
+
+ if (ret != NULL && ((addr ^ (long)ret) & 0x00ffffff)
+ && !tried_to_align)
+ {
+ 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;
+ goto retry;
+ }
+ }
return ret;
}
psxM = psxMap(0x80000000, 0x00210000, 1, MAP_TAG_RAM);
#ifndef RAM_FIXED
+#ifdef __BLACKBERRY_QNX__
if (psxM == NULL)
- psxM = psxMap(0x70000000, 0x00210000, 0, MAP_TAG_RAM);
+ 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"));
void psxMemShutdown() {
psxUnmap(psxM, 0x00210000, MAP_TAG_RAM);
- psxUnmap(psxH, 0x1f800000, MAP_TAG_OTHER);
+ psxUnmap(psxH, 0x10000, MAP_TAG_OTHER);
psxUnmap(psxR, 0x80000, MAP_TAG_OTHER);
free(psxMemRLUT);
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (mem < 0x1f801000)
+ if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+ if ((mem & 0xffff) < 0x400)
return psxHu8(mem);
else
return psxHwRead8(mem);
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (mem < 0x1f801000)
+ if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+ if ((mem & 0xffff) < 0x400)
return psxHu16(mem);
else
return psxHwRead16(mem);
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (mem < 0x1f801000)
+ if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+ if ((mem & 0xffff) < 0x400)
return psxHu32(mem);
else
return psxHwRead32(mem);
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (mem < 0x1f801000)
+ if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+ if ((mem & 0xffff) < 0x400)
psxHu8(mem) = value;
else
psxHwWrite8(mem, value);
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (mem < 0x1f801000)
+ if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+ if ((mem & 0xffff) < 0x400)
psxHu16ref(mem) = SWAPu16(value);
else
psxHwWrite16(mem, value);
// if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
t = mem >> 16;
- if (t == 0x1f80) {
- if (mem < 0x1f801000)
+ if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+ if ((mem & 0xffff) < 0x400)
psxHu32ref(mem) = SWAPu32(value);
else
psxHwWrite32(mem, value);
u32 t;
t = mem >> 16;
- if (t == 0x1f80) {
- if (mem < 0x1f801000)
+ if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
+ if ((mem & 0xffff) < 0x400)
return (void *)&psxH[mem];
else
return NULL;