diff options
Diffstat (limited to '')
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 3 | ||||
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index 9bb22ca2e..3742c2d38 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp @@ -27,7 +27,6 @@ CallstackWidget::CallstackWidget(QWidget* parent): QDockWidget(parent) void CallstackWidget::OnDebugModeEntered() { - ARM_Disasm* disasm = new ARM_Disasm(); ARM_Interface* app_core = Core::g_app_core; u32 sp = app_core->GetReg(13); //stack pointer @@ -46,7 +45,7 @@ void CallstackWidget::OnDebugModeEntered() /* TODO (mattvail) clean me, move to debugger interface */ u32 insn = Memory::Read32(call_addr); - if (disasm->Decode(insn) == OP_BL) + if (ARM_Disasm::Decode(insn) == OP_BL) { std::string name; // ripped from disasm diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 54d21dc90..f620687ae 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -232,11 +232,8 @@ void DisassemblerWidget::OnDebugModeEntered() { ARMword next_instr = Core::g_app_core->GetPC(); - // TODO: Make BreakPoints less crappy (i.e. const-correct) so that this doesn't need a const_cast. - if (const_cast<BreakPoints&>(model->GetBreakPoints()).IsAddressBreakPoint(next_instr)) - { + if (model->GetBreakPoints().IsAddressBreakPoint(next_instr)) emu_thread.SetCpuRunning(false); - } model->SetNextInstruction(next_instr); |