more various refactors to memory interface

1 files changed, 8 insertions, 5 deletions

diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index 8fc8388ec..44b4b07b7 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -17,20 +17,23 @@ u8*    g_base                   = NULL;         ///< The base pointer to the aut
 MemArena g_arena;                               ///< The MemArena class
 
 u8* g_bootrom                   = NULL;         ///< Bootrom physical memory
-u8* g_fcram                     = NULL;         ///< Main memory (FCRAM) pointer
+u8* g_heap_gsp                  = NULL;
+u8* g_heap                      = NULL;
 u8* g_vram                      = NULL;         ///< Video memory (VRAM) pointer
 
 u8* g_physical_bootrom          = NULL;         ///< Bootrom physical memory
 u8* g_uncached_bootrom          = NULL;
 
 u8* g_physical_fcram            = NULL;         ///< Main physical memory (FCRAM)
+u8* g_physical_heap_gsp         = NULL;
 u8* g_physical_vram             = NULL;         ///< Video physical memory (VRAM)
 u8* g_physical_scratchpad       = NULL;         ///< Scratchpad memory used for main thread stack
 
 // We don't declare the IO region in here since its handled by other means.
 static MemoryView g_views[] = {
-    { &g_vram,  &g_physical_vram,   MEM_VRAM_VADDR,     MEM_VRAM_SIZE,  0 },
-    { &g_fcram, &g_physical_fcram,  MEM_FCRAM_VADDR,    MEM_FCRAM_SIZE, MV_IS_PRIMARY_RAM },
+    {&g_vram,       &g_physical_vram,       VRAM_VADDR,     VRAM_SIZE,      0},
+    {&g_heap_gsp,   &g_physical_heap_gsp,   HEAP_GSP_VADDR, HEAP_GSP_SIZE,  0},
+    {&g_heap,       &g_physical_fcram,      HEAP_VADDR,     HEAP_SIZE,      MV_IS_PRIMARY_RAM},
 };
 
 /*static MemoryView views[] =
@@ -54,12 +57,12 @@ void Init() {
 
     for (size_t i = 0; i < ARRAY_SIZE(g_views); i++) {
         if (g_views[i].flags & MV_IS_PRIMARY_RAM)
-            g_views[i].size = MEM_FCRAM_SIZE;
+            g_views[i].size = FCRAM_SIZE;
     }
 
     g_base = MemoryMap_Setup(g_views, kNumMemViews, flags, &g_arena);
 
-    NOTICE_LOG(MEMMAP, "initialized OK, RAM at %p (mirror at 0 @ %p)", g_fcram, 
+    NOTICE_LOG(MEMMAP, "initialized OK, RAM at %p (mirror at 0 @ %p)", g_heap, 
         g_physical_fcram);
 }