Merge pull request #1167 from FioraAeterna/fixdebugwindow
Debug: fix display of instructions in virtual memory in MMU games
This commit is contained in:
commit
63cee3328f
|
@ -25,8 +25,15 @@ std::string PPCDebugInterface::Disassemble(unsigned int address)
|
|||
|
||||
if (Core::GetState() != Core::CORE_UNINITIALIZED)
|
||||
{
|
||||
if (Memory::IsRAMAddress(address, true, true))
|
||||
if (!Memory::IsRAMAddress(address, true, true))
|
||||
{
|
||||
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU || !((address & JIT_ICACHE_VMEM_BIT) &&
|
||||
Memory::TranslateAddress(address, Memory::FLAG_OPCODE)))
|
||||
{
|
||||
return "(No RAM here)";
|
||||
}
|
||||
}
|
||||
|
||||
u32 op = Memory::Read_Instruction(address);
|
||||
std::string disasm = GekkoDisassembler::Disassemble(op, address);
|
||||
|
||||
|
@ -41,11 +48,6 @@ std::string PPCDebugInterface::Disassemble(unsigned int address)
|
|||
return disasm;
|
||||
}
|
||||
else
|
||||
{
|
||||
return "(No RAM here)";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return "<unknown>";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue