From 1c0b87edc2d8262c06ea4c301bcfc884875f918b Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 9 May 2015 00:39:56 -0300 Subject: Memory: Re-organize and rename memory area address constants --- src/core/mem_map.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/core/mem_map.cpp') diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index 46e271c8..74faf0dc 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp @@ -12,13 +12,12 @@ namespace Memory { u8* g_exefs_code; ///< ExeFS:/.code is loaded here -u8* g_system_mem; ///< System memory u8* g_heap; ///< Application heap (main memory) u8* g_heap_linear; ///< Linear heap u8* g_vram; ///< Video memory (VRAM) pointer u8* g_shared_mem; ///< Shared memory u8* g_dsp_mem; ///< DSP memory -u8* g_kernel_mem; ///< Kernel memory +u8* g_tls_mem; ///< TLS memory namespace { @@ -29,14 +28,13 @@ struct MemoryArea { // We don't declare the IO regions in here since its handled by other means. static MemoryArea memory_areas[] = { - {&g_exefs_code, EXEFS_CODE_SIZE }, - {&g_vram, VRAM_SIZE }, - {&g_heap, HEAP_SIZE }, - {&g_shared_mem, SHARED_MEMORY_SIZE}, - {&g_system_mem, SYSTEM_MEMORY_SIZE}, - {&g_dsp_mem, DSP_MEMORY_SIZE }, - {&g_kernel_mem, KERNEL_MEMORY_SIZE}, - {&g_heap_linear, HEAP_LINEAR_SIZE }, + {&g_exefs_code, PROCESS_IMAGE_MAX_SIZE}, + {&g_vram, VRAM_SIZE }, + {&g_heap, HEAP_SIZE }, + {&g_shared_mem, SHARED_MEMORY_SIZE }, + {&g_dsp_mem, DSP_RAM_SIZE }, + {&g_tls_mem, TLS_AREA_SIZE }, + {&g_heap_linear, LINEAR_HEAP_SIZE }, }; } -- cgit v1.2.3