diff options
| author | 2014-04-10 20:50:10 -0400 | |
|---|---|---|
| committer | 2014-04-10 20:51:32 -0400 | |
| commit | ff4fe52bf649b9b290ffa9844aad07ca5319e3e0 (patch) | |
| tree | eba6c7c29871327a28bc1945213401ce77920f11 /src/citra_qt/disasm.cpp | |
| parent | removed scm_rev.h from version control (diff) | |
| download | yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.tar.gz yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.tar.xz yuzu-ff4fe52bf649b9b290ffa9844aad07ca5319e3e0.zip | |
Temporarily "fix" citra_qt for Windows
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 @@ | |||
| 5 | #include "bootmanager.hxx" | 5 | #include "bootmanager.hxx" |
| 6 | #include "hotkeys.hxx" | 6 | #include "hotkeys.hxx" |
| 7 | 7 | ||
| 8 | #include "common.h" | 8 | #include "common/common.h" |
| 9 | #include "mem_map.h" | 9 | #include "core/mem_map.h" |
| 10 | 10 | ||
| 11 | #include "core.h" | 11 | #include "core/core.h" |
| 12 | #include "break_points.h" | 12 | #include "common/break_points.h" |
| 13 | #include "arm/interpreter/armdefs.h" | 13 | #include "core/arm/interpreter/armdefs.h" |
| 14 | #include "arm/disassembler/arm_disasm.h" | 14 | #include "core/arm/disassembler/arm_disasm.h" |
| 15 | 15 | ||
| 16 | GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread) | 16 | GDisAsmView::GDisAsmView(QWidget* parent, EmuThread& emu_thread) : QDockWidget(parent), base_addr(0), emu_thread(emu_thread) |
| 17 | { | 17 | { |
| @@ -43,7 +43,7 @@ void GDisAsmView::Init() | |||
| 43 | { | 43 | { |
| 44 | ARM_Disasm* disasm = new ARM_Disasm(); | 44 | ARM_Disasm* disasm = new ARM_Disasm(); |
| 45 | 45 | ||
| 46 | base_addr = Core::g_app_core->PC(); | 46 | base_addr = Core::g_app_core->GetPC(); |
| 47 | unsigned int curInstAddr = base_addr; | 47 | unsigned int curInstAddr = base_addr; |
| 48 | char result[255]; | 48 | char result[255]; |
| 49 | 49 | ||
| @@ -112,7 +112,7 @@ void GDisAsmView::OnToggleStartStop() | |||
| 112 | 112 | ||
| 113 | void GDisAsmView::OnCPUStepped() | 113 | void GDisAsmView::OnCPUStepped() |
| 114 | { | 114 | { |
| 115 | ARMword next_instr = Core::g_app_core->PC(); | 115 | ARMword next_instr = Core::g_app_core->GetPC(); |
| 116 | 116 | ||
| 117 | if (breakpoints->IsAddressBreakPoint(next_instr)) | 117 | if (breakpoints->IsAddressBreakPoint(next_instr)) |
| 118 | { | 118 | { |