static bool use_lightrec_interpreter;
static bool use_pcsx_interpreter;
static bool booting;
-static u32 lightrec_begin_cycles;
enum my_cp2_opcodes {
OP_CP2_RTPS = 0x01,
static bool has_interrupt(void)
{
+ struct lightrec_registers *regs = lightrec_get_registers(lightrec_state);
+
return ((psxHu32(0x1070) & psxHu32(0x1074)) &&
- (psxRegs.CP0.n.Status & 0x401) == 0x401) ||
- (psxRegs.CP0.n.Status & psxRegs.CP0.n.Cause & 0x0300);
+ (regs->cp0[12] & 0x401) == 0x401) ||
+ (regs->cp0[12] & regs->cp0[13] & 0x0300);
}
static void lightrec_restore_state(struct lightrec_state *state)
case 0x1f801074:
return !is_write;
default:
- return is_write || kaddr < 0x1f801c00 || kaddr >= 0x1f801e00;
+ return kaddr < 0x1f801c00 || kaddr >= 0x1f801e00;
}
default:
switch (kaddr) {
lightrec_map[PSX_MAP_KERNEL_USER_RAM].address = psxM;
lightrec_map[PSX_MAP_BIOS].address = psxR;
lightrec_map[PSX_MAP_SCRATCH_PAD].address = psxH;
+ lightrec_map[PSX_MAP_HW_REGISTERS].address = psxH + 0x1000;
lightrec_map[PSX_MAP_PARALLEL_PORT].address = psxP;
if (LIGHTREC_CUSTOM_MAP) {
lightrec_map[PSX_MAP_MIRROR1].address = psxM + 0x200000;
lightrec_map[PSX_MAP_MIRROR2].address = psxM + 0x400000;
lightrec_map[PSX_MAP_MIRROR3].address = psxM + 0x600000;
- lightrec_map[PSX_MAP_HW_REGISTERS].address = psxH + 0x1000;
lightrec_map[PSX_MAP_CODE_BUFFER].address = code_buffer;
}
use_lightrec_interpreter = !!getenv("LIGHTREC_INTERPRETER");
- if (getenv("LIGHTREC_BEGIN_CYCLES"))
- lightrec_begin_cycles = (unsigned int) strtol(
- getenv("LIGHTREC_BEGIN_CYCLES"), NULL, 0);
lightrec_state = lightrec_init(name,
lightrec_map, ARRAY_SIZE(lightrec_map),
extern void intExecuteBlock();
extern void gen_interupt();
-static void lightrec_plugin_execute_block(void)
+static void lightrec_plugin_execute_internal(bool block_only)
{
- u32 old_pc = psxRegs.pc;
u32 flags;
gen_interupt();
// step during early boot so that 0x80030000 fastboot hack works
- if (booting)
+ booting = block_only;
+ if (block_only)
next_interupt = psxRegs.cycle;
if (use_pcsx_interpreter) {
if (flags & LIGHTREC_EXIT_SYSCALL)
psxException(0x20, 0);
-
- if (booting && (psxRegs.pc & 0xff800000) == 0x80000000)
- booting = false;
}
if ((psxRegs.CP0.n.Cause & psxRegs.CP0.n.Status & 0x300) &&
{
extern int stop;
+ if (!booting)
+ lightrec_plugin_sync_regs_from_pcsx();
+
while (!stop)
- lightrec_plugin_execute_block();
+ lightrec_plugin_execute_internal(false);
+
+ lightrec_plugin_sync_regs_to_pcsx();
+}
+
+static void lightrec_plugin_execute_block(void)
+{
+ lightrec_plugin_execute_internal(true);
}
static void lightrec_plugin_clear(u32 addr, u32 size)
regs->cp0[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
regs->cp0[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
-
- booting = true;
}
-void lightrec_plugin_prepare_load_state(void)
+void lightrec_plugin_sync_regs_from_pcsx(void)
{
struct lightrec_registers *regs;
lightrec_invalidate_all(lightrec_state);
}
-void lightrec_plugin_prepare_save_state(void)
+void lightrec_plugin_sync_regs_to_pcsx(void)
{
struct lightrec_registers *regs;