From bedd2912c83b1a87a6bfe3f59a892fd65cda7084 Mon Sep 17 00:00:00 2001 From: Johan Bengtsson Date: Wed, 17 Mar 2010 13:56:07 +0100 Subject: 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 Signed-off-by: Aurelien Jarno --- target-arm/translate.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'target-arm') diff --git a/target-arm/translate.c b/target-arm/translate.c index cdfe946a6..3b84c1dab 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); -- cgit v1.2.3