summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2015-08-30 09:26:10 -0700
committerRichard Henderson <rth@twiddle.net>2015-10-07 20:36:47 +1100
commita3fd522048f6728d8259e14596c9632c7c67305a (patch)
tree696a76567c047ff3b5d5ce495a49aff10fd6deb0
parentc20d594e45bc8c4b21be1a7637cba0f279f72879 (diff)
downloadfocaccia-qemu-a3fd522048f6728d8259e14596c9632c7c67305a.tar.gz
focaccia-qemu-a3fd522048f6728d8259e14596c9632c7c67305a.zip
target-s390x: Add cc_op state to insn_start
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <rth@twiddle.net>
-rw-r--r--target-s390x/cpu.h1
-rw-r--r--target-s390x/translate.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 5acd54c6ca..b927c66404 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -42,6 +42,7 @@
 #include "fpu/softfloat.h"
 
 #define NB_MMU_MODES 3
+#define TARGET_INSN_START_EXTRA_WORDS 1
 
 #define MMU_MODE0_SUFFIX _primary
 #define MMU_MODE1_SUFFIX _secondary
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index 4959828111..6bbc760596 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -5369,7 +5369,7 @@ static inline void gen_intermediate_code_internal(S390CPU *cpu,
             tcg_ctx.gen_opc_instr_start[lj] = 1;
             tcg_ctx.gen_opc_icount[lj] = num_insns;
         }
-        tcg_gen_insn_start(dc.pc);
+        tcg_gen_insn_start(dc.pc, dc.cc_op);
         num_insns++;
 
         if (unlikely(cpu_breakpoint_test(cs, dc.pc, BP_ANY))) {