added OS memory read/write for thread command buffer

4 files changed, 60 insertions, 12 deletions

diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp
index 3d2c5395..51432dc8 100644
--- a/src/core/hle/hle.cpp
+++ b/src/core/hle/hle.cpp
@@ -15,6 +15,40 @@ namespace HLE {
 
 static std::vector<ModuleDef> g_module_db;
 
+u8* g_command_buffer = NULL;    ///< Command buffer used for sharing between appcore and syscore
+
+// Read from memory used by CTROS HLE functions
+template <typename T>
+inline void Read(T &var, const u32 addr) {
+    if (addr >= HLE::CMD_BUFFER_ADDR && addr < HLE::CMD_BUFFER_ADDR_END) {
+        var = *((const T*)&g_command_buffer[addr & CMD_BUFFER_MASK]);
+    } else {
+        ERROR_LOG(HLE, "unknown read from address %08X", addr);
+    }
+}
+
+// Write to memory used by CTROS HLE functions
+template <typename T>
+inline void Write(u32 addr, const T data) {
+    if (addr >= HLE::CMD_BUFFER_ADDR && addr < HLE::CMD_BUFFER_ADDR_END) {
+        *(T*)&g_command_buffer[addr & CMD_BUFFER_MASK] = data;
+    } else {
+        ERROR_LOG(HLE, "unknown write to address %08X", addr);
+    }
+}
+
+// Explicitly instantiate template functions because we aren't defining this in the header:
+
+template void Read<u64>(u64 &var, const u32 addr);
+template void Read<u32>(u32 &var, const u32 addr);
+template void Read<u16>(u16 &var, const u32 addr);
+template void Read<u8>(u8 &var, const u32 addr);
+
+template void Write<u64>(u32 addr, const u64 data);
+template void Write<u32>(u32 addr, const u32 data);
+template void Write<u16>(u32 addr, const u16 data);
+template void Write<u8>(u32 addr, const u8 data);
+
 const FunctionDef* GetSyscallInfo(u32 opcode) {
     u32 func_num = opcode & 0xFFFFFF; // 8 bits
     if (func_num > 0xFF) {
@@ -41,8 +75,8 @@ void CallSyscall(u32 opcode) {
 Addr CallGetThreadCommandBuffer() {
     // Called on insruction: mrc p15, 0, r0, c13, c0, 3
     // Returns an address in OSHLE memory for the CPU to read/write to
-    RETURN(OS_THREAD_COMMAND_BUFFER_ADDR);
-    return OS_THREAD_COMMAND_BUFFER_ADDR;
+    RETURN(CMD_BUFFER_ADDR);
+    return CMD_BUFFER_ADDR;
 }
 
 void RegisterModule(std::string name, int num_functions, const FunctionDef* func_table) {
@@ -56,6 +90,8 @@ void RegisterAllModules() {
 
 void Init() {
     Service::Init();
+
+    g_command_buffer = new u8[CMD_BUFFER_SIZE];
     
     RegisterAllModules();
 
@@ -63,7 +99,12 @@ void Init() {
 }
 
 void Shutdown() {
+    Service::Shutdown();
+
+    delete g_command_buffer;
+
     g_module_db.clear();
+
     NOTICE_LOG(HLE, "shutdown OK");
 }
 
diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h
index 2bd1f99a..5ee90bcd 100644
--- a/src/core/hle/hle.h
+++ b/src/core/hle/hle.h
@@ -17,7 +17,10 @@
 namespace HLE {
 
 enum {
-    OS_THREAD_COMMAND_BUFFER_ADDR = 0xA0004000,
+    CMD_BUFFER_ADDR     = 0xA0010000,    ///< Totally arbitrary unused address space
+    CMD_BUFFER_SIZE     = 0x10000,
+    CMD_BUFFER_MASK     = (CMD_BUFFER_SIZE - 1),
+    CMD_BUFFER_ADDR_END = (CMD_BUFFER_ADDR + CMD_BUFFER_SIZE),
 };
 
 typedef u32 Addr;
@@ -35,6 +38,14 @@ struct ModuleDef {
     const FunctionDef*  func_table;
 };
 
+// Read from memory used by CTROS HLE functions
+template <typename T>
+inline void Read(T &var, const u32 addr);
+
+// Write to memory used by CTROS HLE functions
+template <typename T>
+inline void Write(u32 addr, const T data);
+
 void RegisterModule(std::string name, int num_functions, const FunctionDef *func_table);
 
 void CallSyscall(u32 opcode);
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index 2596ba92..ab2c2d4e 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),
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index f35e25ca..18429628 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -20,8 +20,8 @@ inline void _Read(T &var, const u32 addr) {
     // Memory allocated for HLE use that can be addressed from the emulated application
     // The primary use of this is sharing a commandbuffer between the HLE OS (syscore) and the LLE
     // core running the user application (appcore)
-    if (addr >= MEM_OSHLE_VADDR && addr < MEM_OSHLE_VADDR_END) {
-        NOTICE_LOG(MEMMAP, "OSHLE read @ 0x%08X", addr);
+    if (addr >= HLE::CMD_BUFFER_ADDR && addr < HLE::CMD_BUFFER_ADDR_END) {
+        HLE::Read<T>(var, addr);
 
     // Hardware I/O register reads
     // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space
@@ -58,13 +58,13 @@ inline void _Write(u32 addr, const T data) {
     // Memory allocated for HLE use that can be addressed from the emulated application
     // The primary use of this is sharing a commandbuffer between the HLE OS (syscore) and the LLE
     // core running the user application (appcore)
-    if (addr >= MEM_OSHLE_VADDR && addr < MEM_OSHLE_VADDR_END) {
-        NOTICE_LOG(MEMMAP, "OSHLE write @ 0x%08X", addr);
+    if (addr >= HLE::CMD_BUFFER_ADDR && addr < HLE::CMD_BUFFER_ADDR_END) {
+        HLE::Write<T>(addr, data);
 
     // Hardware I/O register writes
     // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space
     } else if ((addr & 0xFF000000) == 0x10000000 || (addr & 0xFF000000) == 0x1E000000) {
-        HW::Write<const T>(addr, data);
+        HW::Write<T>(addr, data);
     
     // ExeFS:/.code is loaded here:
     } else if ((addr & 0xFFF00000) == 0x00100000) {