summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-07-19 07:22:28 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-08-16 06:03:44 +0200
commitccab02c72332d62c78f376be10f21044b5b226aa (patch)
tree1047bc05437d6a81a342b0de0b7218aee190fc5a /src/core
parentVMManager: Introduce names for used ResultCodes (diff)
downloadyuzu-ccab02c72332d62c78f376be10f21044b5b226aa.tar
yuzu-ccab02c72332d62c78f376be10f21044b5b226aa.tar.gz
yuzu-ccab02c72332d62c78f376be10f21044b5b226aa.tar.bz2
yuzu-ccab02c72332d62c78f376be10f21044b5b226aa.tar.lz
yuzu-ccab02c72332d62c78f376be10f21044b5b226aa.tar.xz
yuzu-ccab02c72332d62c78f376be10f21044b5b226aa.tar.zst
yuzu-ccab02c72332d62c78f376be10f21044b5b226aa.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/memory.h2
-rw-r--r--src/core/memory_setup.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/memory.h b/src/core/memory.h
index 418609de0..2a06cc6c3 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -15,6 +15,8 @@ namespace Memory {
* be mapped.
*/
const u32 PAGE_SIZE = 0x1000;
+const u32 PAGE_MASK = PAGE_SIZE - 1;
+const int PAGE_BITS = 12;
/// Physical memory regions as seen from the ARM11
enum : PAddr {
diff --git a/src/core/memory_setup.h b/src/core/memory_setup.h
index 361bfc816..84ff30120 100644
--- a/src/core/memory_setup.h
+++ b/src/core/memory_setup.h
@@ -10,9 +10,6 @@
namespace Memory {
-const u32 PAGE_MASK = PAGE_SIZE - 1;
-const int PAGE_BITS = 12;
-
void InitMemoryMap();
/**