-#include <lightrec.h>
#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <sys/mman.h>
#endif
+#include "lightrec.h"
+#include "internals.h"
#include "../cdrom.h"
#include "../gpu.h"
#include "../gte.h"
#include "../r3000a.h"
#include "../psxinterpreter.h"
#include "../psxhle.h"
-#include "../new_dynarec/events.h"
+#include "../psxevents.h"
#include "../frontend/main.h"
static bool use_pcsx_interpreter;
static bool block_stepping;
+extern u32 lightrec_hacks;
+
enum my_cp2_opcodes {
OP_CP2_RTPS = 0x01,
OP_CP2_NCLIP = 0x06,
}
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);
}
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);
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) {
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);
if (flags & LIGHTREC_EXIT_SYSCALL)
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;
static void lightrec_plugin_execute(void)
{
- extern int stop;
-
while (!stop)
lightrec_plugin_execute_internal(false);
}
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 */
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);
+ lightrec_plugin_clear_block_caches(lightrec_state);
+ }
+ cycles_per_op_old = cycles_per_op;
+ lightrec_set_cycles_per_opcode(lightrec_state, cycles_per_op);
}
static void lightrec_plugin_shutdown(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(bool need_cp2)