Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 14:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CPU/Recompiler: Don't try fastmem for RAM mirrors

Browse source
This commit is contained in:
Connor McLaughlin 2020-10-26 22:07:52 +10:00
parent 875b0b91f1
commit 7f795d25aa
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/bus.cpp
View file

@ -314,28 +314,31 @@ void UpdateFastmemViews(bool enabled, bool isolate_cache)
{ {
// KUSEG - cached // KUSEG - cached
MapRAM(0x00000000, !isolate_cache); MapRAM(0x00000000, !isolate_cache);
//MapRAM(0x00200000, !isolate_cache); // MapRAM(0x00200000, !isolate_cache);
//MapRAM(0x00400000, !isolate_cache); // MapRAM(0x00400000, !isolate_cache);
//MapRAM(0x00600000, !isolate_cache); // MapRAM(0x00600000, !isolate_cache);
// KSEG0 - cached // KSEG0 - cached
MapRAM(0x80000000, !isolate_cache); MapRAM(0x80000000, !isolate_cache);
//MapRAM(0x80200000, !isolate_cache); // MapRAM(0x80200000, !isolate_cache);
//MapRAM(0x80400000, !isolate_cache); // MapRAM(0x80400000, !isolate_cache);
//MapRAM(0x80600000, !isolate_cache); // MapRAM(0x80600000, !isolate_cache);
} }
// KSEG1 - uncached // KSEG1 - uncached
MapRAM(0xA0000000, true); MapRAM(0xA0000000, true);
//MapRAM(0xA0200000, true); // MapRAM(0xA0200000, true);
//MapRAM(0xA0400000, true); // MapRAM(0xA0400000, true);
//MapRAM(0xA0600000, true); // MapRAM(0xA0600000, true);
} }
bool CanUseFastmemForAddress(VirtualMemoryAddress address) bool CanUseFastmemForAddress(VirtualMemoryAddress address)
{ {
const PhysicalMemoryAddress paddr = address & CPU::PHYSICAL_MEMORY_ADDRESS_MASK; const PhysicalMemoryAddress paddr = address & CPU::PHYSICAL_MEMORY_ADDRESS_MASK;
return IsRAMAddress(paddr);
// Currently since we don't map the mirrors, don't use fastmem for them.
// This is because the swapping of page code bits for SMC is too expensive.
return (paddr < RAM_SIZE);
} }
bool IsRAMCodePage(u32 index) bool IsRAMCodePage(u32 index)

8
src/core/cpu_recompiler_code_generator_generic.cpp
View file

@ -42,9 +42,15 @@ Value CodeGenerator::EmitLoadGuestMemory(const CodeBlockInstruction& cbi, const
Value result = m_register_cache.AllocateScratch(size); Value result = m_register_cache.AllocateScratch(size);
if (g_settings.IsUsingFastmem() && Bus::IsRAMAddress(static_cast<u32>(address.constant_value))) if (g_settings.IsUsingFastmem() && Bus::IsRAMAddress(static_cast<u32>(address.constant_value)))
EmitLoadGuestRAMFastmem(address, size, result); {
// have to mask away the high bits for mirrors, since we don't map them in fastmem
EmitLoadGuestRAMFastmem(Value::FromConstantU32(static_cast<u32>(address.constant_value) & Bus::RAM_MASK), size,
result);
}
else else
{
EmitLoadGlobal(result.GetHostRegister(), size, ptr); EmitLoadGlobal(result.GetHostRegister(), size, ptr);
}
m_delayed_cycles_add += read_ticks; m_delayed_cycles_add += read_ticks;
return result; return result;