diff options
| author | 2015-05-06 09:45:42 -0400 | |
|---|---|---|
| committer | 2015-05-06 09:45:42 -0400 | |
| commit | c4abfe893bf23e7937a29263a68451c24b349fd9 (patch) | |
| tree | 0707ce5701d0c996a3ee131542e0f2178ba6e48e /src/core/arm | |
| parent | Merge pull request #719 from yuriks/unused-stuff (diff) | |
| parent | HLE: Clean up SVC dispatch mechanism (diff) | |
| download | yuzu-c4abfe893bf23e7937a29263a68451c24b349fd9.tar.gz yuzu-c4abfe893bf23e7937a29263a68451c24b349fd9.tar.xz yuzu-c4abfe893bf23e7937a29263a68451c24b349fd9.zip | |
Merge pull request #720 from yuriks/svc-cleanup
HLE: Clean up SVC dispatch mechanism
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index 991da740b..5ee99e93a 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include "common/profiler.h" | 11 | #include "common/profiler.h" |
| 12 | 12 | ||
| 13 | #include "core/mem_map.h" | 13 | #include "core/mem_map.h" |
| 14 | #include "core/hle/hle.h" | 14 | #include "core/hle/svc.h" |
| 15 | #include "core/arm/disassembler/arm_disasm.h" | 15 | #include "core/arm/disassembler/arm_disasm.h" |
| 16 | #include "core/arm/dyncom/arm_dyncom_interpreter.h" | 16 | #include "core/arm/dyncom/arm_dyncom_interpreter.h" |
| 17 | #include "core/arm/dyncom/arm_dyncom_thumb.h" | 17 | #include "core/arm/dyncom/arm_dyncom_thumb.h" |
| @@ -6234,7 +6234,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) { | |||
| 6234 | SWI_INST: | 6234 | SWI_INST: |
| 6235 | { | 6235 | { |
| 6236 | if (inst_base->cond == 0xE || CondPassed(cpu, inst_base->cond)) { | 6236 | if (inst_base->cond == 0xE || CondPassed(cpu, inst_base->cond)) { |
| 6237 | HLE::CallSVC(Memory::Read32(cpu->Reg[15])); | 6237 | SVC::CallSVC(Memory::Read32(cpu->Reg[15])); |
| 6238 | } | 6238 | } |
| 6239 | 6239 | ||
| 6240 | cpu->Reg[15] += GET_INST_SIZE(cpu); | 6240 | cpu->Reg[15] += GET_INST_SIZE(cpu); |