Fixing dynarec.

Author: nicolasnoble

src/core/DynaRec_aa64/recompiler.cc

@@ -169,7 +169,6 @@ void DynaRecCPU::emitDispatcher() {
     gen.Str(contextPointer,
             MemOperand(sp, -16, PreIndex));  // Save contextPointer register in stack (also align stack pointer)
 
-    gen.Mov(runningPointer, (uintptr_t)PCSX::g_system->runningPtr());  // Move runningPtr to runningPointer register
     gen.Mov(contextPointer, (uintptr_t)this);                          // Load context pointer
 
     // Back up all our allocateable volatile regs
@@ -188,8 +187,12 @@ void DynaRecCPU::emitDispatcher() {
 
     loadThisPointer(arg1.X());  // Poll events
     call(recBranchTestWrapper);
+    gen.Mov(runningPointer, (uintptr_t)PCSX::g_system->runningPtr());  // Move runningPtr to runningPointer register
     gen.Ldrb(w0, MemOperand(runningPointer));  // Check if PCSX::g_system->running is true
     gen.Cbz(w0, &done);                        // If it's not, return
+    gen.Mov(runningPointer, (uintptr_t)PCSX::g_system->quittingPtr());  // Load pointer to "quitting" variable
+    gen.Ldrb(w0, MemOperand(runningPointer));  // Check if PCSX::g_system->quitting is true
+    gen.Cbnz(w0, &done);                       // If it is, return
     emitBlockLookup();                         // Otherwise, look up next block
 
     gen.align();

src/core/DynaRec_x64/recompiler.cc

@@ -186,7 +186,6 @@ void DynaRecCPU::emitDispatcher() {
         gen.push(reg.cvt64());
     }
     gen.mov(qword[contextPointer + HOST_REG_CACHE_OFFSET(0)], runningPointer);  // Backup running pointer
-    gen.mov(runningPointer, (uintptr_t)PCSX::g_system->runningPtr());           // Load pointer to "running" variable
 
     // Allocate shadow stack space on Windows
     if constexpr (isWindows()) {
@@ -202,8 +201,12 @@ void DynaRecCPU::emitDispatcher() {
 
     // Poll events
     emitMemberFunctionCall(&PCSX::R3000Acpu::branchTest, this);
+    gen.mov(runningPointer, (uintptr_t)PCSX::g_system->runningPtr());  // Load pointer to "running" variable
     gen.test(Xbyak::util::byte[runningPointer], 1);  // Check if PCSX::g_system->running is true
     gen.jz(done);                                    // If it's not, return
+    gen.mov(runningPointer, (uintptr_t)PCSX::g_system->quittingPtr());  // Load pointer to "quitting" variable
+    gen.test(Xbyak::util::byte[runningPointer], 1);  // Check if PCSX::g_system->running is true
+    gen.jnz(done);                                   // If it is, return
     emitBlockLookup();                               // Otherwise, look up next block
 
     gen.align(16);

src/core/system.h

@@ -168,6 +168,7 @@ class System {
         return m_running && !m_quitting;
     }
     const bool *runningPtr() { return &m_running; }
+    const bool *quittingPtr() { return &m_quitting; }
     bool quitting() { return m_quitting; }
     int exitCode() { return m_exitCode; }
     bool emergencyExit() { return m_emergencyExit; }