diff options
Diffstat (limited to 'src/core/mem_map.cpp')
| -rw-r--r-- | src/core/mem_map.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index cf12f24d9..74a93b1d9 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp @@ -11,38 +11,38 @@ namespace Memory { -u8* g_base = NULL; ///< The base pointer to the auto-mirrored arena. +u8* g_base = nullptr; ///< The base pointer to the auto-mirrored arena. -MemArena g_arena; ///< The MemArena class +static MemArena arena; ///< The MemArena class -u8* g_exefs_code = NULL; ///< ExeFS:/.code is loaded here -u8* g_system_mem = NULL; ///< System memory -u8* g_heap = NULL; ///< Application heap (main memory) -u8* g_heap_gsp = NULL; ///< GSP heap (main memory) -u8* g_vram = NULL; ///< Video memory (VRAM) pointer -u8* g_shared_mem = NULL; ///< Shared memory -u8* g_kernel_mem; ///< Kernel memory +u8* g_exefs_code = nullptr; ///< ExeFS:/.code is loaded here +u8* g_system_mem = nullptr; ///< System memory +u8* g_heap = nullptr; ///< Application heap (main memory) +u8* g_heap_gsp = nullptr; ///< GSP heap (main memory) +u8* g_vram = nullptr; ///< Video memory (VRAM) pointer +u8* g_shared_mem = nullptr; ///< Shared memory +u8* g_kernel_mem; ///< Kernel memory -u8* g_physical_bootrom = NULL; ///< Bootrom physical memory -u8* g_uncached_bootrom = NULL; +static u8* physical_bootrom = nullptr; ///< Bootrom physical memory +static u8* uncached_bootrom = nullptr; -u8* g_physical_exefs_code = NULL; ///< Phsical ExeFS:/.code is loaded here -u8* g_physical_system_mem = NULL; ///< System physical memory -u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM) -u8* g_physical_heap_gsp = NULL; ///< GSP heap physical memory -u8* g_physical_vram = NULL; ///< Video physical memory (VRAM) -u8* g_physical_shared_mem = NULL; ///< Physical shared memory -u8* g_physical_kernel_mem; ///< Kernel memory +static u8* physical_exefs_code = nullptr; ///< Phsical ExeFS:/.code is loaded here +static u8* physical_system_mem = nullptr; ///< System physical memory +static u8* physical_fcram = nullptr; ///< Main physical memory (FCRAM) +static u8* physical_heap_gsp = nullptr; ///< GSP heap physical memory +static u8* physical_vram = nullptr; ///< Video physical memory (VRAM) +static u8* physical_shared_mem = nullptr; ///< Physical shared memory +static u8* physical_kernel_mem; ///< Kernel memory // We don't declare the IO region in here since its handled by other means. static MemoryView g_views[] = { - {&g_exefs_code, &g_physical_exefs_code, EXEFS_CODE_VADDR, EXEFS_CODE_SIZE, 0}, - {&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0}, - {&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM}, - {&g_shared_mem, &g_physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0}, - {&g_system_mem, &g_physical_system_mem, SYSTEM_MEMORY_VADDR, SYSTEM_MEMORY_SIZE, 0}, - {&g_kernel_mem, &g_physical_kernel_mem, KERNEL_MEMORY_VADDR, KERNEL_MEMORY_SIZE, 0}, - {&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0}, + {&g_exefs_code, &physical_exefs_code, EXEFS_CODE_VADDR, EXEFS_CODE_SIZE, 0}, + {&g_vram, &physical_vram, VRAM_VADDR, VRAM_SIZE, 0}, + {&g_heap, &physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM}, + {&g_shared_mem, &physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0}, + {&g_system_mem, &physical_system_mem, SYSTEM_MEMORY_VADDR, SYSTEM_MEMORY_SIZE, 0}, + {&g_kernel_mem, &physical_kernel_mem, KERNEL_MEMORY_VADDR, KERNEL_MEMORY_SIZE, 0}, + {&g_heap_gsp, &physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0}, }; /*static MemoryView views[] = @@ -69,18 +69,18 @@ void Init() { g_views[i].size = FCRAM_SIZE; } - g_base = MemoryMap_Setup(g_views, kNumMemViews, flags, &g_arena); + g_base = MemoryMap_Setup(g_views, kNumMemViews, flags, &arena); NOTICE_LOG(MEMMAP, "initialized OK, RAM at %p (mirror at 0 @ %p)", g_heap, - g_physical_fcram); + physical_fcram); } void Shutdown() { u32 flags = 0; - MemoryMap_Shutdown(g_views, kNumMemViews, flags, &g_arena); + MemoryMap_Shutdown(g_views, kNumMemViews, flags, &arena); - g_arena.ReleaseSpace(); - g_base = NULL; + arena.ReleaseSpace(); + g_base = nullptr; NOTICE_LOG(MEMMAP, "shutdown OK"); } |