summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/core.vcxproj5
-rw-r--r--src/core/core.vcxproj.filters12
-rw-r--r--src/core/hle/hle.cpp4
-rw-r--r--src/core/hle/hle_syscall.h37
-rw-r--r--src/core/hle/service/service.h60
-rw-r--r--src/core/hle/syscall.cpp (renamed from src/core/hle/hle_syscall.cpp)126
-rw-r--r--src/core/hle/syscall.h19
7 files changed, 157 insertions, 106 deletions
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 @@
153 <ClCompile Include="file_sys\directory_file_system.cpp" /> 153 <ClCompile Include="file_sys\directory_file_system.cpp" />
154 <ClCompile Include="file_sys\meta_file_system.cpp" /> 154 <ClCompile Include="file_sys\meta_file_system.cpp" />
155 <ClCompile Include="hle\hle.cpp" /> 155 <ClCompile Include="hle\hle.cpp" />
156 <ClCompile Include="hle\hle_syscall.cpp" /> 156 <ClCompile Include="hle\syscall.cpp" />
157 <ClCompile Include="hw\hw.cpp" /> 157 <ClCompile Include="hw\hw.cpp" />
158 <ClCompile Include="hw\hw_lcd.cpp" /> 158 <ClCompile Include="hw\hw_lcd.cpp" />
159 <ClCompile Include="loader.cpp" /> 159 <ClCompile Include="loader.cpp" />
@@ -186,7 +186,8 @@
186 <ClInclude Include="file_sys\meta_file_system.h" /> 186 <ClInclude Include="file_sys\meta_file_system.h" />
187 <ClInclude Include="hle\function_wrappers.h" /> 187 <ClInclude Include="hle\function_wrappers.h" />
188 <ClInclude Include="hle\hle.h" /> 188 <ClInclude Include="hle\hle.h" />
189 <ClInclude Include="hle\hle_syscall.h" /> 189 <ClInclude Include="hle\service\service.h" />
190 <ClInclude Include="hle\syscall.h" />
190 <ClInclude Include="hw\hw.h" /> 191 <ClInclude Include="hw\hw.h" />
191 <ClInclude Include="hw\hw_lcd.h" /> 192 <ClInclude Include="hw\hw_lcd.h" />
192 <ClInclude Include="loader.h" /> 193 <ClInclude Include="loader.h" />
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 @@
25 <Filter Include="hle"> 25 <Filter Include="hle">
26 <UniqueIdentifier>{8b62769e-3e2a-4a57-a7bc-b3b2933c2bc7}</UniqueIdentifier> 26 <UniqueIdentifier>{8b62769e-3e2a-4a57-a7bc-b3b2933c2bc7}</UniqueIdentifier>
27 </Filter> 27 </Filter>
28 <Filter Include="hle\service">
29 <UniqueIdentifier>{812c5189-ca49-4704-b842-3ffad09092d3}</UniqueIdentifier>
30 </Filter>
28 </ItemGroup> 31 </ItemGroup>
29 <ItemGroup> 32 <ItemGroup>
30 <ClCompile Include="arm\disassembler\arm_disasm.cpp"> 33 <ClCompile Include="arm\disassembler\arm_disasm.cpp">
@@ -78,10 +81,10 @@
78 <ClCompile Include="mem_map_funcs.cpp" /> 81 <ClCompile Include="mem_map_funcs.cpp" />
79 <ClCompile Include="system.cpp" /> 82 <ClCompile Include="system.cpp" />
80 <ClCompile Include="core_timing.cpp" /> 83 <ClCompile Include="core_timing.cpp" />
81 <ClCompile Include="hle\hle_syscall.cpp"> 84 <ClCompile Include="hle\hle.cpp">
82 <Filter>hle</Filter> 85 <Filter>hle</Filter>
83 </ClCompile> 86 </ClCompile>
84 <ClCompile Include="hle\hle.cpp"> 87 <ClCompile Include="hle\syscall.cpp">
85 <Filter>hle</Filter> 88 <Filter>hle</Filter>
86 </ClCompile> 89 </ClCompile>
87 </ItemGroup> 90 </ItemGroup>
@@ -163,7 +166,10 @@
163 <ClInclude Include="hle\function_wrappers.h"> 166 <ClInclude Include="hle\function_wrappers.h">
164 <Filter>hle</Filter> 167 <Filter>hle</Filter>
165 </ClInclude> 168 </ClInclude>
166 <ClInclude Include="hle\hle_syscall.h"> 169 <ClInclude Include="hle\service\service.h">
170 <Filter>hle\service</Filter>
171 </ClInclude>
172 <ClInclude Include="hle\syscall.h">
167 <Filter>hle</Filter> 173 <Filter>hle</Filter>
168 </ClInclude> 174 </ClInclude>
169 </ItemGroup> 175 </ItemGroup>
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 @@
5#include <vector> 5#include <vector>
6 6
7#include "core/hle/hle.h" 7#include "core/hle/hle.h"
8#include "core/hle/hle_syscall.h" 8#include "core/hle/syscall.h"
9 9
10//////////////////////////////////////////////////////////////////////////////////////////////////// 10////////////////////////////////////////////////////////////////////////////////////////////////////
11 11
@@ -41,7 +41,7 @@ void RegisterModule(std::string name, int num_functions, const FunctionDef* func
41} 41}
42 42
43void RegisterAllModules() { 43void RegisterAllModules() {
44 Register_Syscall(); 44 Syscall::Register();
45} 45}
46 46
47void Init() { 47void Init() {
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 @@
1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include "common/common_types.h"
8
9////////////////////////////////////////////////////////////////////////////////////////////////////
10
11//template <class T>
12//class KernelObject {
13//public:
14// virtual ~KernelObject() {}
15//
16// T GetNative() const {
17// return m_native;
18// }
19//
20// void SetNative(const T& native) {
21// m_native = native;
22// }
23//
24// virtual const char *GetTypeName() {return "[BAD KERNEL OBJECT TYPE]";}
25// virtual const char *GetName() {return "[UNKNOWN KERNEL OBJECT]";}
26//
27//private:
28// T m_native;
29//};
30
31//class Handle : public KernelObject<u32> {
32// const char* GetTypeName() {
33// return "Handle";
34// }
35//};
36
37void 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 @@
1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include <string>
8
9#include "common/common_types.h"
10#include "core/hle/syscall.h"
11
12////////////////////////////////////////////////////////////////////////////////////////////////////
13// Namespace Service
14
15namespace Service {
16
17typedef s32 NativeUID;
18
19/// Interface to a CTROS service
20class Interface {
21public:
22
23 virtual ~Interface() {
24 }
25
26 /**
27 * Gets the UID for the serice
28 * @return UID of service in native format
29 */
30 NativeUID GetUID() const {
31 return (NativeUID)m_uid;
32 }
33
34 /**
35 * Gets the string name used by CTROS for a service
36 * @return String name of service
37 */
38 virtual std::string GetName() {
39 return "[UNKNOWN SERVICE NAME]";
40 }
41
42 /**
43 * Gets the string name used by CTROS for a service
44 * @return Port name of service
45 */
46 virtual std::string GetPort() {
47 return "[UNKNOWN SERVICE PORT]";
48 }
49
50 /**
51 * Called when svcSendSyncRequest is called, loads command buffer and executes comand
52 * @return Return result of svcSendSyncRequest passed back to user app
53 */
54 virtual Syscall::Result Sync() = 0;
55
56private:
57 u32 m_uid;
58};
59
60} // namespace
diff --git a/src/core/hle/hle_syscall.cpp b/src/core/hle/syscall.cpp
index 92d9b0c85..98155dc8e 100644
--- a/src/core/hle/hle_syscall.cpp
+++ b/src/core/hle/syscall.cpp
@@ -2,15 +2,15 @@
2// Licensed under GPLv2 2// Licensed under GPLv2
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <map>
6
5#include "core/hle/function_wrappers.h" 7#include "core/hle/function_wrappers.h"
6#include "core/hle/hle_syscall.h" 8#include "core/hle/syscall.h"
7 9
8//////////////////////////////////////////////////////////////////////////////////////////////////// 10////////////////////////////////////////////////////////////////////////////////////////////////////
11// Namespace Syscall
9 12
10typedef u32 Handle; 13namespace Syscall {
11typedef s32 Result;
12
13////////////////////////////////////////////////////////////////////////////////////////////////////
14 14
15Result SVC_ConnectToPort(void* out, const char* port_name) { 15Result SVC_ConnectToPort(void* out, const char* port_name) {
16 NOTICE_LOG(OSHLE, "svcConnectToPort called, port_name: %s", port_name); 16 NOTICE_LOG(OSHLE, "svcConnectToPort called, port_name: %s", port_name);
@@ -64,23 +64,23 @@ const HLE::FunctionDef Syscall_Table[] = {
64 {0x2B, NULL, "svcGetProcessInfo"}, 64 {0x2B, NULL, "svcGetProcessInfo"},
65 {0x2C, NULL, "svcGetThreadInfo"}, 65 {0x2C, NULL, "svcGetThreadInfo"},
66 {0x2D, WrapI_VC<SVC_ConnectToPort>, "svcConnectToPort"}, 66 {0x2D, WrapI_VC<SVC_ConnectToPort>, "svcConnectToPort"},
67 {0x2E NULL, "svcSendSyncRequest1"}, 67 {0x2E, NULL, "svcSendSyncRequest1"},
68 {0x2F NULL, "svcSendSyncRequest2"}, 68 {0x2F, NULL, "svcSendSyncRequest2"},
69 {0x30 NULL, "svcSendSyncRequest3"}, 69 {0x30, NULL, "svcSendSyncRequest3"},
70 {0x31 NULL, "svcSendSyncRequest4"}, 70 {0x31, NULL, "svcSendSyncRequest4"},
71 {0x32 NULL, "svcSendSyncRequest"}, 71 {0x32, NULL, "svcSendSyncRequest"},
72 {0x33 NULL, "svcOpenProcess"}, 72 {0x33, NULL, "svcOpenProcess"},
73 {0x34 NULL, "svcOpenThread"}, 73 {0x34, NULL, "svcOpenThread"},
74 {0x35 NULL, "svcGetProcessId"}, 74 {0x35, NULL, "svcGetProcessId"},
75 {0x36 NULL, "svcGetProcessIdOfThread"}, 75 {0x36, NULL, "svcGetProcessIdOfThread"},
76 {0x37 NULL, "svcGetThreadId"}, 76 {0x37, NULL, "svcGetThreadId"},
77 {0x38 NULL, "svcGetResourceLimit"}, 77 {0x38, NULL, "svcGetResourceLimit"},
78 {0x39 NULL, "svcGetResourceLimitLimitValues"}, 78 {0x39, NULL, "svcGetResourceLimitLimitValues"},
79 {0x3A NULL, "svcGetResourceLimitCurrentValues"}, 79 {0x3A, NULL, "svcGetResourceLimitCurrentValues"},
80 {0x3B NULL, "svcGetThreadContext"}, 80 {0x3B, NULL, "svcGetThreadContext"},
81 {0x3C NULL, "svcBreak"}, 81 {0x3C, NULL, "svcBreak"},
82 {0x3D NULL, "svcOutputDebugString"}, 82 {0x3D, NULL, "svcOutputDebugString"},
83 {0x3E NULL, "svcControlPerformanceCounter"}, 83 {0x3E, NULL, "svcControlPerformanceCounter"},
84 {0x3F, NULL, "Unknown"}, 84 {0x3F, NULL, "Unknown"},
85 {0x40, NULL, "Unknown"}, 85 {0x40, NULL, "Unknown"},
86 {0x41, NULL, "Unknown"}, 86 {0x41, NULL, "Unknown"},
@@ -89,24 +89,24 @@ const HLE::FunctionDef Syscall_Table[] = {
89 {0x44, NULL, "Unknown"}, 89 {0x44, NULL, "Unknown"},
90 {0x45, NULL, "Unknown"}, 90 {0x45, NULL, "Unknown"},
91 {0x46, NULL, "Unknown"}, 91 {0x46, NULL, "Unknown"},
92 {0x47 NULL, "svcCreatePort"}, 92 {0x47, NULL, "svcCreatePort"},
93 {0x48 NULL, "svcCreateSessionToPort"}, 93 {0x48, NULL, "svcCreateSessionToPort"},
94 {0x49 NULL, "svcCreateSession"}, 94 {0x49, NULL, "svcCreateSession"},
95 {0x4A NULL, "svcAcceptSession"}, 95 {0x4A, NULL, "svcAcceptSession"},
96 {0x4B NULL, "svcReplyAndReceive1"}, 96 {0x4B, NULL, "svcReplyAndReceive1"},
97 {0x4C NULL, "svcReplyAndReceive2"}, 97 {0x4C, NULL, "svcReplyAndReceive2"},
98 {0x4D NULL, "svcReplyAndReceive3"}, 98 {0x4D, NULL, "svcReplyAndReceive3"},
99 {0x4E NULL, "svcReplyAndReceive4"}, 99 {0x4E, NULL, "svcReplyAndReceive4"},
100 {0x4F NULL, "svcReplyAndReceive"}, 100 {0x4F, NULL, "svcReplyAndReceive"},
101 {0x50 NULL, "svcBindInterrupt"}, 101 {0x50, NULL, "svcBindInterrupt"},
102 {0x51 NULL, "svcUnbindInterrupt"}, 102 {0x51, NULL, "svcUnbindInterrupt"},
103 {0x52 NULL, "svcInvalidateProcessDataCache"}, 103 {0x52, NULL, "svcInvalidateProcessDataCache"},
104 {0x53 NULL, "svcStoreProcessDataCache"}, 104 {0x53, NULL, "svcStoreProcessDataCache"},
105 {0x54 NULL, "svcFlushProcessDataCache"}, 105 {0x54, NULL, "svcFlushProcessDataCache"},
106 {0x55 NULL, "svcStartInterProcessDma"}, 106 {0x55, NULL, "svcStartInterProcessDma"},
107 {0x56 NULL, "svcStopDma"}, 107 {0x56, NULL, "svcStopDma"},
108 {0x57 NULL, "svcGetDmaState"}, 108 {0x57, NULL, "svcGetDmaState"},
109 {0x58 NULL, "svcRestartDma"}, 109 {0x58, NULL, "svcRestartDma"},
110 {0x59, NULL, "Unknown"}, 110 {0x59, NULL, "Unknown"},
111 {0x5A, NULL, "Unknown"}, 111 {0x5A, NULL, "Unknown"},
112 {0x5B, NULL, "Unknown"}, 112 {0x5B, NULL, "Unknown"},
@@ -114,38 +114,40 @@ const HLE::FunctionDef Syscall_Table[] = {
114 {0x5D, NULL, "Unknown"}, 114 {0x5D, NULL, "Unknown"},
115 {0x5E, NULL, "Unknown"}, 115 {0x5E, NULL, "Unknown"},
116 {0x5F, NULL, "Unknown"}, 116 {0x5F, NULL, "Unknown"},
117 {0x60 NULL, "svcDebugActiveProcess"}, 117 {0x60, NULL, "svcDebugActiveProcess"},
118 {0x61 NULL, "svcBreakDebugProcess"}, 118 {0x61, NULL, "svcBreakDebugProcess"},
119 {0x62 NULL, "svcTerminateDebugProcess"}, 119 {0x62, NULL, "svcTerminateDebugProcess"},
120 {0x63 NULL, "svcGetProcessDebugEvent"}, 120 {0x63, NULL, "svcGetProcessDebugEvent"},
121 {0x64 NULL, "svcContinueDebugEvent"}, 121 {0x64, NULL, "svcContinueDebugEvent"},
122 {0x65 NULL, "svcGetProcessList"}, 122 {0x65, NULL, "svcGetProcessList"},
123 {0x66 NULL, "svcGetThreadList"}, 123 {0x66, NULL, "svcGetThreadList"},
124 {0x67 NULL, "svcGetDebugThreadContext"}, 124 {0x67, NULL, "svcGetDebugThreadContext"},
125 {0x68 NULL, "svcSetDebugThreadContext"}, 125 {0x68, NULL, "svcSetDebugThreadContext"},
126 {0x69 NULL, "svcQueryDebugProcessMemory"}, 126 {0x69, NULL, "svcQueryDebugProcessMemory"},
127 {0x6A NULL, "svcReadProcessMemory"}, 127 {0x6A, NULL, "svcReadProcessMemory"},
128 {0x6B NULL, "svcWriteProcessMemory"}, 128 {0x6B, NULL, "svcWriteProcessMemory"},
129 {0x6C NULL, "svcSetHardwareBreakPoint"}, 129 {0x6C, NULL, "svcSetHardwareBreakPoint"},
130 {0x6D NULL, "svcGetDebugThreadParam"}, 130 {0x6D, NULL, "svcGetDebugThreadParam"},
131 {0x6E, NULL, "Unknown"}, 131 {0x6E, NULL, "Unknown"},
132 {0x6F, NULL, "Unknown"}, 132 {0x6F, NULL, "Unknown"},
133 {0x70 NULL, "svcControlProcessMemory"}, 133 {0x70, NULL, "svcControlProcessMemory"},
134 {0x71 NULL, "svcMapProcessMemory"}, 134 {0x71, NULL, "svcMapProcessMemory"},
135 {0x72 NULL, "svcUnmapProcessMemory"}, 135 {0x72, NULL, "svcUnmapProcessMemory"},
136 {0x73, NULL, "Unknown"}, 136 {0x73, NULL, "Unknown"},
137 {0x74, NULL, "Unknown"}, 137 {0x74, NULL, "Unknown"},
138 {0x75, NULL, "Unknown"}, 138 {0x75, NULL, "Unknown"},
139 {0x76 NULL, "svcTerminateProcess"}, 139 {0x76, NULL, "svcTerminateProcess"},
140 {0x77, NULL, "Unknown"}, 140 {0x77, NULL, "Unknown"},
141 {0x78 NULL, "svcCreateResourceLimit"}, 141 {0x78, NULL, "svcCreateResourceLimit"},
142 {0x79, NULL, "Unknown"}, 142 {0x79, NULL, "Unknown"},
143 {0x7A, NULL, "Unknown"}, 143 {0x7A, NULL, "Unknown"},
144 {0x7B, NULL, "Unknown"}, 144 {0x7B, NULL, "Unknown"},
145 {0x7C NULL, "svcKernelSetState"}, 145 {0x7C, NULL, "svcKernelSetState"},
146 {0x7D NULL, "svcQueryProcessMemory"}, 146 {0x7D, NULL, "svcQueryProcessMemory"},
147}; 147};
148 148
149void Register_Syscall() { 149void Register() {
150 HLE::RegisterModule("SyscallTable", ARRAY_SIZE(Syscall_Table), Syscall_Table); 150 HLE::RegisterModule("SyscallTable", ARRAY_SIZE(Syscall_Table), Syscall_Table);
151} 151}
152
153} // 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 @@
1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include "common/common_types.h"
8
9////////////////////////////////////////////////////////////////////////////////////////////////////
10// Namespace Syscall
11
12namespace Syscall {
13
14typedef u32 Handle;
15typedef s32 Result;
16
17void Register();
18
19} // namespace
HIC SVNT DRACONES