From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zh9fg-000257-Qm for qemu-devel@nongnu.org; Wed, 30 Sep 2015 01:11:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zh9fc-0004wa-EY for qemu-devel@nongnu.org; Wed, 30 Sep 2015 01:11:16 -0400 Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]:33577) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zh9fc-0004wS-9T for qemu-devel@nongnu.org; Wed, 30 Sep 2015 01:11:12 -0400 Received: by pacex6 with SMTP id ex6so28403589pac.0 for ; Tue, 29 Sep 2015 22:11:11 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Wed, 30 Sep 2015 15:09:29 +1000 Message-Id: <1443589786-26929-10-git-send-email-rth@twiddle.net> In-Reply-To: <1443589786-26929-1-git-send-email-rth@twiddle.net> References: <1443589786-26929-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v4 09/26] target-s390x: Add cc_op state to insn_start List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aurelien@aurel32.net Reviewed-by: Aurelien Jarno Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target-s390x/cpu.h | 1 + target-s390x/translate.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 5acd54c..b927c66 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 4959828..6bbc760 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))) { -- 2.4.3