From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zcni7-00014Y-KJ for qemu-devel@nongnu.org; Fri, 18 Sep 2015 00:55:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zcni5-0004Tg-KZ for qemu-devel@nongnu.org; Fri, 18 Sep 2015 00:55:47 -0400 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:35710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zcni5-0004TS-Fd for qemu-devel@nongnu.org; Fri, 18 Sep 2015 00:55:45 -0400 Received: by pacfv12 with SMTP id fv12so40289750pac.2 for ; Thu, 17 Sep 2015 21:55:45 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Thu, 17 Sep 2015 21:55:22 -0700 Message-Id: <1442552129-19242-16-git-send-email-rth@twiddle.net> In-Reply-To: <1442552129-19242-1-git-send-email-rth@twiddle.net> References: <1442552129-19242-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v2 15/22] target-sparc: Add npc 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, alex.bennee@linaro.org, aurelien@aurel32.net Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target-sparc/cpu.h | 1 + target-sparc/translate.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 72ea171..ac8f383 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -236,6 +236,7 @@ typedef struct trap_state { uint32_t tt; } trap_state; #endif +#define TARGET_INSN_START_EXTRA_WORDS 1 typedef struct sparc_def_t { const char *name; diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 25b5bc0..6e5b82d 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -5257,7 +5257,12 @@ static inline void gen_intermediate_code_internal(SPARCCPU *cpu, tcg_ctx.gen_opc_icount[lj] = num_insns; } } - tcg_gen_insn_start(dc->pc); + if (dc->npc & JUMP_PC) { + assert(dc->jump_pc[1] == dc->pc + 4); + tcg_gen_insn_start(dc->pc, dc->jump_pc[0] | JUMP_PC); + } else { + tcg_gen_insn_start(dc->pc, dc->npc); + } num_insns++; if (unlikely(cpu_breakpoint_test(cs, dc->pc, BP_ANY))) { -- 2.1.0