diff options
| author | 2014-05-26 20:52:00 -0400 | |
|---|---|---|
| committer | 2014-05-26 20:52:00 -0400 | |
| commit | 6448c2f30062c085330ff26a4812c9a91c7b492c (patch) | |
| tree | 386e32cf3ec053491fb8dfd8459a1c92553241d9 /src/core/mem_map.cpp | |
| parent | Merge pull request #4 from archshift/patch-1 (diff) | |
| parent | service: fixed typo that MSVC did not catch as an error (diff) | |
| download | yuzu-6448c2f30062c085330ff26a4812c9a91c7b492c.tar.gz yuzu-6448c2f30062c085330ff26a4812c9a91c7b492c.tar.xz yuzu-6448c2f30062c085330ff26a4812c9a91c7b492c.zip | |
Merge pull request #9 from bunnei/master
Add initial kernel HLE, includes thread creation and context switching
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 59560b87d..c45746be9 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp | |||
| @@ -17,6 +17,7 @@ u8* g_base = NULL; ///< The base pointer to the aut | |||
| 17 | MemArena g_arena; ///< The MemArena class | 17 | MemArena g_arena; ///< The MemArena class |
| 18 | 18 | ||
| 19 | u8* g_exefs_code = NULL; ///< ExeFS:/.code is loaded here | 19 | u8* g_exefs_code = NULL; ///< ExeFS:/.code is loaded here |
| 20 | u8* g_system_mem = NULL; ///< System memory | ||
| 20 | u8* g_heap = NULL; ///< Application heap (main memory) | 21 | u8* g_heap = NULL; ///< Application heap (main memory) |
| 21 | u8* g_heap_gsp = NULL; ///< GSP heap (main memory) | 22 | u8* g_heap_gsp = NULL; ///< GSP heap (main memory) |
| 22 | u8* g_vram = NULL; ///< Video memory (VRAM) pointer | 23 | u8* g_vram = NULL; ///< Video memory (VRAM) pointer |
| @@ -27,6 +28,7 @@ u8* g_physical_bootrom = NULL; ///< Bootrom physical memory | |||
| 27 | u8* g_uncached_bootrom = NULL; | 28 | u8* g_uncached_bootrom = NULL; |
| 28 | 29 | ||
| 29 | u8* g_physical_exefs_code = NULL; ///< Phsical ExeFS:/.code is loaded here | 30 | u8* g_physical_exefs_code = NULL; ///< Phsical ExeFS:/.code is loaded here |
| 31 | u8* g_physical_system_mem = NULL; ///< System physical memory | ||
| 30 | u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM) | 32 | u8* g_physical_fcram = NULL; ///< Main physical memory (FCRAM) |
| 31 | u8* g_physical_heap_gsp = NULL; ///< GSP heap physical memory | 33 | u8* g_physical_heap_gsp = NULL; ///< GSP heap physical memory |
| 32 | u8* g_physical_vram = NULL; ///< Video physical memory (VRAM) | 34 | u8* g_physical_vram = NULL; ///< Video physical memory (VRAM) |
| @@ -39,6 +41,7 @@ static MemoryView g_views[] = { | |||
| 39 | {&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0}, | 41 | {&g_vram, &g_physical_vram, VRAM_VADDR, VRAM_SIZE, 0}, |
| 40 | {&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM}, | 42 | {&g_heap, &g_physical_fcram, HEAP_VADDR, HEAP_SIZE, MV_IS_PRIMARY_RAM}, |
| 41 | {&g_shared_mem, &g_physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0}, | 43 | {&g_shared_mem, &g_physical_shared_mem, SHARED_MEMORY_VADDR, SHARED_MEMORY_SIZE, 0}, |
| 44 | {&g_system_mem, &g_physical_system_mem, SYSTEM_MEMORY_VADDR, SYSTEM_MEMORY_SIZE, 0}, | ||
| 42 | {&g_kernel_mem, &g_physical_kernel_mem, KERNEL_MEMORY_VADDR, KERNEL_MEMORY_SIZE, 0}, | 45 | {&g_kernel_mem, &g_physical_kernel_mem, KERNEL_MEMORY_VADDR, KERNEL_MEMORY_SIZE, 0}, |
| 43 | {&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0}, | 46 | {&g_heap_gsp, &g_physical_heap_gsp, HEAP_GSP_VADDR, HEAP_GSP_SIZE, 0}, |
| 44 | }; | 47 | }; |