mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +00:00 
			
		
		
		
	renamed "syscall" module to "svc" (more accurate naming)
This commit is contained in:
		
							parent
							
								
									f654a03f1f
								
							
						
					
					
						commit
						143bba2045
					
				
					 9 changed files with 28 additions and 26 deletions
				
			
		|  | @ -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() { | ||||
|  |  | |||
|  | @ -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); | ||||
| 
 | ||||
|  |  | |||
|  | @ -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" | ||||
| 
 | ||||
|  |  | |||
|  | @ -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
 | ||||
|  |  | |||
|  | @ -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
 | ||||
|  | @ -39,9 +39,9 @@ enum ResetType { | |||
| }; | ||||
| 
 | ||||
| ////////////////////////////////////////////////////////////////////////////////////////////////////
 | ||||
| // Namespace Syscall
 | ||||
| // Namespace SVC
 | ||||
| 
 | ||||
| namespace Syscall { | ||||
| namespace SVC { | ||||
| 
 | ||||
| void Register(); | ||||
| 
 | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue