diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2015-05-09 15:57:29 +0200 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2015-05-09 15:57:29 +0200 |
| commit | e35e72d0a5c90c37d22328115fa0f29dd17aeaee (patch) | |
| tree | 4053db2c53a1ac77294c03782de75c91c0cf4b27 /src/core/mem_map.cpp | |
| parent | Loader: Add missing include (diff) | |
| parent | Memory: Add GetPhysicalPointer helper function (diff) | |
| download | yuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.tar yuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.tar.gz yuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.tar.bz2 yuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.tar.lz yuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.tar.xz yuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.tar.zst yuzu-e35e72d0a5c90c37d22328115fa0f29dd17aeaee.zip | |
Diffstat (limited to 'src/core/mem_map.cpp')
| -rw-r--r-- | src/core/mem_map.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index 46e271c80..f99520464 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 }, }; } |