diff options
| author | Mathieu Vaillancourt <vaillancourtm@gmail.com> | 2014-04-11 02:50:10 +0200 |
|---|---|---|
| committer | Mathieu Vaillancourt <vaillancourtm@gmail.com> | 2014-04-11 02:51:32 +0200 |
| commit | ff4fe52bf649b9b290ffa9844aad07ca5319e3e0 (patch) | |
| tree | eba6c7c29871327a28bc1945213401ce77920f11 /src/citra_qt/disasm.cpp | |
| parent | removed scm_rev.h from version control (diff) | |
| download | yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.tar yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.tar.gz yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.tar.bz2 yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.tar.lz yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.tar.xz yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.tar.zst yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.zip | |
Diffstat (limited to 'src/citra_qt/disasm.cpp')
| -rw-r--r-- | src/citra_qt/disasm.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/citra_qt/disasm.cpp b/src/citra_qt/disasm.cpp index ddcbf69d8..c4f69cac0 100644 --- a/src/citra_qt/disasm.cpp +++ b/src/citra_qt/disasm.cpp @@ -5,13 +5,13 @@ #include "bootmanager.hxx" #include "hotkeys.hxx" -#include "common.h" -#include "mem_map.h" +#include "common/common.h" +#include "core/mem_map.h" -#include "core.h" -#include "break_points.h" -#include "arm/interpreter/armdefs.h" -#include "arm/disassembler/arm_disasm.h" +#include "core/core.h" +#include "common/break_points.h" +#include "core/arm/interpreter/armdefs.h" +#include "core/arm/disassembler/arm_disasm.h" GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread) { @@ -43,7 +43,7 @@ void GDisAsmView::Init() { ARM_Disasm* disasm = new ARM_Disasm(); - base_addr = Core::g_app_core->PC(); + base_addr = Core::g_app_core->GetPC(); unsigned int curInstAddr = base_addr; char result[255]; @@ -112,7 +112,7 @@ void GDisAsmView::OnToggleStartStop() void GDisAsmView::OnCPUStepped() { - ARMword next_instr = Core::g_app_core->PC(); + ARMword next_instr = Core::g_app_core->GetPC(); if (breakpoints->IsAddressBreakPoint(next_instr)) { |