diff options
| author |  Yuri Kunde Schlesner | 2015-05-14 20:40:53 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-14 20:40:53 -0700 |
| commit | bb689338943791c735c7c6adb186256457e064b4 (patch) | |
| tree | a04ba64d18dd163709b1cb4b4212afaca6c091a6 /src/core/core.cpp | |
| parent | Merge pull request #769 from lioncash/cond (diff) | |
| parent | Memory: Use a table based lookup scheme to read from memory regions (diff) | |
| download | yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.gz yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.xz yuzu-bb689338943791c735c7c6adb186256457e064b4.zip | |
Merge pull request #762 from yuriks/memmap
Memory: Use a table based lookup scheme to read from memory regions
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 53aae8c2f..79038cd52 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include "core/core.h" | 8 | #include "core/core.h" |
| 9 | #include "core/core_timing.h" | 9 | #include "core/core_timing.h" |
| 10 | 10 | ||
| 11 | #include "core/mem_map.h" | ||
| 12 | #include "core/settings.h" | 11 | #include "core/settings.h" |
| 13 | #include "core/arm/arm_interface.h" | 12 | #include "core/arm/arm_interface.h" |
| 14 | #include "core/arm/disassembler/arm_disasm.h" | 13 | #include "core/arm/disassembler/arm_disasm.h" |