OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-22 12:10:05 +00:00
Code Issues Projects Releases Wiki Activity

Memory: Sort memory region variables by VAddr

Browse Source
This commit is contained in:
Yuri Kunde Schlesner 2015-05-09 00:44:29 -03:00
parent 1c0b87edc2
commit e7b6ed7578
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/mem_map.cpp
View File

@ -13,9 +13,9 @@ namespace Memory {
u8* g_exefs_code; ///< ExeFS:/.code is loaded here u8* g_exefs_code; ///< ExeFS:/.code is loaded here
u8* g_heap; ///< Application heap (main memory) u8* g_heap; ///< Application heap (main memory)
u8* g_shared_mem; ///< Shared memory
u8* g_heap_linear; ///< Linear heap u8* g_heap_linear; ///< Linear heap
u8* g_vram; ///< Video memory (VRAM) pointer u8* g_vram; ///< Video memory (VRAM) pointer
u8* g_shared_mem; ///< Shared memory
u8* g_dsp_mem; ///< DSP memory u8* g_dsp_mem; ///< DSP memory
u8* g_tls_mem; ///< TLS memory u8* g_tls_mem; ///< TLS memory
@ -29,12 +29,12 @@ struct MemoryArea {
// We don't declare the IO regions in here since its handled by other means. // We don't declare the IO regions in here since its handled by other means.
static MemoryArea memory_areas[] = { static MemoryArea memory_areas[] = {
{&g_exefs_code, PROCESS_IMAGE_MAX_SIZE}, {&g_exefs_code, PROCESS_IMAGE_MAX_SIZE},
{&g_vram, VRAM_SIZE },
{&g_heap, HEAP_SIZE }, {&g_heap, HEAP_SIZE },
{&g_shared_mem, SHARED_MEMORY_SIZE }, {&g_shared_mem, SHARED_MEMORY_SIZE },
{&g_heap_linear, LINEAR_HEAP_SIZE },
{&g_vram, VRAM_SIZE },
{&g_dsp_mem, DSP_RAM_SIZE }, {&g_dsp_mem, DSP_RAM_SIZE },
{&g_tls_mem, TLS_AREA_SIZE }, {&g_tls_mem, TLS_AREA_SIZE },
{&g_heap_linear, LINEAR_HEAP_SIZE },
}; };
} }

14
src/core/mem_map.h
View File

@ -121,13 +121,13 @@ struct MemoryBlock {
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
extern u8* g_heap_linear; ///< Linear heap (main memory) extern u8* g_exefs_code; ///< ExeFS:/.code is loaded here
extern u8* g_heap; ///< Application heap (main memory) extern u8* g_heap; ///< Application heap (main memory)
extern u8* g_vram; ///< Video memory (VRAM) extern u8* g_shared_mem; ///< Shared memory
extern u8* g_shared_mem; ///< Shared memory extern u8* g_heap_linear; ///< Linear heap (main memory)
extern u8* g_tls_mem; ///< TLS memory extern u8* g_vram; ///< Video memory (VRAM)
extern u8* g_dsp_mem; ///< DSP memory extern u8* g_dsp_mem; ///< DSP memory
extern u8* g_exefs_code; ///< ExeFS:/.code is loaded here extern u8* g_tls_mem; ///< TLS memory
void Init(); void Init();
void Shutdown(); void Shutdown();