diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-07-25 23:12:34 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-07-25 23:12:34 -0400 |
| commit | 392c7feba0cd152e46ffbe6089def35082fa2692 (patch) | |
| tree | d959d1751d99a6f5307b45d04e46c19c53d5efc2 /src/citra_qt/debugger/disassembler.cpp | |
| parent | 453764aefc3b822d08dae3642fab83ea1adf2bc8 (diff) | |
| parent | 03213f893e7f2cbd692144334ac72d9138fd5e70 (diff) | |
Merge pull request #990 from lioncash/arm
dyncom: General cleanup
Diffstat (limited to 'src/citra_qt/debugger/disassembler.cpp')
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index b41c40a0..1e5ef529 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -15,7 +15,6 @@ #include "common/break_points.h" #include "common/symbols.h" #include "core/arm/arm_interface.h" -#include "core/arm/skyeye_common/armdefs.h" #include "core/arm/disassembler/arm_disasm.h" @@ -219,7 +218,7 @@ void DisassemblerWidget::OnToggleStartStop() { } void DisassemblerWidget::OnDebugModeEntered() { - ARMword next_instr = Core::g_app_core->GetPC(); + u32 next_instr = Core::g_app_core->GetPC(); if (model->GetBreakPoints().IsAddressBreakPoint(next_instr)) emu_thread->SetRunning(false); |