From e7b6ed757849bcec43d736ec8efaf17141a46d4b Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sat, 9 May 2015 00:44:29 -0300
Subject: Memory: Sort memory region variables by VAddr

---
 src/core/mem_map.cpp |  6 +++---
 src/core/mem_map.h   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index 74faf0dc..f9952046 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -13,9 +13,9 @@ namespace Memory {
 
 u8* g_exefs_code;  ///< ExeFS:/.code is loaded here
 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_tls_mem;     ///< TLS memory
 
@@ -29,12 +29,12 @@ struct MemoryArea {
 // We don't declare the IO regions in here since its handled by other means.
 static MemoryArea memory_areas[] = {
     {&g_exefs_code,  PROCESS_IMAGE_MAX_SIZE},
-    {&g_vram,        VRAM_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         },
-    {&g_heap_linear, LINEAR_HEAP_SIZE      },
 };
 
 }
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index 3866a3a1..1591fc0a 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -121,13 +121,13 @@ struct MemoryBlock {
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-extern u8* g_heap_linear;   ///< Linear heap (main memory)
-extern u8* g_heap;          ///< Application heap (main memory)
-extern u8* g_vram;          ///< Video memory (VRAM)
-extern u8* g_shared_mem;    ///< Shared memory
-extern u8* g_tls_mem;       ///< TLS memory
-extern u8* g_dsp_mem;       ///< DSP memory
-extern u8* g_exefs_code;    ///< ExeFS:/.code is loaded here
+extern u8* g_exefs_code;  ///< ExeFS:/.code is loaded here
+extern u8* g_heap;        ///< Application heap (main memory)
+extern u8* g_shared_mem;  ///< Shared memory
+extern u8* g_heap_linear; ///< Linear heap (main memory)
+extern u8* g_vram;        ///< Video memory (VRAM)
+extern u8* g_dsp_mem;     ///< DSP memory
+extern u8* g_tls_mem;     ///< TLS memory
 
 void Init();
 void Shutdown();
-- 
cgit v1.2.3