commit bedd2912c83b1a87a6bfe3f59a892fd65cda7084
author Johan Bengtsson <teofrastius@gmail.com> Wed Mar 17 13:56:07 2010 +0100
committer Aurelien Jarno <aurelien@aurel32.net> Tue Mar 23 22:10:45 2010 +0100
tree 99e47165b2b871465c9bc372263762bae477e2e3
parent 3f90f252ecbbb1a0872b72d57965f0db860e22a3

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>

target-arm/translate.c

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 @@
 
     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);