diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-29 17:08:00 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-16 06:03:46 +0200 |
commit | 69c3021a8d203dbbea9673977535f1eb75b274a1 (patch) | |
tree | 7fce1fe7dce9f94062361832d1f1a1378a66e4af /src/core/hle | |
parent | Memory: Move address type conversion routines to memory.cpp/h (diff) | |
download | yuzu-69c3021a8d203dbbea9673977535f1eb75b274a1.tar yuzu-69c3021a8d203dbbea9673977535f1eb75b274a1.tar.gz yuzu-69c3021a8d203dbbea9673977535f1eb75b274a1.tar.bz2 yuzu-69c3021a8d203dbbea9673977535f1eb75b274a1.tar.lz yuzu-69c3021a8d203dbbea9673977535f1eb75b274a1.tar.xz yuzu-69c3021a8d203dbbea9673977535f1eb75b274a1.tar.zst yuzu-69c3021a8d203dbbea9673977535f1eb75b274a1.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/memory.cpp (renamed from src/core/mem_map.cpp) | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/memory.h (renamed from src/core/mem_map.h) | 0 | ||||
-rw-r--r-- | src/core/hle/kernel/process.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/svc.cpp | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/src/core/mem_map.cpp b/src/core/hle/kernel/memory.cpp index f6a063825..57e1912d3 100644 --- a/src/core/mem_map.cpp +++ b/src/core/hle/kernel/memory.cpp @@ -14,7 +14,6 @@ #include "core/hle/kernel/vm_manager.h" #include "core/hle/result.h" #include "core/hle/shared_page.h" -#include "core/mem_map.h" #include "core/memory.h" #include "core/memory_setup.h" diff --git a/src/core/mem_map.h b/src/core/hle/kernel/memory.h index cba8a0714..cba8a0714 100644 --- a/src/core/mem_map.h +++ b/src/core/hle/kernel/memory.h diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 561824305..2cd1cfc14 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -7,11 +7,11 @@ #include "common/logging/log.h" #include "common/make_unique.h" +#include "core/hle/kernel/memory.h" #include "core/hle/kernel/process.h" #include "core/hle/kernel/resource_limit.h" #include "core/hle/kernel/thread.h" #include "core/hle/kernel/vm_manager.h" -#include "core/mem_map.h" #include "core/memory.h" namespace Kernel { diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 91260fe71..b944f4af0 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -10,11 +10,11 @@ #include "common/symbols.h" #include "core/core_timing.h" -#include "core/mem_map.h" #include "core/arm/arm_interface.h" #include "core/hle/kernel/address_arbiter.h" #include "core/hle/kernel/event.h" +#include "core/hle/kernel/memory.h" #include "core/hle/kernel/mutex.h" #include "core/hle/kernel/process.h" #include "core/hle/kernel/resource_limit.h" |