summaryrefslogtreecommitdiffstats
path: root/src/core/mem_map.cpp
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-04-25 05:56:06 +0200
committerbunnei <ericbunnie@gmail.com>2014-04-25 05:56:06 +0200
commit890c7261d2d6d6a760512ebe93c565ee87220983 (patch)
tree7d822f01da90c37c188faa76578c0d1733136d06 /src/core/mem_map.cpp
parentadded functions to map Heap and Shared memory space (diff)
downloadyuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar
yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.gz
yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.bz2
yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.lz
yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.xz
yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.tar.zst
yuzu-890c7261d2d6d6a760512ebe93c565ee87220983.zip
Diffstat (limited to 'src/core/mem_map.cpp')
-rw-r--r--src/core/mem_map.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index f0090206e..96245e320 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -19,6 +19,7 @@ MemArena g_arena; ///< The MemArena class
u8* g_heap = NULL; ///< Application heap (main memory)
u8* g_heap_gsp = NULL; ///< GSP heap (main memory)
u8* g_vram = NULL; ///< Video memory (VRAM) pointer
+u8* g_shared_mem = NULL; ///< Shared memory
u8* g_physical_bootrom = NULL; ///< Bootrom physical memory
u8* g_uncached_bootrom = NULL;
@@ -26,13 +27,14 @@ u8* g_uncached_bootrom = NULL;
u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM)
u8* g_physical_heap_gsp = NULL; ///< GSP heap physical memory
u8* g_physical_vram = NULL; ///< Video physical memory (VRAM)
-u8* g_physical_scratchpad = NULL; ///< Scratchpad memory used for main thread stack
+u8* g_physical_shared_mem = NULL; ///< Physical shared memory
// We don't declare the IO region in here since its handled by other means.
static MemoryView g_views[] = {
- {&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0},
- {&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0},
- {&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM},
+ {&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0},
+ {&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM},
+ {&g_shared_mem, &g_physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0},
+ {&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0},
};
/*static MemoryView views[] =