Merge pull request #734 from yuriks/memmap

Small memory map definitions cleanup

1 files changed, 9 insertions, 11 deletions

diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index 46e271c8..f9952046 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_shared_mem;  ///< Shared 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_heap,        HEAP_SIZE             },
+    {&g_shared_mem,  SHARED_MEMORY_SIZE    },
+    {&g_heap_linear, LINEAR_HEAP_SIZE      },
+    {&g_vram,        VRAM_SIZE             },
+    {&g_dsp_mem,     DSP_RAM_SIZE          },
+    {&g_tls_mem,     TLS_AREA_SIZE         },
 };
 
 }