adjust bios handling again

[pcsx_rearmed.git] / libpcsxcore / lightrec / plugin.c

diff --git a/libpcsxcore/lightrec/plugin.c b/libpcsxcore/lightrec/plugin.c
index 8f12b97..dd7cc73 100644 (file)
--- a/libpcsxcore/lightrec/plugin.c
+++ b/libpcsxcore/lightrec/plugin.c
@@ -12,6 +12,7 @@
 #include "../psxhw.h"
 #include "../psxmem.h"
 #include "../r3000a.h"
+#include "../new_dynarec/events.h"
 
 #include "../frontend/main.h"
 
@@ -53,8 +54,7 @@ static char *name = "retroarch.exe";
 
 static bool use_lightrec_interpreter;
 static bool use_pcsx_interpreter;
-static bool booting;
-static u32 lightrec_begin_cycles;
+static bool block_stepping;
 
 enum my_cp2_opcodes {
        OP_CP2_RTPS             = 0x01,
@@ -137,7 +137,7 @@ static void lightrec_restore_state(struct lightrec_state *state)
 {
        lightrec_reset_cycle_count(state, psxRegs.cycle);
 
-       if (booting || has_interrupt())
+       if (block_stepping || has_interrupt())
                lightrec_set_exit_flags(state, LIGHTREC_EXIT_CHECK_INTERRUPT);
        else
                lightrec_set_target_cycle_count(state, next_interupt);
@@ -345,7 +345,7 @@ static bool lightrec_can_hw_direct(u32 kaddr, bool is_write, u8 size)
                case 0x1f801074:
                        return !is_write;
                default:
-                       return is_write || kaddr < 0x1f801c00 || kaddr >= 0x1f801e00;
+                       return kaddr < 0x1f801c00 || kaddr >= 0x1f801e00;
                }
        default:
                switch (kaddr) {
@@ -403,9 +403,6 @@ static int lightrec_plugin_init(void)
        }
 
        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),
@@ -423,46 +420,25 @@ static int lightrec_plugin_init(void)
        return 0;
 }
 
-static void lightrec_dump_regs(struct lightrec_state *state)
-{
-       struct lightrec_registers *regs = lightrec_get_registers(state);
-
-       if (unlikely(booting))
-               memcpy(&psxRegs.GPR, regs->gpr, sizeof(regs->gpr));
-       psxRegs.CP0.n.Status = regs->cp0[12];
-       psxRegs.CP0.n.Cause = regs->cp0[13];
-}
-
-static void lightrec_restore_regs(struct lightrec_state *state)
-{
-       struct lightrec_registers *regs = lightrec_get_registers(state);
-
-       if (unlikely(booting))
-               memcpy(regs->gpr, &psxRegs.GPR, sizeof(regs->gpr));
-       regs->cp0[12] = psxRegs.CP0.n.Status;
-       regs->cp0[13] = psxRegs.CP0.n.Cause;
-       regs->cp0[14] = psxRegs.CP0.n.EPC;
-}
-
 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;
+       struct lightrec_registers *regs;
        u32 flags;
 
-       gen_interupt();
+       regs = lightrec_get_registers(lightrec_state);
+       gen_interupt((psxCP0Regs *)regs->cp0);
 
        // step during early boot so that 0x80030000 fastboot hack works
-       if (booting)
+       block_stepping = block_only;
+       if (block_only)
                next_interupt = psxRegs.cycle;
 
        if (use_pcsx_interpreter) {
                intExecuteBlock();
        } else {
                lightrec_reset_cycle_count(lightrec_state, psxRegs.cycle);
-               lightrec_restore_regs(lightrec_state);
 
                if (unlikely(use_lightrec_interpreter)) {
                        psxRegs.pc = lightrec_run_interpreter(lightrec_state,
@@ -475,7 +451,6 @@ static void lightrec_plugin_execute_block(void)
 
                psxRegs.cycle = lightrec_current_cycle_count(lightrec_state);
 
-               lightrec_dump_regs(lightrec_state);
                flags = lightrec_exit_flags(lightrec_state);
 
                if (flags & LIGHTREC_EXIT_SEGFAULT) {
@@ -485,17 +460,13 @@ static void lightrec_plugin_execute_block(void)
                }
 
                if (flags & LIGHTREC_EXIT_SYSCALL)
-                       psxException(0x20, 0);
-
-               if (booting && (psxRegs.pc & 0xff800000) == 0x80000000)
-                       booting = false;
+                       psxException(0x20, 0, (psxCP0Regs *)regs->cp0);
        }
 
-       if ((psxRegs.CP0.n.Cause & psxRegs.CP0.n.Status & 0x300) &&
-                       (psxRegs.CP0.n.Status & 0x1)) {
+       if ((regs->cp0[13] & regs->cp0[12] & 0x300) && (regs->cp0[12] & 0x1)) {
                /* Handle software interrupts */
-               psxRegs.CP0.n.Cause &= ~0x7c;
-               psxException(psxRegs.CP0.n.Cause, 0);
+               regs->cp0[13] &= ~0x7c;
+               psxException(regs->cp0[13], 0, (psxCP0Regs *)regs->cp0);
        }
 }
 
@@ -504,7 +475,12 @@ static void lightrec_plugin_execute(void)
        extern int stop;
 
        while (!stop)
-               lightrec_plugin_execute_block();
+               lightrec_plugin_execute_internal(false);
+}
+
+static void lightrec_plugin_execute_block(enum blockExecCaller caller)
+{
+       lightrec_plugin_execute_internal(true);
 }
 
 static void lightrec_plugin_clear(u32 addr, u32 size)
@@ -516,21 +492,24 @@ static void lightrec_plugin_clear(u32 addr, u32 size)
                lightrec_invalidate(lightrec_state, addr, size * 4);
 }
 
-static void lightrec_plugin_notify(int note, void *data)
+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)
 {
-       /*
-       To change once proper icache emulation is emulated
        switch (note)
        {
-               case R3000ACPU_NOTIFY_CACHE_UNISOLATED:
-                       lightrec_plugin_clear(0, 0x200000/4);
-                       break;
-               case R3000ACPU_NOTIFY_CACHE_ISOLATED:
-               // Sent from psxDma3().
-               case R3000ACPU_NOTIFY_DMA3_EXE_LOAD:
-               default:
-                       break;
-       }*/
+       case R3000ACPU_NOTIFY_CACHE_ISOLATED:
+       case R3000ACPU_NOTIFY_CACHE_UNISOLATED:
+               /* not used, lightrec calls lightrec_enable_ram() instead */
+               break;
+       case R3000ACPU_NOTIFY_BEFORE_SAVE:
+               lightrec_plugin_sync_regs_to_pcsx();
+               break;
+       case R3000ACPU_NOTIFY_AFTER_LOAD:
+               lightrec_plugin_sync_regs_from_pcsx();
+               break;
+       }
 }
 
 static void lightrec_plugin_apply_config()
@@ -556,11 +535,9 @@ 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
-
-       booting = true;
 }
 
-void lightrec_plugin_prepare_load_state(void)
+static void lightrec_plugin_sync_regs_from_pcsx(void)
 {
        struct lightrec_registers *regs;
 
@@ -572,7 +549,7 @@ void lightrec_plugin_prepare_load_state(void)
        lightrec_invalidate_all(lightrec_state);
 }
 
-void lightrec_plugin_prepare_save_state(void)
+static void lightrec_plugin_sync_regs_to_pcsx(void)
 {
        struct lightrec_registers *regs;