ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Debugger: Disable pseudo ops

This commit is contained in:
Ty Lamontagne 2024-04-18 15:53:47 -04:00 committed by refractionpcsx2
parent 08e824831b
commit bdeb0fcb76
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2-qt/Debugger/Models/BreakpointModel.cpp
View File

@ -103,7 +103,7 @@ QVariant BreakpointModel::data(const QModelIndex& index, int role) const
return m_cpu.GetSymbolMap().GetLabelName(bp->addr).c_str(); return m_cpu.GetSymbolMap().GetLabelName(bp->addr).c_str();
case BreakpointColumns::OPCODE: case BreakpointColumns::OPCODE:
// Note: Fix up the disassemblymanager so we can use it here, instead of calling a function through the disassemblyview (yuck) // Note: Fix up the disassemblymanager so we can use it here, instead of calling a function through the disassemblyview (yuck)
return m_cpu.disasm(bp->addr, true).c_str(); return m_cpu.disasm(bp->addr, false).c_str();
case BreakpointColumns::CONDITION: case BreakpointColumns::CONDITION:
return bp->hasCond ? QString::fromLocal8Bit(bp->cond.expressionString) : ""; return bp->hasCond ? QString::fromLocal8Bit(bp->cond.expressionString) : "";
case BreakpointColumns::HITS: case BreakpointColumns::HITS:
@ -149,7 +149,7 @@ QVariant BreakpointModel::data(const QModelIndex& index, int role) const
return m_cpu.GetSymbolMap().GetLabelName(bp->addr).c_str(); return m_cpu.GetSymbolMap().GetLabelName(bp->addr).c_str();
case BreakpointColumns::OPCODE: case BreakpointColumns::OPCODE:
// Note: Fix up the disassemblymanager so we can use it here, instead of calling a function through the disassemblyview (yuck) // Note: Fix up the disassemblymanager so we can use it here, instead of calling a function through the disassemblyview (yuck)
return m_cpu.disasm(bp->addr, true).c_str(); return m_cpu.disasm(bp->addr, false).c_str();
case BreakpointColumns::CONDITION: case BreakpointColumns::CONDITION:
return bp->hasCond ? QString::fromLocal8Bit(bp->cond.expressionString) : ""; return bp->hasCond ? QString::fromLocal8Bit(bp->cond.expressionString) : "";
case BreakpointColumns::HITS: case BreakpointColumns::HITS:

23
pcsx2/DebugTools/DisassemblyManager.cpp
View File

@ -562,7 +562,7 @@ void DisassemblyFunction::load()
} }
MIPSAnalyst::MipsOpcodeInfo opInfo = MIPSAnalyst::GetOpcodeInfo(cpu,funcPos); MIPSAnalyst::MipsOpcodeInfo opInfo = MIPSAnalyst::GetOpcodeInfo(cpu,funcPos);
u32 opAddress = funcPos; //u32 opAddress = funcPos;
funcPos += 4; funcPos += 4;
// skip branches and their delay slots // skip branches and their delay slots
@ -572,6 +572,25 @@ void DisassemblyFunction::load()
continue; continue;
} }
/*
The QT debugger doesn't follow the same logic as the disassembler
It _should_ follow the path of the disassembler, but instead it is naively reading the
disassembler output for every single instruction.
This causes issues disassembling:
0x1000 lui $t0, 0x1234
0x1004 ori $t0, $t0, 0x5678
0x1008 nop
Into:
0x1000 li $t0, 0x12345678
0x1004 li $t0, 0x12346789
0x1008 nop
Where it should be:
0x1000 li $t0, 0x12345678
0x1008 nop
As a quick remedy, I'm disabling the macro generation.
*/
#if 0
// lui // lui
if (MIPS_GET_OP(opInfo.encodedOpcode) == 0x0F && funcPos < funcEnd && funcPos != nextData) if (MIPS_GET_OP(opInfo.encodedOpcode) == 0x0F && funcPos < funcEnd && funcPos != nextData)
{ {
@ -660,7 +679,7 @@ void DisassemblyFunction::load()
} }
} }
} }
#endif
// just a normal opcode // just a normal opcode
} }