adjust bios handling again

changed my mind about BiosBooted

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 3864c88..60fff5d 100644 (file)
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -501,7 +501,7 @@ struct rearmed_cbs pl_rearmed_cbs = {
 void pl_frame_limit(void)
 {
    /* called once per frame, make psxCpu->Execute() above return */
-   stop = 1;
+   stop++;
 }
 
 void pl_timing_prepare(int is_pal)

diff --git a/frontend/main.c b/frontend/main.c
index 3a51bff..cf015a4 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -492,7 +492,7 @@ int emu_core_init(void)
 
 void emu_core_ask_exit(void)
 {
-       stop = 1;
+       stop++;
        g_emu_want_quit = 1;
 }
 

diff --git a/frontend/main.h b/frontend/main.h
index 7ce9e5d..22053bb 100644 (file)
--- a/frontend/main.h
+++ b/frontend/main.h
@@ -91,7 +91,7 @@ static inline void emu_set_action(enum sched_action action_)
        if (action_ == SACTION_NONE)
                emu_action_old = 0;
        else if (action_ != emu_action_old)
-               stop = 1;
+               stop++;
        emu_action = action_;
 }
 

diff --git a/libpcsxcore/lightrec/plugin.c b/libpcsxcore/lightrec/plugin.c
index 82ae822..dd7cc73 100644 (file)
--- a/libpcsxcore/lightrec/plugin.c
+++ b/libpcsxcore/lightrec/plugin.c
@@ -478,7 +478,7 @@ static void lightrec_plugin_execute(void)
                lightrec_plugin_execute_internal(false);
 }
 
-static void lightrec_plugin_execute_block(void)
+static void lightrec_plugin_execute_block(enum blockExecCaller caller)
 {
        lightrec_plugin_execute_internal(true);
 }

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 678f2db..223266b 100644 (file)
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -196,9 +196,10 @@ int LoadCdrom() {
        char exename[256];
 
        if (!Config.HLE) {
-               if (!BiosBooted) return 0;              // custom BIOS
-               if (psxRegs.pc != 0x80030000) return 0; // BiosBootBypass'ed
-               if (Config.SlowBoot) return 0;
+               if (psxRegs.pc != 0x80030000) // BiosBootBypass'ed or custom BIOS?
+                       return 0;
+               if (Config.SlowBoot)
+                       return 0;
        }
 
        time[0] = itob(0); time[1] = itob(2); time[2] = itob(0x10);

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index f713587..e89b635 100644 (file)
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -265,6 +265,17 @@ static void ari64_execute()
        }
 }
 
+static void ari64_execute_block(enum blockExecCaller caller)
+{
+       if (caller == EXEC_CALLER_BOOT)
+               stop++;
+
+       ari64_execute_until();
+
+       if (caller == EXEC_CALLER_BOOT)
+               stop--;
+}
+
 static void ari64_clear(u32 addr, u32 size)
 {
        size *= 4; /* PCSX uses DMA units (words) */
@@ -315,7 +326,7 @@ R3000Acpu psxRec = {
        ari64_init,
        ari64_reset,
        ari64_execute,
-       ari64_execute_until,
+       ari64_execute_block,
        ari64_clear,
        ari64_notify,
        ari64_apply_config,

diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c
index 69e531f..b89206c 100644 (file)
--- a/libpcsxcore/psxbios.c
+++ b/libpcsxcore/psxbios.c
@@ -285,7 +285,7 @@ static inline void softCall(u32 pc) {
 
        hleSoftCall = TRUE;
 
-       while (pc0 != 0x80001000) psxCpu->ExecuteBlock();
+       while (pc0 != 0x80001000) psxCpu->ExecuteBlock(EXEC_CALLER_HLE);
 
        hleSoftCall = FALSE;
 }
@@ -297,7 +297,7 @@ static inline void softCall2(u32 pc) {
 
        hleSoftCall = TRUE;
 
-       while (pc0 != 0x80001000) psxCpu->ExecuteBlock();
+       while (pc0 != 0x80001000) psxCpu->ExecuteBlock(EXEC_CALLER_HLE);
        ra = sra;
 
        hleSoftCall = FALSE;

diff --git a/libpcsxcore/psxcommon.c b/libpcsxcore/psxcommon.c
index fcc3deb..8313304 100644 (file)
--- a/libpcsxcore/psxcommon.c
+++ b/libpcsxcore/psxcommon.c
@@ -26,7 +26,6 @@
 
 PcsxConfig Config;
 boolean NetOpened = FALSE;
-boolean BiosBooted = FALSE;
 
 int Log = 0;
 FILE *emuLog = NULL;

diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 67a0ae0..92e69ee 100644 (file)
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -154,7 +154,6 @@ typedef struct {
 
 extern PcsxConfig Config;
 extern boolean NetOpened;
-extern boolean BiosBooted;
 
 struct PcsxSaveFuncs {
        void *(*open)(const char *name, const char *mode);

diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c
index f59934a..8e0aafe 100644 (file)
--- a/libpcsxcore/psxinterpreter.c
+++ b/libpcsxcore/psxinterpreter.c
@@ -1102,7 +1102,7 @@ static void intExecute() {
                execI_(memRLUT, regs_);
 }
 
-void intExecuteBlock() {
+void intExecuteBlock(enum blockExecCaller caller) {
        psxRegisters *regs_ = &psxRegs;
        u8 **memRLUT = psxMemRLUT;
 

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 53a5eba..fbccdea 100644 (file)
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -69,7 +69,6 @@ void psxReset() {
 
        BiosLikeGPUSetup(); // a bit of a hack but whatever
 
-       BiosBooted = FALSE;
        if (!Config.HLE) {
                psxExecuteBios();
                if (psxRegs.pc == 0x80030000 && !Config.SlowBoot)
@@ -244,11 +243,12 @@ void psxJumpTest() {
 
 void psxExecuteBios() {
        int i;
-       for (i = 0; psxRegs.pc != 0x80030000 && i < 5000000; i++)
-               psxCpu->ExecuteBlock();
-       if (psxRegs.pc == 0x80030000)
-               BiosBooted = TRUE;
-       else
-               SysPrintf("BIOS boot timeout - custom BIOS?\n");
+       for (i = 0; i < 5000000; i++) {
+               psxCpu->ExecuteBlock(EXEC_CALLER_BOOT);
+               if ((psxRegs.pc & 0xff800000) == 0x80000000)
+                       break;
+       }
+       if (psxRegs.pc != 0x80030000)
+               SysPrintf("non-standard BIOS detected (%d, %08x)\n", i, psxRegs.pc);
 }
 

diff --git a/libpcsxcore/r3000a.h b/libpcsxcore/r3000a.h
index 229b14a..8d53a18 100644 (file)
--- a/libpcsxcore/r3000a.h
+++ b/libpcsxcore/r3000a.h
@@ -36,11 +36,16 @@ enum R3000Anote {
        R3000ACPU_NOTIFY_AFTER_LOAD,
 };
 
+enum blockExecCaller {
+       EXEC_CALLER_BOOT,
+       EXEC_CALLER_HLE,
+};
+
 typedef struct {
        int  (*Init)();
        void (*Reset)();
-       void (*Execute)();              /* executes up to a break */
-       void (*ExecuteBlock)(); /* executes up to a jump */
+       void (*Execute)();
+       void (*ExecuteBlock)(enum blockExecCaller caller); /* executes up to a jump */
        void (*Clear)(u32 Addr, u32 Size);
        void (*Notify)(enum R3000Anote note, void *data);
        void (*ApplyConfig)();