diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-09 05:44:29 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-09 06:31:00 +0200 |
| 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 yuzu-e7b6ed757849bcec43d736ec8efaf17141a46d4b.tar.gz yuzu-e7b6ed757849bcec43d736ec8efaf17141a46d4b.tar.bz2 yuzu-e7b6ed757849bcec43d736ec8efaf17141a46d4b.tar.lz yuzu-e7b6ed757849bcec43d736ec8efaf17141a46d4b.tar.xz yuzu-e7b6ed757849bcec43d736ec8efaf17141a46d4b.tar.zst yuzu-e7b6ed757849bcec43d736ec8efaf17141a46d4b.zip | |
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 { 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 }, }; } |