mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	added memory mapped region for system mem - sdk demos load a segment here on ELF load
This commit is contained in:
		
							parent
							
								
									3c240abf10
								
							
						
					
					
						commit
						4910b6f336
					
				
					 3 changed files with 23 additions and 1 deletions
				
			
		|  | @ -17,6 +17,7 @@ u8*    g_base                   = NULL;         ///< The base pointer to the aut | ||||||
| MemArena g_arena;                               ///< The MemArena class
 | MemArena g_arena;                               ///< The MemArena class
 | ||||||
| 
 | 
 | ||||||
| u8* g_exefs_code                = NULL;         ///< ExeFS:/.code is loaded here
 | u8* g_exefs_code                = NULL;         ///< ExeFS:/.code is loaded here
 | ||||||
|  | u8* g_system_mem                = NULL;         ///< System memory
 | ||||||
| u8* g_heap                      = NULL;         ///< Application heap (main memory)
 | u8* g_heap                      = NULL;         ///< Application heap (main memory)
 | ||||||
| u8* g_heap_gsp                  = NULL;         ///< GSP heap (main memory)
 | u8* g_heap_gsp                  = NULL;         ///< GSP heap (main memory)
 | ||||||
| u8* g_vram                      = NULL;         ///< Video memory (VRAM) pointer
 | u8* g_vram                      = NULL;         ///< Video memory (VRAM) pointer
 | ||||||
|  | @ -27,6 +28,7 @@ u8* g_physical_bootrom          = NULL;         ///< Bootrom physical memory | ||||||
| u8* g_uncached_bootrom          = NULL; | u8* g_uncached_bootrom          = NULL; | ||||||
| 
 | 
 | ||||||
| u8* g_physical_exefs_code       = NULL;         ///< Phsical ExeFS:/.code is loaded here
 | u8* g_physical_exefs_code       = NULL;         ///< Phsical ExeFS:/.code is loaded here
 | ||||||
|  | u8* g_physical_system_mem       = NULL;         ///< System physical memory
 | ||||||
| u8* g_physical_fcram            = NULL;         ///< Main physical memory (FCRAM)
 | u8* g_physical_fcram            = NULL;         ///< Main physical memory (FCRAM)
 | ||||||
| u8* g_physical_heap_gsp         = NULL;         ///< GSP heap physical memory
 | u8* g_physical_heap_gsp         = NULL;         ///< GSP heap physical memory
 | ||||||
| u8* g_physical_vram             = NULL;         ///< Video physical memory (VRAM)
 | u8* g_physical_vram             = NULL;         ///< Video physical memory (VRAM)
 | ||||||
