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/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 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/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) isize) & R15PCBITS)); #endif - } - else + } else if (instr != 0xDEADC0DE) // thumbemu uses 0xDEADCODE for debugging to catch non updates ARMul_MCR (state, instr, DEST); } @@ -4549,7 +4548,7 @@ ARMul_Emulate26 (ARMul_State * state) // ARMul_OSHandleSWI (state, BITS (0, 23)); // break; //} - HLE::CallSyscall(instr); + HLE::CallSVC(instr); ARMul_Abort (state, ARMul_SWIV); break; } |