summaryrefslogtreecommitdiffstats
path: root/src/core/mem_map.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-13 04:12:12 +0100
committerbunnei <bunneidev@gmail.com>2014-12-13 04:12:12 +0100
commita6791e4fc73dda4853c8363d8ecf5094dbedd0ab (patch)
tree279039386bc3c63f2eda6530fa325334ddadb957 /src/core/mem_map.cpp
parentMerge pull request #261 from neobrain/boost (diff)
parentAPT_U: Added GetSharedFont service function. (diff)
downloadyuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar
yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.gz
yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.bz2
yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.lz
yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.xz
yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.tar.zst
yuzu-a6791e4fc73dda4853c8363d8ecf5094dbedd0ab.zip
Diffstat (limited to 'src/core/mem_map.cpp')
-rw-r--r--src/core/mem_map.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index 74a93b1d9..e1c2580ff 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -18,7 +18,7 @@ static MemArena arena; ///< The MemArena class
u8* g_exefs_code = nullptr; ///< ExeFS:/.code is loaded here
u8* g_system_mem = nullptr; ///< System memory
u8* g_heap = nullptr; ///< Application heap (main memory)
-u8* g_heap_gsp = nullptr; ///< GSP heap (main memory)
+u8* g_heap_linear = nullptr; ///< Linear heap
u8* g_vram = nullptr; ///< Video memory (VRAM) pointer
u8* g_shared_mem = nullptr; ///< Shared memory
u8* g_kernel_mem; ///< Kernel memory
@@ -36,13 +36,13 @@ static u8* physical_kernel_mem; ///< Kernel memory
// We don't declare the IO region in here since its handled by other means.
static MemoryView g_views[] = {
- {&g_exefs_code, &physical_exefs_code, EXEFS_CODE_VADDR, EXEFS_CODE_SIZE, 0},
- {&g_vram, &physical_vram, VRAM_VADDR, VRAM_SIZE, 0},
- {&g_heap, &physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM},
- {&g_shared_mem, &physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0},
- {&g_system_mem, &physical_system_mem, SYSTEM_MEMORY_VADDR, SYSTEM_MEMORY_SIZE, 0},
- {&g_kernel_mem, &physical_kernel_mem, KERNEL_MEMORY_VADDR, KERNEL_MEMORY_SIZE, 0},
- {&g_heap_gsp, &physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0},
+ {&g_exefs_code, &physical_exefs_code, EXEFS_CODE_VADDR, EXEFS_CODE_SIZE, 0},
+ {&g_vram, &physical_vram, VRAM_VADDR, VRAM_SIZE, 0},
+ {&g_heap, &physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM},
+ {&g_shared_mem, &physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0},
+ {&g_system_mem, &physical_system_mem, SYSTEM_MEMORY_VADDR, SYSTEM_MEMORY_SIZE, 0},
+ {&g_kernel_mem, &physical_kernel_mem, KERNEL_MEMORY_VADDR, KERNEL_MEMORY_SIZE, 0},
+ {&g_heap_linear, &physical_heap_gsp, HEAP_LINEAR_VADDR, HEAP_LINEAR_SIZE, 0},
};
/*static MemoryView views[] =