diff options
| author |  bunnei | 2014-12-23 09:43:46 -0500 |
|---|---|---|
| committer | bunnei | 2014-12-23 09:43:46 -0500 |
| commit | 53447da142e4466fc2e509d19c15423ba7595fac (patch) | |
| tree | ba4f97d9efd0db16d14e49e42f71a6365dd531fe /src/core/arm/interpreter/armsupp.cpp | |
| parent | Merge pull request #275 from yuriks/cmake-clean (diff) | |
| parent | armemu: Properly set the Q flag for SSAT16/USAT16 upon saturation. (diff) | |
| download | yuzu-53447da142e4466fc2e509d19c15423ba7595fac.tar.gz yuzu-53447da142e4466fc2e509d19c15423ba7595fac.tar.xz yuzu-53447da142e4466fc2e509d19c15423ba7595fac.zip | |
Merge pull request #335 from lioncash/cpsrcreate
armemu: Emulate the GE and Q flags.
Diffstat (limited to 'src/core/arm/interpreter/armsupp.cpp')
| -rw-r--r-- | src/core/arm/interpreter/armsupp.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/arm/interpreter/armsupp.cpp b/src/core/arm/interpreter/armsupp.cpp index 30519f216..b31c0ea24 100644 --- a/src/core/arm/interpreter/armsupp.cpp +++ b/src/core/arm/interpreter/armsupp.cpp | |||
| @@ -227,8 +227,9 @@ ARMul_CPSRAltered (ARMul_State * state) | |||
| 227 | //state->Cpsr &= ~CBIT; | 227 | //state->Cpsr &= ~CBIT; |
| 228 | ASSIGNV ((state->Cpsr & VBIT) != 0); | 228 | ASSIGNV ((state->Cpsr & VBIT) != 0); |
| 229 | //state->Cpsr &= ~VBIT; | 229 | //state->Cpsr &= ~VBIT; |
| 230 | ASSIGNS ((state->Cpsr & SBIT) != 0); | 230 | ASSIGNQ ((state->Cpsr & QBIT) != 0); |
| 231 | //state->Cpsr &= ~SBIT; | 231 | //state->Cpsr &= ~QBIT; |
| 232 | state->GEFlag = (state->Cpsr & 0x000F0000); | ||
| 232 | #ifdef MODET | 233 | #ifdef MODET |
| 233 | ASSIGNT ((state->Cpsr & TBIT) != 0); | 234 | ASSIGNT ((state->Cpsr & TBIT) != 0); |
| 234 | //state->Cpsr &= ~TBIT; | 235 | //state->Cpsr &= ~TBIT; |