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.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index 5b5c57fca..8fc8388ec 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -19,7 +19,6 @@ MemArena g_arena; ///< The MemArena class
19u8* g_bootrom = NULL; ///< Bootrom physical memory 19u8* g_bootrom = NULL; ///< Bootrom physical memory
20u8* g_fcram = NULL; ///< Main memory (FCRAM) pointer 20u8* g_fcram = NULL; ///< Main memory (FCRAM) pointer
21u8* g_vram = NULL; ///< Video memory (VRAM) pointer 21u8* g_vram = NULL; ///< Video memory (VRAM) pointer
22u8* g_scratchpad = NULL; ///< Scratchpad memory - Used for main thread stack
23 22
24u8* g_physical_bootrom = NULL; ///< Bootrom physical memory 23u8* g_physical_bootrom = NULL; ///< Bootrom physical memory
25u8* g_uncached_bootrom = NULL; 24u8* g_uncached_bootrom = NULL;
@@ -60,8 +59,6 @@ void Init() {
60 59
61 g_base = MemoryMap_Setup(g_views, kNumMemViews, flags, &g_arena); 60 g_base = MemoryMap_Setup(g_views, kNumMemViews, flags, &g_arena);
62 61
63 g_scratchpad = new u8[MEM_SCRATCHPAD_SIZE];
64
65 NOTICE_LOG(MEMMAP, "initialized OK, RAM at %p (mirror at 0 @ %p)", g_fcram, 62 NOTICE_LOG(MEMMAP, "initialized OK, RAM at %p (mirror at 0 @ %p)", g_fcram,
66 g_physical_fcram); 63 g_physical_fcram);
67} 64}
@@ -71,10 +68,7 @@ void Shutdown() {
71 MemoryMap_Shutdown(g_views, kNumMemViews, flags, &g_arena); 68 MemoryMap_Shutdown(g_views, kNumMemViews, flags, &g_arena);
72 69
73 g_arena.ReleaseSpace(); 70 g_arena.ReleaseSpace();
74 delete[] g_scratchpad; 71 g_base = NULL;
75
76 g_base = NULL;
77 g_scratchpad = NULL;
78 72
79 NOTICE_LOG(MEMMAP, "shutdown OK"); 73 NOTICE_LOG(MEMMAP, "shutdown OK");
80} 74}