diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-14 20:40:53 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-14 20:40:53 -0700 |
| commit | bb689338943791c735c7c6adb186256457e064b4 (patch) | |
| tree | a04ba64d18dd163709b1cb4b4212afaca6c091a6 /src/citra_qt | |
| parent | 9f503387dc2d1c697fe732264cc2b1a1513a3541 (diff) | |
| parent | dd4430609afce172542fba1d2cd53c3029f182ce (diff) | |
Merge pull request #762 from yuriks/memmap
Memory: Use a table based lookup scheme to read from memory regions
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_framebuffer.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/ramview.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index 3742c2d3..94e20471 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp @@ -8,7 +8,7 @@ #include "core/core.h" #include "core/arm/arm_interface.h" -#include "core/mem_map.h" +#include "core/memory.h" #include "common/symbols.h" #include "core/arm/disassembler/arm_disasm.h" diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 780607e8..e99ec1b3 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -7,7 +7,7 @@ #include "../bootmanager.h" #include "../hotkeys.h" -#include "core/mem_map.h" +#include "core/memory.h" #include "core/core.h" #include "common/break_points.h" diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp index 3287b470..0c1a3f47 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.cpp +++ b/src/citra_qt/debugger/graphics_framebuffer.cpp @@ -10,6 +10,8 @@ #include <QSpinBox> #include "core/hw/gpu.h" +#include "core/memory.h" + #include "video_core/color.h" #include "video_core/pica.h" #include "video_core/utils.h" diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp index 7149a048..b6ebc7fc 100644 --- a/src/citra_qt/debugger/ramview.cpp +++ b/src/citra_qt/debugger/ramview.cpp @@ -4,8 +4,6 @@ #include "ramview.h" -#include "core/mem_map.h" - GRamView::GRamView(QWidget* parent) : QHexEdit(parent) { |