tcg/ppc: Use full load/store helpers in user-only mode
Instead of using helper_unaligned_{ld,st}, use the full load/store helpers. This will allow the fast path to increase alignment to implement atomicity while not immediately raising an alignment exception. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
e9266ecd8f
commit
64d51dc31a
@ -1962,7 +1962,6 @@ static const uint32_t qemu_stx_opc[(MO_SIZE + MO_BSWAP) + 1] = {
|
||||
[MO_BSWAP | MO_UQ] = STDBRX,
|
||||
};
|
||||
|
||||
#if defined (CONFIG_SOFTMMU)
|
||||
static TCGReg ldst_ra_gen(TCGContext *s, const TCGLabelQemuLdst *l, int arg)
|
||||
{
|
||||
if (arg < 0) {
|
||||
@ -2012,49 +2011,6 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb)
|
||||
tcg_out_b(s, 0, lb->raddr);
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
static bool tcg_out_fail_alignment(TCGContext *s, TCGLabelQemuLdst *l)
|
||||
{
|
||||
if (!reloc_pc14(l->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (TCG_TARGET_REG_BITS < TARGET_LONG_BITS) {
|
||||
TCGReg arg = TCG_REG_R4;
|
||||
|
||||
arg |= (TCG_TARGET_CALL_ARG_I64 == TCG_CALL_ARG_EVEN);
|
||||
if (l->addrlo_reg != arg) {
|
||||
tcg_out_mov(s, TCG_TYPE_I32, arg, l->addrhi_reg);
|
||||
tcg_out_mov(s, TCG_TYPE_I32, arg + 1, l->addrlo_reg);
|
||||
} else if (l->addrhi_reg != arg + 1) {
|
||||
tcg_out_mov(s, TCG_TYPE_I32, arg + 1, l->addrlo_reg);
|
||||
tcg_out_mov(s, TCG_TYPE_I32, arg, l->addrhi_reg);
|
||||
} else {
|
||||
tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R0, arg);
|
||||
tcg_out_mov(s, TCG_TYPE_I32, arg, arg + 1);
|
||||
tcg_out_mov(s, TCG_TYPE_I32, arg + 1, TCG_REG_R0);
|
||||
}
|
||||
} else {
|
||||
tcg_out_mov(s, TCG_TYPE_TL, TCG_REG_R4, l->addrlo_reg);
|
||||
}
|
||||
tcg_out_mov(s, TCG_TYPE_TL, TCG_REG_R3, TCG_AREG0);
|
||||
|
||||
/* "Tail call" to the helper, with the return address back inline. */
|
||||
tcg_out_call_int(s, 0, (const void *)(l->is_ld ? helper_unaligned_ld
|
||||
: helper_unaligned_st));
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l)
|
||||
{
|
||||
return tcg_out_fail_alignment(s, l);
|
||||
}
|
||||
|
||||
static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l)
|
||||
{
|
||||
return tcg_out_fail_alignment(s, l);
|
||||
}
|
||||
#endif /* SOFTMMU */
|
||||
|
||||
typedef struct {
|
||||
TCGReg base;
|
||||
|
Loading…
Reference in New Issue
Block a user