From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjlGs-0001ok-J6 for qemu-devel@nongnu.org; Wed, 07 Oct 2015 05:44:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjlGr-0004Pg-M3 for qemu-devel@nongnu.org; Wed, 07 Oct 2015 05:44:26 -0400 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]:33818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjlGr-0004P7-C3 for qemu-devel@nongnu.org; Wed, 07 Oct 2015 05:44:25 -0400 Received: by padhy16 with SMTP id hy16so16776112pad.1 for ; Wed, 07 Oct 2015 02:44:25 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Wed, 7 Oct 2015 20:43:34 +1100 Message-Id: <1444211031-11624-10-git-send-email-rth@twiddle.net> In-Reply-To: <1444211031-11624-1-git-send-email-rth@twiddle.net> References: <1444211031-11624-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 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 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