[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/53] tcg/aarch64: Convert tcg_out_qemu_{ld,st}_slow_path
From: |
Richard Henderson |
Subject: |
[PULL 23/53] tcg/aarch64: Convert tcg_out_qemu_{ld,st}_slow_path |
Date: |
Thu, 11 May 2023 09:04:20 +0100 |
Use tcg_out_ld_helper_args, tcg_out_ld_helper_ret,
and tcg_out_st_helper_args.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/aarch64/tcg-target.c.inc | 40 +++++++++++++++---------------------
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
index 202b90c001..62dd22d73c 100644
--- a/tcg/aarch64/tcg-target.c.inc
+++ b/tcg/aarch64/tcg-target.c.inc
@@ -1580,13 +1580,6 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext,
TCGReg d,
}
}
-static void tcg_out_adr(TCGContext *s, TCGReg rd, const void *target)
-{
- ptrdiff_t offset = tcg_pcrel_diff(s, target);
- tcg_debug_assert(offset == sextract64(offset, 0, 21));
- tcg_out_insn(s, 3406, ADR, rd, offset);
-}
-
typedef struct {
TCGReg base;
TCGReg index;
@@ -1627,47 +1620,46 @@ static void * const qemu_st_helpers[MO_SIZE + 1] = {
#endif
};
+static const TCGLdstHelperParam ldst_helper_param = {
+ .ntmp = 1, .tmp = { TCG_REG_TMP }
+};
+
static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb)
{
- MemOpIdx oi = lb->oi;
- MemOp opc = get_memop(oi);
+ MemOp opc = get_memop(lb->oi);
if (!reloc_pc19(lb->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) {
return false;
}
- tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_X0, TCG_AREG0);
- tcg_out_mov(s, TARGET_LONG_BITS == 64, TCG_REG_X1, lb->addrlo_reg);
- tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_X2, oi);
- tcg_out_adr(s, TCG_REG_X3, lb->raddr);
+ tcg_out_ld_helper_args(s, lb, &ldst_helper_param);
tcg_out_call_int(s, qemu_ld_helpers[opc & MO_SIZE]);
-
- tcg_out_movext(s, lb->type, lb->datalo_reg,
- TCG_TYPE_REG, opc & MO_SSIZE, TCG_REG_X0);
+ tcg_out_ld_helper_ret(s, lb, false, &ldst_helper_param);
tcg_out_goto(s, lb->raddr);
return true;
}
static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb)
{
- MemOpIdx oi = lb->oi;
- MemOp opc = get_memop(oi);
- MemOp size = opc & MO_SIZE;
+ MemOp opc = get_memop(lb->oi);
if (!reloc_pc19(lb->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) {
return false;
}
- tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_X0, TCG_AREG0);
- tcg_out_mov(s, TARGET_LONG_BITS == 64, TCG_REG_X1, lb->addrlo_reg);
- tcg_out_mov(s, size == MO_64, TCG_REG_X2, lb->datalo_reg);
- tcg_out_movi(s, TCG_TYPE_I32, TCG_REG_X3, oi);
- tcg_out_adr(s, TCG_REG_X4, lb->raddr);
+ tcg_out_st_helper_args(s, lb, &ldst_helper_param);
tcg_out_call_int(s, qemu_st_helpers[opc & MO_SIZE]);
tcg_out_goto(s, lb->raddr);
return true;
}
#else
+static void tcg_out_adr(TCGContext *s, TCGReg rd, const void *target)
+{
+ ptrdiff_t offset = tcg_pcrel_diff(s, target);
+ tcg_debug_assert(offset == sextract64(offset, 0, 21));
+ tcg_out_insn(s, 3406, ADR, rd, offset);
+}
+
static bool tcg_out_fail_alignment(TCGContext *s, TCGLabelQemuLdst *l)
{
if (!reloc_pc19(l->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) {
--
2.34.1
- [PULL 26/53] tcg/mips: Convert tcg_out_qemu_{ld,st}_slow_path, (continued)
- [PULL 26/53] tcg/mips: Convert tcg_out_qemu_{ld,st}_slow_path, Richard Henderson, 2023/05/11
- [PULL 31/53] tcg/mips: Remove MO_BSWAP handling, Richard Henderson, 2023/05/11
- [PULL 34/53] tcg/ppc: Reorg tcg_out_tlb_read, Richard Henderson, 2023/05/11
- [PULL 15/53] tcg/loongarch64: Introduce prepare_host_addr, Richard Henderson, 2023/05/11
- [PULL 21/53] tcg/i386: Convert tcg_out_qemu_ld_slow_path, Richard Henderson, 2023/05/11
- [PULL 22/53] tcg/i386: Convert tcg_out_qemu_st_slow_path, Richard Henderson, 2023/05/11
- [PULL 33/53] tcg/mips: Simplify constraints on qemu_ld/st, Richard Henderson, 2023/05/11
- [PULL 36/53] tcg/ppc: Remove unused constraints A, B, C, D, Richard Henderson, 2023/05/11
- [PULL 16/53] tcg/mips: Introduce prepare_host_addr, Richard Henderson, 2023/05/11
- [PULL 38/53] tcg/riscv: Simplify constraints on qemu_ld/st, Richard Henderson, 2023/05/11
- [PULL 23/53] tcg/aarch64: Convert tcg_out_qemu_{ld,st}_slow_path,
Richard Henderson <=
- [PULL 39/53] tcg/s390x: Use ALGFR in constructing softmmu host address, Richard Henderson, 2023/05/11
- [PULL 20/53] tcg: Add routines for calling slow-path helpers, Richard Henderson, 2023/05/11
- [PULL 19/53] tcg/s390x: Introduce prepare_host_addr, Richard Henderson, 2023/05/11
- [PULL 28/53] tcg/riscv: Convert tcg_out_qemu_{ld,st}_slow_path, Richard Henderson, 2023/05/11
- [PULL 27/53] tcg/ppc: Convert tcg_out_qemu_{ld,st}_slow_path, Richard Henderson, 2023/05/11
- [PULL 30/53] tcg/loongarch64: Simplify constraints on qemu_ld/st, Richard Henderson, 2023/05/11
- [PULL 29/53] tcg/s390x: Convert tcg_out_qemu_{ld,st}_slow_path, Richard Henderson, 2023/05/11
- [PULL 24/53] tcg/arm: Convert tcg_out_qemu_{ld,st}_slow_path, Richard Henderson, 2023/05/11
- [PULL 03/53] disas: Fix tabs and braces in disas.c, Richard Henderson, 2023/05/11
- [PULL 35/53] tcg/ppc: Adjust constraints on qemu_ld/st, Richard Henderson, 2023/05/11