diff options
| author |  bunnei <bunneidev@gmail.com> | 2014-12-17 22:06:27 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-17 22:06:27 -0500 |
| commit | 797efbde1ae722653a894ec4e3d2fa64bb6a68fd (patch) | |
| tree | b5f9e73f1c730943e25f3b3d09e94533ee1e9a88 /src | |
| parent | a968adf50e5aeb1f9d0be0c8fa8152aa691569aa (diff) | |
| parent | 41fee1c94005f5848addb3da253b4f883b4b1a71 (diff) | |
Merge pull request #298 from lioncash/flags
armemu: Unset GE flags for UADD8 if results are < 0x100
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index a36035e9..3b1a36bd 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp @@ -5958,11 +5958,29 @@ L_stm_s_takeabort: b2 = ((u8)(from >> 8) + (u8)(to >> 8)); b3 = ((u8)(from >> 16) + (u8)(to >> 16)); b4 = ((u8)(from >> 24) + (u8)(to >> 24)); - if (b1 & 0xffffff00) state->Cpsr |= (1 << 16); - if (b2 & 0xffffff00) state->Cpsr |= (1 << 17); - if (b3 & 0xffffff00) state->Cpsr |= (1 << 18); - if (b4 & 0xffffff00) state->Cpsr |= (1 << 19); + + if (b1 & 0xffffff00) + state->Cpsr |= (1 << 16); + else + state->Cpsr &= ~(1 << 16); + + if (b2 & 0xffffff00) + state->Cpsr |= (1 << 17); + else + state->Cpsr &= ~(1 << 17); + + if (b3 & 0xffffff00) + state->Cpsr |= (1 << 18); + else + state->Cpsr &= ~(1 << 18); + + + if (b4 & 0xffffff00) + state->Cpsr |= (1 << 19); + else + state->Cpsr &= ~(1 << 19); } + state->Reg[rd] = (u32)(b1 | (b2 & 0xff) << 8 | (b3 & 0xff) << 16 | (b4 & 0xff) << 24); return 1; } |