From d9bb4f11c61503bd2e40d2ea9fc9795c55e48c2e Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 10 Apr 2014 19:56:30 -0400 Subject: added Memory::GetCharPointer to read strings from HLE functions --- src/core/mem_map.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core/mem_map.h') diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 1a3bd7234..94469ec8c 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -70,4 +70,8 @@ void Write32(const u32 addr, const u32 data); u8* GetPointer(const u32 Address); +inline const char* GetCharPointer(const u32 address) { + return (const char *)GetPointer(address); +} + } // namespace -- cgit v1.2.3 From 9a9b7b289ab87e22b9896c0345d42b61c47a304f Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 12 Apr 2014 01:33:13 -0400 Subject: added a memory mapped option for HLE --- src/core/mem_map.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/core/mem_map.h') diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 94469ec8c..29f2dce86 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -19,19 +19,22 @@ enum { MEM_AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size MEM_FCRAM_SIZE = 0x08000000, ///< FCRAM size... Really 0x07E00000, but power of 2 // works much better - MEM_SCRATCHPAD_SIZE = 0x00004000, ///< Typical stack size - TODO: Read from exheader + MEM_SCRATCHPAD_SIZE = 0x00004000, ///< Typical stack size - TODO: Read from exheader MEM_VRAM_MASK = 0x007FFFFF, MEM_FCRAM_MASK = (MEM_FCRAM_SIZE - 1), ///< FCRAM mask MEM_SCRATCHPAD_MASK = (MEM_SCRATCHPAD_SIZE - 1), ///< Scratchpad memory mask - MEM_FCRAM_PADDR = 0x20000000, ///< FCRAM physical address - MEM_FCRAM_PADDR_END = (MEM_FCRAM_PADDR + MEM_FCRAM_SIZE), ///< FCRAM end of physical space - MEM_FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address - MEM_FCRAM_VADDR_END = (MEM_FCRAM_VADDR + MEM_FCRAM_SIZE), ///< FCRAM end of virtual space + MEM_FCRAM_PADDR = 0x20000000, ///< FCRAM physical address + MEM_FCRAM_PADDR_END = (MEM_FCRAM_PADDR + MEM_FCRAM_SIZE), ///< FCRAM end of physical space + MEM_FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address + MEM_FCRAM_VADDR_END = (MEM_FCRAM_VADDR + MEM_FCRAM_SIZE), ///< FCRAM end of virtual space MEM_VRAM_VADDR = 0x1F000000, MEM_SCRATCHPAD_VADDR = (0x10000000 - MEM_SCRATCHPAD_SIZE), ///< Scratchpad virtual address + + MEM_OSHLE_VADDR = 0xC0000000, ///< Memory for use by OSHLE accessible by appcore CPU + MEM_OSHLE_SIZE = 0x08000000, ///< ...Same size as FCRAM for now }; //////////////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 68e198476f17a026fed88f3c9a271aa768694354 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 12 Apr 2014 21:55:36 -0400 Subject: - added HLE to connect to "srv:" service - added a manager for keeping track of services/ports - added a memory mapped region for memory accessed by HLE - added HLE for GetThreadCommandBuffer function --- src/core/mem_map.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core/mem_map.h') diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 29f2dce86..2596ba925 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -33,8 +33,9 @@ enum { MEM_VRAM_VADDR = 0x1F000000, MEM_SCRATCHPAD_VADDR = (0x10000000 - MEM_SCRATCHPAD_SIZE), ///< Scratchpad virtual address - MEM_OSHLE_VADDR = 0xC0000000, ///< Memory for use by OSHLE accessible by appcore CPU MEM_OSHLE_SIZE = 0x08000000, ///< ...Same size as FCRAM for now + MEM_OSHLE_VADDR = 0xA0000000, ///< Memory for use by OSHLE accessible by appcore CPU + MEM_OSHLE_VADDR_END = (MEM_OSHLE_VADDR + MEM_OSHLE_SIZE), }; //////////////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From 6f6d5158de18a7ca134406d55446c27f6db48a1a Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 12 Apr 2014 23:31:39 -0400 Subject: added OS memory read/write for thread command buffer --- src/core/mem_map.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/core/mem_map.h') diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 2596ba925..ab2c2d4ec 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -32,10 +32,6 @@ enum { MEM_VRAM_VADDR = 0x1F000000, MEM_SCRATCHPAD_VADDR = (0x10000000 - MEM_SCRATCHPAD_SIZE), ///< Scratchpad virtual address - - MEM_OSHLE_SIZE = 0x08000000, ///< ...Same size as FCRAM for now - MEM_OSHLE_VADDR = 0xA0000000, ///< Memory for use by OSHLE accessible by appcore CPU - MEM_OSHLE_VADDR_END = (MEM_OSHLE_VADDR + MEM_OSHLE_SIZE), }; //////////////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From ce822b68152fe2a35c30fd38d0e98d92db2e8d04 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 13 Apr 2014 00:39:05 -0400 Subject: replace tabs with spaces --- src/core/mem_map.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/mem_map.h') diff --git a/src/core/mem_map.h b/src/core/mem_map.h index ab2c2d4ec..d0308fa5c 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -50,8 +50,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_fcram; ///< Main memory -extern u8* g_vram; ///< Video memory (VRAM) +extern u8* g_fcram; ///< Main memory +extern u8* g_vram; ///< Video memory (VRAM) extern u8* g_scratchpad; ///< Stack memory void Init(); @@ -71,7 +71,7 @@ void Write32(const u32 addr, const u32 data); u8* GetPointer(const u32 Address); inline const char* GetCharPointer(const u32 address) { - return (const char *)GetPointer(address); + return (const char *)GetPointer(address); } } // namespace -- cgit v1.2.3 From ae99574b6dd2f21960bd42e0bb9a1978e18413d4 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 18:40:42 -0400 Subject: cleaned up memory interfaces a lot, removed some hackish stuff --- src/core/mem_map.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/core/mem_map.h') diff --git a/src/core/mem_map.h b/src/core/mem_map.h index d0308fa5c..82cfdece5 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -17,8 +17,7 @@ enum { MEM_VRAM_SIZE = 0x00600000, ///< VRAM size MEM_DSP_SIZE = 0x00080000, ///< DSP memory size MEM_AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size - MEM_FCRAM_SIZE = 0x08000000, ///< FCRAM size... Really 0x07E00000, but power of 2 - // works much better + MEM_FCRAM_SIZE = 0x08000000, ///< FCRAM size MEM_SCRATCHPAD_SIZE = 0x00004000, ///< Typical stack size - TODO: Read from exheader MEM_VRAM_MASK = 0x007FFFFF, @@ -52,7 +51,6 @@ extern u8 *g_base; // 32-bit: Same as the corresponding physical/virtual pointers. extern u8* g_fcram; ///< Main memory extern u8* g_vram; ///< Video memory (VRAM) -extern u8* g_scratchpad; ///< Stack memory void Init(); void Shutdown(); -- cgit v1.2.3 From 09ffe87360f39a76b084fe1c9bac2330d6f6f790 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 21:05:34 -0400 Subject: more various refactors to memory interface --- src/core/mem_map.h | 53 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 20 deletions(-) (limited to 'src/core/mem_map.h') diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 82cfdece5..a1fa90f3e 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -12,25 +12,38 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// enum { - MEM_BOOTROM_SIZE = 0x00010000, ///< Bootrom (super secret code/data @ 0x8000) size - MEM_MPCORE_PRIV_SIZE = 0x00002000, ///< MPCore private memory region size - MEM_VRAM_SIZE = 0x00600000, ///< VRAM size - MEM_DSP_SIZE = 0x00080000, ///< DSP memory size - MEM_AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size - MEM_FCRAM_SIZE = 0x08000000, ///< FCRAM size - MEM_SCRATCHPAD_SIZE = 0x00004000, ///< Typical stack size - TODO: Read from exheader - - MEM_VRAM_MASK = 0x007FFFFF, - MEM_FCRAM_MASK = (MEM_FCRAM_SIZE - 1), ///< FCRAM mask - MEM_SCRATCHPAD_MASK = (MEM_SCRATCHPAD_SIZE - 1), ///< Scratchpad memory mask - - MEM_FCRAM_PADDR = 0x20000000, ///< FCRAM physical address - MEM_FCRAM_PADDR_END = (MEM_FCRAM_PADDR + MEM_FCRAM_SIZE), ///< FCRAM end of physical space - MEM_FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address - MEM_FCRAM_VADDR_END = (MEM_FCRAM_VADDR + MEM_FCRAM_SIZE), ///< FCRAM end of virtual space - - MEM_VRAM_VADDR = 0x1F000000, - MEM_SCRATCHPAD_VADDR = (0x10000000 - MEM_SCRATCHPAD_SIZE), ///< Scratchpad virtual address + BOOTROM_SIZE = 0x00010000, ///< Bootrom (super secret code/data @ 0x8000) size + MPCORE_PRIV_SIZE = 0x00002000, ///< MPCore private memory region size + VRAM_SIZE = 0x00600000, ///< VRAM size + DSP_SIZE = 0x00080000, ///< DSP memory size + AXI_WRAM_SIZE = 0x00080000, ///< AXI WRAM size + FCRAM_SIZE = 0x08000000, ///< FCRAM size + SCRATCHPAD_SIZE = 0x00004000, ///< Typical stack size - TODO: Read from exheader + HEAP_GSP_SIZE = 0x02000000, ///< GSP heap size... TODO: Define correctly? + HEAP_SIZE = FCRAM_SIZE, ///< Application heap size + + HEAP_PADDR = HEAP_GSP_SIZE, + HEAP_PADDR_END = (HEAP_PADDR + HEAP_SIZE), + HEAP_VADDR = 0x08000000, + HEAP_VADDR_END = (HEAP_VADDR + HEAP_SIZE), + HEAP_GSP_VADDR = 0x14000000, + HEAP_GSP_VADDR_END = (HEAP_GSP_VADDR + HEAP_GSP_SIZE), + HEAP_GSP_PADDR = 0x00000000, + HEAP_GSP_PADDR_END = (HEAP_GSP_PADDR + HEAP_GSP_SIZE), + + VRAM_MASK = 0x007FFFFF, + FCRAM_MASK = (FCRAM_SIZE - 1), ///< FCRAM mask + SCRATCHPAD_MASK = (SCRATCHPAD_SIZE - 1), ///< Scratchpad memory mask + HEAP_MASK = (HEAP_SIZE - 1), + + FCRAM_PADDR = 0x20000000, ///< FCRAM physical address + FCRAM_PADDR_END = (FCRAM_PADDR + FCRAM_SIZE), ///< FCRAM end of physical space + FCRAM_VADDR = 0x08000000, ///< FCRAM virtual address + FCRAM_VADDR_END = (FCRAM_VADDR + FCRAM_SIZE), ///< FCRAM end of virtual space + + VRAM_VADDR = 0x1F000000, + SCRATCHPAD_VADDR_END = 0x10000000, + SCRATCHPAD_VADDR = (SCRATCHPAD_VADDR_END - SCRATCHPAD_SIZE), ///< Stack space }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -49,7 +62,7 @@ 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_fcram; ///< Main memory +extern u8* g_heap; ///< Main memory extern u8* g_vram; ///< Video memory (VRAM) void Init(); -- cgit v1.2.3 From a9dba388eba586691724187fe53b385cc0bf23aa Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 21:15:40 -0400 Subject: added memory read/write to GSP heap --- src/core/mem_map.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/core/mem_map.h') 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(); -- cgit v1.2.3 From fb026f6b46210d9e8cd24458c11c2d3845583a03 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 21:19:32 -0400 Subject: moved enums into Memory:: namespace --- src/core/mem_map.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/core/mem_map.h') diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 9ca05cc4e..9931daece 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -4,11 +4,11 @@ #pragma once -//////////////////////////////////////////////////////////////////////////////////////////////////// - #include "common/common.h" #include "common/common_types.h" +namespace Memory { + //////////////////////////////////////////////////////////////////////////////////////////////////// enum { @@ -49,8 +49,6 @@ enum { //////////////////////////////////////////////////////////////////////////////////////////////////// -namespace Memory { - // Base is a pointer to the base of the memory map. Yes, some MMU tricks // are used to set up a full GC or Wii memory map in process memory. on // 32-bit, you have to mask your offsets with 0x3FFFFFFF. This means that -- cgit v1.2.3 From b2baafaf8ba760ce2b975391fd04db52ad386e29 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 23:05:31 -0400 Subject: added GSP heap memory allocation --- src/core/mem_map.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/core/mem_map.h') diff --git a/src/core/mem_map.h b/src/core/mem_map.h index 9931daece..ab1eb2606 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -49,6 +49,23 @@ enum { //////////////////////////////////////////////////////////////////////////////////////////////////// +/// Represents a block of heap memory mapped by ControlMemory +struct HeapBlock { + HeapBlock() : base_address(0), address(0), size(0), operation(0), permissions(0) { + } + u32 base_address; + u32 address; + u32 size; + u32 operation; + u32 permissions; + + const u32 GetVirtualAddress() const{ + return base_address + address; + } +}; + +//////////////////////////////////////////////////////////////////////////////////////////////////// + // Base is a pointer to the base of the memory map. Yes, some MMU tricks // are used to set up a full GC or Wii memory map in process memory. on // 32-bit, you have to mask your offsets with 0x3FFFFFFF. This means that @@ -81,6 +98,14 @@ void Write32(const u32 addr, const u32 data); u8* GetPointer(const u32 Address); +/** + * Maps a block of memory on the GSP heap + * @param size Size of block in bytes + * @param operation Control memory operation + * @param permissions Control memory permissions + */ +u32 MapBlock_HeapGSP(u32 size, u32 operation, u32 permissions); + inline const char* GetCharPointer(const u32 address) { return (const char *)GetPointer(address); } -- cgit v1.2.3