summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/mem_map.cpp6
-rw-r--r--src/core/mem_map.h14
2 files changed, 10 insertions, 10 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
14u8* g_exefs_code; ///< ExeFS:/.code is loaded here 14u8* g_exefs_code; ///< ExeFS:/.code is loaded here
15u8* g_heap; ///< Application heap (main memory) 15u8* g_heap; ///< Application heap (main memory)
16u8* g_shared_mem; ///< Shared memory
16u8* g_heap_linear; ///< Linear heap 17u8* g_heap_linear; ///< Linear heap
17u8* g_vram; ///< Video memory (VRAM) pointer 18u8* g_vram; ///< Video memory (VRAM) pointer
18u8* g_shared_mem; ///< Shared memory
19u8* g_dsp_mem; ///< DSP memory 19u8* g_dsp_mem; ///< DSP memory
20u8* g_tls_mem; ///< TLS memory 20u8* 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.
30static MemoryArea memory_areas[] = { 30static 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}
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index 3866a3a11..1591fc0a9 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -121,13 +121,13 @@ struct MemoryBlock {
121 121
122//////////////////////////////////////////////////////////////////////////////////////////////////// 122////////////////////////////////////////////////////////////////////////////////////////////////////
123 123
124extern u8* g_heap_linear; ///< Linear heap (main memory) 124extern u8* g_exefs_code; ///< ExeFS:/.code is loaded here
125extern u8* g_heap; ///< Application heap (main memory) 125extern u8* g_heap; ///< Application heap (main memory)
126extern u8* g_vram; ///< Video memory (VRAM) 126extern u8* g_shared_mem; ///< Shared memory
127extern u8* g_shared_mem; ///< Shared memory 127extern u8* g_heap_linear; ///< Linear heap (main memory)
128extern u8* g_tls_mem; ///< TLS memory 128extern u8* g_vram; ///< Video memory (VRAM)
129extern u8* g_dsp_mem; ///< DSP memory 129extern u8* g_dsp_mem; ///< DSP memory
130extern u8* g_exefs_code; ///< ExeFS:/.code is loaded here 130extern u8* g_tls_mem; ///< TLS memory
131 131
132void Init(); 132void Init();
133void Shutdown(); 133void Shutdown();