summaryrefslogtreecommitdiffstats
path: root/src/core/loader
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-15 05:40:53 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-15 05:40:53 +0200
commitbb689338943791c735c7c6adb186256457e064b4 (patch)
treea04ba64d18dd163709b1cb4b4212afaca6c091a6 /src/core/loader
parentMerge pull request #769 from lioncash/cond (diff)
parentMemory: Use a table based lookup scheme to read from memory regions (diff)
downloadyuzu-bb689338943791c735c7c6adb186256457e064b4.tar
yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.gz
yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.bz2
yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.lz
yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.xz
yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.zst
yuzu-bb689338943791c735c7c6adb186256457e064b4.zip
Diffstat (limited to '')
-rw-r--r--src/core/loader/3dsx.cpp2
-rw-r--r--src/core/loader/elf.cpp2
-rw-r--r--src/core/loader/loader.cpp1
-rw-r--r--src/core/loader/ncch.cpp2
4 files changed, 3 insertions, 4 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp
index e28986085..84b13ee52 100644
--- a/src/core/loader/3dsx.cpp
+++ b/src/core/loader/3dsx.cpp
@@ -12,7 +12,7 @@
#include "core/hle/service/fs/archive.h"
#include "core/loader/elf.h"
#include "core/loader/ncch.h"
-#include "core/mem_map.h"
+#include "core/memory.h"
#include "3dsx.h"
diff --git a/src/core/loader/elf.cpp b/src/core/loader/elf.cpp
index 47d4e8cea..a951bc80f 100644
--- a/src/core/loader/elf.cpp
+++ b/src/core/loader/elf.cpp
@@ -12,7 +12,7 @@
#include "core/hle/kernel/kernel.h"
#include "core/loader/elf.h"
-#include "core/mem_map.h"
+#include "core/memory.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// ELF Header Constants
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 4f881cf6f..8b14edf00 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -13,7 +13,6 @@
#include "core/loader/3dsx.h"
#include "core/loader/elf.h"
#include "core/loader/ncch.h"
-#include "core/mem_map.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 3325a6ab8..36e341fd4 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -12,7 +12,7 @@
#include "core/hle/kernel/kernel.h"
#include "core/loader/ncch.h"
-#include "core/mem_map.h"
+#include "core/memory.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// Loader namespace