return -1;
}
+ if (DISABLE_MEM_LUTS)
+ return 0;
+
psxMemRLUT = (u8 **)malloc(0x10000 * sizeof(void *));
psxMemWLUT = (u8 **)malloc(0x10000 * sizeof(void *));
free(psxMemWLUT); psxMemWLUT = NULL;
}
+int cache_isolated;
+
void psxMemOnIsolate(int enable)
{
- if (enable) {
- memset(psxMemWLUT + 0x0000, (int)(uintptr_t)INVALID_PTR, 0x80 * sizeof(void *));
- memset(psxMemWLUT + 0x8000, (int)(uintptr_t)INVALID_PTR, 0x80 * sizeof(void *));
- //memset(psxMemWLUT + 0xa000, (int)(uintptr_t)INVALID_PTR, 0x80 * sizeof(void *));
- } else {
- int i;
- for (i = 0; i < 0x80; i++)
- psxMemWLUT[i + 0x0000] = (void *)&psxM[(i & 0x1f) << 16];
- memcpy(psxMemWLUT + 0x8000, psxMemWLUT, 0x80 * sizeof(void *));
- memcpy(psxMemWLUT + 0xa000, psxMemWLUT, 0x80 * sizeof(void *));
+ if (!DISABLE_MEM_LUTS) {
+ if (enable) {
+ memset(psxMemWLUT + 0x0000, (int)(uintptr_t)INVALID_PTR, 0x80 * sizeof(void *));
+ memset(psxMemWLUT + 0x8000, (int)(uintptr_t)INVALID_PTR, 0x80 * sizeof(void *));
+ //memset(psxMemWLUT + 0xa000, (int)(uintptr_t)INVALID_PTR, 0x80 * sizeof(void *));
+ } else {
+ int i;
+ for (i = 0; i < 0x80; i++)
+ psxMemWLUT[i + 0x0000] = (void *)&psxM[(i & 0x1f) << 16];
+ memcpy(psxMemWLUT + 0x8000, psxMemWLUT, 0x80 * sizeof(void *));
+ memcpy(psxMemWLUT + 0xa000, psxMemWLUT, 0x80 * sizeof(void *));
+ }
}
+
+ cache_isolated = enable;
psxCpu->Notify(enable ? R3000ACPU_NOTIFY_CACHE_ISOLATED
: R3000ACPU_NOTIFY_CACHE_UNISOLATED, NULL);
}
else
return psxHwRead8(mem);
} else {
- p = (char *)(psxMemRLUT[t]);
+ p = psxm(mem, 0);
if (p != INVALID_PTR) {
if (Config.Debug)
DebugCheckBP((mem & 0xffffff) | 0x80000000, R1);
- return *(u8 *)(p + (mem & 0xffff));
+ return *(u8 *)p;
} else {
#ifdef PSXMEM_LOG
PSXMEM_LOG("err lb %8.8lx\n", mem);
else
return psxHwRead16(mem);
} else {
- p = (char *)(psxMemRLUT[t]);
+ p = psxm(mem, 0);
if (p != INVALID_PTR) {
if (Config.Debug)
DebugCheckBP((mem & 0xffffff) | 0x80000000, R2);
- return SWAPu16(*(u16 *)(p + (mem & 0xffff)));
+ return SWAPu16(*(u16 *)p);
} else {
#ifdef PSXMEM_LOG
PSXMEM_LOG("err lh %8.8lx\n", mem);
else
return psxHwRead32(mem);
} else {
- p = (char *)(psxMemRLUT[t]);
+ p = psxm(mem, 0);
if (p != INVALID_PTR) {
if (Config.Debug)
DebugCheckBP((mem & 0xffffff) | 0x80000000, R4);
- return SWAPu32(*(u32 *)(p + (mem & 0xffff)));
+ return SWAPu32(*(u32 *)p);
} else {
if (mem == 0xfffe0130)
return psxRegs.biuReg;
}
}
-void psxMemWrite8(u32 mem, u8 value) {
+void psxMemWrite8(u32 mem, u32 value) {
char *p;
u32 t;
else
psxHwWrite8(mem, value);
} else {
- p = (char *)(psxMemWLUT[t]);
+ p = psxm(mem, 1);
if (p != INVALID_PTR) {
if (Config.Debug)
DebugCheckBP((mem & 0xffffff) | 0x80000000, W1);
- *(u8 *)(p + (mem & 0xffff)) = value;
+ *(u8 *)p = value;
#ifndef DRC_DISABLE
psxCpu->Clear((mem & (~3)), 1);
#endif
}
}
-void psxMemWrite16(u32 mem, u16 value) {
+void psxMemWrite16(u32 mem, u32 value) {
char *p;
u32 t;
else
psxHwWrite16(mem, value);
} else {
- p = (char *)(psxMemWLUT[t]);
+ p = psxm(mem, 1);
if (p != INVALID_PTR) {
if (Config.Debug)
DebugCheckBP((mem & 0xffffff) | 0x80000000, W2);
- *(u16 *)(p + (mem & 0xffff)) = SWAPu16(value);
+ *(u16 *)p = SWAPu16(value);
#ifndef DRC_DISABLE
psxCpu->Clear((mem & (~3)), 1);
#endif
else
psxHwWrite32(mem, value);
} else {
- p = (char *)(psxMemWLUT[t]);
+ p = psxm(mem, 1);
if (p != INVALID_PTR) {
if (Config.Debug)
DebugCheckBP((mem & 0xffffff) | 0x80000000, W4);
- *(u32 *)(p + (mem & 0xffff)) = SWAPu32(value);
+ *(u32 *)p = SWAPu32(value);
#ifndef DRC_DISABLE
psxCpu->Clear(mem, 1);
#endif
else
return NULL;
} else {
- p = (char *)(psxMemWLUT[t]);
+ p = psxm(mem, 1);
if (p != INVALID_PTR) {
- return (void *)(p + (mem & 0xffff));
+ return (void *)p;
}
return NULL;
}