diff options
| author | 2014-05-08 17:16:35 -0400 | |
|---|---|---|
| committer | 2014-05-08 17:16:35 -0400 | |
| commit | bdc54d0d4897841a4d24aee80311bfb1f0eba884 (patch) | |
| tree | 558d87c83fe8f7e8e3e57644407c872244ee5a3a /src/core/mem_map.cpp | |
| parent | Merge pull request #16 from Sethpaien/master (diff) | |
| parent | removed unknown fields from GX_CmdBufferHeader (diff) | |
| download | yuzu-bdc54d0d4897841a4d24aee80311bfb1f0eba884.tar.gz yuzu-bdc54d0d4897841a4d24aee80311bfb1f0eba884.tar.xz yuzu-bdc54d0d4897841a4d24aee80311bfb1f0eba884.zip | |
Merge pull request #15 from bunnei/hle-services
Various fixes/improvements to HLE of 3DS services, mostly cleans up GSP call decoding
Diffstat (limited to 'src/core/mem_map.cpp')
| -rw-r--r-- | src/core/mem_map.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index af99cbe32..59560b87d 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp | |||
| @@ -21,6 +21,7 @@ u8* g_heap = NULL; ///< Application heap (main memo | |||
| 21 | u8* g_heap_gsp = NULL; ///< GSP heap (main memory) | 21 | u8* g_heap_gsp = NULL; ///< GSP heap (main memory) |
| 22 | u8* g_vram = NULL; ///< Video memory (VRAM) pointer | 22 | u8* g_vram = NULL; ///< Video memory (VRAM) pointer |
| 23 | u8* g_shared_mem = NULL; ///< Shared memory | 23 | u8* g_shared_mem = NULL; ///< Shared memory |
| 24 | u8* g_kernel_mem; ///< Kernel memory | ||
| 24 | 25 | ||
| 25 | u8* g_physical_bootrom = NULL; ///< Bootrom physical memory | 26 | u8* g_physical_bootrom = NULL; ///< Bootrom physical memory |
| 26 | u8* g_uncached_bootrom = NULL; | 27 | u8* g_uncached_bootrom = NULL; |
| @@ -30,6 +31,7 @@ u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM | |||
| 30 | u8* g_physical_heap_gsp = NULL; ///< GSP heap physical memory | 31 | u8* g_physical_heap_gsp = NULL; ///< GSP heap physical memory |
| 31 | u8* g_physical_vram = NULL; ///< Video physical memory (VRAM) | 32 | u8* g_physical_vram = NULL; ///< Video physical memory (VRAM) |
| 32 | u8* g_physical_shared_mem = NULL; ///< Physical shared memory | 33 | u8* g_physical_shared_mem = NULL; ///< Physical shared memory |
| 34 | u8* g_physical_kernel_mem; ///< Kernel memory | ||
| 33 | 35 | ||
| 34 | // We don't declare the IO region in here since its handled by other means. | 36 | // We don't declare the IO region in here since its handled by other means. |
| 35 | static MemoryView g_views[] = { | 37 | static MemoryView g_views[] = { |
| @@ -37,6 +39,7 @@ static MemoryView g_views[] = { | |||
| 37 | {&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0}, | 39 | {&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0}, |
| 38 | {&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM}, | 40 | {&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM}, |
| 39 | {&g_shared_mem, &g_physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0}, | 41 | {&g_shared_mem, &g_physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0}, |
| 42 | {&g_kernel_mem, &g_physical_kernel_mem, KERNEL_MEMORY_VADDR, KERNEL_MEMORY_SIZE, 0}, | ||
| 40 | {&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0}, | 43 | {&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0}, |
| 41 | }; | 44 | }; |
| 42 | 45 | ||