Patchwork [1/3] target-arm: fix thumb CPS

login
register
mail settings
Submitter Rabin Vincent
Date Feb. 14, 2010, 6:32 p.m.
Message ID <1266172357-9252-2-git-send-email-rabin@rab.in>
Download mbox | patch
Permalink /patch/45333/
State New
Headers show

Comments

Rabin Vincent - Feb. 14, 2010, 6:32 p.m.
The Thumb CPS currently does not work correctly: CPSID touches more bits
than the instruction wants to, and CPSIE does nothing.  Fix it by
passing the correct mask (the "affect" bits) and value.

Signed-off-by: Rabin Vincent <rabin@rab.in>
---
 target-arm/translate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/target-arm/translate.c b/target-arm/translate.c
index 786c329..10a516b 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -8898,7 +8898,7 @@  static void disas_thumb_insn(CPUState *env, DisasContext *s)
                     shift = CPSR_A | CPSR_I | CPSR_F;
                 else
                     shift = 0;
-                gen_set_psr_im(s, shift, 0, ((insn & 7) << 6) & shift);
+                gen_set_psr_im(s, ((insn & 7) << 6), 0, shift);
             }
             break;