diff options
| author | 2015-05-09 00:44:29 -0300 | |
|---|---|---|
| committer | 2015-05-09 01:31:00 -0300 | |
| commit | e7b6ed757849bcec43d736ec8efaf17141a46d4b (patch) | |
| tree | 16b5d3659c5d6fd953c1306293f5d5f6dabdb048 /src/core/mem_map.cpp | |
| parent | Memory: Re-organize and rename memory area address constants (diff) | |
| download | yuzu-e7b6ed757849bcec43d736ec8efaf17141a46d4b.tar.gz yuzu-e7b6ed757849bcec43d736ec8efaf17141a46d4b.tar.xz yuzu-e7b6ed757849bcec43d736ec8efaf17141a46d4b.zip | |
Memory: Sort memory region variables by VAddr
Diffstat (limited to 'src/core/mem_map.cpp')
| -rw-r--r-- | src/core/mem_map.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index 74faf0dce..f99520464 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp | |||
| @@ -13,9 +13,9 @@ namespace Memory { | |||
| 13 | 13 | ||
| 14 | u8* g_exefs_code; ///< ExeFS:/.code is loaded here | 14 | u8* g_exefs_code; ///< ExeFS:/.code is loaded here |
| 15 | u8* g_heap; ///< Application heap (main memory) | 15 | u8* g_heap; ///< Application heap (main memory) |
| 16 | u8* g_shared_mem; ///< Shared memory | ||
| 16 | u8* g_heap_linear; ///< Linear heap | 17 | u8* g_heap_linear; ///< Linear heap |
| 17 | u8* g_vram; ///< Video memory (VRAM) pointer | 18 | u8* g_vram; ///< Video memory (VRAM) pointer |
| 18 | u8* g_shared_mem; ///< Shared memory | ||
| 19 | u8* g_dsp_mem; ///< DSP memory | 19 | u8* g_dsp_mem; ///< DSP memory |
| 20 | u8* g_tls_mem; ///< TLS memory | 20 | u8* g_tls_mem; ///< TLS memory |
| 21 | 21 | ||
| @@ -29,12 +29,12 @@ struct MemoryArea { | |||
| 29 | // We don't declare the IO regions in here since its handled by other means. | 29 | // We don't declare the IO regions in here since its handled by other means. |
| 30 | static MemoryArea memory_areas[] = { | 30 | static MemoryArea memory_areas[] = { |
| 31 | {&g_exefs_code, PROCESS_IMAGE_MAX_SIZE}, | 31 | {&g_exefs_code, PROCESS_IMAGE_MAX_SIZE}, |
| 32 | {&g_vram, VRAM_SIZE }, | ||
| 33 | {&g_heap, HEAP_SIZE }, | 32 | {&g_heap, HEAP_SIZE }, |
| 34 | {&g_shared_mem, SHARED_MEMORY_SIZE }, | 33 | {&g_shared_mem, SHARED_MEMORY_SIZE }, |
| 34 | {&g_heap_linear, LINEAR_HEAP_SIZE }, | ||
| 35 | {&g_vram, VRAM_SIZE }, | ||
| 35 | {&g_dsp_mem, DSP_RAM_SIZE }, | 36 | {&g_dsp_mem, DSP_RAM_SIZE }, |
| 36 | {&g_tls_mem, TLS_AREA_SIZE }, | 37 | {&g_tls_mem, TLS_AREA_SIZE }, |
| 37 | {&g_heap_linear, LINEAR_HEAP_SIZE }, | ||
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | } | 40 | } |