commit f9e6c8b8a601247e4b51fd1da293fad4e49557d1
author David 'Digit' Turner <digit@google.com> Fri Jul 04 09:46:31 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 02 20:49:53 2014 +0000
tree 08cf2271c03f0d09a1ec4df699fd8dcc99332f95
parent 342f69d6f89a11a440563137b2cced7fa49471a4
parent c3b504f4c434a24513336fba2c6dff2d9ff43f28

Merge "Fix emulation."

target-arm/translate.c

diff --git a/target-arm/translate.c b/target-arm/translate.c
index 7bc50c1..2dc14b9 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -9808,6 +9808,19 @@
             }
         }
 
+        if (search_pc) {
+            j = tcg_ctx.gen_opc_ptr - tcg_ctx.gen_opc_buf;
+            if (lj < j) {
+                lj++;
+                while (lj < j)
+                    tcg_ctx.gen_opc_instr_start[lj++] = 0;
+            }
+            tcg_ctx.gen_opc_pc[lj] = dc->pc;
+            gen_opc_condexec_bits[lj] = (dc->condexec_cond << 4) | (dc->condexec_mask >> 1);
+            tcg_ctx.gen_opc_instr_start[lj] = 1;
+            tcg_ctx.gen_opc_icount[lj] = num_insns;
+        }
+
         if (num_insns + 1 == max_insns && (tb->cflags & CF_LAST_IO))
             gen_io_start();