aboutsummaryrefslogtreecommitdiff
path: root/target-arm
diff options
context:
space:
mode:
authorJohan Bengtsson <teofrastius@gmail.com>2010-03-17 13:56:07 +0100
committerAurelien Jarno <aurelien@aurel32.net>2010-03-23 22:10:45 +0100
commitbedd2912c83b1a87a6bfe3f59a892fd65cda7084 (patch)
tree99e47165b2b871465c9bc372263762bae477e2e3 /target-arm
parent3f90f252ecbbb1a0872b72d57965f0db860e22a3 (diff)
downloadqemu-bedd2912c83b1a87a6bfe3f59a892fd65cda7084.zip
qemu-bedd2912c83b1a87a6bfe3f59a892fd65cda7084.tar.gz
qemu-bedd2912c83b1a87a6bfe3f59a892fd65cda7084.tar.bz2
target-arm: Fix handling of AL condition in IT instruction
Do not try to insert a conditional jump over next instruction when the condition code is AL as this will trigger an internal error. Signed-off-by: Johan Bengtsson <teofrastius@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/translate.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/target-arm/translate.c b/target-arm/translate.c
index cdfe946..3b84c1d 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -8336,9 +8336,11 @@ static void disas_thumb_insn(CPUState *env, DisasContext *s)
if (s->condexec_mask) {
cond = s->condexec_cond;
- s->condlabel = gen_new_label();
- gen_test_cc(cond ^ 1, s->condlabel);
- s->condjmp = 1;
+ if (cond != 0x0e) { /* Skip conditional when condition is AL. */
+ s->condlabel = gen_new_label();
+ gen_test_cc(cond ^ 1, s->condlabel);
+ s->condjmp = 1;
+ }
}
insn = lduw_code(s->pc);