summaryrefslogtreecommitdiff
path: root/src/core/mem_map.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/mem_map.cpp')
-rw-r--r--src/core/mem_map.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index 180829239..96245e320 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -16,23 +16,25 @@ u8* g_base = NULL; ///< The base pointer to the aut
16 16
17MemArena g_arena; ///< The MemArena class 17MemArena g_arena; ///< The MemArena class
18 18
19u8* g_heap_gsp = NULL; ///< GSP heap (main memory)
20u8* g_heap = NULL; ///< Application heap (main memory) 19u8* g_heap = NULL; ///< Application heap (main memory)
20u8* g_heap_gsp = NULL; ///< GSP heap (main memory)
21u8* g_vram = NULL; ///< Video memory (VRAM) pointer 21u8* g_vram = NULL; ///< Video memory (VRAM) pointer
22u8* g_shared_mem = NULL; ///< Shared memory
22 23
23u8* g_physical_bootrom = NULL; ///< Bootrom physical memory 24u8* g_physical_bootrom = NULL; ///< Bootrom physical memory
24u8* g_uncached_bootrom = NULL; 25u8* g_uncached_bootrom = NULL;
25 26
26u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM) 27u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM)
27u8* g_physical_heap_gsp = NULL; 28u8* g_physical_heap_gsp = NULL; ///< GSP heap physical memory
28u8* g_physical_vram = NULL; ///< Video physical memory (VRAM) 29u8* g_physical_vram = NULL; ///< Video physical memory (VRAM)
29u8* g_physical_scratchpad = NULL; ///< Scratchpad memory used for main thread stack 30u8* g_physical_shared_mem = NULL; ///< Physical shared memory
30 31
31// We don't declare the IO region in here since its handled by other means. 32// We don't declare the IO region in here since its handled by other means.
32static MemoryView g_views[] = { 33static MemoryView g_views[] = {
33 {&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0}, 34 {&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0},
34 {&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0}, 35 {&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM},
35 {&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM}, 36 {&g_shared_mem, &g_physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0},
37 {&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0},
36}; 38};
37 39
38/*static MemoryView views[] = 40/*static MemoryView views[] =