diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-04-04 01:03:55 +0200 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-04-04 01:03:55 +0200 |
| commit | 7bf24c066b09db65422e581827b6201fbfead467 (patch) | |
| tree | c5fa1d34567850eb8ba6c7a86de76d9933dec597 /src/core/src/arm/armemu.cpp | |
| parent | convert tabs to spaces (diff) | |
| download | yuzu-7bf24c066b09db65422e581827b6201fbfead467.tar yuzu-7bf24c066b09db65422e581827b6201fbfead467.tar.gz yuzu-7bf24c066b09db65422e581827b6201fbfead467.tar.bz2 yuzu-7bf24c066b09db65422e581827b6201fbfead467.tar.lz yuzu-7bf24c066b09db65422e581827b6201fbfead467.tar.xz yuzu-7bf24c066b09db65422e581827b6201fbfead467.tar.zst yuzu-7bf24c066b09db65422e581827b6201fbfead467.zip | |
Diffstat (limited to 'src/core/src/arm/armemu.cpp')
| -rw-r--r-- | src/core/src/arm/armemu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/src/arm/armemu.cpp b/src/core/src/arm/armemu.cpp index 0b14a6166..5e3a9cfbf 100644 --- a/src/core/src/arm/armemu.cpp +++ b/src/core/src/arm/armemu.cpp @@ -936,10 +936,10 @@ ARMul_Emulate26 (ARMul_State * state) pipelined PC value is used when executing Thumb code, and also for dealing with the BL instruction. */ if (TFLAG) { - ARMword new; + ARMword new_instr; /* Check if in Thumb mode. */ - switch (ARMul_ThumbDecode (state, pc, instr, &new)) { + switch (ARMul_ThumbDecode(state, pc, instr, &new_instr)) { case t_undefined: /* This is a Thumb instruction. */ ARMul_UndefInstr (state, instr); @@ -952,7 +952,7 @@ ARMul_Emulate26 (ARMul_State * state) case t_decoded: /* ARM instruction available. */ //printf("t decode %04lx -> %08lx\n", instr & 0xffff, new); - instr = new; + instr = new_instr; /* So continue instruction decoding. */ break; default: |