From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v7 25/27] tcg/tci: Remove the qemu_ld/st_type macros
Date: Tue, 1 Jun 2021 08:01:04 -0700 [thread overview]
Message-ID: <20210601150106.12761-26-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210601150106.12761-1-richard.henderson@linaro.org>
These macros are only used in one place. By expanding,
we get to apply some common-subexpression elimination
and create some local variables.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/tci.c | 165 +++++++++++++++++++++++++++++++++---------------------
1 file changed, 100 insertions(+), 65 deletions(-)
diff --git a/tcg/tci.c b/tcg/tci.c
index 8b17b244bf..11219fec18 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -286,85 +286,88 @@ static bool tci_compare64(uint64_t u0, uint64_t u1, TCGCond condition)
return result;
}
-#ifdef CONFIG_SOFTMMU
-# define qemu_ld_ub \
- helper_ret_ldub_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
-# define qemu_ld_leuw \
- helper_le_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
-# define qemu_ld_leul \
- helper_le_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
-# define qemu_ld_leq \
- helper_le_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
-# define qemu_ld_beuw \
- helper_be_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
-# define qemu_ld_beul \
- helper_be_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
-# define qemu_ld_beq \
- helper_be_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
-# define qemu_st_b(X) \
- helper_ret_stb_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
-# define qemu_st_lew(X) \
- helper_le_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
-# define qemu_st_lel(X) \
- helper_le_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
-# define qemu_st_leq(X) \
- helper_le_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
-# define qemu_st_bew(X) \
- helper_be_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
-# define qemu_st_bel(X) \
- helper_be_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
-# define qemu_st_beq(X) \
- helper_be_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
-#else
-# define qemu_ld_ub ldub_p(g2h(env_cpu(env), taddr))
-# define qemu_ld_leuw lduw_le_p(g2h(env_cpu(env), taddr))
-# define qemu_ld_leul (uint32_t)ldl_le_p(g2h(env_cpu(env), taddr))
-# define qemu_ld_leq ldq_le_p(g2h(env_cpu(env), taddr))
-# define qemu_ld_beuw lduw_be_p(g2h(env_cpu(env), taddr))
-# define qemu_ld_beul (uint32_t)ldl_be_p(g2h(env_cpu(env), taddr))
-# define qemu_ld_beq ldq_be_p(g2h(env_cpu(env), taddr))
-# define qemu_st_b(X) stb_p(g2h(env_cpu(env), taddr), X)
-# define qemu_st_lew(X) stw_le_p(g2h(env_cpu(env), taddr), X)
-# define qemu_st_lel(X) stl_le_p(g2h(env_cpu(env), taddr), X)
-# define qemu_st_leq(X) stq_le_p(g2h(env_cpu(env), taddr), X)
-# define qemu_st_bew(X) stw_be_p(g2h(env_cpu(env), taddr), X)
-# define qemu_st_bel(X) stl_be_p(g2h(env_cpu(env), taddr), X)
-# define qemu_st_beq(X) stq_be_p(g2h(env_cpu(env), taddr), X)
-#endif
-
static uint64_t tci_qemu_ld(CPUArchState *env, target_ulong taddr,
TCGMemOpIdx oi, const void *tb_ptr)
{
MemOp mop = get_memop(oi) & (MO_BSWAP | MO_SSIZE);
+#ifdef CONFIG_SOFTMMU
+ uintptr_t ra = (uintptr_t)tb_ptr;
+
switch (mop) {
case MO_UB:
- return qemu_ld_ub;
+ return helper_ret_ldub_mmu(env, taddr, oi, ra);
case MO_SB:
- return (int8_t)qemu_ld_ub;
+ return helper_ret_ldsb_mmu(env, taddr, oi, ra);
case MO_LEUW:
- return qemu_ld_leuw;
+ return helper_le_lduw_mmu(env, taddr, oi, ra);
case MO_LESW:
- return (int16_t)qemu_ld_leuw;
+ return helper_le_ldsw_mmu(env, taddr, oi, ra);
case MO_LEUL:
- return qemu_ld_leul;
+ return helper_le_ldul_mmu(env, taddr, oi, ra);
case MO_LESL:
- return (int32_t)qemu_ld_leul;
+ return helper_le_ldsl_mmu(env, taddr, oi, ra);
case MO_LEQ:
- return qemu_ld_leq;
+ return helper_le_ldq_mmu(env, taddr, oi, ra);
case MO_BEUW:
- return qemu_ld_beuw;
+ return helper_be_lduw_mmu(env, taddr, oi, ra);
case MO_BESW:
- return (int16_t)qemu_ld_beuw;
+ return helper_be_ldsw_mmu(env, taddr, oi, ra);
case MO_BEUL:
- return qemu_ld_beul;
+ return helper_be_ldul_mmu(env, taddr, oi, ra);
case MO_BESL:
- return (int32_t)qemu_ld_beul;
+ return helper_be_ldsl_mmu(env, taddr, oi, ra);
case MO_BEQ:
- return qemu_ld_beq;
+ return helper_be_ldq_mmu(env, taddr, oi, ra);
default:
g_assert_not_reached();
}
+#else
+ void *haddr = g2h(env_cpu(env), taddr);
+ uint64_t ret;
+
+ switch (mop) {
+ case MO_UB:
+ ret = ldub_p(haddr);
+ break;
+ case MO_SB:
+ ret = ldsb_p(haddr);
+ break;
+ case MO_LEUW:
+ ret = lduw_le_p(haddr);
+ break;
+ case MO_LESW:
+ ret = ldsw_le_p(haddr);
+ break;
+ case MO_LEUL:
+ ret = (uint32_t)ldl_le_p(haddr);
+ break;
+ case MO_LESL:
+ ret = (int32_t)ldl_le_p(haddr);
+ break;
+ case MO_LEQ:
+ ret = ldq_le_p(haddr);
+ break;
+ case MO_BEUW:
+ ret = lduw_be_p(haddr);
+ break;
+ case MO_BESW:
+ ret = ldsw_be_p(haddr);
+ break;
+ case MO_BEUL:
+ ret = (uint32_t)ldl_be_p(haddr);
+ break;
+ case MO_BESL:
+ ret = (int32_t)ldl_be_p(haddr);
+ break;
+ case MO_BEQ:
+ ret = ldq_be_p(haddr);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ return ret;
+#endif
}
static void tci_qemu_st(CPUArchState *env, target_ulong taddr, uint64_t val,
@@ -372,31 +375,63 @@ static void tci_qemu_st(CPUArchState *env, target_ulong taddr, uint64_t val,
{
MemOp mop = get_memop(oi) & (MO_BSWAP | MO_SSIZE);
+#ifdef CONFIG_SOFTMMU
+ uintptr_t ra = (uintptr_t)tb_ptr;
+
switch (mop) {
case MO_UB:
- qemu_st_b(val);
+ helper_ret_stb_mmu(env, taddr, val, oi, ra);
break;
case MO_LEUW:
- qemu_st_lew(val);
+ helper_le_stw_mmu(env, taddr, val, oi, ra);
break;
case MO_LEUL:
- qemu_st_lel(val);
+ helper_le_stl_mmu(env, taddr, val, oi, ra);
break;
case MO_LEQ:
- qemu_st_leq(val);
+ helper_le_stq_mmu(env, taddr, val, oi, ra);
break;
case MO_BEUW:
- qemu_st_bew(val);
+ helper_be_stw_mmu(env, taddr, val, oi, ra);
break;
case MO_BEUL:
- qemu_st_bel(val);
+ helper_be_stl_mmu(env, taddr, val, oi, ra);
break;
case MO_BEQ:
- qemu_st_beq(val);
+ helper_be_stq_mmu(env, taddr, val, oi, ra);
break;
default:
g_assert_not_reached();
}
+#else
+ void *haddr = g2h(env_cpu(env), taddr);
+
+ switch (mop) {
+ case MO_UB:
+ stb_p(haddr, val);
+ break;
+ case MO_LEUW:
+ stw_le_p(haddr, val);
+ break;
+ case MO_LEUL:
+ stl_le_p(haddr, val);
+ break;
+ case MO_LEQ:
+ stq_le_p(haddr, val);
+ break;
+ case MO_BEUW:
+ stw_be_p(haddr, val);
+ break;
+ case MO_BEUL:
+ stl_be_p(haddr, val);
+ break;
+ case MO_BEQ:
+ stq_be_p(haddr, val);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+#endif
}
#if TCG_TARGET_REG_BITS == 64
--
2.25.1
next prev parent reply other threads:[~2021-06-01 15:14 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 15:00 [PATCH v7 00/27] TCI fixes and cleanups Richard Henderson
2021-06-01 15:00 ` [PATCH v7 01/27] tcg: Combine dh_is_64bit and dh_is_signed to dh_typecode Richard Henderson
2021-06-01 15:00 ` [PATCH v7 02/27] tcg: Add tcg_call_flags Richard Henderson
2021-06-01 15:00 ` [PATCH v7 03/27] accel/tcg/plugin-gen: Drop inline markers Richard Henderson
2021-06-01 15:00 ` [PATCH v7 04/27] plugins: Drop tcg_flags from struct qemu_plugin_dyn_cb Richard Henderson
2021-06-02 9:22 ` Alex Bennée
2021-06-02 16:02 ` Richard Henderson
2021-06-01 15:00 ` [PATCH v7 05/27] accel/tcg: Add tcg call flags to plugins helpers Richard Henderson
2021-06-01 15:00 ` [PATCH v7 06/27] tcg: Store the TCGHelperInfo in the TCGOp for call Richard Henderson
2021-06-01 15:00 ` [PATCH v7 07/27] tcg: Add tcg_call_func Richard Henderson
2021-06-01 15:00 ` [PATCH v7 08/27] tcg: Build ffi data structures for helpers Richard Henderson
2021-06-01 15:00 ` [PATCH v7 09/27] tcg/tci: Improve tcg_target_call_clobber_regs Richard Henderson
2021-06-02 17:59 ` Philippe Mathieu-Daudé
2021-06-01 15:00 ` [PATCH v7 10/27] tcg/tci: Move call-return regs to end of tcg_target_reg_alloc_order Richard Henderson
2021-06-01 15:00 ` [PATCH v7 11/27] tcg/tci: Use ffi for calls Richard Henderson
2021-06-02 10:31 ` Alex Bennée
2021-06-01 15:00 ` [PATCH v7 12/27] tcg/tci: Reserve r13 for a temporary Richard Henderson
2021-06-19 15:50 ` Philippe Mathieu-Daudé
2021-06-01 15:00 ` [PATCH v7 13/27] tcg/tci: Emit setcond before brcond Richard Henderson
2021-06-19 15:50 ` Philippe Mathieu-Daudé
2021-06-01 15:00 ` [PATCH v7 14/27] tcg/tci: Remove tci_write_reg Richard Henderson
2021-06-01 15:00 ` [PATCH v7 15/27] tcg/tci: Change encoding to uint32_t units Richard Henderson
2021-06-12 10:21 ` Philippe Mathieu-Daudé
2021-06-12 15:40 ` Richard Henderson
2021-06-19 17:48 ` Philippe Mathieu-Daudé
2021-06-19 18:05 ` Richard Henderson
2021-06-01 15:00 ` [PATCH v7 16/27] tcg/tci: Implement goto_ptr Richard Henderson
2021-06-12 9:45 ` Philippe Mathieu-Daudé
2021-06-01 15:00 ` [PATCH v7 17/27] tcg/tci: Implement movcond Richard Henderson
2021-06-01 15:00 ` [PATCH v7 18/27] tcg/tci: Implement andc, orc, eqv, nand, nor Richard Henderson
2021-06-01 15:00 ` [PATCH v7 19/27] tcg/tci: Implement extract, sextract Richard Henderson
2021-06-01 15:00 ` [PATCH v7 20/27] tcg/tci: Implement clz, ctz, ctpop Richard Henderson
2021-06-01 15:01 ` [PATCH v7 21/27] tcg/tci: Implement mulu2, muls2 Richard Henderson
2021-06-01 15:01 ` [PATCH v7 22/27] tcg/tci: Implement add2, sub2 Richard Henderson
2021-06-12 9:36 ` Philippe Mathieu-Daudé
2021-06-01 15:01 ` [PATCH v7 23/27] tcg/tci: Split out tci_qemu_ld, tci_qemu_st Richard Henderson
2021-06-02 18:01 ` Philippe Mathieu-Daudé
2021-06-01 15:01 ` [PATCH v7 24/27] Revert "tcg/tci: Use exec/cpu_ldst.h interfaces" Richard Henderson
2021-06-12 9:24 ` Philippe Mathieu-Daudé
2021-06-01 15:01 ` Richard Henderson [this message]
2021-06-02 18:03 ` [PATCH v7 25/27] tcg/tci: Remove the qemu_ld/st_type macros Philippe Mathieu-Daudé
2021-06-01 15:01 ` [PATCH v7 26/27] tcg/tci: Use {set,clear}_helper_retaddr Richard Henderson
2021-06-12 9:24 ` Philippe Mathieu-Daudé
2021-06-01 15:01 ` [PATCH v7 27/27] tests/tcg: Increase timeout for TCI Richard Henderson
2021-06-02 9:26 ` Alex Bennée
2021-06-01 15:30 ` [PATCH v7 00/27] TCI fixes and cleanups no-reply
2021-06-19 17:42 ` Philippe Mathieu-Daudé
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=20210601150106.12761-26-richard.henderson@linaro.org \
--to=richard.henderson@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 NNTP newsgroup(s).