Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-30 09:35:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CPU/Recompiler: Handle self-modifying code within same block

Browse source 
Fixes Spyro 2 and 3 PAL with recompiler.
This commit is contained in:
Connor McLaughlin 2021-02-18 17:46:20 +10:00
parent 67fe97a17c
commit d3717e66c3
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/core/cpu_recompiler_code_generator.cpp
View file

@ -1008,6 +1008,13 @@ void CodeGenerator::InstructionEpilogue(const CodeBlockInstruction& cbi)
} }
} }
void CodeGenerator::TruncateBlockAtCurrentInstruction()
{
Log_DevPrintf("Truncating block %08X at %08X", m_block->GetPC(), m_current_instruction->pc);
m_block_end = m_current_instruction + 1;
WriteNewPC(CalculatePC(), true);
}
void CodeGenerator::AddPendingCycles(bool commit) void CodeGenerator::AddPendingCycles(bool commit)
{ {
if (m_delayed_cycles_add == 0) if (m_delayed_cycles_add == 0)
@ -1496,6 +1503,25 @@ bool CodeGenerator::Compile_Store(const CodeBlockInstruction& cbi)
} }
InstructionEpilogue(cbi); InstructionEpilogue(cbi);
if (address_spec)
{
const CPU::Segment seg = GetSegmentForAddress(*address_spec);
if (seg == Segment::KUSEG || seg == Segment::KSEG0 || seg == Segment::KSEG1)
{
const PhysicalMemoryAddress phys_addr = VirtualAddressToPhysical(*address_spec);
const PhysicalMemoryAddress block_start = VirtualAddressToPhysical(m_block->GetPC());
const PhysicalMemoryAddress block_end = VirtualAddressToPhysical(
m_block->GetPC() + static_cast<u32>(m_block->instructions.size()) * sizeof(Instruction));
if (phys_addr >= block_start && phys_addr < block_end)
{
Log_WarningPrintf("Instruction %08X speculatively writes to %08X inside block %08X-%08X. Truncating block.",
cbi.pc, phys_addr, block_start, block_end);
TruncateBlockAtCurrentInstruction();
}
}
}
return true; return true;
} }

1
src/core/cpu_recompiler_code_generator.h
View file

@ -196,6 +196,7 @@ private:
void BlockEpilogue(); void BlockEpilogue();
void InstructionPrologue(const CodeBlockInstruction& cbi, TickCount cycles, bool force_sync = false); void InstructionPrologue(const CodeBlockInstruction& cbi, TickCount cycles, bool force_sync = false);
void InstructionEpilogue(const CodeBlockInstruction& cbi); void InstructionEpilogue(const CodeBlockInstruction& cbi);
void TruncateBlockAtCurrentInstruction();
void AddPendingCycles(bool commit); void AddPendingCycles(bool commit);
Value CalculatePC(u32 offset = 0); Value CalculatePC(u32 offset = 0);