OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 13:00:07 +00:00
Code Issues Projects Releases Wiki Activity

renamed "syscall" module to "svc" (more accurate naming)

Browse Source
This commit is contained in:
bunnei 2014-05-20 18:28:38 -04:00
parent f654a03f1f
commit 143bba2045
9 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/CMakeLists.txt
View File

@ -33,7 +33,7 @@ set(SRCS core.cpp
hle/hle.cpp
hle/config_mem.cpp
hle/coprocessor.cpp
hle/syscall.cpp
hle/svc.cpp
hle/kernel/kernel.cpp
hle/kernel/thread.cpp
hle/service/apt.cpp

4
src/core/core.vcxproj
View File

@ -175,7 +175,7 @@
<ClCompile Include="hle\service\hid.cpp" />
<ClCompile Include="hle\service\service.cpp" />
<ClCompile Include="hle\service\srv.cpp" />
<ClCompile Include="hle\syscall.cpp" />
<ClCompile Include="hle\svc.cpp" />
<ClCompile Include="hw\hw.cpp" />
<ClCompile Include="hw\lcd.cpp" />
<ClCompile Include="hw\ndma.cpp" />
@ -223,7 +223,7 @@
<ClInclude Include="hle\service\hid.h" />
<ClInclude Include="hle\service\service.h" />
<ClInclude Include="hle\service\srv.h" />
<ClInclude Include="hle\syscall.h" />
<ClInclude Include="hle\svc.h" />
<ClInclude Include="hw\hw.h" />
<ClInclude Include="hw\lcd.h" />
<ClInclude Include="hw\ndma.h" />

12
src/core/core.vcxproj.filters
View File

@ -84,9 +84,6 @@
<ClCompile Include="hle\hle.cpp">
<Filter>hle</Filter>
</ClCompile>
<ClCompile Include="hle\syscall.cpp">
<Filter>hle</Filter>
</ClCompile>
<ClCompile Include="hle\service\service.cpp">
<Filter>hle\service</Filter>
</ClCompile>
@ -162,6 +159,9 @@
<ClCompile Include="hle\kernel\thread.cpp">
<Filter>hle\kernel</Filter>
</ClCompile>
<ClCompile Include="hle\svc.cpp">
<Filter>hle</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="arm\disassembler\arm_disasm.h">
@ -226,9 +226,6 @@
<ClInclude Include="hle\service\service.h">
<Filter>hle\service</Filter>
</ClInclude>
<ClInclude Include="hle\syscall.h">
<Filter>hle</Filter>
</ClInclude>
<ClInclude Include="hle\service\apt.h">
<Filter>hle\service</Filter>
</ClInclude>
@ -289,6 +286,9 @@
<ClInclude Include="hle\kernel\thread.h">
<Filter>hle\kernel</Filter>
</ClInclude>
<ClInclude Include="hle\svc.h">
<Filter>hle</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />

14
src/core/hle/hle.cpp
View File

@ -6,7 +6,7 @@
#include "core/mem_map.h"
#include "core/hle/hle.h"
#include "core/hle/syscall.h"
#include "core/hle/svc.h"
#include "core/hle/service/service.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
@ -15,17 +15,17 @@ namespace HLE {
static std::vector<ModuleDef> g_module_db;
const FunctionDef* GetSyscallInfo(u32 opcode) {
const FunctionDef* GetSVCInfo(u32 opcode) {
u32 func_num = opcode & 0xFFFFFF; // 8 bits
if (func_num > 0xFF) {
ERROR_LOG(HLE,"Unknown syscall: 0x%02X", func_num);
ERROR_LOG(HLE,"Unknown SVC: 0x%02X", func_num);
return NULL;
}
return &g_module_db[0].func_table[func_num];
}
void CallSyscall(u32 opcode) {
const FunctionDef *info = GetSyscallInfo(opcode);
void CallSVC(u32 opcode) {
const FunctionDef *info = GetSVCInfo(opcode);
if (!info) {
return;
@ -33,7 +33,7 @@ void CallSyscall(u32 opcode) {
if (info->func) {
info->func();
} else {
ERROR_LOG(HLE, "Unimplemented SysCall function %s(..)", info->name.c_str());
ERROR_LOG(HLE, "Unimplemented SVC function %s(..)", info->name.c_str());
}
}
@ -54,7 +54,7 @@ void RegisterModule(std::string name, int num_functions, const FunctionDef* func
}
void RegisterAllModules() {
Syscall::Register();
SVC::Register();
}
void Init() {

2
src/core/hle/hle.h
View File

@ -34,7 +34,7 @@ struct ModuleDef {
void RegisterModule(std::string name, int num_functions, const FunctionDef *func_table);
void CallSyscall(u32 opcode);
void CallSVC(u32 opcode);
void EatCycles(u32 cycles);

2
src/core/hle/kernel/thread.cpp
View File

@ -15,7 +15,7 @@
#include "core/core.h"
#include "core/mem_map.h"
#include "core/hle/hle.h"
#include "core/hle/syscall.h"
#include "core/hle/svc.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/thread.h"

2
src/core/hle/service/service.h
View File

@ -14,7 +14,7 @@
#include "core/mem_map.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/syscall.h"
#include "core/hle/svc.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// Namespace Service

12
src/core/hle/syscall.cpp → src/core/hle/svc.cpp
View File

@ -13,14 +13,14 @@
#include "core/hle/kernel/thread.h"
#include "core/hle/function_wrappers.h"
#include "core/hle/syscall.h"
#include "core/hle/svc.h"
#include "core/hle/service/service.h"
#include "core/hle/kernel/thread.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// Namespace Syscall
// Namespace SVC
namespace Syscall {
namespace SVC {
enum ControlMemoryOperation {
MEMORY_OPERATION_HEAP = 0x00000003,
@ -123,6 +123,8 @@ Result WaitSynchronizationN(void* _out, void* _handles, u32 handle_count, u32 wa
for (u32 i = 0; i < handle_count; i++) {
DEBUG_LOG(SVC, "\thandle[%d]=0x%08X", i, handles[i]);
}
__KernelReschedule("WaitSynchronizationN");
return 0;
}
@ -212,7 +214,7 @@ Result CreateEvent(void* _event, u32 reset_type) {
return 0;
}
const HLE::FunctionDef Syscall_Table[] = {
const HLE::FunctionDef SVC_Table[] = {
{0x00, NULL, "Unknown"},
{0x01, WrapI_VUUUUU<ControlMemory>, "ControlMemory"},
{0x02, WrapI_VVU<QueryMemory>, "QueryMemory"},
@ -342,7 +344,7 @@ const HLE::FunctionDef Syscall_Table[] = {
};
void Register() {
HLE::RegisterModule("SyscallTable", ARRAY_SIZE(Syscall_Table), Syscall_Table);
HLE::RegisterModule("SVC_Table", ARRAY_SIZE(SVC_Table), SVC_Table);
}
} // namespace

4
src/core/hle/syscall.h → src/core/hle/svc.h
View File

@ -39,9 +39,9 @@ enum ResetType {
};
////////////////////////////////////////////////////////////////////////////////////////////////////
// Namespace Syscall
// Namespace SVC
namespace Syscall {
namespace SVC {
void Register();