diff options
author | bunnei <ericbunnie@gmail.com> | 2014-05-23 04:57:45 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-05-23 04:57:45 +0200 |
commit | 32c314c99290a52f1f870ecf8c677e3792ed09c4 (patch) | |
tree | 1cea62bc320d51ebb217e7c361ae10b65b71dd45 /src/core/hle/hle.cpp | |
parent | Merge branch 'master' of https://github.com/citra-emu/citra (diff) | |
parent | core: added Kernel::Reschedule() call to check for thread changes, shortened delay time to 100 instructions (diff) | |
download | yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.gz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.bz2 yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.lz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.xz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.zst yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.zip |
Diffstat (limited to 'src/core/hle/hle.cpp')
-rw-r--r-- | src/core/hle/hle.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp index be151665b..080c36abf 100644 --- a/src/core/hle/hle.cpp +++ b/src/core/hle/hle.cpp @@ -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,17 +33,28 @@ 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()); } } +void EatCycles(u32 cycles) { + // TODO: ImplementMe +} + +void ReSchedule(const char *reason) { +#ifdef _DEBUG + _dbg_assert_msg_(HLE, reason != 0 && strlen(reason) < 256, "ReSchedule: Invalid or too long reason."); +#endif + // TODO: ImplementMe +} + 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() { - Syscall::Register(); + SVC::Register(); } void Init() { |