Emulator-Archive/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2024-11-23 05:49:43 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

CPU: Fix load delay register reads for same register in delay slot

Browse Source
This commit is contained in:
Connor McLaughlin 2019-09-15 12:16:51 +10:00
parent 1bb794dd39
commit d58dbe04c0
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pse/cpu_core.cpp
View File

@ -179,13 +179,18 @@ void Core::RaiseException(Exception excode)
FlushPipeline();
}
void Core::FlushPipeline()
void Core::FlushLoadDelay()
{
// loads are flushed
m_load_delay_reg = Reg::count;
m_load_delay_old_value = 0;
m_next_load_delay_reg = Reg::count;
m_next_load_delay_old_value = 0;
}
void Core::FlushPipeline()
{
// loads are flushed
FlushLoadDelay();
// not in a branch delay slot
m_branched = false;
@ -214,7 +219,7 @@ void Core::WriteRegDelayed(Reg rd, u32 value)
// save the old value, this will be returned if the register is read in the next instruction
m_next_load_delay_reg = rd;
m_next_load_delay_old_value = m_regs.r[static_cast<u8>(rd)];
m_next_load_delay_old_value = ReadReg(rd);
m_regs.r[static_cast<u8>(rd)] = value;
}

3
src/pse/cpu_core.h
View File

@ -71,6 +71,9 @@ private:
void Branch(u32 target);
void RaiseException(Exception excode);
// flushes any load delays if present
void FlushLoadDelay();
// clears pipeline of load/branch delays
void FlushPipeline();