From f68de21ad1cd267029b60ee3767d219c46f5fba0 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 10 Apr 2014 19:58:28 -0400 Subject: added initial modules for setting up SysCall HLE --- src/core/core.vcxproj | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/core/core.vcxproj') diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 1800b5512..55ce508a6 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -152,6 +152,7 @@ + @@ -182,6 +183,9 @@ + + + -- cgit v1.2.3 From 2a7d7ce55d51a1cf893d14e893b87941df4a2f03 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 10 Apr 2014 21:30:00 -0400 Subject: - removed syscall classes (will just use HLEFunction) - added hle.cpp and module registration - removed unused code --- src/core/core.vcxproj | 1 + src/core/core.vcxproj.filters | 3 +++ src/core/hle.cpp | 33 +++++++++++++++++++++++++++++++++ src/core/hle/hle.h | 18 ++++++++++-------- src/core/hle/hle_syscall.cpp | 10 ++++++---- src/core/hle/hle_syscall.h | 4 +--- 6 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 src/core/hle.cpp (limited to 'src/core/core.vcxproj') diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 55ce508a6..8097a47d3 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -152,6 +152,7 @@ + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 7bac04a2d..79bddf09a 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -81,6 +81,9 @@ hle + + hle + diff --git a/src/core/hle.cpp b/src/core/hle.cpp new file mode 100644 index 000000000..f0c7d2178 --- /dev/null +++ b/src/core/hle.cpp @@ -0,0 +1,33 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include + +#include "core/hle/hle.h" +#include "core/hle/hle_syscall.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// + +namespace HLE { + +static std::vector g_module_db; + +void RegisterModule(const char *name, int num_functions, const HLEFunction *func_table) { + HLEModule module = {name, num_functions, func_table}; + g_module_db.push_back(module); +} + +void RegisterAllModules() { + Register_SysCall(); +} + +void Init() { + RegisterAllModules(); +} + +void Shutdown() { + g_module_db.clear(); +} + +} // namespace diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h index 6780b52c4..6648c787f 100644 --- a/src/core/hle/hle.h +++ b/src/core/hle/hle.h @@ -10,13 +10,11 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// typedef void (*HLEFunc)(); -typedef void (*SysCallFunc)(); struct HLEFunction { u32 id; HLEFunc func; const char* name; - u32 flags; }; struct HLEModule { @@ -25,11 +23,15 @@ struct HLEModule { const HLEFunction* func_table; }; -struct SysCall { - u8 id; - SysCallFunc func; - const char* name; -}; - #define PARAM(n) Core::g_app_core->GetReg(n) #define RETURN(n) Core::g_app_core->SetReg(0, n) + +namespace HLE { + +void Init(); + +void Shutdown(); + +void RegisterModule(const char *name, int num_functions, const HLEFunction *func_table); + +} // namespace diff --git a/src/core/hle/hle_syscall.cpp b/src/core/hle/hle_syscall.cpp index c8a516848..b17a2e220 100644 --- a/src/core/hle/hle_syscall.cpp +++ b/src/core/hle/hle_syscall.cpp @@ -7,16 +7,18 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// - +typedef u32 Handle; +typedef s32 Result; Result SVC_ConnectToPort(void* out, const char* port_name) { - NOTICE_LOG(OSHLE, "SVC_ConnectToPort called, port_name: %s", port_name); + NOTICE_LOG(OSHLE, "svcConnectToPort called, port_name: %s", port_name); return 0; } -const SysCall SysCallTable[] = { +const HLEFunction SysCallTable[] = { {0x2D, WrapI_VC, "svcConnectToPort"}, }; -void Register_SysCalls() { +void Register_SysCall() { + HLE::RegisterModule("SysCallTable", ARRAY_SIZE(SysCallTable), SysCallTable); } diff --git a/src/core/hle/hle_syscall.h b/src/core/hle/hle_syscall.h index 506dcfc78..643af0bf4 100644 --- a/src/core/hle/hle_syscall.h +++ b/src/core/hle/hle_syscall.h @@ -35,8 +35,6 @@ //}; -typedef u32 Handle; -typedef s32 Result; -Result ConnectToPort(Handle* out, const char* port_name); +void Register_SysCall(); -- cgit v1.2.3 From f6c328cf37fe6e0250c20fcbf128f301b3d71d36 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 11 Apr 2014 18:07:49 -0400 Subject: moved hle.cpp into hle folder (due to mistake earlier) --- src/core/core.vcxproj | 2 +- src/core/core.vcxproj.filters | 2 +- src/core/hle.cpp | 57 ------------------------------------------- src/core/hle/hle.cpp | 57 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 src/core/hle.cpp create mode 100644 src/core/hle/hle.cpp (limited to 'src/core/core.vcxproj') diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 8097a47d3..89795ce63 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -152,7 +152,7 @@ - + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 79bddf09a..eece5d486 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -81,7 +81,7 @@ hle - + hle diff --git a/src/core/hle.cpp b/src/core/hle.cpp deleted file mode 100644 index d62d2d0ce..000000000 --- a/src/core/hle.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include - -#include "core/hle/hle.h" -#include "core/hle/hle_syscall.h" - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -namespace HLE { - -static std::vector g_module_db; - -const FunctionDef* GetSyscallInfo(u32 opcode) { - u32 func_num = opcode & 0xFFFFFF; // 8 bits - if (func_num > 0xFF) { - ERROR_LOG(HLE,"Unknown syscall: 0x%02X", func_num); - return NULL; - } - return &g_module_db[0].func_table[func_num]; -} - -void CallSyscall(u32 opcode) { - const FunctionDef *info = GetSyscallInfo(opcode); - - if (!info) { - return; - } - if (info->func) { - info->func(); - } else { - ERROR_LOG(HLE, "Unimplemented HLE function %s", info->name); - } -} - -void RegisterModule(std::string name, int num_functions, const FunctionDef* func_table) { - ModuleDef module = {name, num_functions, func_table}; - g_module_db.push_back(module); -} - -void RegisterAllModules() { - Register_Syscall(); -} - -void Init() { - RegisterAllModules(); - NOTICE_LOG(HLE, "initialized OK"); -} - -void Shutdown() { - g_module_db.clear(); - NOTICE_LOG(HLE, "shutdown OK"); -} - -} // namespace diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp new file mode 100644 index 000000000..d62d2d0ce --- /dev/null +++ b/src/core/hle/hle.cpp @@ -0,0 +1,57 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include + +#include "core/hle/hle.h" +#include "core/hle/hle_syscall.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// + +namespace HLE { + +static std::vector g_module_db; + +const FunctionDef* GetSyscallInfo(u32 opcode) { + u32 func_num = opcode & 0xFFFFFF; // 8 bits + if (func_num > 0xFF) { + ERROR_LOG(HLE,"Unknown syscall: 0x%02X", func_num); + return NULL; + } + return &g_module_db[0].func_table[func_num]; +} + +void CallSyscall(u32 opcode) { + const FunctionDef *info = GetSyscallInfo(opcode); + + if (!info) { + return; + } + if (info->func) { + info->func(); + } else { + ERROR_LOG(HLE, "Unimplemented HLE function %s", info->name); + } +} + +void RegisterModule(std::string name, int num_functions, const FunctionDef* func_table) { + ModuleDef module = {name, num_functions, func_table}; + g_module_db.push_back(module); +} + +void RegisterAllModules() { + Register_Syscall(); +} + +void Init() { + RegisterAllModules(); + NOTICE_LOG(HLE, "initialized OK"); +} + +void Shutdown() { + g_module_db.clear(); + NOTICE_LOG(HLE, "shutdown OK"); +} + +} // namespace -- cgit v1.2.3 From 02fbd42e7f006236199698c61ca917092afa1f7d Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 11 Apr 2014 18:44:21 -0400 Subject: - renamed hle_syscall to just syscall - added service.h as an initial service interface --- src/core/core.vcxproj | 5 +- src/core/core.vcxproj.filters | 12 +++- src/core/hle/hle.cpp | 4 +- src/core/hle/hle_syscall.cpp | 151 ---------------------------------------- src/core/hle/hle_syscall.h | 37 ---------- src/core/hle/service/service.h | 60 ++++++++++++++++ src/core/hle/syscall.cpp | 153 +++++++++++++++++++++++++++++++++++++++++ src/core/hle/syscall.h | 19 +++++ 8 files changed, 246 insertions(+), 195 deletions(-) delete mode 100644 src/core/hle/hle_syscall.cpp delete mode 100644 src/core/hle/hle_syscall.h create mode 100644 src/core/hle/service/service.h create mode 100644 src/core/hle/syscall.cpp create mode 100644 src/core/hle/syscall.h (limited to 'src/core/core.vcxproj') diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 89795ce63..10ecca596 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -153,7 +153,7 @@ - + @@ -186,7 +186,8 @@ - + + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index eece5d486..d450224a4 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -25,6 +25,9 @@ {8b62769e-3e2a-4a57-a7bc-b3b2933c2bc7} + + {812c5189-ca49-4704-b842-3ffad09092d3} + @@ -78,10 +81,10 @@ - + hle - + hle @@ -163,7 +166,10 @@ hle - + + hle\service + + hle diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp index d62d2d0ce..32aff0eb5 100644 --- a/src/core/hle/hle.cpp +++ b/src/core/hle/hle.cpp @@ -5,7 +5,7 @@ #include #include "core/hle/hle.h" -#include "core/hle/hle_syscall.h" +#include "core/hle/syscall.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -41,7 +41,7 @@ void RegisterModule(std::string name, int num_functions, const FunctionDef* func } void RegisterAllModules() { - Register_Syscall(); + Syscall::Register(); } void Init() { diff --git a/src/core/hle/hle_syscall.cpp b/src/core/hle/hle_syscall.cpp deleted file mode 100644 index 92d9b0c85..000000000 --- a/src/core/hle/hle_syscall.cpp +++ /dev/null @@ -1,151 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "core/hle/function_wrappers.h" -#include "core/hle/hle_syscall.h" - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -typedef u32 Handle; -typedef s32 Result; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -Result SVC_ConnectToPort(void* out, const char* port_name) { - NOTICE_LOG(OSHLE, "svcConnectToPort called, port_name: %s", port_name); - return 0; -} - -const HLE::FunctionDef Syscall_Table[] = { - {0x00, NULL, "Unknown"}, - {0x01, NULL, "svcControlMemory"}, - {0x02, NULL, "svcQueryMemory"}, - {0x03, NULL, "svcExitProcess"}, - {0x04, NULL, "svcGetProcessAffinityMask"}, - {0x05, NULL, "svcSetProcessAffinityMask"}, - {0x06, NULL, "svcGetProcessIdealProcessor"}, - {0x07, NULL, "svcSetProcessIdealProcessor"}, - {0x08, NULL, "svcCreateThread"}, - {0x09, NULL, "svcExitThread"}, - {0x0A, NULL, "svcSleepThread"}, - {0x0B, NULL, "svcGetThreadPriority"}, - {0x0C, NULL, "svcSetThreadPriority"}, - {0x0D, NULL, "svcGetThreadAffinityMask"}, - {0x0E, NULL, "svcSetThreadAffinityMask"}, - {0x0F, NULL, "svcGetThreadIdealProcessor"}, - {0x10, NULL, "svcSetThreadIdealProcessor"}, - {0x11, NULL, "svcGetCurrentProcessorNumber"}, - {0x12, NULL, "svcRun"}, - {0x13, NULL, "svcCreateMutex"}, - {0x14, NULL, "svcReleaseMutex"}, - {0x15, NULL, "svcCreateSemaphore"}, - {0x16, NULL, "svcReleaseSemaphore"}, - {0x17, NULL, "svcCreateEvent"}, - {0x18, NULL, "svcSignalEvent"}, - {0x19, NULL, "svcClearEvent"}, - {0x1A, NULL, "svcCreateTimer"}, - {0x1B, NULL, "svcSetTimer"}, - {0x1C, NULL, "svcCancelTimer"}, - {0x1D, NULL, "svcClearTimer"}, - {0x1E, NULL, "svcCreateMemoryBlock"}, - {0x1F, NULL, "svcMapMemoryBlock"}, - {0x20, NULL, "svcUnmapMemoryBlock"}, - {0x21, NULL, "svcCreateAddressArbiter"}, - {0x22, NULL, "svcArbitrateAddress"}, - {0x23, NULL, "svcCloseHandle"}, - {0x24, NULL, "svcWaitSynchronization1"}, - {0x25, NULL, "svcWaitSynchronizationN"}, - {0x26, NULL, "svcSignalAndWait"}, - {0x27, NULL, "svcDuplicateHandle"}, - {0x28, NULL, "svcGetSystemTick"}, - {0x29, NULL, "svcGetHandleInfo"}, - {0x2A, NULL, "svcGetSystemInfo"}, - {0x2B, NULL, "svcGetProcessInfo"}, - {0x2C, NULL, "svcGetThreadInfo"}, - {0x2D, WrapI_VC, "svcConnectToPort"}, - {0x2E NULL, "svcSendSyncRequest1"}, - {0x2F NULL, "svcSendSyncRequest2"}, - {0x30 NULL, "svcSendSyncRequest3"}, - {0x31 NULL, "svcSendSyncRequest4"}, - {0x32 NULL, "svcSendSyncRequest"}, - {0x33 NULL, "svcOpenProcess"}, - {0x34 NULL, "svcOpenThread"}, - {0x35 NULL, "svcGetProcessId"}, - {0x36 NULL, "svcGetProcessIdOfThread"}, - {0x37 NULL, "svcGetThreadId"}, - {0x38 NULL, "svcGetResourceLimit"}, - {0x39 NULL, "svcGetResourceLimitLimitValues"}, - {0x3A NULL, "svcGetResourceLimitCurrentValues"}, - {0x3B NULL, "svcGetThreadContext"}, - {0x3C NULL, "svcBreak"}, - {0x3D NULL, "svcOutputDebugString"}, - {0x3E NULL, "svcControlPerformanceCounter"}, - {0x3F, NULL, "Unknown"}, - {0x40, NULL, "Unknown"}, - {0x41, NULL, "Unknown"}, - {0x42, NULL, "Unknown"}, - {0x43, NULL, "Unknown"}, - {0x44, NULL, "Unknown"}, - {0x45, NULL, "Unknown"}, - {0x46, NULL, "Unknown"}, - {0x47 NULL, "svcCreatePort"}, - {0x48 NULL, "svcCreateSessionToPort"}, - {0x49 NULL, "svcCreateSession"}, - {0x4A NULL, "svcAcceptSession"}, - {0x4B NULL, "svcReplyAndReceive1"}, - {0x4C NULL, "svcReplyAndReceive2"}, - {0x4D NULL, "svcReplyAndReceive3"}, - {0x4E NULL, "svcReplyAndReceive4"}, - {0x4F NULL, "svcReplyAndReceive"}, - {0x50 NULL, "svcBindInterrupt"}, - {0x51 NULL, "svcUnbindInterrupt"}, - {0x52 NULL, "svcInvalidateProcessDataCache"}, - {0x53 NULL, "svcStoreProcessDataCache"}, - {0x54 NULL, "svcFlushProcessDataCache"}, - {0x55 NULL, "svcStartInterProcessDma"}, - {0x56 NULL, "svcStopDma"}, - {0x57 NULL, "svcGetDmaState"}, - {0x58 NULL, "svcRestartDma"}, - {0x59, NULL, "Unknown"}, - {0x5A, NULL, "Unknown"}, - {0x5B, NULL, "Unknown"}, - {0x5C, NULL, "Unknown"}, - {0x5D, NULL, "Unknown"}, - {0x5E, NULL, "Unknown"}, - {0x5F, NULL, "Unknown"}, - {0x60 NULL, "svcDebugActiveProcess"}, - {0x61 NULL, "svcBreakDebugProcess"}, - {0x62 NULL, "svcTerminateDebugProcess"}, - {0x63 NULL, "svcGetProcessDebugEvent"}, - {0x64 NULL, "svcContinueDebugEvent"}, - {0x65 NULL, "svcGetProcessList"}, - {0x66 NULL, "svcGetThreadList"}, - {0x67 NULL, "svcGetDebugThreadContext"}, - {0x68 NULL, "svcSetDebugThreadContext"}, - {0x69 NULL, "svcQueryDebugProcessMemory"}, - {0x6A NULL, "svcReadProcessMemory"}, - {0x6B NULL, "svcWriteProcessMemory"}, - {0x6C NULL, "svcSetHardwareBreakPoint"}, - {0x6D NULL, "svcGetDebugThreadParam"}, - {0x6E, NULL, "Unknown"}, - {0x6F, NULL, "Unknown"}, - {0x70 NULL, "svcControlProcessMemory"}, - {0x71 NULL, "svcMapProcessMemory"}, - {0x72 NULL, "svcUnmapProcessMemory"}, - {0x73, NULL, "Unknown"}, - {0x74, NULL, "Unknown"}, - {0x75, NULL, "Unknown"}, - {0x76 NULL, "svcTerminateProcess"}, - {0x77, NULL, "Unknown"}, - {0x78 NULL, "svcCreateResourceLimit"}, - {0x79, NULL, "Unknown"}, - {0x7A, NULL, "Unknown"}, - {0x7B, NULL, "Unknown"}, - {0x7C NULL, "svcKernelSetState"}, - {0x7D NULL, "svcQueryProcessMemory"}, -}; - -void Register_Syscall() { - HLE::RegisterModule("SyscallTable", ARRAY_SIZE(Syscall_Table), Syscall_Table); -} diff --git a/src/core/hle/hle_syscall.h b/src/core/hle/hle_syscall.h deleted file mode 100644 index 80b20c358..000000000 --- a/src/core/hle/hle_syscall.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -#include "common/common_types.h" - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -//template -//class KernelObject { -//public: -// virtual ~KernelObject() {} -// -// T GetNative() const { -// return m_native; -// } -// -// void SetNative(const T& native) { -// m_native = native; -// } -// -// virtual const char *GetTypeName() {return "[BAD KERNEL OBJECT TYPE]";} -// virtual const char *GetName() {return "[UNKNOWN KERNEL OBJECT]";} -// -//private: -// T m_native; -//}; - -//class Handle : public KernelObject { -// const char* GetTypeName() { -// return "Handle"; -// } -//}; - -void Register_Syscall(); diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h new file mode 100644 index 000000000..f15099982 --- /dev/null +++ b/src/core/hle/service/service.h @@ -0,0 +1,60 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include + +#include "common/common_types.h" +#include "core/hle/syscall.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace Service + +namespace Service { + +typedef s32 NativeUID; + +/// Interface to a CTROS service +class Interface { +public: + + virtual ~Interface() { + } + + /** + * Gets the UID for the serice + * @return UID of service in native format + */ + NativeUID GetUID() const { + return (NativeUID)m_uid; + } + + /** + * Gets the string name used by CTROS for a service + * @return String name of service + */ + virtual std::string GetName() { + return "[UNKNOWN SERVICE NAME]"; + } + + /** + * Gets the string name used by CTROS for a service + * @return Port name of service + */ + virtual std::string GetPort() { + return "[UNKNOWN SERVICE PORT]"; + } + + /** + * Called when svcSendSyncRequest is called, loads command buffer and executes comand + * @return Return result of svcSendSyncRequest passed back to user app + */ + virtual Syscall::Result Sync() = 0; + +private: + u32 m_uid; +}; + +} // namespace diff --git a/src/core/hle/syscall.cpp b/src/core/hle/syscall.cpp new file mode 100644 index 000000000..98155dc8e --- /dev/null +++ b/src/core/hle/syscall.cpp @@ -0,0 +1,153 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include + +#include "core/hle/function_wrappers.h" +#include "core/hle/syscall.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace Syscall + +namespace Syscall { + +Result SVC_ConnectToPort(void* out, const char* port_name) { + NOTICE_LOG(OSHLE, "svcConnectToPort called, port_name: %s", port_name); + return 0; +} + +const HLE::FunctionDef Syscall_Table[] = { + {0x00, NULL, "Unknown"}, + {0x01, NULL, "svcControlMemory"}, + {0x02, NULL, "svcQueryMemory"}, + {0x03, NULL, "svcExitProcess"}, + {0x04, NULL, "svcGetProcessAffinityMask"}, + {0x05, NULL, "svcSetProcessAffinityMask"}, + {0x06, NULL, "svcGetProcessIdealProcessor"}, + {0x07, NULL, "svcSetProcessIdealProcessor"}, + {0x08, NULL, "svcCreateThread"}, + {0x09, NULL, "svcExitThread"}, + {0x0A, NULL, "svcSleepThread"}, + {0x0B, NULL, "svcGetThreadPriority"}, + {0x0C, NULL, "svcSetThreadPriority"}, + {0x0D, NULL, "svcGetThreadAffinityMask"}, + {0x0E, NULL, "svcSetThreadAffinityMask"}, + {0x0F, NULL, "svcGetThreadIdealProcessor"}, + {0x10, NULL, "svcSetThreadIdealProcessor"}, + {0x11, NULL, "svcGetCurrentProcessorNumber"}, + {0x12, NULL, "svcRun"}, + {0x13, NULL, "svcCreateMutex"}, + {0x14, NULL, "svcReleaseMutex"}, + {0x15, NULL, "svcCreateSemaphore"}, + {0x16, NULL, "svcReleaseSemaphore"}, + {0x17, NULL, "svcCreateEvent"}, + {0x18, NULL, "svcSignalEvent"}, + {0x19, NULL, "svcClearEvent"}, + {0x1A, NULL, "svcCreateTimer"}, + {0x1B, NULL, "svcSetTimer"}, + {0x1C, NULL, "svcCancelTimer"}, + {0x1D, NULL, "svcClearTimer"}, + {0x1E, NULL, "svcCreateMemoryBlock"}, + {0x1F, NULL, "svcMapMemoryBlock"}, + {0x20, NULL, "svcUnmapMemoryBlock"}, + {0x21, NULL, "svcCreateAddressArbiter"}, + {0x22, NULL, "svcArbitrateAddress"}, + {0x23, NULL, "svcCloseHandle"}, + {0x24, NULL, "svcWaitSynchronization1"}, + {0x25, NULL, "svcWaitSynchronizationN"}, + {0x26, NULL, "svcSignalAndWait"}, + {0x27, NULL, "svcDuplicateHandle"}, + {0x28, NULL, "svcGetSystemTick"}, + {0x29, NULL, "svcGetHandleInfo"}, + {0x2A, NULL, "svcGetSystemInfo"}, + {0x2B, NULL, "svcGetProcessInfo"}, + {0x2C, NULL, "svcGetThreadInfo"}, + {0x2D, WrapI_VC, "svcConnectToPort"}, + {0x2E, NULL, "svcSendSyncRequest1"}, + {0x2F, NULL, "svcSendSyncRequest2"}, + {0x30, NULL, "svcSendSyncRequest3"}, + {0x31, NULL, "svcSendSyncRequest4"}, + {0x32, NULL, "svcSendSyncRequest"}, + {0x33, NULL, "svcOpenProcess"}, + {0x34, NULL, "svcOpenThread"}, + {0x35, NULL, "svcGetProcessId"}, + {0x36, NULL, "svcGetProcessIdOfThread"}, + {0x37, NULL, "svcGetThreadId"}, + {0x38, NULL, "svcGetResourceLimit"}, + {0x39, NULL, "svcGetResourceLimitLimitValues"}, + {0x3A, NULL, "svcGetResourceLimitCurrentValues"}, + {0x3B, NULL, "svcGetThreadContext"}, + {0x3C, NULL, "svcBreak"}, + {0x3D, NULL, "svcOutputDebugString"}, + {0x3E, NULL, "svcControlPerformanceCounter"}, + {0x3F, NULL, "Unknown"}, + {0x40, NULL, "Unknown"}, + {0x41, NULL, "Unknown"}, + {0x42, NULL, "Unknown"}, + {0x43, NULL, "Unknown"}, + {0x44, NULL, "Unknown"}, + {0x45, NULL, "Unknown"}, + {0x46, NULL, "Unknown"}, + {0x47, NULL, "svcCreatePort"}, + {0x48, NULL, "svcCreateSessionToPort"}, + {0x49, NULL, "svcCreateSession"}, + {0x4A, NULL, "svcAcceptSession"}, + {0x4B, NULL, "svcReplyAndReceive1"}, + {0x4C, NULL, "svcReplyAndReceive2"}, + {0x4D, NULL, "svcReplyAndReceive3"}, + {0x4E, NULL, "svcReplyAndReceive4"}, + {0x4F, NULL, "svcReplyAndReceive"}, + {0x50, NULL, "svcBindInterrupt"}, + {0x51, NULL, "svcUnbindInterrupt"}, + {0x52, NULL, "svcInvalidateProcessDataCache"}, + {0x53, NULL, "svcStoreProcessDataCache"}, + {0x54, NULL, "svcFlushProcessDataCache"}, + {0x55, NULL, "svcStartInterProcessDma"}, + {0x56, NULL, "svcStopDma"}, + {0x57, NULL, "svcGetDmaState"}, + {0x58, NULL, "svcRestartDma"}, + {0x59, NULL, "Unknown"}, + {0x5A, NULL, "Unknown"}, + {0x5B, NULL, "Unknown"}, + {0x5C, NULL, "Unknown"}, + {0x5D, NULL, "Unknown"}, + {0x5E, NULL, "Unknown"}, + {0x5F, NULL, "Unknown"}, + {0x60, NULL, "svcDebugActiveProcess"}, + {0x61, NULL, "svcBreakDebugProcess"}, + {0x62, NULL, "svcTerminateDebugProcess"}, + {0x63, NULL, "svcGetProcessDebugEvent"}, + {0x64, NULL, "svcContinueDebugEvent"}, + {0x65, NULL, "svcGetProcessList"}, + {0x66, NULL, "svcGetThreadList"}, + {0x67, NULL, "svcGetDebugThreadContext"}, + {0x68, NULL, "svcSetDebugThreadContext"}, + {0x69, NULL, "svcQueryDebugProcessMemory"}, + {0x6A, NULL, "svcReadProcessMemory"}, + {0x6B, NULL, "svcWriteProcessMemory"}, + {0x6C, NULL, "svcSetHardwareBreakPoint"}, + {0x6D, NULL, "svcGetDebugThreadParam"}, + {0x6E, NULL, "Unknown"}, + {0x6F, NULL, "Unknown"}, + {0x70, NULL, "svcControlProcessMemory"}, + {0x71, NULL, "svcMapProcessMemory"}, + {0x72, NULL, "svcUnmapProcessMemory"}, + {0x73, NULL, "Unknown"}, + {0x74, NULL, "Unknown"}, + {0x75, NULL, "Unknown"}, + {0x76, NULL, "svcTerminateProcess"}, + {0x77, NULL, "Unknown"}, + {0x78, NULL, "svcCreateResourceLimit"}, + {0x79, NULL, "Unknown"}, + {0x7A, NULL, "Unknown"}, + {0x7B, NULL, "Unknown"}, + {0x7C, NULL, "svcKernelSetState"}, + {0x7D, NULL, "svcQueryProcessMemory"}, +}; + +void Register() { + HLE::RegisterModule("SyscallTable", ARRAY_SIZE(Syscall_Table), Syscall_Table); +} + +} // namespace diff --git a/src/core/hle/syscall.h b/src/core/hle/syscall.h new file mode 100644 index 000000000..7a94e0136 --- /dev/null +++ b/src/core/hle/syscall.h @@ -0,0 +1,19 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include "common/common_types.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace Syscall + +namespace Syscall { + +typedef u32 Handle; +typedef s32 Result; + +void Register(); + +} // namespace -- 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/arm/interpreter/armsupp.cpp | 68 ++++----- src/core/core.vcxproj | 1 + src/core/core.vcxproj.filters | 3 + src/core/hle/hle.cpp | 13 ++ src/core/hle/hle.h | 7 + src/core/hle/service/service.cpp | 115 +++++++++++++++ src/core/hle/service/service.h | 57 +++++++- src/core/hle/syscall.cpp | 266 ++++++++++++++++++----------------- src/core/mem_map.cpp | 3 +- src/core/mem_map.h | 3 +- src/core/mem_map_funcs.cpp | 18 ++- 11 files changed, 386 insertions(+), 168 deletions(-) create mode 100644 src/core/hle/service/service.cpp (limited to 'src/core/core.vcxproj') diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp index a0c866c15..101b9807a 100644 --- a/src/core/arm/interpreter/armsupp.cpp +++ b/src/core/arm/interpreter/armsupp.cpp @@ -19,6 +19,8 @@ #include "armemu.h" //#include "ansidecl.h" #include "skyeye_defs.h" +#include "core/hle/hle.h" + unsigned xscale_cp15_cp_access_allowed (ARMul_State * state, unsigned reg, unsigned cpnum); //extern int skyeye_instr_debug; @@ -734,39 +736,39 @@ ARMword ARMul_MRC (ARMul_State * state, ARMword instr) { unsigned cpab; - ARMword result = 0; - - //printf("SKYEYE ARMul_MRC, CPnum is %x, instr %x\n",CPNum, instr); - if (!CP_ACCESS_ALLOWED (state, CPNum)) { - //chy 2004-07-19 should fix in the future????!!!! - //printf("SKYEYE ARMul_MRC,NOT ALLOWed UndefInstr CPnum is %x, instr %x\n",CPNum, instr); - ARMul_UndefInstr (state, instr); - return -1; - } - - cpab = (state->MRC[CPNum]) (state, ARMul_FIRST, instr, &result); - while (cpab == ARMul_BUSY) { - ARMul_Icycles (state, 1, 0); - if (IntPending (state)) { - cpab = (state->MRC[CPNum]) (state, ARMul_INTERRUPT, - instr, 0); - return (0); - } - else - cpab = (state->MRC[CPNum]) (state, ARMul_BUSY, instr, - &result); - } - if (cpab == ARMul_CANT) { - printf ("SKYEYE ARMul_MRC,CANT UndefInstr CPnum is %x, instr %x\n", CPNum, instr); - ARMul_Abort (state, ARMul_UndefinedInstrV); - /* Parent will destroy the flags otherwise. */ - result = ECC; - } - else { - BUSUSEDINCPCN; - ARMul_Ccycles (state, 1, 0); - ARMul_Icycles (state, 1, 0); - } + ARMword result = HLE::CallGetThreadCommandBuffer(); + + ////printf("SKYEYE ARMul_MRC, CPnum is %x, instr %x\n",CPNum, instr); + //if (!CP_ACCESS_ALLOWED (state, CPNum)) { + // //chy 2004-07-19 should fix in the future????!!!! + // //printf("SKYEYE ARMul_MRC,NOT ALLOWed UndefInstr CPnum is %x, instr %x\n",CPNum, instr); + // ARMul_UndefInstr (state, instr); + // return -1; + //} + + //cpab = (state->MRC[CPNum]) (state, ARMul_FIRST, instr, &result); + //while (cpab == ARMul_BUSY) { + // ARMul_Icycles (state, 1, 0); + // if (IntPending (state)) { + // cpab = (state->MRC[CPNum]) (state, ARMul_INTERRUPT, + // instr, 0); + // return (0); + // } + // else + // cpab = (state->MRC[CPNum]) (state, ARMul_BUSY, instr, + // &result); + //} + //if (cpab == ARMul_CANT) { + // printf ("SKYEYE ARMul_MRC,CANT UndefInstr CPnum is %x, instr %x\n", CPNum, instr); + // ARMul_Abort (state, ARMul_UndefinedInstrV); + // /* Parent will destroy the flags otherwise. */ + // result = ECC; + //} + //else { + // BUSUSEDINCPCN; + // ARMul_Ccycles (state, 1, 0); + // ARMul_Icycles (state, 1, 0); + //} return result; } diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 10ecca596..b10ae8684 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -153,6 +153,7 @@ + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index d450224a4..4844e78b8 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -87,6 +87,9 @@ hle + + hle\service + diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp index 32aff0eb5..3d2c53954 100644 --- a/src/core/hle/hle.cpp +++ b/src/core/hle/hle.cpp @@ -4,8 +4,10 @@ #include +#include "core/mem_map.h" #include "core/hle/hle.h" #include "core/hle/syscall.h" +#include "core/hle/service/service.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -35,6 +37,14 @@ void CallSyscall(u32 opcode) { } } +/// Returns the coprocessor (in this case, syscore) command buffer pointer +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; +} + void RegisterModule(std::string name, int num_functions, const FunctionDef* func_table) { ModuleDef module = {name, num_functions, func_table}; g_module_db.push_back(module); @@ -45,7 +55,10 @@ void RegisterAllModules() { } void Init() { + Service::Init(); + RegisterAllModules(); + NOTICE_LOG(HLE, "initialized OK"); } diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h index 9466be540..2bd1f99a2 100644 --- a/src/core/hle/hle.h +++ b/src/core/hle/hle.h @@ -16,6 +16,11 @@ namespace HLE { +enum { + OS_THREAD_COMMAND_BUFFER_ADDR = 0xA0004000, +}; + +typedef u32 Addr; typedef void (*Func)(); struct FunctionDef { @@ -34,6 +39,8 @@ void RegisterModule(std::string name, int num_functions, const FunctionDef *func void CallSyscall(u32 opcode); +Addr CallGetThreadCommandBuffer(); + void Init(); void Shutdown(); diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp new file mode 100644 index 000000000..4bc96cc18 --- /dev/null +++ b/src/core/hle/service/service.cpp @@ -0,0 +1,115 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "common/common.h" +#include "common/log.h" + +#include "core/hle/service/service.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace Service + +namespace Service { + +Manager* g_manager = NULL; ///< Service manager + +Manager::Manager() { +} + +Manager::~Manager() { + for(Interface* service : m_services) { + DeleteService(service->GetPortName()); + } +} + +/// Add a service to the manager (does not create it though) +void Manager::AddService(Interface* service) { + int index = m_services.size(); + u32 new_uid = GetUIDFromIndex(index); + + m_services.push_back(service); + + m_port_map[service->GetPortName()] = new_uid; + service->m_uid = new_uid; +} + +/// Removes a service from the manager, also frees memory +void Manager::DeleteService(std::string port_name) { + auto service = FetchFromPortName(port_name); + + m_services.erase(m_services.begin() + GetIndexFromUID(service->m_uid)); + m_port_map.erase(port_name); + + delete service; +} + +/// Get a Service Interface from its UID +Interface* Manager::FetchFromUID(u32 uid) { + int index = GetIndexFromUID(uid); + if (index < (int)m_services.size()) { + return m_services[index]; + } + return NULL; +} + +/// Get a Service Interface from its port +Interface* Manager::FetchFromPortName(std::string port_name) { + auto itr = m_port_map.find(port_name); + if (itr == m_port_map.end()) { + return NULL; + } + return FetchFromUID(itr->second); +} + +class Interface_SRV : public Interface { +public: + + Interface_SRV() { + } + + ~Interface_SRV() { + } + + /** + * Gets the string name used by CTROS for a service + * @return String name of service + */ + std::string GetName() { + return "ServiceManager"; + } + + /** + * Gets the string name used by CTROS for a service + * @return Port name of service + */ + std::string GetPortName() { + return "srv:"; + } + + /** + * Called when svcSendSyncRequest is called, loads command buffer and executes comand + * @return Return result of svcSendSyncRequest passed back to user app + */ + Syscall::Result Sync() { + ERROR_LOG(HLE, "Unimplemented function ServiceManager::Sync"); + return -1; + } + +}; + +/// Initialize ServiceManager +void Init() { + g_manager = new Manager; + g_manager->AddService(new Interface_SRV); + NOTICE_LOG(HLE, "ServiceManager initialized OK"); +} + +/// Shutdown ServiceManager +void Shutdown() { + delete g_manager; + NOTICE_LOG(HLE, "ServiceManager shutdown OK"); +} + + +} diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index f15099982..3fd855dee 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -4,6 +4,8 @@ #pragma once +#include +#include #include #include "common/common_types.h" @@ -14,10 +16,13 @@ namespace Service { -typedef s32 NativeUID; +typedef s32 NativeUID; ///< Native handle for a service + +class Manager; /// Interface to a CTROS service class Interface { + friend class Manager; public: virtual ~Interface() { @@ -43,7 +48,7 @@ public: * Gets the string name used by CTROS for a service * @return Port name of service */ - virtual std::string GetPort() { + virtual std::string GetPortName() { return "[UNKNOWN SERVICE PORT]"; } @@ -57,4 +62,52 @@ private: u32 m_uid; }; +/// Simple class to manage accessing services from ports and UID handles +class Manager { + +public: + Manager(); + + ~Manager(); + + /// Add a service to the manager (does not create it though) + void AddService(Interface* service); + + /// Removes a service from the manager (does not delete it though) + void DeleteService(std::string port_name); + + /// Get a Service Interface from its UID + Interface* FetchFromUID(u32 uid); + + /// Get a Service Interface from its port + Interface* FetchFromPortName(std::string port_name); + +private: + + /// Convert an index into m_services vector into a UID + static u32 GetUIDFromIndex(const int index) { + return index | 0x10000000; + } + + /// Convert a UID into an index into m_services + static int GetIndexFromUID(const u32 uid) { + return uid & 0x0FFFFFFF; + } + + std::vector m_services; + std::map m_port_map; + + DISALLOW_COPY_AND_ASSIGN(Manager); +}; + +/// Initialize ServiceManager +void Init(); + +/// Shutdown ServiceManager +void Shutdown(); + + +extern Manager* g_manager; ///< Service manager + + } // namespace diff --git a/src/core/hle/syscall.cpp b/src/core/hle/syscall.cpp index 98155dc8e..8225f168b 100644 --- a/src/core/hle/syscall.cpp +++ b/src/core/hle/syscall.cpp @@ -6,144 +6,154 @@ #include "core/hle/function_wrappers.h" #include "core/hle/syscall.h" +#include "core/hle/service/service.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Namespace Syscall namespace Syscall { -Result SVC_ConnectToPort(void* out, const char* port_name) { - NOTICE_LOG(OSHLE, "svcConnectToPort called, port_name: %s", port_name); +/// Connect to an OS service given the port name, returns the handle to the port to out +Result ConnectToPort(void* out, const char* port_name) { + Service::Interface* service = Service::g_manager->FetchFromPortName(port_name); + Core::g_app_core->SetReg(1, service->GetUID()); + return 0; +} + +/// Synchronize to an OS service +Result SendSyncRequest(Handle session) { + Service::Interface* service = Service::g_manager->FetchFromUID(session); + service->Sync(); return 0; } const HLE::FunctionDef Syscall_Table[] = { - {0x00, NULL, "Unknown"}, - {0x01, NULL, "svcControlMemory"}, - {0x02, NULL, "svcQueryMemory"}, - {0x03, NULL, "svcExitProcess"}, - {0x04, NULL, "svcGetProcessAffinityMask"}, - {0x05, NULL, "svcSetProcessAffinityMask"}, - {0x06, NULL, "svcGetProcessIdealProcessor"}, - {0x07, NULL, "svcSetProcessIdealProcessor"}, - {0x08, NULL, "svcCreateThread"}, - {0x09, NULL, "svcExitThread"}, - {0x0A, NULL, "svcSleepThread"}, - {0x0B, NULL, "svcGetThreadPriority"}, - {0x0C, NULL, "svcSetThreadPriority"}, - {0x0D, NULL, "svcGetThreadAffinityMask"}, - {0x0E, NULL, "svcSetThreadAffinityMask"}, - {0x0F, NULL, "svcGetThreadIdealProcessor"}, - {0x10, NULL, "svcSetThreadIdealProcessor"}, - {0x11, NULL, "svcGetCurrentProcessorNumber"}, - {0x12, NULL, "svcRun"}, - {0x13, NULL, "svcCreateMutex"}, - {0x14, NULL, "svcReleaseMutex"}, - {0x15, NULL, "svcCreateSemaphore"}, - {0x16, NULL, "svcReleaseSemaphore"}, - {0x17, NULL, "svcCreateEvent"}, - {0x18, NULL, "svcSignalEvent"}, - {0x19, NULL, "svcClearEvent"}, - {0x1A, NULL, "svcCreateTimer"}, - {0x1B, NULL, "svcSetTimer"}, - {0x1C, NULL, "svcCancelTimer"}, - {0x1D, NULL, "svcClearTimer"}, - {0x1E, NULL, "svcCreateMemoryBlock"}, - {0x1F, NULL, "svcMapMemoryBlock"}, - {0x20, NULL, "svcUnmapMemoryBlock"}, - {0x21, NULL, "svcCreateAddressArbiter"}, - {0x22, NULL, "svcArbitrateAddress"}, - {0x23, NULL, "svcCloseHandle"}, - {0x24, NULL, "svcWaitSynchronization1"}, - {0x25, NULL, "svcWaitSynchronizationN"}, - {0x26, NULL, "svcSignalAndWait"}, - {0x27, NULL, "svcDuplicateHandle"}, - {0x28, NULL, "svcGetSystemTick"}, - {0x29, NULL, "svcGetHandleInfo"}, - {0x2A, NULL, "svcGetSystemInfo"}, - {0x2B, NULL, "svcGetProcessInfo"}, - {0x2C, NULL, "svcGetThreadInfo"}, - {0x2D, WrapI_VC, "svcConnectToPort"}, - {0x2E, NULL, "svcSendSyncRequest1"}, - {0x2F, NULL, "svcSendSyncRequest2"}, - {0x30, NULL, "svcSendSyncRequest3"}, - {0x31, NULL, "svcSendSyncRequest4"}, - {0x32, NULL, "svcSendSyncRequest"}, - {0x33, NULL, "svcOpenProcess"}, - {0x34, NULL, "svcOpenThread"}, - {0x35, NULL, "svcGetProcessId"}, - {0x36, NULL, "svcGetProcessIdOfThread"}, - {0x37, NULL, "svcGetThreadId"}, - {0x38, NULL, "svcGetResourceLimit"}, - {0x39, NULL, "svcGetResourceLimitLimitValues"}, - {0x3A, NULL, "svcGetResourceLimitCurrentValues"}, - {0x3B, NULL, "svcGetThreadContext"}, - {0x3C, NULL, "svcBreak"}, - {0x3D, NULL, "svcOutputDebugString"}, - {0x3E, NULL, "svcControlPerformanceCounter"}, - {0x3F, NULL, "Unknown"}, - {0x40, NULL, "Unknown"}, - {0x41, NULL, "Unknown"}, - {0x42, NULL, "Unknown"}, - {0x43, NULL, "Unknown"}, - {0x44, NULL, "Unknown"}, - {0x45, NULL, "Unknown"}, - {0x46, NULL, "Unknown"}, - {0x47, NULL, "svcCreatePort"}, - {0x48, NULL, "svcCreateSessionToPort"}, - {0x49, NULL, "svcCreateSession"}, - {0x4A, NULL, "svcAcceptSession"}, - {0x4B, NULL, "svcReplyAndReceive1"}, - {0x4C, NULL, "svcReplyAndReceive2"}, - {0x4D, NULL, "svcReplyAndReceive3"}, - {0x4E, NULL, "svcReplyAndReceive4"}, - {0x4F, NULL, "svcReplyAndReceive"}, - {0x50, NULL, "svcBindInterrupt"}, - {0x51, NULL, "svcUnbindInterrupt"}, - {0x52, NULL, "svcInvalidateProcessDataCache"}, - {0x53, NULL, "svcStoreProcessDataCache"}, - {0x54, NULL, "svcFlushProcessDataCache"}, - {0x55, NULL, "svcStartInterProcessDma"}, - {0x56, NULL, "svcStopDma"}, - {0x57, NULL, "svcGetDmaState"}, - {0x58, NULL, "svcRestartDma"}, - {0x59, NULL, "Unknown"}, - {0x5A, NULL, "Unknown"}, - {0x5B, NULL, "Unknown"}, - {0x5C, NULL, "Unknown"}, - {0x5D, NULL, "Unknown"}, - {0x5E, NULL, "Unknown"}, - {0x5F, NULL, "Unknown"}, - {0x60, NULL, "svcDebugActiveProcess"}, - {0x61, NULL, "svcBreakDebugProcess"}, - {0x62, NULL, "svcTerminateDebugProcess"}, - {0x63, NULL, "svcGetProcessDebugEvent"}, - {0x64, NULL, "svcContinueDebugEvent"}, - {0x65, NULL, "svcGetProcessList"}, - {0x66, NULL, "svcGetThreadList"}, - {0x67, NULL, "svcGetDebugThreadContext"}, - {0x68, NULL, "svcSetDebugThreadContext"}, - {0x69, NULL, "svcQueryDebugProcessMemory"}, - {0x6A, NULL, "svcReadProcessMemory"}, - {0x6B, NULL, "svcWriteProcessMemory"}, - {0x6C, NULL, "svcSetHardwareBreakPoint"}, - {0x6D, NULL, "svcGetDebugThreadParam"}, - {0x6E, NULL, "Unknown"}, - {0x6F, NULL, "Unknown"}, - {0x70, NULL, "svcControlProcessMemory"}, - {0x71, NULL, "svcMapProcessMemory"}, - {0x72, NULL, "svcUnmapProcessMemory"}, - {0x73, NULL, "Unknown"}, - {0x74, NULL, "Unknown"}, - {0x75, NULL, "Unknown"}, - {0x76, NULL, "svcTerminateProcess"}, - {0x77, NULL, "Unknown"}, - {0x78, NULL, "svcCreateResourceLimit"}, - {0x79, NULL, "Unknown"}, - {0x7A, NULL, "Unknown"}, - {0x7B, NULL, "Unknown"}, - {0x7C, NULL, "svcKernelSetState"}, - {0x7D, NULL, "svcQueryProcessMemory"}, + {0x00, NULL, "Unknown"}, + {0x01, NULL, "ControlMemory"}, + {0x02, NULL, "QueryMemory"}, + {0x03, NULL, "ExitProcess"}, + {0x04, NULL, "GetProcessAffinityMask"}, + {0x05, NULL, "SetProcessAffinityMask"}, + {0x06, NULL, "GetProcessIdealProcessor"}, + {0x07, NULL, "SetProcessIdealProcessor"}, + {0x08, NULL, "CreateThread"}, + {0x09, NULL, "ExitThread"}, + {0x0A, NULL, "SleepThread"}, + {0x0B, NULL, "GetThreadPriority"}, + {0x0C, NULL, "SetThreadPriority"}, + {0x0D, NULL, "GetThreadAffinityMask"}, + {0x0E, NULL, "SetThreadAffinityMask"}, + {0x0F, NULL, "GetThreadIdealProcessor"}, + {0x10, NULL, "SetThreadIdealProcessor"}, + {0x11, NULL, "GetCurrentProcessorNumber"}, + {0x12, NULL, "Run"}, + {0x13, NULL, "CreateMutex"}, + {0x14, NULL, "ReleaseMutex"}, + {0x15, NULL, "CreateSemaphore"}, + {0x16, NULL, "ReleaseSemaphore"}, + {0x17, NULL, "CreateEvent"}, + {0x18, NULL, "SignalEvent"}, + {0x19, NULL, "ClearEvent"}, + {0x1A, NULL, "CreateTimer"}, + {0x1B, NULL, "SetTimer"}, + {0x1C, NULL, "CancelTimer"}, + {0x1D, NULL, "ClearTimer"}, + {0x1E, NULL, "CreateMemoryBlock"}, + {0x1F, NULL, "MapMemoryBlock"}, + {0x20, NULL, "UnmapMemoryBlock"}, + {0x21, NULL, "CreateAddressArbiter"}, + {0x22, NULL, "ArbitrateAddress"}, + {0x23, NULL, "CloseHandle"}, + {0x24, NULL, "WaitSynchronization1"}, + {0x25, NULL, "WaitSynchronizationN"}, + {0x26, NULL, "SignalAndWait"}, + {0x27, NULL, "DuplicateHandle"}, + {0x28, NULL, "GetSystemTick"}, + {0x29, NULL, "GetHandleInfo"}, + {0x2A, NULL, "GetSystemInfo"}, + {0x2B, NULL, "GetProcessInfo"}, + {0x2C, NULL, "GetThreadInfo"}, + {0x2D, WrapI_VC, "ConnectToPort"}, + {0x2E, NULL, "SendSyncRequest1"}, + {0x2F, NULL, "SendSyncRequest2"}, + {0x30, NULL, "SendSyncRequest3"}, + {0x31, NULL, "SendSyncRequest4"}, + {0x32, WrapI_U, "SendSyncRequest"}, + {0x33, NULL, "OpenProcess"}, + {0x34, NULL, "OpenThread"}, + {0x35, NULL, "GetProcessId"}, + {0x36, NULL, "GetProcessIdOfThread"}, + {0x37, NULL, "GetThreadId"}, + {0x38, NULL, "GetResourceLimit"}, + {0x39, NULL, "GetResourceLimitLimitValues"}, + {0x3A, NULL, "GetResourceLimitCurrentValues"}, + {0x3B, NULL, "GetThreadContext"}, + {0x3C, NULL, "Break"}, + {0x3D, NULL, "OutputDebugString"}, + {0x3E, NULL, "ControlPerformanceCounter"}, + {0x3F, NULL, "Unknown"}, + {0x40, NULL, "Unknown"}, + {0x41, NULL, "Unknown"}, + {0x42, NULL, "Unknown"}, + {0x43, NULL, "Unknown"}, + {0x44, NULL, "Unknown"}, + {0x45, NULL, "Unknown"}, + {0x46, NULL, "Unknown"}, + {0x47, NULL, "CreatePort"}, + {0x48, NULL, "CreateSessionToPort"}, + {0x49, NULL, "CreateSession"}, + {0x4A, NULL, "AcceptSession"}, + {0x4B, NULL, "ReplyAndReceive1"}, + {0x4C, NULL, "ReplyAndReceive2"}, + {0x4D, NULL, "ReplyAndReceive3"}, + {0x4E, NULL, "ReplyAndReceive4"}, + {0x4F, NULL, "ReplyAndReceive"}, + {0x50, NULL, "BindInterrupt"}, + {0x51, NULL, "UnbindInterrupt"}, + {0x52, NULL, "InvalidateProcessDataCache"}, + {0x53, NULL, "StoreProcessDataCache"}, + {0x54, NULL, "FlushProcessDataCache"}, + {0x55, NULL, "StartInterProcessDma"}, + {0x56, NULL, "StopDma"}, + {0x57, NULL, "GetDmaState"}, + {0x58, NULL, "RestartDma"}, + {0x59, NULL, "Unknown"}, + {0x5A, NULL, "Unknown"}, + {0x5B, NULL, "Unknown"}, + {0x5C, NULL, "Unknown"}, + {0x5D, NULL, "Unknown"}, + {0x5E, NULL, "Unknown"}, + {0x5F, NULL, "Unknown"}, + {0x60, NULL, "DebugActiveProcess"}, + {0x61, NULL, "BreakDebugProcess"}, + {0x62, NULL, "TerminateDebugProcess"}, + {0x63, NULL, "GetProcessDebugEvent"}, + {0x64, NULL, "ContinueDebugEvent"}, + {0x65, NULL, "GetProcessList"}, + {0x66, NULL, "GetThreadList"}, + {0x67, NULL, "GetDebugThreadContext"}, + {0x68, NULL, "SetDebugThreadContext"}, + {0x69, NULL, "QueryDebugProcessMemory"}, + {0x6A, NULL, "ReadProcessMemory"}, + {0x6B, NULL, "WriteProcessMemory"}, + {0x6C, NULL, "SetHardwareBreakPoint"}, + {0x6D, NULL, "GetDebugThreadParam"}, + {0x6E, NULL, "Unknown"}, + {0x6F, NULL, "Unknown"}, + {0x70, NULL, "ControlProcessMemory"}, + {0x71, NULL, "MapProcessMemory"}, + {0x72, NULL, "UnmapProcessMemory"}, + {0x73, NULL, "Unknown"}, + {0x74, NULL, "Unknown"}, + {0x75, NULL, "Unknown"}, + {0x76, NULL, "TerminateProcess"}, + {0x77, NULL, "Unknown"}, + {0x78, NULL, "CreateResourceLimit"}, + {0x79, NULL, "Unknown"}, + {0x7A, NULL, "Unknown"}, + {0x7B, NULL, "Unknown"}, + {0x7C, NULL, "KernelSetState"}, + {0x7D, NULL, "QueryProcessMemory"}, }; void Register() { diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp index a5865d785..5b5c57fca 100644 --- a/src/core/mem_map.cpp +++ b/src/core/mem_map.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Citra Emulator Project + // Copyright 2014 Citra Emulator Project // Licensed under GPLv2 // Refer to the license.txt file included. @@ -12,7 +12,6 @@ namespace Memory { - u8* g_base = NULL; ///< The base pointer to the auto-mirrored arena. MemArena g_arena; ///< The MemArena class 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), }; //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 00719445f..f35e25caf 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -6,6 +6,7 @@ #include "core/mem_map.h" #include "core/hw/hw.h" +#include "hle/hle.h" namespace Memory { @@ -15,9 +16,16 @@ inline void _Read(T &var, const u32 addr) { // TODO: Make sure this represents the mirrors in a correct way. // Could just do a base-relative read, too.... TODO + + // 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); + // Hardware I/O register reads // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space - if ((addr & 0xFF000000) == 0x10000000 || (addr & 0xFF000000) == 0x1E000000) { + } else if ((addr & 0xFF000000) == 0x10000000 || (addr & 0xFF000000) == 0x1E000000) { HW::Read(var, addr); // FCRAM virtual address reads @@ -47,9 +55,15 @@ inline void _Read(T &var, const u32 addr) { template 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); + // Hardware I/O register writes // 0x10XXXXXX- is physical address space, 0x1EXXXXXX is virtual address space - if ((addr & 0xFF000000) == 0x10000000 || (addr & 0xFF000000) == 0x1E000000) { + } else if ((addr & 0xFF000000) == 0x10000000 || (addr & 0xFF000000) == 0x1E000000) { HW::Write(addr, data); // ExeFS:/.code is loaded here: -- cgit v1.2.3 From 9f4d677cdf1fcc937d2e68cae3f52f53c24582f8 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 13 Apr 2014 16:33:45 -0400 Subject: added framework for APT service (application and title launching service) --- src/core/core.vcxproj | 2 ++ src/core/core.vcxproj.filters | 6 ++++ src/core/hle/hle.cpp | 1 + src/core/hle/service/apt.cpp | 21 ++++++++++++ src/core/hle/service/apt.h | 71 ++++++++++++++++++++++++++++++++++++++++ src/core/hle/service/service.cpp | 29 +++++++++++++--- src/core/hle/service/service.h | 1 + 7 files changed, 126 insertions(+), 5 deletions(-) create mode 100644 src/core/hle/service/apt.cpp create mode 100644 src/core/hle/service/apt.h (limited to 'src/core/core.vcxproj') diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index b10ae8684..be750b24f 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -153,6 +153,7 @@ + @@ -187,6 +188,7 @@ + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 4844e78b8..29d680935 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -90,6 +90,9 @@ hle\service + + hle\service + @@ -175,6 +178,9 @@ hle + + hle\service + diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp index a4ab61c0c..c173b82de 100644 --- a/src/core/hle/hle.cpp +++ b/src/core/hle/hle.cpp @@ -42,6 +42,7 @@ u8 *GetPointer(const u32 addr) { return g_command_buffer + (addr & CMD_BUFFER_MASK); } else { ERROR_LOG(HLE, "unknown pointer from address %08X", addr); + return 0; } } diff --git a/src/core/hle/service/apt.cpp b/src/core/hle/service/apt.cpp new file mode 100644 index 000000000..9ab5a361c --- /dev/null +++ b/src/core/hle/service/apt.cpp @@ -0,0 +1,21 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + + +#include "common/log.h" +#include "core/hle/service/apt.h" + + + + +namespace Service { + + +Syscall::Result APT::Sync() { + NOTICE_LOG(HLE, "APT::Sync - Initialize"); + return 0; +} + + +} diff --git a/src/core/hle/service/apt.h b/src/core/hle/service/apt.h new file mode 100644 index 000000000..05c544378 --- /dev/null +++ b/src/core/hle/service/apt.h @@ -0,0 +1,71 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include "core/hle/service/service.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace Service + +namespace Service { + +// Application and title launching service. These services handle signaling for home/power button as +// well. Only one session for either APT service can be open at a time, normally processes close the +// service handle immediately once finished using the service. The commands for APT:U and APT:S are +// exactly the same, however certain commands are only accessible with APT:S(NS module will call +// svcBreak when the command isn't accessible). See http://3dbrew.org/wiki/NS#APT_Services. + +class APT : public Interface { +public: + + APT() { + } + + ~APT() { + } + + enum { + CMD_OFFSET = 0x00000080, + + CMD_HEADER_INIT = 0x00020080, ///< Initialize service + CMD_HEADER_GET_LOCK_HANDLE = 0x00010040, ///< Get service Mutex + CMD_HEADER_ENABLE = 0x00030040, ///< Enable service + CMD_HEADER_INQUIRE_NOTIFICATION = 0x000B0040, ///< Inquire notification + CMD_HEADER_PREPARE_TO_JUMP_TO_HOME_MENU = 0x002B0000, ///< Prepare to jump to home menu + CMD_HEADER_JUMP_TO_HOME_MENU = 0x002C0044, ///< Jump to home menu + CMD_HEADER_NOTIFY_TO_WAIT = 0x00430040, ///< Notify to wait + CMD_HEADER_APPLET_UTILITY = 0x004B00C2, ///< Applet utility + CMD_HEADER_GLANCE_PARAMETER = 0x000E0080, ///< Glance parameter + CMD_HEADER_RECEIVE_PARAMETER = 0x000D0080, ///< Receive parameter + CMD_HEADER_REPLY_SLEEP_QUERY = 0x003E0080, ///< Reply sleep query + CMD_HEADER_PREPARE_TO_CLOSE_APP = 0x00220040, ///< Prepare to close application + CMD_HEADER_CLOSE_APP = 0x00270044, ///< Close application + }; + + /** + * Gets the string name used by CTROS for the APT service + * @return String name of service + */ + std::string GetName() const { + return "APT"; + } + + /** + * Gets the string port name used by CTROS for the APT service + * @return Port name of service + */ + std::string GetPortName() const { + return "APT:U"; + } + + /** + * Called when svcSendSyncRequest is called, loads command buffer and executes comand + * @return Return result of svcSendSyncRequest passed back to user app + */ + virtual Syscall::Result Sync(); + +}; + +} // namespace diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index b0b2b7b35..b2470d814 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -7,6 +7,7 @@ #include "core/hle/hle.h" #include "core/hle/service/service.h" +#include "core/hle/service/apt.h" namespace Service { @@ -104,19 +105,36 @@ public: */ Syscall::Result Sync() { u32 header = 0; - HLE::Read(header, (HLE::CMD_BUFFER_ADDR + CMD_OFFSET)); + Syscall::Result res = 0; + + u32* cmd_buff = (u32*)HLE::GetPointer(HLE::CMD_BUFFER_ADDR + CMD_OFFSET); + + switch (cmd_buff[0]) { - switch (header) { case CMD_HEADER_INIT: - NOTICE_LOG(HLE, "SRV::Sync - Initialize"); + NOTICE_LOG(OSHLE, "SRV::Sync - Initialize"); break; case CMD_HEADER_GET_HANDLE: - NOTICE_LOG(HLE, "SRV::Sync - GetHandle, port: %s", HLE::GetCharPointer(HLE::CMD_BUFFER_ADDR + CMD_OFFSET + 4)); + const char* port_name = (const char*)&cmd_buff[1]; + Interface* service = g_manager->FetchFromPortName(port_name); + + NOTICE_LOG(OSHLE, "SRV::Sync - GetHandle - port: %s, handle: 0x%08X", port_name, + service->GetUID()); + + if (NULL != service) { + cmd_buff[3] = service->GetUID(); + } else { + ERROR_LOG(OSHLE, "Service %s does not exist", port_name); + res = -1; + } + break; } - return 0; + cmd_buff[1] = res; + + return res; } }; @@ -128,6 +146,7 @@ public: void Init() { g_manager = new Manager; g_manager->AddService(new SRV); + g_manager->AddService(new APT); NOTICE_LOG(HLE, "Services initialized OK"); } diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 3cad6c642..365583ed2 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -8,6 +8,7 @@ #include #include +#include "common/common.h" #include "common/common_types.h" #include "core/hle/syscall.h" -- cgit v1.2.3 From 7ec5950bc4c8e4a786df1f4c3392d7b5332d1613 Mon Sep 17 00:00:00 2001 From: bunnei Date: Tue, 15 Apr 2014 22:40:19 -0400 Subject: - extracted srv: calls from service.cpp and put in its own module - added function tables for service calls - lots of refactoring --- src/core/core.vcxproj | 2 + src/core/core.vcxproj.filters | 6 +++ src/core/hle/service/apt.cpp | 91 +++++++++++++++++++++++++++++++++++++--- src/core/hle/service/apt.h | 17 ++------ src/core/hle/service/service.cpp | 84 ++----------------------------------- src/core/hle/service/service.h | 19 +++++---- 6 files changed, 113 insertions(+), 106 deletions(-) (limited to 'src/core/core.vcxproj') diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index be750b24f..da3cc7a26 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -155,6 +155,7 @@ + @@ -190,6 +191,7 @@ + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 29d680935..fa20ab686 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -93,6 +93,9 @@ hle\service + + hle\service + @@ -181,6 +184,9 @@ hle\service + + hle\service + diff --git a/src/core/hle/service/apt.cpp b/src/core/hle/service/apt.cpp index 5e37b838a..b1e49db97 100644 --- a/src/core/hle/service/apt.cpp +++ b/src/core/hle/service/apt.cpp @@ -10,8 +10,89 @@ namespace Service { +const HLE::FunctionDef APT_U_Table[] = { + {0x00010040, NULL, "GetLockHandle"}, + {0x00020080, NULL, "Initialize"}, + {0x00030040, NULL, "Enable"}, + {0x00040040, NULL, "Finalize"}, + {0x00050040, NULL, "GetAppletManInfo"}, + {0x00060040, NULL, "GetAppletInfo"}, + {0x00070000, NULL, "GetLastSignaledAppletId"}, + {0x00080000, NULL, "CountRegisteredApplet"}, + {0x00090040, NULL, "IsRegistered"}, + {0x000A0040, NULL, "GetAttribute"}, + {0x000B0040, NULL, "InquireNotification"}, + {0x000C0104, NULL, "SendParameter"}, + {0x000D0080, NULL, "ReceiveParameter"}, + {0x000E0080, NULL, "GlanceParameter"}, + {0x000F0100, NULL, "CancelParameter"}, + {0x001000C2, NULL, "DebugFunc"}, + {0x001100C0, NULL, "MapProgramIdForDebug"}, + {0x00120040, NULL, "SetHomeMenuAppletIdForDebug"}, + {0x00130000, NULL, "GetPreparationState"}, + {0x00140040, NULL, "SetPreparationState"}, + {0x00150140, NULL, "PrepareToStartApplication"}, + {0x00160040, NULL, "PreloadLibraryApplet"}, + {0x00170040, NULL, "FinishPreloadingLibraryApplet"}, + {0x00180040, NULL, "PrepareToStartLibraryApplet"}, + {0x00190040, NULL, "PrepareToStartSystemApplet"}, + {0x001A0000, NULL, "PrepareToStartNewestHomeMenu"}, + {0x001B00C4, NULL, "StartApplication"}, + {0x001C0000, NULL, "WakeupApplication"}, + {0x001D0000, NULL, "CancelApplication"}, + {0x001E0084, NULL, "StartLibraryApplet"}, + {0x001F0084, NULL, "StartSystemApplet"}, + {0x00200044, NULL, "StartNewestHomeMenu"}, + {0x00210000, NULL, "OrderToCloseApplication"}, + {0x00220040, NULL, "PrepareToCloseApplication"}, + {0x00230040, NULL, "PrepareToJumpToApplication"}, + {0x00240044, NULL, "JumpToApplication"}, + {0x002500C0, NULL, "PrepareToCloseLibraryApplet"}, + {0x00260000, NULL, "PrepareToCloseSystemApplet"}, + {0x00270044, NULL, "CloseApplication"}, + {0x00280044, NULL, "CloseLibraryApplet"}, + {0x00290044, NULL, "CloseSystemApplet"}, + {0x002A0000, NULL, "OrderToCloseSystemApplet"}, + {0x002B0000, NULL, "PrepareToJumpToHomeMenu"}, + {0x002C0044, NULL, "JumpToHomeMenu"}, + {0x002D0000, NULL, "PrepareToLeaveHomeMenu"}, + {0x002E0044, NULL, "LeaveHomeMenu"}, + {0x002F0040, NULL, "PrepareToLeaveResidentApplet"}, + {0x00300044, NULL, "LeaveResidentApplet"}, + {0x00310100, NULL, "PrepareToDoApplicationJump"}, + {0x00320084, NULL, "DoApplicationJump"}, + {0x00330000, NULL, "GetProgramIdOnApplicationJump"}, + {0x00340084, NULL, "SendDeliverArg"}, + {0x00350080, NULL, "ReceiveDeliverArg"}, + {0x00360040, NULL, "LoadSysMenuArg"}, + {0x00370042, NULL, "StoreSysMenuArg"}, + {0x00380040, NULL, "PreloadResidentApplet"}, + {0x00390040, NULL, "PrepareToStartResidentApplet"}, + {0x003A0044, NULL, "StartResidentApplet"}, + {0x003B0040, NULL, "CancelLibraryApplet"}, + {0x003C0042, NULL, "SendDspSleep"}, + {0x003D0042, NULL, "SendDspWakeUp"}, + {0x003E0080, NULL, "ReplySleepQuery"}, + {0x003F0040, NULL, "ReplySleepNotificationComplete"}, + {0x00400042, NULL, "SendCaptureBufferInfo"}, + {0x00410040, NULL, "ReceiveCaptureBufferInfo"}, + {0x00420080, NULL, "SleepSystem"}, + {0x00430040, NULL, "NotifyToWait"}, + {0x00440000, NULL, "GetSharedFont"}, + {0x00450040, NULL, "GetWirelessRebootInfo"}, + {0x00460104, NULL, "Wrap"}, + {0x00470104, NULL, "Unwrap"}, + {0x00480100, NULL, "GetProgramInfo"}, + {0x00490180, NULL, "Reboot"}, + {0x004A0040, NULL, "GetCaptureInfo"}, + {0x004B00C2, NULL, "AppletUtility"}, + {0x004C0000, NULL, "SetFatalErrDispMode"}, + {0x004D0080, NULL, "GetAppletProgramInfo"}, + {0x004E0000, NULL, "HardwareResetAsync"}, +}; + // Returns handle to APT Mutex. Not imlemented. -Syscall::Result APT::GetLockHandle() { +Syscall::Result APT_U::GetLockHandle() { return 0x00000000; } @@ -19,22 +100,22 @@ Syscall::Result APT::GetLockHandle() { * Called when svcSendSyncRequest is called, loads command buffer and executes comand * @return Return result of svcSendSyncRequest passed back to user app */ -Syscall::Result APT::Sync() { +Syscall::Result APT_U::Sync() { Syscall::Result res = 0; u32* cmd_buff = (u32*)HLE::GetPointer(HLE::CMD_BUFFER_ADDR + CMD_OFFSET); switch(cmd_buff[0]) { case CMD_HEADER_INIT: - NOTICE_LOG(OSHLE, "APT::Sync - Initialize"); + NOTICE_LOG(OSHLE, "APT_U::Sync - Initialize"); break; case CMD_HEADER_GET_LOCK_HANDLE: - NOTICE_LOG(OSHLE, "APT::Sync - GetLockHandle"); + NOTICE_LOG(OSHLE, "APT_U::Sync - GetLockHandle"); cmd_buff[5] = GetLockHandle(); break; default: - ERROR_LOG(OSHLE, "APT::Sync - Unknown command 0x%08X", cmd_buff[0]); + ERROR_LOG(OSHLE, "APT_U::Sync - Unknown command 0x%08X", cmd_buff[0]); res = -1; break; } diff --git a/src/core/hle/service/apt.h b/src/core/hle/service/apt.h index 3730bc30e..0e1f205c7 100644 --- a/src/core/hle/service/apt.h +++ b/src/core/hle/service/apt.h @@ -17,13 +17,13 @@ namespace Service { // exactly the same, however certain commands are only accessible with APT:S(NS module will call // svcBreak when the command isn't accessible). See http://3dbrew.org/wiki/NS#APT_Services. -class APT : public Interface { +class APT_U : public Interface { public: - APT() { + APT_U() { } - ~APT() { + ~APT_U() { } enum { @@ -44,14 +44,6 @@ public: CMD_HEADER_CLOSE_APP = 0x00270044, ///< Close application }; - /** - * Gets the string name used by CTROS for the APT service - * @return String name of service - */ - std::string GetName() const { - return "APT"; - } - /** * Gets the string port name used by CTROS for the APT service * @return Port name of service @@ -68,10 +60,9 @@ public: private: - Syscall::Result GetLockHandle(); - + DISALLOW_COPY_AND_ASSIGN(APT_U); }; } // namespace diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 44c7c8627..799dbe90e 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -4,10 +4,12 @@ #include "common/common.h" #include "common/log.h" +#include "common/string_util.h" #include "core/hle/hle.h" #include "core/hle/service/service.h" #include "core/hle/service/apt.h" +#include "core/hle/service/srv.h" namespace Service { @@ -64,84 +66,6 @@ Interface* Manager::FetchFromPortName(std::string port_name) { return FetchFromUID(itr->second); } -//////////////////////////////////////////////////////////////////////////////////////////////////// -// Interface to "SRV" service - -class SRV : public Interface { - -public: - - SRV() { - } - - ~SRV() { - } - - enum { - CMD_OFFSET = 0x80, - CMD_HEADER_INIT = 0x10002, ///< Command header to initialize SRV service - CMD_HEADER_GET_HANDLE = 0x50100, ///< Command header to get handle of other services - }; - - /** - * Gets the string name used by CTROS for a service - * @return String name of service - */ - std::string GetName() const { - return "ServiceManager"; - } - - /** - * Gets the string name used by CTROS for a service - * @return Port name of service - */ - std::string GetPortName() const { - return "srv:"; - } - - /** - * Called when svcSendSyncRequest is called, loads command buffer and executes comand - * @return Return result of svcSendSyncRequest passed back to user app - */ - Syscall::Result Sync() { - Syscall::Result res = 0; - u32* cmd_buff = (u32*)HLE::GetPointer(HLE::CMD_BUFFER_ADDR + CMD_OFFSET); - - switch (cmd_buff[0]) { - - case CMD_HEADER_INIT: - NOTICE_LOG(OSHLE, "SRV::Sync - Initialize"); - break; - - case CMD_HEADER_GET_HANDLE: - { - const char* port_name = (const char*)&cmd_buff[1]; - Interface* service = g_manager->FetchFromPortName(port_name); - - NOTICE_LOG(OSHLE, "SRV::Sync - GetHandle - port: %s, handle: 0x%08X", port_name, - service->GetUID()); - - if (NULL != service) { - cmd_buff[3] = service->GetUID(); - } else { - ERROR_LOG(OSHLE, "Service %s does not exist", port_name); - res = -1; - } - break; - } - - default: - ERROR_LOG(OSHLE, "SRV::Sync - Unknown command 0x%08X", cmd_buff[0]); - res = -1; - break; - } - - cmd_buff[1] = res; - - return res; - } - -}; //////////////////////////////////////////////////////////////////////////////////////////////////// // Module interface @@ -149,8 +73,8 @@ public: /// Initialize ServiceManager void Init() { g_manager = new Manager; - g_manager->AddService(new SRV); - g_manager->AddService(new APT); + g_manager->AddService(new SRV::Interface); + g_manager->AddService(new APT_U); NOTICE_LOG(HLE, "Services initialized OK"); } diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 365583ed2..9368a9f0f 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -37,14 +37,6 @@ public: return (NativeUID)m_uid; } - /** - * Gets the string name used by CTROS for a service - * @return String name of service - */ - virtual std::string GetName() const { - return "[UNKNOWN SERVICE NAME]"; - } - /** * Gets the string name used by CTROS for a service * @return Port name of service @@ -59,8 +51,19 @@ public: */ virtual Syscall::Result Sync() = 0; +protected: + /** + * Registers the functions in the service + */ + void Register(const HLE::FunctionDef* functions, int len) { + for (int i = 0; i < len; i++) { + m_functions[functions[i].id] = functions[i]; + } + } + private: u32 m_uid; + std::map m_functions; }; /// Simple class to manage accessing services from ports and UID handles -- cgit v1.2.3 From 32c3462047d814eada8f3b80ee5ea2cd03936ae0 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 16 Apr 2014 00:03:41 -0400 Subject: - added stubbed out GSP::Gpu service interface - various cleanups/refactors to HLE services --- src/core/core.vcxproj | 2 ++ src/core/core.vcxproj.filters | 6 +++++ src/core/hle/service/apt.h | 2 +- src/core/hle/service/gsp.cpp | 56 ++++++++++++++++++++++++++++++++++++++++ src/core/hle/service/gsp.h | 34 ++++++++++++++++++++++++ src/core/hle/service/service.cpp | 4 +++ src/core/hle/service/service.h | 10 ++++--- src/core/hle/service/srv.cpp | 2 +- src/core/hle/service/srv.h | 2 +- 9 files changed, 111 insertions(+), 7 deletions(-) create mode 100644 src/core/hle/service/gsp.cpp create mode 100644 src/core/hle/service/gsp.h (limited to 'src/core/core.vcxproj') diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index da3cc7a26..931345441 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -154,6 +154,7 @@ + @@ -190,6 +191,7 @@ + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index fa20ab686..e022785ad 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -96,6 +96,9 @@ hle\service + + hle\service + @@ -187,6 +190,9 @@ hle\service + + hle\service + diff --git a/src/core/hle/service/apt.h b/src/core/hle/service/apt.h index 889b12711..9345eabc3 100644 --- a/src/core/hle/service/apt.h +++ b/src/core/hle/service/apt.h @@ -25,7 +25,7 @@ public: ~Interface(); /** - * Gets the string port name used by CTROS for the APT service + * Gets the string port name used by CTROS for the service * @return Port name of service */ std::string GetPortName() const { diff --git a/src/core/hle/service/gsp.cpp b/src/core/hle/service/gsp.cpp new file mode 100644 index 000000000..6dfd76de3 --- /dev/null +++ b/src/core/hle/service/gsp.cpp @@ -0,0 +1,56 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + + +#include "common/log.h" + +#include "core/hle/hle.h" +#include "core/hle/service/gsp.h" + +namespace GSP_GPU { + +const HLE::FunctionDef FunctionTable[] = { + {0x00010082, NULL, "WriteHWRegs"}, + {0x00020084, NULL, "WriteHWRegsWithMask"}, + {0x00030082, NULL, "WriteHWRegRepeat"}, + {0x00040080, NULL, "ReadHWRegs"}, + {0x00050200, NULL, "SetBufferSwap"}, + {0x00060082, NULL, "SetCommandList"}, + {0x000700C2, NULL, "RequestDma"}, + {0x00080082, NULL, "FlushDataCache"}, + {0x00090082, NULL, "InvalidateDataCache"}, + {0x000A0044, NULL, "RegisterInterruptEvents"}, + {0x000B0040, NULL, "SetLcdForceBlack"}, + {0x000C0000, NULL, "TriggerCmdReqQueue"}, + {0x000D0140, NULL, "SetDisplayTransfer"}, + {0x000E0180, NULL, "SetTextureCopy"}, + {0x000F0200, NULL, "SetMemoryFill"}, + {0x00100040, NULL, "SetAxiConfigQoSMode"}, + {0x00110040, NULL, "SetPerfLogMode"}, + {0x00120000, NULL, "GetPerfLog"}, + {0x00130042, NULL, "RegisterInterruptRelayQueue"}, + {0x00140000, NULL, "UnregisterInterruptRelayQueue"}, + {0x00150002, NULL, "TryAcquireRight"}, + {0x00160042, NULL, "AcquireRight"}, + {0x00170000, NULL, "ReleaseRight"}, + {0x00180000, NULL, "ImportDisplayCaptureInfo"}, + {0x00190000, NULL, "SaveVramSysArea"}, + {0x001A0000, NULL, "RestoreVramSysArea"}, + {0x001B0000, NULL, "ResetGpuCore"}, + {0x001C0040, NULL, "SetLedForceOff"}, + {0x001D0040, NULL, "SetTestCommand"}, + {0x001E0080, NULL, "SetInternalPriorities"}, +}; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Interface class + +Interface::Interface() { + Register(FunctionTable, ARRAY_SIZE(FunctionTable)); +} + +Interface::~Interface() { +} + +} // namespace diff --git a/src/core/hle/service/gsp.h b/src/core/hle/service/gsp.h new file mode 100644 index 000000000..0a9d452f6 --- /dev/null +++ b/src/core/hle/service/gsp.h @@ -0,0 +1,34 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include "core/hle/service/service.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace Service + +namespace GSP_GPU { + +class Interface : public Service::Interface { +public: + + Interface(); + + ~Interface(); + + /** + * Gets the string port name used by CTROS for the service + * @return Port name of service + */ + std::string GetPortName() const { + return "gsp::Gpu"; + } + +private: + + DISALLOW_COPY_AND_ASSIGN(Interface); +}; + +} // namespace diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 81a34ed06..f612ff830 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -9,6 +9,7 @@ #include "core/hle/hle.h" #include "core/hle/service/service.h" #include "core/hle/service/apt.h" +#include "core/hle/service/gsp.h" #include "core/hle/service/srv.h" namespace Service { @@ -73,8 +74,11 @@ Interface* Manager::FetchFromPortName(std::string port_name) { /// Initialize ServiceManager void Init() { g_manager = new Manager; + g_manager->AddService(new SRV::Interface); g_manager->AddService(new APT_U::Interface); + g_manager->AddService(new GSP_GPU::Interface); + NOTICE_LOG(HLE, "Services initialized OK"); } diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h index 3b256aa3e..9cbf8b6fa 100644 --- a/src/core/hle/service/service.h +++ b/src/core/hle/service/service.h @@ -19,7 +19,8 @@ namespace Service { typedef s32 NativeUID; ///< Native handle for a service -static const int kCommandHeaderOffset = 0x80; ///< Offset into command buffer of header +static const int kMaxPortSize = 0x08; ///< Maximum size of a port name (8 characters) +static const int kCommandHeaderOffset = 0x80; ///< Offset into command buffer of header class Manager; @@ -59,14 +60,15 @@ public: auto itr = m_functions.find(cmd_buff[0]); if (itr == m_functions.end()) { - ERROR_LOG(OSHLE, "Unknown/unimplemented function: port=%s, command=0x%08X!", + ERROR_LOG(OSHLE, "Unknown/unimplemented function: port = %s, command = 0x%08X!", GetPortName().c_str(), cmd_buff[0]); return -1; } if (itr->second.func == NULL) { - ERROR_LOG(OSHLE, "Unimplemented function: port=%s, name=%s!", + ERROR_LOG(OSHLE, "Unimplemented function: port = %s, name = %s!", GetPortName().c_str(), itr->second.name.c_str()); - } + return -1; + } itr->second.func(); diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp index bb6c08b78..ad7448461 100644 --- a/src/core/hle/service/srv.cpp +++ b/src/core/hle/service/srv.cpp @@ -17,7 +17,7 @@ void GetServiceHandle() { Syscall::Result res = 0; u32* cmd_buff = (u32*)HLE::GetPointer(HLE::CMD_BUFFER_ADDR + Service::kCommandHeaderOffset); - const char* port_name = (const char*)&cmd_buff[1]; + std::string port_name = std::string((const char*)&cmd_buff[1], 0, Service::kMaxPortSize); Service::Interface* service = Service::g_manager->FetchFromPortName(port_name); NOTICE_LOG(OSHLE, "SRV::Sync - GetHandle - port: %s, handle: 0x%08X", port_name, diff --git a/src/core/hle/service/srv.h b/src/core/hle/service/srv.h index b4c5a0c17..a1d26a34d 100644 --- a/src/core/hle/service/srv.h +++ b/src/core/hle/service/srv.h @@ -18,7 +18,7 @@ public: ~Interface(); /** - * Gets the string name used by CTROS for a service + * Gets the string name used by CTROS for the service * @return Port name of service */ std::string GetPortName() const { -- cgit v1.2.3 From bb5bc2df257330561c886ed768ce2191e2641a6c Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 16 Apr 2014 20:58:36 -0400 Subject: added class stub for HID:User service --- src/core/core.vcxproj | 2 ++ src/core/core.vcxproj.filters | 6 ++++++ src/core/hle/service/hid.cpp | 33 +++++++++++++++++++++++++++++++++ src/core/hle/service/hid.h | 37 +++++++++++++++++++++++++++++++++++++ src/core/hle/service/service.cpp | 2 ++ 5 files changed, 80 insertions(+) create mode 100644 src/core/hle/service/hid.cpp create mode 100644 src/core/hle/service/hid.h (limited to 'src/core/core.vcxproj') diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 931345441..caf827be4 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -155,6 +155,7 @@ + @@ -192,6 +193,7 @@ + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index e022785ad..0a5b5a188 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -99,6 +99,9 @@ hle\service + + hle\service + @@ -193,6 +196,9 @@ hle\service + + hle\service + diff --git a/src/core/hle/service/hid.cpp b/src/core/hle/service/hid.cpp new file mode 100644 index 000000000..2d823dd16 --- /dev/null +++ b/src/core/hle/service/hid.cpp @@ -0,0 +1,33 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "common/log.h" + +#include "core/hle/hle.h" +#include "core/hle/service/hid.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace HID_User + +namespace HID_User { + +const HLE::FunctionDef FunctionTable[] = { + {0x000A0000, NULL, "GetIPCHandles"}, + {0x00110000, NULL, "EnableAccelerometer"}, + {0x00130000, NULL, "EnableGyroscopeLow"}, + {0x00150000, NULL, "GetGyroscopeLowRawToDpsCoefficient"}, + {0x00160000, NULL, "GetGyroscopeLowCalibrateParam"}, +}; + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Interface class + +Interface::Interface() { + Register(FunctionTable, ARRAY_SIZE(FunctionTable)); +} + +Interface::~Interface() { +} + +} // namespace diff --git a/src/core/hle/service/hid.h b/src/core/hle/service/hid.h new file mode 100644 index 000000000..746c1b1fc --- /dev/null +++ b/src/core/hle/service/hid.h @@ -0,0 +1,37 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include "core/hle/service/service.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Namespace HID_User + +// This service is used for interfacing to physical user controls... perhaps "Human Interface +// Devices"? Uses include game pad controls, accelerometers, gyroscopes, etc. + +namespace HID_User { + +class Interface : public Service::Interface { +public: + + Interface(); + + ~Interface(); + + /** + * Gets the string port name used by CTROS for the service + * @return Port name of service + */ + std::string GetPortName() const { + return "hid:USER"; + } + +private: + + DISALLOW_COPY_AND_ASSIGN(Interface); +}; + +} // namespace diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index f612ff830..e6605a398 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -10,6 +10,7 @@ #include "core/hle/service/service.h" #include "core/hle/service/apt.h" #include "core/hle/service/gsp.h" +#include "core/hle/service/hid.h" #include "core/hle/service/srv.h" namespace Service { @@ -78,6 +79,7 @@ void Init() { g_manager->AddService(new SRV::Interface); g_manager->AddService(new APT_U::Interface); g_manager->AddService(new GSP_GPU::Interface); + g_manager->AddService(new HID_User::Interface); NOTICE_LOG(HLE, "Services initialized OK"); } -- cgit v1.2.3 From c3a4b4bfca154f3f27830fe747c0fd74f8459d84 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 23:43:55 -0400 Subject: added NDMA hardware interface --- src/common/log.h | 2 +- src/common/log_manager.cpp | 2 +- src/core/core.vcxproj | 2 ++ src/core/core.vcxproj.filters | 6 +++++ src/core/hw/hw.cpp | 61 +++++++++++++++++++++++++++++++++++++++++-- src/core/hw/ndma.cpp | 48 ++++++++++++++++++++++++++++++++++ src/core/hw/ndma.h | 26 ++++++++++++++++++ 7 files changed, 143 insertions(+), 4 deletions(-) create mode 100644 src/core/hw/ndma.cpp create mode 100644 src/core/hw/ndma.h (limited to 'src/core/core.vcxproj') diff --git a/src/common/log.h b/src/common/log.h index 2eacf05f2..02db8bd55 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -55,7 +55,7 @@ enum LOG_TYPE { WII_IPC_HID, WII_IPC_HLE, WII_IPC_NET, - WII_IPC_WC24, + NDMA, HLE, RENDER, LCD, diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index b2dbbbdac..8e56deb8f 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp @@ -67,7 +67,7 @@ LogManager::LogManager() m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER"); m_Log[LogTypes::LCD] = new LogContainer("LCD", "LCD"); m_Log[LogTypes::WII_IPC_NET] = new LogContainer("WII_IPC_NET", "WII IPC NET"); - m_Log[LogTypes::WII_IPC_WC24] = new LogContainer("WII_IPC_WC24", "WII IPC WC24"); + m_Log[LogTypes::NDMA] = new LogContainer("NDMA", "NDMA"); m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation"); m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware"); m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index caf827be4..80bd75eeb 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -161,6 +161,7 @@ + @@ -199,6 +200,7 @@ + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 0a5b5a188..61cb6e405 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -102,6 +102,9 @@ hle\service + + hw + @@ -199,6 +202,9 @@ hle\service + + hw + diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index 59c348ca9..1f240f09c 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -7,17 +7,72 @@ #include "core/hw/hw.h" #include "core/hw/hw_lcd.h" +#include "core/hw/ndma.h" namespace HW { +enum { + ADDRESS_CONFIG = 0x10000000, + ADDRESS_IRQ = 0x10001000, + ADDRESS_NDMA = 0x10002000, + ADDRESS_TIMER = 0x10003000, + ADDRESS_CTRCARD = 0x10004000, + ADDRESS_CTRCARD_2 = 0x10005000, + ADDRESS_SDMC_NAND = 0x10006000, + ADDRESS_SDMC_NAND_2 = 0x10007000, // Apparently not used on retail + ADDRESS_PXI = 0x10008000, + ADDRESS_AES = 0x10009000, + ADDRESS_SHA = 0x1000A000, + ADDRESS_RSA = 0x1000B000, + ADDRESS_XDMA = 0x1000C000, + ADDRESS_SPICARD = 0x1000D800, + ADDRESS_CONFIG_2 = 0x10010000, + ADDRESS_HASH = 0x10101000, + ADDRESS_CSND = 0x10103000, + ADDRESS_DSP = 0x10140000, + ADDRESS_PDN = 0x10141000, + ADDRESS_CODEC = 0x10141000, + ADDRESS_SPI = 0x10142000, + ADDRESS_SPI_2 = 0x10143000, + ADDRESS_I2C = 0x10144000, + ADDRESS_CODEC_2 = 0x10145000, + ADDRESS_HID = 0x10146000, + ADDRESS_PAD = 0x10146000, + ADDRESS_PTM = 0x10146000, + ADDRESS_I2C_2 = 0x10148000, + ADDRESS_SPI_3 = 0x10160000, + ADDRESS_I2C_3 = 0x10161000, + ADDRESS_MIC = 0x10162000, + ADDRESS_PXI_2 = 0x10163000, + ADDRESS_NTRCARD = 0x10164000, + ADDRESS_DSP_2 = 0x10203000, + ADDRESS_HASH_2 = 0x10301000, +}; + template inline void Read(T &var, const u32 addr) { - NOTICE_LOG(HW, "read from address %08X", addr); + switch (addr & 0xFFFFF000) { + + case ADDRESS_NDMA: + NDMA::Read(var, addr); + break; + + default: + ERROR_LOG(HW, "unknown Read%d @ 0x%08X", sizeof(var) * 8, addr); + } } template inline void Write(u32 addr, const T data) { - NOTICE_LOG(HW, "write to address %08X", addr); + switch (addr & 0xFFFFF000) { + + case ADDRESS_NDMA: + NDMA::Write(addr, data); + break; + + default: + ERROR_LOG(HW, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr); + } } // Explicitly instantiate template functions because we aren't defining this in the header: @@ -35,11 +90,13 @@ template void Write(u32 addr, const u8 data); /// Update hardware void Update() { LCD::Update(); + NDMA::Update(); } /// Initialize hardware void Init() { LCD::Init(); + NDMA::Init(); NOTICE_LOG(HW, "initialized OK"); } diff --git a/src/core/hw/ndma.cpp b/src/core/hw/ndma.cpp new file mode 100644 index 000000000..52e459ebd --- /dev/null +++ b/src/core/hw/ndma.cpp @@ -0,0 +1,48 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "common/common_types.h" +#include "common/log.h" + +#include "core/hw/ndma.h" + +namespace NDMA { + +template +inline void Read(T &var, const u32 addr) { + ERROR_LOG(NDMA, "unknown Read%d @ 0x%08X", sizeof(var) * 8, addr); +} + +template +inline void Write(u32 addr, const T data) { + ERROR_LOG(NDMA, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr); +} + +// Explicitly instantiate template functions because we aren't defining this in the header: + +template void Read(u64 &var, const u32 addr); +template void Read(u32 &var, const u32 addr); +template void Read(u16 &var, const u32 addr); +template void Read(u8 &var, const u32 addr); + +template void Write(u32 addr, const u64 data); +template void Write(u32 addr, const u32 data); +template void Write(u32 addr, const u16 data); +template void Write(u32 addr, const u8 data); + +/// Update hardware +void Update() { +} + +/// Initialize hardware +void Init() { + NOTICE_LOG(LCD, "initialized OK"); +} + +/// Shutdown hardware +void Shutdown() { + NOTICE_LOG(LCD, "shutdown OK"); +} + +} // namespace diff --git a/src/core/hw/ndma.h b/src/core/hw/ndma.h new file mode 100644 index 000000000..d8fa3d40b --- /dev/null +++ b/src/core/hw/ndma.h @@ -0,0 +1,26 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include "common/common_types.h" + +namespace NDMA { + +template +inline void Read(T &var, const u32 addr); + +template +inline void Write(u32 addr, const T data); + +/// Update hardware +void Update(); + +/// Initialize hardware +void Init(); + +/// Shutdown hardware +void Shutdown(); + +} // namespace -- cgit v1.2.3 From 70c2cce963264678b5ba5b6aa17c2653bf459e61 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 23:48:23 -0400 Subject: renamed hw_lcd module to just lcd --- src/core/core.vcxproj | 4 +- src/core/core.vcxproj.filters | 12 +++--- src/core/hle/syscall.cpp | 2 - src/core/hw/hw.cpp | 2 +- src/core/hw/hw_lcd.cpp | 48 ---------------------- src/core/hw/hw_lcd.h | 44 -------------------- src/core/hw/lcd.cpp | 48 ++++++++++++++++++++++ src/core/hw/lcd.h | 44 ++++++++++++++++++++ src/video_core/renderer_opengl/renderer_opengl.cpp | 2 +- 9 files changed, 102 insertions(+), 104 deletions(-) delete mode 100644 src/core/hw/hw_lcd.cpp delete mode 100644 src/core/hw/hw_lcd.h create mode 100644 src/core/hw/lcd.cpp create mode 100644 src/core/hw/lcd.h (limited to 'src/core/core.vcxproj') diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 80bd75eeb..b6fc604c6 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -160,7 +160,7 @@ - + @@ -199,7 +199,7 @@ - + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 61cb6e405..ff7877feb 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -69,9 +69,6 @@ hw - - hw - elf @@ -105,6 +102,9 @@ hw + + hw + @@ -161,9 +161,6 @@ hw - - hw - elf @@ -205,6 +202,9 @@ hw + + hw + diff --git a/src/core/hle/syscall.cpp b/src/core/hle/syscall.cpp index 0cb563955..e5533a741 100644 --- a/src/core/hle/syscall.cpp +++ b/src/core/hle/syscall.cpp @@ -6,8 +6,6 @@ #include "core/mem_map.h" -#include "core/hw/hw_lcd.h" - #include "core/hle/function_wrappers.h" #include "core/hle/syscall.h" #include "core/hle/service/service.h" diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp index 1f240f09c..16bd70125 100644 --- a/src/core/hw/hw.cpp +++ b/src/core/hw/hw.cpp @@ -6,7 +6,7 @@ #include "common/log.h" #include "core/hw/hw.h" -#include "core/hw/hw_lcd.h" +#include "core/hw/lcd.h" #include "core/hw/ndma.h" namespace HW { diff --git a/src/core/hw/hw_lcd.cpp b/src/core/hw/hw_lcd.cpp deleted file mode 100644 index 9fb485bac..000000000 --- a/src/core/hw/hw_lcd.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "common/common_types.h" -#include "common/log.h" - -#include "core/core.h" -#include "core/hw/hw_lcd.h" - -#include "video_core/video_core.h" - -namespace LCD { - -static const u32 kFrameTicks = 268123480 / 60; ///< 268MHz / 60 frames per second - -u64 g_last_ticks = 0; ///< Last CPU ticks - -template -inline void Read(T &var, const u32 addr) { -} - -template -inline void Write(u32 addr, const T data) { -} - -/// Update hardware -void Update() { - u64 current_ticks = Core::g_app_core->GetTicks(); - - if ((current_ticks - g_last_ticks) >= kFrameTicks) { - g_last_ticks = current_ticks; - VideoCore::g_renderer->SwapBuffers(); - } -} - -/// Initialize hardware -void Init() { - g_last_ticks = Core::g_app_core->GetTicks(); - NOTICE_LOG(LCD, "initialized OK"); -} - -/// Shutdown hardware -void Shutdown() { - NOTICE_LOG(LCD, "shutdown OK"); -} - -} // namespace diff --git a/src/core/hw/hw_lcd.h b/src/core/hw/hw_lcd.h deleted file mode 100644 index 386ed6004..000000000 --- a/src/core/hw/hw_lcd.h +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#pragma once - -#include "common/common_types.h" - -namespace LCD { - -enum { - TOP_ASPECT_X = 0x5, - TOP_ASPECT_Y = 0x3, - - TOP_HEIGHT = 240, - TOP_WIDTH = 400, - BOTTOM_WIDTH = 320, - - FRAMEBUFFER_SEL = 0x20184E59, - TOP_LEFT_FRAME1 = 0x20184E60, - TOP_LEFT_FRAME2 = 0x201CB370, - TOP_RIGHT_FRAME1 = 0x20282160, - TOP_RIGHT_FRAME2 = 0x202C8670, - SUB_FRAME1 = 0x202118E0, - SUB_FRAME2 = 0x20249CF0, -}; - -template -inline void Read(T &var, const u32 addr); - -template -inline void Write(u32 addr, const T data); - -/// Update hardware -void Update(); - -/// Initialize hardware -void Init(); - -/// Shutdown hardware -void Shutdown(); - - -} // namespace diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp new file mode 100644 index 000000000..3013673f8 --- /dev/null +++ b/src/core/hw/lcd.cpp @@ -0,0 +1,48 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "common/common_types.h" +#include "common/log.h" + +#include "core/core.h" +#include "core/hw/lcd.h" + +#include "video_core/video_core.h" + +namespace LCD { + +static const u32 kFrameTicks = 268123480 / 60; ///< 268MHz / 60 frames per second + +u64 g_last_ticks = 0; ///< Last CPU ticks + +template +inline void Read(T &var, const u32 addr) { +} + +template +inline void Write(u32 addr, const T data) { +} + +/// Update hardware +void Update() { + u64 current_ticks = Core::g_app_core->GetTicks(); + + if ((current_ticks - g_last_ticks) >= kFrameTicks) { + g_last_ticks = current_ticks; + VideoCore::g_renderer->SwapBuffers(); + } +} + +/// Initialize hardware +void Init() { + g_last_ticks = Core::g_app_core->GetTicks(); + NOTICE_LOG(LCD, "initialized OK"); +} + +/// Shutdown hardware +void Shutdown() { + NOTICE_LOG(LCD, "shutdown OK"); +} + +} // namespace diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h new file mode 100644 index 000000000..386ed6004 --- /dev/null +++ b/src/core/hw/lcd.h @@ -0,0 +1,44 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#pragma once + +#include "common/common_types.h" + +namespace LCD { + +enum { + TOP_ASPECT_X = 0x5, + TOP_ASPECT_Y = 0x3, + + TOP_HEIGHT = 240, + TOP_WIDTH = 400, + BOTTOM_WIDTH = 320, + + FRAMEBUFFER_SEL = 0x20184E59, + TOP_LEFT_FRAME1 = 0x20184E60, + TOP_LEFT_FRAME2 = 0x201CB370, + TOP_RIGHT_FRAME1 = 0x20282160, + TOP_RIGHT_FRAME2 = 0x202C8670, + SUB_FRAME1 = 0x202118E0, + SUB_FRAME2 = 0x20249CF0, +}; + +template +inline void Read(T &var, const u32 addr); + +template +inline void Write(u32 addr, const T data); + +/// Update hardware +void Update(); + +/// Initialize hardware +void Init(); + +/// Shutdown hardware +void Shutdown(); + + +} // namespace diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 168de9253..35804aee1 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "core/hw/hw_lcd.h" +#include "core/hw/lcd.h" #include "video_core/video_core.h" #include "video_core/renderer_opengl/renderer_opengl.h" -- cgit v1.2.3