From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4968-00033R-CT for qemu-devel@nongnu.org; Fri, 28 Apr 2017 12:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4965-0004wl-8j for qemu-devel@nongnu.org; Fri, 28 Apr 2017 12:50:24 -0400 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:35503) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4965-0004wU-2Q for qemu-devel@nongnu.org; Fri, 28 Apr 2017 12:50:21 -0400 Received: by mail-wm0-x234.google.com with SMTP id w64so47249045wma.0 for ; Fri, 28 Apr 2017 09:50:20 -0700 (PDT) References: <20170427120006.20564-1-rth@twiddle.net> <20170427120006.20564-11-rth@twiddle.net> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <20170427120006.20564-11-rth@twiddle.net> Date: Fri, 28 Apr 2017 17:50:50 +0100 Message-ID: <87shks79xx.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v5 10/19] target/i386: introduce gen_jr helper to generate lookup_and_goto_ptr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson Cc: qemu-devel@nongnu.org, cota@braap.org Richard Henderson writes: > From: "Emilio G. Cota" > > This helper will be used by subsequent changes. > > Signed-off-by: Emilio G. Cota > Message-Id: <1493263764-18657-9-git-send-email-cota@braap.org> > Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée > --- > target/i386/translate.c | 25 ++++++++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) > > diff --git a/target/i386/translate.c b/target/i386/translate.c > index 1d1372f..f0e48dc 100644 > --- a/target/i386/translate.c > +++ b/target/i386/translate.c > @@ -141,6 +141,7 @@ typedef struct DisasContext { > } DisasContext; > > static void gen_eob(DisasContext *s); > +static void gen_jr(DisasContext *s, TCGv dest); > static void gen_jmp(DisasContext *s, target_ulong eip); > static void gen_jmp_tb(DisasContext *s, target_ulong eip, int tb_num); > static void gen_op(DisasContext *s1, int op, TCGMemOp ot, int d); > @@ -2509,7 +2510,8 @@ static void gen_bnd_jmp(DisasContext *s) > If INHIBIT, set HF_INHIBIT_IRQ_MASK if it isn't already set. > If RECHECK_TF, emit a rechecking helper for #DB, ignoring the state of > S->TF. This is used by the syscall/sysret insns. */ > -static void gen_eob_worker(DisasContext *s, bool inhibit, bool recheck_tf) > +static void > +do_gen_eob_worker(DisasContext *s, bool inhibit, bool recheck_tf, TCGv jr) > { > gen_update_cc_op(s); > > @@ -2530,12 +2532,27 @@ static void gen_eob_worker(DisasContext *s, bool inhibit, bool recheck_tf) > tcg_gen_exit_tb(0); > } else if (s->tf) { > gen_helper_single_step(cpu_env); > + } else if (!TCGV_IS_UNUSED(jr)) { > + TCGv vaddr = tcg_temp_new(); > + > + tcg_gen_add_tl(vaddr, jr, cpu_seg_base[R_CS]); > + tcg_gen_lookup_and_goto_ptr(vaddr); > + tcg_temp_free(vaddr); > } else { > tcg_gen_exit_tb(0); > } > s->is_jmp = DISAS_TB_JUMP; > } > > +static inline void > +gen_eob_worker(DisasContext *s, bool inhibit, bool recheck_tf) > +{ > + TCGv unused; > + > + TCGV_UNUSED(unused); > + do_gen_eob_worker(s, inhibit, recheck_tf, unused); > +} > + > /* End of block. > If INHIBIT, set HF_INHIBIT_IRQ_MASK if it isn't already set. */ > static void gen_eob_inhibit_irq(DisasContext *s, bool inhibit) > @@ -2549,6 +2566,12 @@ static void gen_eob(DisasContext *s) > gen_eob_worker(s, false, false); > } > > +/* Jump to register */ > +static void gen_jr(DisasContext *s, TCGv dest) > +{ > + do_gen_eob_worker(s, false, false, dest); > +} > + > /* generate a jump to eip. No segment change must happen before as a > direct call to the next block may occur */ > static void gen_jmp_tb(DisasContext *s, target_ulong eip, int tb_num) -- Alex Bennée