From: aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 29 Mar 2009 01:18:03 +0000 (+0000)
Subject: target-ppc: avoid nop to override next instruction
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=af4b6c54c141c1e2d3637fc15b912e82b88828cf;p=qemu-xen-4.1-testing.git

target-ppc: avoid nop to override next instruction

While searching PC, always store the pc of a new instruction.
Instructions that didn't generate tcg code (such as nop) prevented the
next one to be referenced.

Based on patch for target-alpha, r6930.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6931 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 952ee99d4..870aec5ec 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -8213,10 +8213,10 @@ static always_inline void gen_intermediate_code_internal (CPUState *env,
                 lj++;
                 while (lj < j)
                     gen_opc_instr_start[lj++] = 0;
-                gen_opc_pc[lj] = ctx.nip;
-                gen_opc_instr_start[lj] = 1;
-                gen_opc_icount[lj] = num_insns;
             }
+            gen_opc_pc[lj] = ctx.nip;
+            gen_opc_instr_start[lj] = 1;
+            gen_opc_icount[lj] = num_insns;
         }
         LOG_DISAS("----------------\n");
         LOG_DISAS("nip=" ADDRX " super=%d ir=%d\n",