From ec4baa7d5d08c244066f11638298e20e37f91368 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 2 Sep 2023 22:54:16 +0300 Subject: [PATCH] lightrec: initial hle support --- frontend/libretro.c | 7 +----- libpcsxcore/lightrec/plugin.c | 43 +++++++++++++++++++++----------- libpcsxcore/new_dynarec/emu_if.c | 3 ++- libpcsxcore/psxbios.c | 10 ++++++++ libpcsxcore/r3000a.h | 2 +- 5 files changed, 43 insertions(+), 22 deletions(-) diff --git a/frontend/libretro.c b/frontend/libretro.c index 519aa1b1..32d27f5d 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -1948,18 +1948,13 @@ static void update_variables(bool in_flight) { R3000Acpu *prev_cpu = psxCpu; -#if defined(LIGHTREC) - bool can_use_dynarec = found_bios; -#else - bool can_use_dynarec = 1; -#endif #ifdef _3DS if (!__ctr_svchax) Config.Cpu = CPU_INTERPRETER; else #endif - if (strcmp(var.value, "disabled") == 0 || !can_use_dynarec) + if (strcmp(var.value, "disabled") == 0) Config.Cpu = CPU_INTERPRETER; else if (strcmp(var.value, "enabled") == 0) Config.Cpu = CPU_DYNAREC; diff --git a/libpcsxcore/lightrec/plugin.c b/libpcsxcore/lightrec/plugin.c index 2a46942b..7248c178 100644 --- a/libpcsxcore/lightrec/plugin.c +++ b/libpcsxcore/lightrec/plugin.c @@ -19,6 +19,7 @@ #include "../psxmem.h" #include "../r3000a.h" #include "../psxinterpreter.h" +#include "../psxhle.h" #include "../new_dynarec/events.h" #include "../frontend/main.h" @@ -479,6 +480,9 @@ static int lightrec_plugin_init(void) return 0; } +static void lightrec_plugin_sync_regs_to_pcsx(bool need_cp2); +static void lightrec_plugin_sync_regs_from_pcsx(bool need_cp2); + static void lightrec_plugin_execute_internal(bool block_only) { struct lightrec_registers *regs; @@ -518,7 +522,18 @@ static void lightrec_plugin_execute_internal(bool block_only) } if (flags & LIGHTREC_EXIT_SYSCALL) - psxException(0x20, 0, (psxCP0Regs *)regs->cp0); + psxException(R3000E_Syscall << 2, 0, (psxCP0Regs *)regs->cp0); + else if (flags & LIGHTREC_EXIT_UNKNOWN_OP) { + u32 op = intFakeFetch(psxRegs.pc); + u32 hlec = op & 0x03ffffff; + if ((op >> 26) == 0x3b && hlec < ARRAY_SIZE(psxHLEt) && Config.HLE) { + lightrec_plugin_sync_regs_to_pcsx(0); + psxHLEt[hlec](); + lightrec_plugin_sync_regs_from_pcsx(0); + } + else + psxException(R3000E_RI << 2, 0, (psxCP0Regs *)regs->cp0); + } } if ((regs->cp0[13] & regs->cp0[12] & 0x300) && (regs->cp0[12] & 0x1)) { @@ -550,9 +565,6 @@ static void lightrec_plugin_clear(u32 addr, u32 size) lightrec_invalidate(lightrec_state, addr, size * 4); } -static void lightrec_plugin_sync_regs_to_pcsx(void); -static void lightrec_plugin_sync_regs_from_pcsx(void); - static void lightrec_plugin_notify(enum R3000Anote note, void *data) { switch (note) @@ -562,10 +574,13 @@ static void lightrec_plugin_notify(enum R3000Anote note, void *data) /* not used, lightrec calls lightrec_enable_ram() instead */ break; case R3000ACPU_NOTIFY_BEFORE_SAVE: - lightrec_plugin_sync_regs_to_pcsx(); + /* non-null 'data' means this is HLE related sync */ + lightrec_plugin_sync_regs_to_pcsx(data == NULL); break; case R3000ACPU_NOTIFY_AFTER_LOAD: - lightrec_plugin_sync_regs_from_pcsx(); + lightrec_plugin_sync_regs_from_pcsx(data == NULL); + if (data == NULL) + lightrec_invalidate_all(lightrec_state); break; } } @@ -608,26 +623,26 @@ static void lightrec_plugin_reset(void) regs->cp0[15] = 0x00000002; // PRevID = Revision ID, same as R3000A } -static void lightrec_plugin_sync_regs_from_pcsx(void) +static void lightrec_plugin_sync_regs_from_pcsx(bool need_cp2) { struct lightrec_registers *regs; regs = lightrec_get_registers(lightrec_state); - memcpy(regs->cp2d, &psxRegs.CP2, sizeof(regs->cp2d) + sizeof(regs->cp2c)); - memcpy(regs->cp0, &psxRegs.CP0, sizeof(regs->cp0)); memcpy(regs->gpr, &psxRegs.GPR, sizeof(regs->gpr)); - - lightrec_invalidate_all(lightrec_state); + memcpy(regs->cp0, &psxRegs.CP0, sizeof(regs->cp0)); + if (need_cp2) + memcpy(regs->cp2d, &psxRegs.CP2, sizeof(regs->cp2d) + sizeof(regs->cp2c)); } -static void lightrec_plugin_sync_regs_to_pcsx(void) +static void lightrec_plugin_sync_regs_to_pcsx(bool need_cp2) { struct lightrec_registers *regs; regs = lightrec_get_registers(lightrec_state); - memcpy(&psxRegs.CP2, regs->cp2d, sizeof(regs->cp2d) + sizeof(regs->cp2c)); - memcpy(&psxRegs.CP0, regs->cp0, sizeof(regs->cp0)); memcpy(&psxRegs.GPR, regs->gpr, sizeof(regs->gpr)); + memcpy(&psxRegs.CP0, regs->cp0, sizeof(regs->cp0)); + if (need_cp2) + memcpy(&psxRegs.CP2, regs->cp2d, sizeof(regs->cp2d) + sizeof(regs->cp2c)); } R3000Acpu psxRec = diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c index f879ad8c..e21003c0 100644 --- a/libpcsxcore/new_dynarec/emu_if.c +++ b/libpcsxcore/new_dynarec/emu_if.c @@ -297,7 +297,8 @@ static void ari64_notify(enum R3000Anote note, void *data) { case R3000ACPU_NOTIFY_BEFORE_SAVE: break; case R3000ACPU_NOTIFY_AFTER_LOAD: - ari64_reset(); + if (data == NULL) + ari64_reset(); psxInt.Notify(note, data); break; } diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c index fcaa481f..03d6aea2 100644 --- a/libpcsxcore/psxbios.c +++ b/libpcsxcore/psxbios.c @@ -47,6 +47,8 @@ #define PSXBIOS_LOG(...) #endif +#define PTR_1 (void *)(size_t)1 + char *biosA0n[256] = { // 0x00 "open", "lseek", "read", "write", @@ -384,9 +386,13 @@ static inline void softCall(u32 pc) { ra = 0x80001000; psxRegs.CP0.n.SR &= ~0x404; // disable interrupts + psxCpu->Notify(R3000ACPU_NOTIFY_AFTER_LOAD, PTR_1); + while (pc0 != 0x80001000 && ++lim < 1000000) psxCpu->ExecuteBlock(EXEC_CALLER_HLE); + psxCpu->Notify(R3000ACPU_NOTIFY_BEFORE_SAVE, PTR_1); + if (lim == 1000000) PSXBIOS_LOG("softCall @%x hit lim\n", pc); ra = sra; @@ -403,9 +409,13 @@ static inline void softCallInException(u32 pc) { return; ra = 0x80001000; + psxCpu->Notify(R3000ACPU_NOTIFY_AFTER_LOAD, PTR_1); + while (!returned_from_exception() && pc0 != 0x80001000 && ++lim < 1000000) psxCpu->ExecuteBlock(EXEC_CALLER_HLE); + psxCpu->Notify(R3000ACPU_NOTIFY_BEFORE_SAVE, PTR_1); + if (lim == 1000000) PSXBIOS_LOG("softCallInException @%x hit lim\n", pc); if (pc0 == 0x80001000) diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h index 912a41f6..fb5e1db6 100644 --- a/libpcsxcore/r3000a.h +++ b/libpcsxcore/r3000a.h @@ -45,7 +45,7 @@ enum R3000Aexception { enum R3000Anote { R3000ACPU_NOTIFY_CACHE_ISOLATED = 0, R3000ACPU_NOTIFY_CACHE_UNISOLATED = 1, - R3000ACPU_NOTIFY_BEFORE_SAVE, + R3000ACPU_NOTIFY_BEFORE_SAVE, // data arg - hle if non-null R3000ACPU_NOTIFY_AFTER_LOAD, }; -- 2.39.5