From 9ceb0d93817c1dd48c954bfdbb7516fc3d913245 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 22 Oct 2017 23:17:59 -0400 Subject: memory: Support 32-bit paging, move heap address space up. --- src/core/memory.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/memory.h') diff --git a/src/core/memory.h b/src/core/memory.h index 9a04b9a16..8c60f1dd3 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -26,7 +26,7 @@ namespace Memory { const int PAGE_BITS = 12; const u64 PAGE_SIZE = 1 << PAGE_BITS; const u64 PAGE_MASK = PAGE_SIZE - 1; -const size_t PAGE_TABLE_NUM_ENTRIES = 1ULL << (32 - PAGE_BITS); +const size_t PAGE_TABLE_NUM_ENTRIES = 1ULL << (36 - PAGE_BITS); enum class PageType { /// Page is unmapped and should cause an access error. @@ -135,7 +135,7 @@ enum : VAddr { IPC_MAPPING_VADDR_END = IPC_MAPPING_VADDR + IPC_MAPPING_SIZE, /// Application heap (includes stack). - HEAP_VADDR = 0x08000000, + HEAP_VADDR = 0x108000000, HEAP_SIZE = 0x08000000, HEAP_VADDR_END = HEAP_VADDR + HEAP_SIZE, -- cgit v1.2.3