summaryrefslogtreecommitdiffstats
path: root/src/core/mem_map.h
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-04-18 03:15:40 +0200
committerbunnei <ericbunnie@gmail.com>2014-04-18 03:15:40 +0200
commita9dba388eba586691724187fe53b385cc0bf23aa (patch)
treecdd718342fba54e3345d111e14150a2461d795a7 /src/core/mem_map.h
parentmore various refactors to memory interface (diff)
downloadyuzu-a9dba388eba586691724187fe53b385cc0bf23aa.tar
yuzu-a9dba388eba586691724187fe53b385cc0bf23aa.tar.gz
yuzu-a9dba388eba586691724187fe53b385cc0bf23aa.tar.bz2
yuzu-a9dba388eba586691724187fe53b385cc0bf23aa.tar.lz
yuzu-a9dba388eba586691724187fe53b385cc0bf23aa.tar.xz
yuzu-a9dba388eba586691724187fe53b385cc0bf23aa.tar.zst
yuzu-a9dba388eba586691724187fe53b385cc0bf23aa.zip
Diffstat (limited to '')
-rw-r--r--src/core/mem_map.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index a1fa90f3e..9ca05cc4e 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -34,6 +34,7 @@ enum {
VRAM_MASK = 0x007FFFFF,
FCRAM_MASK = (FCRAM_SIZE - 1), ///< FCRAM mask
SCRATCHPAD_MASK = (SCRATCHPAD_SIZE - 1), ///< Scratchpad memory mask
+ HEAP_GSP_MASK = (HEAP_GSP_SIZE - 1),
HEAP_MASK = (HEAP_SIZE - 1),
FCRAM_PADDR = 0x20000000, ///< FCRAM physical address
@@ -62,7 +63,8 @@ extern u8 *g_base;
// These are guaranteed to point to "low memory" addresses (sub-32-bit).
// 64-bit: Pointers to low-mem (sub-0x10000000) mirror
// 32-bit: Same as the corresponding physical/virtual pointers.
-extern u8* g_heap; ///< Main memory
+extern u8* g_heap_gsp; ///< GSP heap (main memory)
+extern u8* g_heap; ///< Application heap (main memory)
extern u8* g_vram; ///< Video memory (VRAM)
void Init();