ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CPU: Delay interrupts by one instruction/block 

Fixes Gameshark Sampler Disc.
This commit is contained in:
Connor McLaughlin 2020-07-03 00:57:22 +10:00
parent 8a8ce8d41c
commit 2d74062abb
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/cpu_core.cpp
View File

@ -1,7 +1,7 @@
#include "cpu_core.h" #include "cpu_core.h"
#include "common/align.h"
#include "common/log.h" #include "common/log.h"
#include "common/state_wrapper.h" #include "common/state_wrapper.h"
#include "common/align.h"
#include "cpu_disasm.h" #include "cpu_disasm.h"
#include <cstdio> #include <cstdio>
Log_SetChannel(CPU::Core); Log_SetChannel(CPU::Core);
@ -93,6 +93,8 @@ bool Core::DoState(StateWrapper& sw)
sw.Do(&m_current_instruction_was_branch_taken); sw.Do(&m_current_instruction_was_branch_taken);
sw.Do(&m_next_instruction_is_branch_delay_slot); sw.Do(&m_next_instruction_is_branch_delay_slot);
sw.Do(&m_branch_was_taken); sw.Do(&m_branch_was_taken);
sw.Do(&m_exception_raised);
sw.Do(&m_interrupt_delay);
sw.Do(&m_load_delay_reg); sw.Do(&m_load_delay_reg);
sw.Do(&m_load_delay_value); sw.Do(&m_load_delay_value);
sw.Do(&m_next_load_delay_reg); sw.Do(&m_next_load_delay_reg);
@ -328,6 +330,7 @@ void Core::RaiseException(Exception excode, u32 EPC, bool BD, bool BT, u8 CE)
void Core::SetExternalInterrupt(u8 bit) void Core::SetExternalInterrupt(u8 bit)
{ {
m_cop0_regs.cause.Ip |= static_cast<u8>(1u << bit); m_cop0_regs.cause.Ip |= static_cast<u8>(1u << bit);
m_interrupt_delay = 1;
} }
void Core::ClearExternalInterrupt(u8 bit) void Core::ClearExternalInterrupt(u8 bit)
@ -341,7 +344,10 @@ bool Core::HasPendingInterrupt()
const bool do_interrupt = const bool do_interrupt =
m_cop0_regs.sr.IEc && (((m_cop0_regs.cause.bits & m_cop0_regs.sr.bits) & (UINT32_C(0xFF) << 8)) != 0); m_cop0_regs.sr.IEc && (((m_cop0_regs.cause.bits & m_cop0_regs.sr.bits) & (UINT32_C(0xFF) << 8)) != 0);
return do_interrupt; const bool interrupt_delay = m_interrupt_delay;
m_interrupt_delay = false;
return do_interrupt && !interrupt_delay;
} }
void Core::DispatchInterrupt() void Core::DispatchInterrupt()

1
src/core/cpu_core.h
View File

@ -155,6 +155,7 @@ private:
bool m_next_instruction_is_branch_delay_slot = false; bool m_next_instruction_is_branch_delay_slot = false;
bool m_branch_was_taken = false; bool m_branch_was_taken = false;
bool m_exception_raised = false; bool m_exception_raised = false;
bool m_interrupt_delay = false;
// load delays // load delays
Reg m_load_delay_reg = Reg::count; Reg m_load_delay_reg = Reg::count;

2
src/core/save_state_version.h
View File

@ -2,7 +2,7 @@
#include "types.h" #include "types.h"
static constexpr u32 SAVE_STATE_MAGIC = 0x43435544; static constexpr u32 SAVE_STATE_MAGIC = 0x43435544;
static constexpr u32 SAVE_STATE_VERSION = 37; static constexpr u32 SAVE_STATE_VERSION = 38;
#pragma pack(push, 4) #pragma pack(push, 4)
struct SAVE_STATE_HEADER struct SAVE_STATE_HEADER