ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcg/aarch64: Introduce HostAddress 

Collect the 3 potential parts of the host address into a struct.
Reorg tcg_out_qemu_{ld,st}_direct to use it.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-04-21 09:52:25 +01:00
parent ff0cc85ef3
commit 7f65be51b6
1 changed files with 59 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
tcg/aarch64/tcg-target.c.inc
View File

@ -1587,6 +1587,12 @@ static void tcg_out_adr(TCGContext *s, TCGReg rd, const void *target)
tcg_out_insn(s, 3406, ADR, rd, offset); tcg_out_insn(s, 3406, ADR, rd, offset);
} }
typedef struct {
TCGReg base;
TCGReg index;
TCGType index_ext;
} HostAddress;
#ifdef CONFIG_SOFTMMU #ifdef CONFIG_SOFTMMU
/* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr,
* MemOpIdx oi, uintptr_t ra) * MemOpIdx oi, uintptr_t ra)
@ -1796,32 +1802,31 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l)
#endif /* CONFIG_SOFTMMU */ #endif /* CONFIG_SOFTMMU */
static void tcg_out_qemu_ld_direct(TCGContext *s, MemOp memop, TCGType ext, static void tcg_out_qemu_ld_direct(TCGContext *s, MemOp memop, TCGType ext,
TCGReg data_r, TCGReg addr_r, TCGReg data_r, HostAddress h)
TCGType otype, TCGReg off_r)
{ {
switch (memop & MO_SSIZE) { switch (memop & MO_SSIZE) {
case MO_UB: case MO_UB:
tcg_out_ldst_r(s, I3312_LDRB, data_r, addr_r, otype, off_r); tcg_out_ldst_r(s, I3312_LDRB, data_r, h.base, h.index_ext, h.index);
break; break;
case MO_SB: case MO_SB:
tcg_out_ldst_r(s, ext ? I3312_LDRSBX : I3312_LDRSBW, tcg_out_ldst_r(s, ext ? I3312_LDRSBX : I3312_LDRSBW,
data_r, addr_r, otype, off_r); data_r, h.base, h.index_ext, h.index);
break; break;
case MO_UW: case MO_UW:
tcg_out_ldst_r(s, I3312_LDRH, data_r, addr_r, otype, off_r); tcg_out_ldst_r(s, I3312_LDRH, data_r, h.base, h.index_ext, h.index);
break; break;
case MO_SW: case MO_SW:
tcg_out_ldst_r(s, (ext ? I3312_LDRSHX : I3312_LDRSHW), tcg_out_ldst_r(s, (ext ? I3312_LDRSHX : I3312_LDRSHW),
data_r, addr_r, otype, off_r); data_r, h.base, h.index_ext, h.index);
break; break;
case MO_UL: case MO_UL:
tcg_out_ldst_r(s, I3312_LDRW, data_r, addr_r, otype, off_r); tcg_out_ldst_r(s, I3312_LDRW, data_r, h.base, h.index_ext, h.index);
break; break;
case MO_SL: case MO_SL:
tcg_out_ldst_r(s, I3312_LDRSWX, data_r, addr_r, otype, off_r); tcg_out_ldst_r(s, I3312_LDRSWX, data_r, h.base, h.index_ext, h.index);
break; break;
case MO_UQ: case MO_UQ:
tcg_out_ldst_r(s, I3312_LDRX, data_r, addr_r, otype, off_r); tcg_out_ldst_r(s, I3312_LDRX, data_r, h.base, h.index_ext, h.index);
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
@ -1829,21 +1834,20 @@ static void tcg_out_qemu_ld_direct(TCGContext *s, MemOp memop, TCGType ext,
} }
static void tcg_out_qemu_st_direct(TCGContext *s, MemOp memop, static void tcg_out_qemu_st_direct(TCGContext *s, MemOp memop,
TCGReg data_r, TCGReg addr_r, TCGReg data_r, HostAddress h)
TCGType otype, TCGReg off_r)
{ {
switch (memop & MO_SIZE) { switch (memop & MO_SIZE) {
case MO_8: case MO_8:
tcg_out_ldst_r(s, I3312_STRB, data_r, addr_r, otype, off_r); tcg_out_ldst_r(s, I3312_STRB, data_r, h.base, h.index_ext, h.index);
break; break;
case MO_16: case MO_16:
tcg_out_ldst_r(s, I3312_STRH, data_r, addr_r, otype, off_r); tcg_out_ldst_r(s, I3312_STRH, data_r, h.base, h.index_ext, h.index);
break; break;
case MO_32: case MO_32:
tcg_out_ldst_r(s, I3312_STRW, data_r, addr_r, otype, off_r); tcg_out_ldst_r(s, I3312_STRW, data_r, h.base, h.index_ext, h.index);
break; break;
case MO_64: case MO_64:
tcg_out_ldst_r(s, I3312_STRX, data_r, addr_r, otype, off_r); tcg_out_ldst_r(s, I3312_STRX, data_r, h.base, h.index_ext, h.index);
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
@ -1855,6 +1859,7 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
{ {
MemOp memop = get_memop(oi); MemOp memop = get_memop(oi);
TCGType addr_type = TARGET_LONG_BITS == 64 ? TCG_TYPE_I64 : TCG_TYPE_I32; TCGType addr_type = TARGET_LONG_BITS == 64 ? TCG_TYPE_I64 : TCG_TYPE_I32;
HostAddress h;
/* Byte swapping is left to middle-end expansion. */ /* Byte swapping is left to middle-end expansion. */
tcg_debug_assert((memop & MO_BSWAP) == 0); tcg_debug_assert((memop & MO_BSWAP) == 0);
@ -1863,8 +1868,14 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
tcg_insn_unit *label_ptr; tcg_insn_unit *label_ptr;
tcg_out_tlb_read(s, addr_reg, memop, &label_ptr, get_mmuidx(oi), 1); tcg_out_tlb_read(s, addr_reg, memop, &label_ptr, get_mmuidx(oi), 1);
tcg_out_qemu_ld_direct(s, memop, data_type, data_reg,
TCG_REG_X1, addr_type, addr_reg); h = (HostAddress){
.base = TCG_REG_X1,
.index = addr_reg,
.index_ext = addr_type
};
tcg_out_qemu_ld_direct(s, memop, data_type, data_reg, h);
add_qemu_ldst_label(s, true, oi, data_type, data_reg, addr_reg, add_qemu_ldst_label(s, true, oi, data_type, data_reg, addr_reg,
s->code_ptr, label_ptr); s->code_ptr, label_ptr);
#else /* !CONFIG_SOFTMMU */ #else /* !CONFIG_SOFTMMU */
@ -1873,12 +1884,19 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
tcg_out_test_alignment(s, true, addr_reg, a_bits); tcg_out_test_alignment(s, true, addr_reg, a_bits);
} }
if (USE_GUEST_BASE) { if (USE_GUEST_BASE) {
tcg_out_qemu_ld_direct(s, memop, data_type, data_reg, h = (HostAddress){
TCG_REG_GUEST_BASE, addr_type, addr_reg); .base = TCG_REG_GUEST_BASE,
.index = addr_reg,
.index_ext = addr_type
};
} else { } else {
tcg_out_qemu_ld_direct(s, memop, data_type, data_reg, h = (HostAddress){
addr_reg, TCG_TYPE_I64, TCG_REG_XZR); .base = addr_reg,
.index = TCG_REG_XZR,
.index_ext = TCG_TYPE_I64
};
} }
tcg_out_qemu_ld_direct(s, memop, data_type, data_reg, h);
#endif /* CONFIG_SOFTMMU */ #endif /* CONFIG_SOFTMMU */
} }
@ -1887,6 +1905,7 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
{ {
MemOp memop = get_memop(oi); MemOp memop = get_memop(oi);
TCGType addr_type = TARGET_LONG_BITS == 64 ? TCG_TYPE_I64 : TCG_TYPE_I32; TCGType addr_type = TARGET_LONG_BITS == 64 ? TCG_TYPE_I64 : TCG_TYPE_I32;
HostAddress h;
/* Byte swapping is left to middle-end expansion. */ /* Byte swapping is left to middle-end expansion. */
tcg_debug_assert((memop & MO_BSWAP) == 0); tcg_debug_assert((memop & MO_BSWAP) == 0);
@ -1895,8 +1914,14 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
tcg_insn_unit *label_ptr; tcg_insn_unit *label_ptr;
tcg_out_tlb_read(s, addr_reg, memop, &label_ptr, get_mmuidx(oi), 0); tcg_out_tlb_read(s, addr_reg, memop, &label_ptr, get_mmuidx(oi), 0);
tcg_out_qemu_st_direct(s, memop, data_reg,
TCG_REG_X1, addr_type, addr_reg); h = (HostAddress){
.base = TCG_REG_X1,
.index = addr_reg,
.index_ext = addr_type
};
tcg_out_qemu_st_direct(s, memop, data_reg, h);
add_qemu_ldst_label(s, false, oi, data_type, data_reg, addr_reg, add_qemu_ldst_label(s, false, oi, data_type, data_reg, addr_reg,
s->code_ptr, label_ptr); s->code_ptr, label_ptr);
#else /* !CONFIG_SOFTMMU */ #else /* !CONFIG_SOFTMMU */
@ -1905,12 +1930,19 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg,
tcg_out_test_alignment(s, false, addr_reg, a_bits); tcg_out_test_alignment(s, false, addr_reg, a_bits);
} }
if (USE_GUEST_BASE) { if (USE_GUEST_BASE) {
tcg_out_qemu_st_direct(s, memop, data_reg, h = (HostAddress){
TCG_REG_GUEST_BASE, addr_type, addr_reg); .base = TCG_REG_GUEST_BASE,
.index = addr_reg,
.index_ext = addr_type
};
} else { } else {
tcg_out_qemu_st_direct(s, memop, data_reg, h = (HostAddress){
addr_reg, TCG_TYPE_I64, TCG_REG_XZR); .base = addr_reg,
.index = TCG_REG_XZR,
.index_ext = TCG_TYPE_I64
};
} }
tcg_out_qemu_st_direct(s, memop, data_reg, h);
#endif /* CONFIG_SOFTMMU */ #endif /* CONFIG_SOFTMMU */
} }