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.h | |
| 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.h')
| -rw-r--r-- | src/core/mem_map.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/mem_map.h b/src/core/mem_map.h index af2212a5f..12d497ef3 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h | |||
| @@ -47,6 +47,12 @@ enum { | |||
| 47 | EXEFS_CODE_VADDR_END = (EXEFS_CODE_VADDR + EXEFS_CODE_SIZE), | 47 | EXEFS_CODE_VADDR_END = (EXEFS_CODE_VADDR + EXEFS_CODE_SIZE), |
| 48 | EXEFS_CODE_MASK = 0x03FFFFFF, | 48 | EXEFS_CODE_MASK = 0x03FFFFFF, |
| 49 | 49 | ||
| 50 | // Region of FCRAM used by system | ||
| 51 | SYSTEM_MEMORY_SIZE = 0x02C00000, ///< 44MB | ||
| 52 | SYSTEM_MEMORY_VADDR = 0x04000000, | ||
| 53 | SYSTEM_MEMORY_VADDR_END = (SYSTEM_MEMORY_VADDR + SYSTEM_MEMORY_SIZE), | ||
| 54 | SYSTEM_MEMORY_MASK = 0x03FFFFFF, | ||
| 55 | |||
| 50 | HEAP_SIZE = FCRAM_SIZE, ///< Application heap size | 56 | HEAP_SIZE = FCRAM_SIZE, ///< Application heap size |
| 51 | //HEAP_PADDR = HEAP_GSP_SIZE, | 57 | //HEAP_PADDR = HEAP_GSP_SIZE, |
| 52 | //HEAP_PADDR_END = (HEAP_PADDR + HEAP_SIZE), | 58 | //HEAP_PADDR_END = (HEAP_PADDR + HEAP_SIZE), |
| @@ -116,6 +122,7 @@ extern u8* g_heap; ///< Application heap (main memory) | |||
| 116 | extern u8* g_vram; ///< Video memory (VRAM) | 122 | extern u8* g_vram; ///< Video memory (VRAM) |
| 117 | extern u8* g_shared_mem; ///< Shared memory | 123 | extern u8* g_shared_mem; ///< Shared memory |
| 118 | extern u8* g_kernel_mem; ///< Kernel memory | 124 | extern u8* g_kernel_mem; ///< Kernel memory |
| 125 | extern u8* g_system_mem; ///< System memory | ||
| 119 | extern u8* g_exefs_code; ///< ExeFS:/.code is loaded here | 126 | extern u8* g_exefs_code; ///< ExeFS:/.code is loaded here |
| 120 | 127 | ||
| 121 | void Init(); | 128 | void Init(); |