diff options
| author |  bunnei <ericbunnie@gmail.com> | 2014-04-24 23:56:06 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-24 23:56:06 -0400 |
| commit | 890c7261d2d6d6a760512ebe93c565ee87220983 (patch) | |
| tree | 7d822f01da90c37c188faa76578c0d1733136d06 /src/core/mem_map.cpp | |
| parent | b7cd4c9e90be42476a2e242571d36cbbca2fbd4c (diff) | |
- added preliminary support for svc_MapMemoryBlock
- added shared memory region
- moarrrr cleanups to memory_map
Diffstat (limited to 'src/core/mem_map.cpp')
| -rw-r--r-- | src/core/mem_map.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index f0090206..96245e32 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[] = |