From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: jniethe5@gmail.com
Subject: [PATCH v4 03/13] tcg/ppc: Reinterpret tb-relative to TB+4
Date: Fri, 13 Oct 2023 10:10:02 -0700 [thread overview]
Message-ID: <20231013171012.122980-4-richard.henderson@linaro.org> (raw)
In-Reply-To: <20231013171012.122980-1-richard.henderson@linaro.org>
It saves one insn to load the address of TB+4 instead of TB.
Adjust all of the indexing to match.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/ppc/tcg-target.c.inc | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
index 9197cfd6c6..aafbf2db4e 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -215,6 +215,12 @@ static const int tcg_target_callee_save_regs[] = {
TCG_REG_R31
};
+/* For PPC, we use TB+4 instead of TB as the base. */
+static inline ptrdiff_t ppc_tbrel_diff(TCGContext *s, const void *target)
+{
+ return tcg_tbrel_diff(s, target) - 4;
+}
+
static inline bool in_range_b(tcg_target_long target)
{
return target == sextract64(target, 0, 26);
@@ -991,7 +997,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret,
}
/* Load addresses within the TB with one insn. */
- tb_diff = tcg_tbrel_diff(s, (void *)arg);
+ tb_diff = ppc_tbrel_diff(s, (void *)arg);
if (!in_prologue && USE_REG_TB && tb_diff == (int16_t)tb_diff) {
tcg_out32(s, ADDI | TAI(ret, TCG_REG_TB, tb_diff));
return;
@@ -1044,7 +1050,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret,
/* Use the constant pool, if possible. */
if (!in_prologue && USE_REG_TB) {
new_pool_label(s, arg, R_PPC_ADDR16, s->code_ptr,
- tcg_tbrel_diff(s, NULL));
+ ppc_tbrel_diff(s, NULL));
tcg_out32(s, LD | TAI(ret, TCG_REG_TB, 0));
return;
}
@@ -1104,7 +1110,7 @@ static void tcg_out_dupi_vec(TCGContext *s, TCGType type, unsigned vece,
*/
if (USE_REG_TB) {
rel = R_PPC_ADDR16;
- add = tcg_tbrel_diff(s, NULL);
+ add = ppc_tbrel_diff(s, NULL);
} else {
rel = R_PPC_ADDR32;
add = 0;
@@ -2531,7 +2537,6 @@ static void tcg_out_tb_start(TCGContext *s)
/* bcl 20,31,$+4 (preferred form for getting nia) */
tcg_out32(s, BC | BO_ALWAYS | BI(7, CR_SO) | 0x4 | LK);
tcg_out32(s, MFSPR | RT(TCG_REG_TB) | LR);
- tcg_out32(s, ADDI | TAI(TCG_REG_TB, TCG_REG_TB, -4));
}
}
@@ -2551,7 +2556,7 @@ static void tcg_out_goto_tb(TCGContext *s, int which)
/* When branch is out of range, fall through to indirect. */
if (USE_REG_TB) {
- ptrdiff_t offset = tcg_tbrel_diff(s, (void *)ptr);
+ ptrdiff_t offset = ppc_tbrel_diff(s, (void *)ptr);
tcg_out_mem_long(s, LD, LDX, TCG_REG_TMP1, TCG_REG_TB, offset);
} else {
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_TMP1, ptr - (int16_t)ptr);
--
2.34.1
next prev parent reply other threads:[~2023-10-13 17:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 17:09 [PATCH v4 00/13] tcg/ppc: direct branching, power9, power10 Richard Henderson
2023-10-13 17:10 ` [PATCH v4 01/13] tcg/ppc: Untabify tcg-target.c.inc Richard Henderson
2023-10-13 17:10 ` [PATCH v4 02/13] tcg/ppc: Enable direct branching tcg_out_goto_tb with TCG_REG_TB Richard Henderson
2023-10-13 17:10 ` Richard Henderson [this message]
2023-10-13 17:10 ` [PATCH v4 04/13] tcg/ppc: Use ADDPCIS in tcg_out_tb_start Richard Henderson
2023-10-13 17:10 ` [PATCH v4 05/13] tcg/ppc: Use ADDPCIS in tcg_out_movi_int Richard Henderson
2023-10-13 17:10 ` [PATCH v4 06/13] tcg/ppc: Use ADDPCIS for the constant pool Richard Henderson
2023-10-13 17:10 ` [PATCH v4 07/13] tcg/ppc: Use ADDPCIS in tcg_out_goto_tb Richard Henderson
2023-10-13 17:10 ` [PATCH v4 08/13] tcg/ppc: Use PADDI in tcg_out_movi Richard Henderson
2023-10-13 17:10 ` [PATCH v4 09/13] tcg/ppc: Use prefixed instructions in tcg_out_mem_long Richard Henderson
2023-10-13 17:10 ` [PATCH v4 10/13] tcg/ppc: Use PLD in tcg_out_movi for constant pool Richard Henderson
2023-10-13 17:10 ` [PATCH v4 11/13] tcg/ppc: Use prefixed instructions in tcg_out_dupi_vec Richard Henderson
2023-10-13 17:10 ` [PATCH v4 12/13] tcg/ppc: Use PLD in tcg_out_goto_tb Richard Henderson
2023-10-13 17:10 ` [PATCH v4 13/13] tcg/ppc: Disable TCG_REG_TB for Power9/Power10 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=20231013171012.122980-4-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=jniethe5@gmail.com \
--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 NNTP newsgroup(s).