[commit] r3789 - cpu/arm

[repository service]

Author: tooch
Date: Fri Dec 18 20:09:57 2015
New Revision: 3789
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3789

Log:
ARM Simulator - Oops. We never enabled conditional execution of instructions.
Apparently we rarely use that feature.

Modified:
   cpu/arm/armsim.c

Modified: cpu/arm/armsim.c
==============================================================================
--- cpu/arm/armsim.c	Sat Nov 14 02:12:02 2015	(r3788)
+++ cpu/arm/armsim.c	Fri Dec 18 20:09:57 2015	(r3789)
@@ -343,6 +343,9 @@
             regdump(instruction, last_pc, 0);
 //#endif
         EVAL_COND(COND);
+        if (cond == 0) {
+            goto annul;
+        }
         if (cond == 0xf)
                 UNIMP("unconditional");
         switch (OP) {
@@ -1283,6 +1286,7 @@
 case 0x7e:
 case 0x7f: UNIMP("svc"); break;
         } // switch (OP)
+annul:
         if (PC == last_pc)
             PC += 4;
         else // branch or move