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

CPU/CoreCache: Use virtual (unmasked) address as PC

This commit is contained in:
Connor McLaughlin 2019-12-12 20:23:53 +10:00
parent a267451614
commit 002d1cd4fd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/cpu_code_cache.cpp
View File

@ -46,7 +46,7 @@ void CodeCache::Execute()
if (m_core->HasPendingInterrupt()) if (m_core->HasPendingInterrupt())
{ {
// TODO: Fill in m_next_instruction... // TODO: Fill in m_next_instruction...
//m_core->SafeReadMemoryWord(m_core->m_regs.pc, &m_core->m_next_instruction.bits); // m_core->SafeReadMemoryWord(m_core->m_regs.pc, &m_core->m_next_instruction.bits);
m_core->DispatchInterrupt(); m_core->DispatchInterrupt();
next_block_key = GetNextBlockKey(); next_block_key = GetNextBlockKey();
} }
@ -163,10 +163,8 @@ void CodeCache::LogCurrentState()
CodeBlockKey CodeCache::GetNextBlockKey() const CodeBlockKey CodeCache::GetNextBlockKey() const
{ {
const u32 address = m_bus->UnmirrorAddress(m_core->m_regs.pc & UINT32_C(0x1FFFFFFF));
CodeBlockKey key = {}; CodeBlockKey key = {};
key.SetPC(address); key.SetPC(m_core->GetRegs().pc);
key.user_mode = m_core->InUserMode(); key.user_mode = m_core->InUserMode();
return key; return key;
} }
@ -248,8 +246,10 @@ bool CodeCache::CompileBlock(CodeBlock* block)
for (;;) for (;;)
{ {
CodeBlockInstruction cbi = {}; CodeBlockInstruction cbi = {};
if (!m_bus->IsCacheableAddress(pc) ||
m_bus->DispatchAccess<MemoryAccessType::Read, MemoryAccessSize::Word>(pc, cbi.instruction.bits) < 0 || const PhysicalMemoryAddress phys_addr = pc & PHYSICAL_MEMORY_ADDRESS_MASK;
if (!m_bus->IsCacheableAddress(phys_addr) ||
m_bus->DispatchAccess<MemoryAccessType::Read, MemoryAccessSize::Word>(phys_addr, cbi.instruction.bits) < 0 ||
!IsInvalidInstruction(cbi.instruction)) !IsInvalidInstruction(cbi.instruction))
{ {
break; break;