diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/mem_map.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index 96f8d0440..180829239 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Citra Emulator Project + // Copyright 2014 Citra Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. @@ -12,27 +12,27 @@ namespace Memory { - u8* g_base = NULL; ///< The base pointer to the auto-mirrored arena. 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; ///< GSP heap (main memory) +u8* g_heap = NULL; ///< Application heap (main memory) u8* g_vram = NULL; ///< Video memory (VRAM) pointer -u8* g_scratchpad = NULL; ///< Scratchpad memory - Used for main thread stack 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[] = @@ -56,14 +56,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); - g_scratchpad = new u8[MEM_SCRATCHPAD_SIZE]; - - NOTICE_LOG(MEMMAP, "Memory system initialized. 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); } @@ -72,12 +70,9 @@ void Shutdown() { MemoryMap_Shutdown(g_views, kNumMemViews, flags, &g_arena); g_arena.ReleaseSpace(); - delete[] g_scratchpad; - - g_base = NULL; - g_scratchpad = NULL; + g_base = NULL; - NOTICE_LOG(MEMMAP, "Memory system shut down."); + NOTICE_LOG(MEMMAP, "shutdown OK"); } } // namespace |