X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Flightrec%2Fplugin.c;h=7f500fd275f8497f83b488c5ffc7e35bb405212b;hb=3e80e5c25edcf850f603cf0948e1cc16dc38e98d;hp=2a46942b7327099328b52512eabe0793604cd1b4;hpb=03b78a3bf48813202e01149ae0b3c5c1f01efb4c;p=pcsx_rearmed.git diff --git a/libpcsxcore/lightrec/plugin.c b/libpcsxcore/lightrec/plugin.c index 2a46942b..7f500fd2 100644 --- a/libpcsxcore/lightrec/plugin.c +++ b/libpcsxcore/lightrec/plugin.c @@ -1,4 +1,3 @@ -#include #include #include #include @@ -10,6 +9,7 @@ #include #endif +#include "lightrec.h" #include "../cdrom.h" #include "../gpu.h" #include "../gte.h" @@ -19,7 +19,8 @@ #include "../psxmem.h" #include "../r3000a.h" #include "../psxinterpreter.h" -#include "../new_dynarec/events.h" +#include "../psxhle.h" +#include "../psxevents.h" #include "../frontend/main.h" @@ -52,6 +53,14 @@ # define unlikely(x) (x) #endif +#ifndef LIGHTREC_PROG_NAME +# ifdef __linux__ +# define LIGHTREC_PROG_NAME "/proc/self/exe" +# else +# define LIGHTREC_PROG_NAME "retroarch.exe" +# endif +#endif + psxRegisters psxRegs; Rcnt rcnts[4]; @@ -59,12 +68,14 @@ void* code_buffer; static struct lightrec_state *lightrec_state; -static char *name = "retroarch.exe"; - static bool use_lightrec_interpreter; static bool use_pcsx_interpreter; static bool block_stepping; +extern u32 lightrec_hacks; + +extern void lightrec_code_inv(void *ptr, uint32_t len); + enum my_cp2_opcodes { OP_CP2_RTPS = 0x01, OP_CP2_NCLIP = 0x06, @@ -160,7 +171,7 @@ static void lightrec_tansition_from_pcsx(struct lightrec_state *state) } static void hw_write_byte(struct lightrec_state *state, - u32 op, void *host, u32 mem, u8 val) + u32 op, void *host, u32 mem, u32 val) { lightrec_tansition_to_pcsx(state); @@ -170,7 +181,7 @@ static void hw_write_byte(struct lightrec_state *state, } static void hw_write_half(struct lightrec_state *state, - u32 op, void *host, u32 mem, u16 val) + u32 op, void *host, u32 mem, u32 val) { lightrec_tansition_to_pcsx(state); @@ -332,6 +343,14 @@ static void lightrec_enable_ram(struct lightrec_state *state, bool enable) static bool lightrec_can_hw_direct(u32 kaddr, bool is_write, u8 size) { + if (is_write && size != 32) { + // force32 so must go through handlers + if (0x1f801000 <= kaddr && kaddr < 0x1f801024) + return false; + if ((kaddr & 0x1fffff80) == 0x1f801080) // dma + return false; + } + switch (size) { case 8: switch (kaddr) { @@ -406,29 +425,11 @@ static bool lightrec_can_hw_direct(u32 kaddr, bool is_write, u8 size) } } -#if defined(HW_DOL) || defined(HW_RVL) -static void lightrec_code_inv(void *ptr, uint32_t len) -{ - extern void DCFlushRange(void *ptr, u32 len); - extern void ICInvalidateRange(void *ptr, u32 len); - - DCFlushRange(ptr, len); - ICInvalidateRange(ptr, len); -} -#elif defined(HW_WUP) -static void lightrec_code_inv(void *ptr, uint32_t len) -{ - wiiu_clear_cache(ptr, (void *)((uintptr_t)ptr + len)); -} -#endif - static const struct lightrec_ops lightrec_ops = { .cop2_op = cop2_op, .enable_ram = lightrec_enable_ram, .hw_direct = lightrec_can_hw_direct, -#if defined(HW_DOL) || defined(HW_RVL) || defined(HW_WUP) - .code_inv = lightrec_code_inv, -#endif + .code_inv = LIGHTREC_CODE_INV ? lightrec_code_inv : NULL, }; static int lightrec_plugin_init(void) @@ -463,7 +464,7 @@ static int lightrec_plugin_init(void) use_lightrec_interpreter = !!getenv("LIGHTREC_INTERPRETER"); - lightrec_state = lightrec_init(name, + lightrec_state = lightrec_init(LIGHTREC_PROG_NAME, lightrec_map, ARRAY_SIZE(lightrec_map), &lightrec_ops); @@ -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; @@ -486,6 +490,9 @@ static void lightrec_plugin_execute_internal(bool block_only) regs = lightrec_get_registers(lightrec_state); gen_interupt((psxCP0Regs *)regs->cp0); + if (!block_only && stop) + return; + cycles_pcsx = next_interupt - psxRegs.cycle; assert((s32)cycles_pcsx > 0); @@ -518,7 +525,20 @@ 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); + if (flags & LIGHTREC_EXIT_BREAK) + psxException(R3000E_Bp << 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)) { @@ -530,8 +550,6 @@ static void lightrec_plugin_execute_internal(bool block_only) static void lightrec_plugin_execute(void) { - extern int stop; - while (!stop) lightrec_plugin_execute_internal(false); } @@ -543,16 +561,14 @@ static void lightrec_plugin_execute_block(enum blockExecCaller caller) static void lightrec_plugin_clear(u32 addr, u32 size) { - if (addr == 0 && size == UINT32_MAX) + if ((addr == 0 && size == UINT32_MAX) + || (lightrec_hacks & LIGHTREC_OPT_INV_DMA_ONLY)) lightrec_invalidate_all(lightrec_state); else /* size * 4: PCSX uses DMA units */ 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,21 +578,31 @@ 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; } } static void lightrec_plugin_apply_config() { + static u32 cycles_per_op_old; u32 cycle_mult = Config.cycle_multiplier_override && Config.cycle_multiplier == CYCLE_MULT_DEFAULT ? Config.cycle_multiplier_override : Config.cycle_multiplier; - assert(cycle_mult); + u32 cycles_per_op = cycle_mult * 1024 / 100; + assert(cycles_per_op); - lightrec_set_cycles_per_opcode(lightrec_state, cycle_mult * 1024 / 100); + if (cycles_per_op_old && cycles_per_op_old != cycles_per_op) { + SysPrintf("lightrec: reinit block cache for cycles_per_op %.2f\n", + cycles_per_op / 1024.f); + } + cycles_per_op_old = cycles_per_op; + lightrec_set_cycles_per_opcode(lightrec_state, cycles_per_op); } static void lightrec_plugin_shutdown(void) @@ -606,28 +632,30 @@ static void lightrec_plugin_reset(void) regs->cp0[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1 regs->cp0[15] = 0x00000002; // PRevID = Revision ID, same as R3000A + + lightrec_set_unsafe_opt_flags(lightrec_state, lightrec_hacks); } -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 =