|  | @ -39,6 +41,7 @@ static MemoryView g_views[] = { | ||||||
|     {&g_vram,       &g_physical_vram,       VRAM_VADDR,             VRAM_SIZE,          0}, |     {&g_vram,       &g_physical_vram,       VRAM_VADDR,             VRAM_SIZE,          0}, | ||||||
|     {&g_heap,       &g_physical_fcram,      HEAP_VADDR,             HEAP_SIZE,          MV_IS_PRIMARY_RAM}, |     {&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_shared_mem, &g_physical_shared_mem, SHARED_MEMORY_VADDR,    SHARED_MEMORY_SIZE, 0}, | ||||||
|  |     {&g_system_mem, &g_physical_system_mem, SYSTEM_MEMORY_VADDR,    SYSTEM_MEMORY_SIZE,    0}, | ||||||
|     {&g_kernel_mem, &g_physical_kernel_mem, KERNEL_MEMORY_VADDR,    KERNEL_MEMORY_SIZE, 0}, |     {&g_kernel_mem, &g_physical_kernel_mem, KERNEL_MEMORY_VADDR,    KERNEL_MEMORY_SIZE, 0}, | ||||||
|     {&g_heap_gsp,   &g_physical_heap_gsp,   HEAP_GSP_VADDR,         HEAP_GSP_SIZE,      0}, |     {&g_heap_gsp,   &g_physical_heap_gsp,   HEAP_GSP_VADDR,         HEAP_GSP_SIZE,      0}, | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | @ -47,6 +47,12 @@ enum { | ||||||
|     EXEFS_CODE_VADDR_END    = (EXEFS_CODE_VADDR + EXEFS_CODE_SIZE), |     EXEFS_CODE_VADDR_END    = (EXEFS_CODE_VADDR + EXEFS_CODE_SIZE), | ||||||
|     EXEFS_CODE_MASK         = 0x03FFFFFF, |     EXEFS_CODE_MASK         = 0x03FFFFFF, | ||||||
| 
 | 
 | ||||||
|  |     // Region of FCRAM used by system
 | ||||||
|  |     SYSTEM_MEMORY_SIZE      = 0x02C00000,   ///< 44MB
 | ||||||
|  |     SYSTEM_MEMORY_VADDR     = 0x04000000, | ||||||
|  |     SYSTEM_MEMORY_VADDR_END = (SYSTEM_MEMORY_VADDR + SYSTEM_MEMORY_SIZE), | ||||||
|  |     SYSTEM_MEMORY_MASK      = 0x03FFFFFF, | ||||||
|  | 
 | ||||||
|     HEAP_SIZE               = FCRAM_SIZE,   ///< Application heap size
 |     HEAP_SIZE               = FCRAM_SIZE,   ///< Application heap size
 | ||||||
|     //HEAP_PADDR              = HEAP_GSP_SIZE,
 |     //HEAP_PADDR              = HEAP_GSP_SIZE,
 | ||||||
|     //HEAP_PADDR_END          = (HEAP_PADDR + HEAP_SIZE),
 |     //HEAP_PADDR_END          = (HEAP_PADDR + HEAP_SIZE),
 | ||||||
|  | @ -116,6 +122,7 @@ extern u8* g_heap;          ///< Application heap (main memory) | ||||||
| extern u8* g_vram;          ///< Video memory (VRAM)
 | extern u8* g_vram;          ///< Video memory (VRAM)
 | ||||||
| extern u8* g_shared_mem;    ///< Shared memory
 | extern u8* g_shared_mem;    ///< Shared memory
 | ||||||
| extern u8* g_kernel_mem;    ///< Kernel memory
 | extern u8* g_kernel_mem;    ///< Kernel memory
 | ||||||
|  | extern u8* g_system_mem;    ///< System memory
 | ||||||
| extern u8* g_exefs_code;    ///< ExeFS:/.code is loaded here
 | extern u8* g_exefs_code;    ///< ExeFS:/.code is loaded here
 | ||||||
| 
 | 
 | ||||||
| void Init(); | void Init(); | ||||||
|  |  | ||||||
|  | @ -73,6 +73,10 @@ inline void _Read(T &var, const u32 addr) { | ||||||
|     } else if ((vaddr >= SHARED_MEMORY_VADDR)  && (vaddr < SHARED_MEMORY_VADDR_END)) { |     } else if ((vaddr >= SHARED_MEMORY_VADDR)  && (vaddr < SHARED_MEMORY_VADDR_END)) { | ||||||
|         var = *((const T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK]); |         var = *((const T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK]); | ||||||
| 
 | 
 | ||||||
|  |     // System memory
 | ||||||
|  |     } else if ((vaddr >= SYSTEM_MEMORY_VADDR)  && (vaddr < SYSTEM_MEMORY_VADDR_END)) { | ||||||
|  |         var = *((const T*)&g_system_mem[vaddr & SYSTEM_MEMORY_MASK]); | ||||||
|  | 
 | ||||||
|     // Config memory
 |     // Config memory
 | ||||||
|     } else if ((vaddr >= CONFIG_MEMORY_VADDR)  && (vaddr < CONFIG_MEMORY_VADDR_END)) { |     } else if ((vaddr >= CONFIG_MEMORY_VADDR)  && (vaddr < CONFIG_MEMORY_VADDR_END)) { | ||||||
|         ConfigMem::Read<T>(var, vaddr); |         ConfigMem::Read<T>(var, vaddr); | ||||||
|  | @ -115,6 +119,10 @@ inline void _Write(u32 addr, const T data) { | ||||||
|     } else if ((vaddr >= SHARED_MEMORY_VADDR)  && (vaddr < SHARED_MEMORY_VADDR_END)) { |     } else if ((vaddr >= SHARED_MEMORY_VADDR)  && (vaddr < SHARED_MEMORY_VADDR_END)) { | ||||||
|         *(T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK] = data; |         *(T*)&g_shared_mem[vaddr & SHARED_MEMORY_MASK] = data; | ||||||
| 
 | 
 | ||||||
|  |     // System memory
 | ||||||
|  |     } else if ((vaddr >= SYSTEM_MEMORY_VADDR)  && (vaddr < SYSTEM_MEMORY_VADDR_END)) { | ||||||
|  |          *(T*)&g_system_mem[vaddr & SYSTEM_MEMORY_MASK] = data; | ||||||
|  | 
 | ||||||
|     // VRAM
 |     // VRAM
 | ||||||
|     } else if ((vaddr >= VRAM_VADDR)  && (vaddr < VRAM_VADDR_END)) { |     } else if ((vaddr >= VRAM_VADDR)  && (vaddr < VRAM_VADDR_END)) { | ||||||
|         *(T*)&g_vram[vaddr & VRAM_MASK] = data; |         *(T*)&g_vram[vaddr & VRAM_MASK] = data; | ||||||
|  | @ -153,9 +161,13 @@ u8 *GetPointer(const u32 addr) { | ||||||
|         return g_heap + (vaddr & HEAP_MASK); |         return g_heap + (vaddr & HEAP_MASK); | ||||||
| 
 | 
 | ||||||
|     // Shared memory
 |     // Shared memory
 | ||||||
|     } else if ((vaddr > SHARED_MEMORY_VADDR)  && (vaddr < SHARED_MEMORY_VADDR_END)) { |     } else if ((vaddr >= SHARED_MEMORY_VADDR)  && (vaddr < SHARED_MEMORY_VADDR_END)) { | ||||||
|         return g_shared_mem + (vaddr & SHARED_MEMORY_MASK); |         return g_shared_mem + (vaddr & SHARED_MEMORY_MASK); | ||||||
| 
 | 
 | ||||||
|  |     // System memory
 | ||||||
|  |     } else if ((vaddr >= SYSTEM_MEMORY_VADDR)  && (vaddr < SYSTEM_MEMORY_VADDR_END)) { | ||||||
|  |          return g_system_mem + (vaddr & SYSTEM_MEMORY_MASK); | ||||||
|  | 
 | ||||||
|     // VRAM
 |     // VRAM
 | ||||||
|     } else if ((vaddr > VRAM_VADDR)  && (vaddr < VRAM_VADDR_END)) { |     } else if ((vaddr > VRAM_VADDR)  && (vaddr < VRAM_VADDR_END)) { | ||||||
|         return g_vram + (vaddr & VRAM_MASK); |         return g_vram + (vaddr & VRAM_MASK); | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue