Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HLE: Move SVC handlers to the Kernel namespace

Browse source
This commit is contained in:
Yuri Kunde Schlesner 2017-12-09 18:05:43 -08:00
parent ad71e23f23
commit 21188f5683
5 changed files with 209 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/arm/dynarmic/arm_dynarmic.cpp
View file

@ -54,7 +54,7 @@ static Dynarmic::UserCallbacks GetUserCallbacks(
Dynarmic::UserCallbacks user_callbacks{};
user_callbacks.InterpreterFallback = &InterpreterFallback;
user_callbacks.user_arg = static_cast<void*>(interpreter_state.get());
user_callbacks.CallSVC = &SVC::CallSVC;
user_callbacks.CallSVC = &Kernel::CallSVC;
user_callbacks.memory.IsReadOnlyMemory = &IsReadOnlyMemory;
user_callbacks.memory.ReadCode = &Memory::Read32;
user_callbacks.memory.Read8 = &Memory::Read8;

2
src/core/arm/dyncom/arm_dyncom_interpreter.cpp
View file

@ -3863,7 +3863,7 @@ SWI_INST : {
cpu->NumInstrsToExecute =
num_instrs >= cpu->NumInstrsToExecute ? 0 : cpu->NumInstrsToExecute - num_instrs;
num_instrs = 0;
SVC::CallSVC(inst_cream->num & 0xFFFF);
Kernel::CallSVC(inst_cream->num & 0xFFFF);
}
cpu->Reg[15] += cpu->GetInstructionSize();