diff options
| author |  bunnei | 2014-05-22 22:57:45 -0400 |
|---|---|---|
| committer | bunnei | 2014-05-22 22:57:45 -0400 |
| commit | 32c314c99290a52f1f870ecf8c677e3792ed09c4 (patch) | |
| tree | 1cea62bc320d51ebb217e7c361ae10b65b71dd45 /src/core/arm/interpreter/armemu.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 ... (diff) | |
| download | yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.gz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.xz yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.zip | |
Merge branch 'threading'
Diffstat (limited to 'src/core/arm/interpreter/armemu.cpp')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index 32e315f4b..e5dc7bd44 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp | |||
| @@ -4478,8 +4478,7 @@ ARMul_Emulate26 (ARMul_State * state) | |||
| 4478 | isize) & | 4478 | isize) & |
| 4479 | R15PCBITS)); | 4479 | R15PCBITS)); |
| 4480 | #endif | 4480 | #endif |
| 4481 | } | 4481 | } else if (instr != 0xDEADC0DE) // thumbemu uses 0xDEADCODE for debugging to catch non updates |
| 4482 | else | ||
| 4483 | ARMul_MCR (state, instr, | 4482 | ARMul_MCR (state, instr, |
| 4484 | DEST); | 4483 | DEST); |
| 4485 | } | 4484 | } |
| @@ -4549,7 +4548,7 @@ ARMul_Emulate26 (ARMul_State * state) | |||
| 4549 | // ARMul_OSHandleSWI (state, BITS (0, 23)); | 4548 | // ARMul_OSHandleSWI (state, BITS (0, 23)); |
| 4550 | // break; | 4549 | // break; |
| 4551 | //} | 4550 | //} |
| 4552 | HLE::CallSyscall(instr); | 4551 | HLE::CallSVC(instr); |
| 4553 | ARMul_Abort (state, ARMul_SWIV); | 4552 | ARMul_Abort (state, ARMul_SWIV); |
| 4554 | break; | 4553 | break; |
| 4555 | } | 4554 | } |