From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 7/9] target/alpha: Split out gen_goto_tb
Date: Sat, 4 May 2024 08:39:24 -0700 [thread overview]
Message-ID: <20240504153926.357845-8-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240504153926.357845-1-richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240424234436.995410-4-richard.henderson@linaro.org>
[PMD: Split bigger patch, part 5/5]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240503072014.24751-8-philmd@linaro.org>
---
target/alpha/translate.c | 53 ++++++++++++----------------------------
1 file changed, 16 insertions(+), 37 deletions(-)
diff --git a/target/alpha/translate.c b/target/alpha/translate.c
index b7b94cc378..c1a55e5153 100644
--- a/target/alpha/translate.c
+++ b/target/alpha/translate.c
@@ -425,15 +425,22 @@ static DisasJumpType gen_store_conditional(DisasContext *ctx, int ra, int rb,
return DISAS_NEXT;
}
-static bool use_goto_tb(DisasContext *ctx, uint64_t dest)
+static void gen_goto_tb(DisasContext *ctx, int idx, int32_t disp)
{
- return translator_use_goto_tb(&ctx->base, dest);
+ uint64_t dest = ctx->base.pc_next + disp;
+
+ if (translator_use_goto_tb(&ctx->base, dest)) {
+ tcg_gen_goto_tb(idx);
+ tcg_gen_movi_i64(cpu_pc, dest);
+ tcg_gen_exit_tb(ctx->base.tb, idx);
+ } else {
+ tcg_gen_movi_i64(cpu_pc, dest);
+ tcg_gen_lookup_and_goto_ptr();
+ }
}
static DisasJumpType gen_bdirect(DisasContext *ctx, int ra, int32_t disp)
{
- uint64_t dest = ctx->base.pc_next + disp;
-
if (ra != 31) {
tcg_gen_movi_i64(ctx->ir[ra], ctx->base.pc_next);
}
@@ -442,43 +449,19 @@ static DisasJumpType gen_bdirect(DisasContext *ctx, int ra, int32_t disp)
if (disp == 0) {
return DISAS_NEXT;
}
-
- if (use_goto_tb(ctx, dest)) {
- tcg_gen_goto_tb(0);
- tcg_gen_movi_i64(cpu_pc, dest);
- tcg_gen_exit_tb(ctx->base.tb, 0);
- } else {
- tcg_gen_movi_i64(cpu_pc, dest);
- tcg_gen_lookup_and_goto_ptr();
- }
-
+ gen_goto_tb(ctx, 0, disp);
return DISAS_NORETURN;
}
static DisasJumpType gen_bcond_internal(DisasContext *ctx, TCGCond cond,
TCGv cmp, uint64_t imm, int32_t disp)
{
- uint64_t dest = ctx->base.pc_next + disp;
TCGLabel *lab_true = gen_new_label();
tcg_gen_brcondi_i64(cond, cmp, imm, lab_true);
- if (use_goto_tb(ctx, ctx->base.pc_next)) {
- tcg_gen_goto_tb(0);
- tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next);
- tcg_gen_exit_tb(ctx->base.tb, 0);
- } else {
- tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next);
- tcg_gen_lookup_and_goto_ptr();
- }
+ gen_goto_tb(ctx, 0, 0);
gen_set_label(lab_true);
- if (use_goto_tb(ctx, dest)) {
- tcg_gen_goto_tb(1);
- tcg_gen_movi_i64(cpu_pc, dest);
- tcg_gen_exit_tb(ctx->base.tb, 1);
- } else {
- tcg_gen_movi_i64(cpu_pc, dest);
- tcg_gen_lookup_and_goto_ptr();
- }
+ gen_goto_tb(ctx, 1, disp);
return DISAS_NORETURN;
}
@@ -2922,12 +2905,8 @@ static void alpha_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
case DISAS_NORETURN:
break;
case DISAS_TOO_MANY:
- if (use_goto_tb(ctx, ctx->base.pc_next)) {
- tcg_gen_goto_tb(0);
- tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next);
- tcg_gen_exit_tb(ctx->base.tb, 0);
- }
- /* FALLTHRU */
+ gen_goto_tb(ctx, 0, 0);
+ break;
case DISAS_PC_STALE:
tcg_gen_movi_i64(cpu_pc, ctx->base.pc_next);
/* FALLTHRU */
--
2.34.1
next prev parent reply other threads:[~2024-05-04 15:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-04 15:39 [PULL 0/9] target/alpha: Implement CF_PCREL Richard Henderson
2024-05-04 15:39 ` [PULL 1/9] target/alpha: Use cpu_env in preference to ALPHA_CPU Richard Henderson
2024-05-04 15:39 ` [PULL 2/9] target/alpha: Hoist branch shift to initial decode Richard Henderson
2024-05-04 15:39 ` [PULL 3/9] target/alpha: Use DISAS_NEXT definition instead of magic '0' value Richard Henderson
2024-05-04 15:39 ` [PULL 4/9] target/alpha: Inline DISAS_PC_UPDATED and return DISAS_NORETURN Richard Henderson
2024-05-04 15:39 ` [PULL 5/9] target/alpha: Return DISAS_NORETURN once Richard Henderson
2024-05-04 15:39 ` [PULL 6/9] target/alpha: Simplify gen_bcond_internal() Richard Henderson
2024-05-04 15:39 ` Richard Henderson [this message]
2024-05-04 15:39 ` [PULL 8/9] target/alpha: Split out gen_pc_disp Richard Henderson
2024-05-04 15:39 ` [PULL 9/9] target/alpha: Implement CF_PCREL Richard Henderson
2024-05-05 0:39 ` [PULL 0/9] " Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240504153926.357845-8-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).