From 7bbabe80066083236adfd653f289de17443a7dd8 Mon Sep 17 00:00:00 2001 From: gameblabla Date: Sun, 10 Oct 2021 15:30:59 +0000 Subject: [PATCH] Fix oversight for icache emulation code. (#226) This fixes Armored Core when being run in icache emulation mode. This was a mistake on my part as i forgot about that piece of code. --- libpcsxcore/misc.c | 2 ++ libpcsxcore/psxmem.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index 1b38e287..cd16c41a 100644 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -244,6 +244,7 @@ int LoadCdrom() { tmpHead.t_addr = SWAP32(tmpHead.t_addr); psxCpu->Clear(tmpHead.t_addr, tmpHead.t_size / 4); + psxCpu->Reset(); // Read the rest of the main executable while (tmpHead.t_size & ~2047) { @@ -291,6 +292,7 @@ int LoadCdromFile(const char *filename, EXE_HEADER *head) { addr = head->t_addr; psxCpu->Clear(addr, size / 4); + psxCpu->Reset(); while (size & ~2047) { incTime(); diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c index 171104cb..c09965dc 100644 --- a/libpcsxcore/psxmem.c +++ b/libpcsxcore/psxmem.c @@ -389,6 +389,10 @@ void psxMemWrite32(u32 mem, u32 value) { memset(psxMemWLUT + 0x0000, 0, 0x80 * sizeof(void *)); memset(psxMemWLUT + 0x8000, 0, 0x80 * sizeof(void *)); memset(psxMemWLUT + 0xa000, 0, 0x80 * sizeof(void *)); +#ifdef ICACHE_EMULATION + /* Required for icache interpreter otherwise Armored Core won't boot on icache interpreter */ + psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_ISOLATED, NULL); +#endif break; case 0x00: case 0x1e988: if (writeok == 1) break; @@ -396,6 +400,10 @@ void psxMemWrite32(u32 mem, u32 value) { 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 *)); +#ifdef ICACHE_EMULATION + /* Dynarecs might take this opportunity to flush their code cache */ + psxCpu->Notify(R3000ACPU_NOTIFY_CACHE_UNISOLATED, NULL); +#endif break; default: #ifdef PSXMEM_LOG -- 2.39.5