diff options
| author |  Lioncash <mathew1800@gmail.com> | 2015-07-21 05:49:05 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-07-21 05:49:05 -0400 |
| commit | 043b2f882aa48488ba632621cd62c5784e1c8fab (patch) | |
| tree | bd812292360525f0172a469e11f81ac57339852d | |
| parent | a48aa4f9243ef2bcf6d57b833e8dc89982f296b5 (diff) | |
| parent | c2689b8c2c6f0ac023eddb25d98da6bc1fa95205 (diff) | |
Merge pull request #964 from lioncash/svc
dyncom: Pass SVC immediates directly.
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/svc.cpp | 7 | ||||
| -rw-r--r-- | src/core/hle/svc.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index e40f3fa9..785f3956 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp @@ -6248,7 +6248,8 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) { SWI_INST: { if (inst_base->cond == 0xE || CondPassed(cpu, inst_base->cond)) { - SVC::CallSVC(Memory::Read32(cpu->Reg[15])); + swi_inst* const inst_cream = (swi_inst*)inst_base->component; + SVC::CallSVC(inst_cream->num & 0xFFFF); } cpu->Reg[15] += GET_INST_SIZE(cpu); diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 802ecc52..bdede964 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -833,8 +833,7 @@ static const FunctionDef SVC_Table[] = { Common::Profiling::TimingCategory profiler_svc("SVC Calls"); -static const FunctionDef* GetSVCInfo(u32 opcode) { - u32 func_num = opcode & 0xFFFFFF; // 8 bits +static const FunctionDef* GetSVCInfo(u32 func_num) { if (func_num >= ARRAY_SIZE(SVC_Table)) { LOG_ERROR(Kernel_SVC, "unknown svc=0x%02X", func_num); return nullptr; @@ -842,10 +841,10 @@ static const FunctionDef* GetSVCInfo(u32 opcode) { return &SVC_Table[func_num]; } -void CallSVC(u32 opcode) { +void CallSVC(u32 immediate) { Common::Profiling::ScopeTimer timer_svc(profiler_svc); - const FunctionDef *info = GetSVCInfo(opcode); + const FunctionDef* info = GetSVCInfo(immediate); if (info) { if (info->func) { info->func(); diff --git a/src/core/hle/svc.h b/src/core/hle/svc.h index 4389aa73..12de9ffb 100644 --- a/src/core/hle/svc.h +++ b/src/core/hle/svc.h @@ -41,6 +41,6 @@ enum ArbitrationType { namespace SVC { -void CallSVC(u32 opcode); +void CallSVC(u32 immediate); } // namespace |