tcg/s390x: 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
30feb7ee43
commit
3df73c7e39
@ -1679,7 +1679,6 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg data,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_SOFTMMU)
|
|
||||||
static const TCGLdstHelperParam ldst_helper_param = {
|
static const TCGLdstHelperParam ldst_helper_param = {
|
||||||
.ntmp = 1, .tmp = { TCG_TMP0 }
|
.ntmp = 1, .tmp = { TCG_TMP0 }
|
||||||
};
|
};
|
||||||
@ -1716,34 +1715,6 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb)
|
|||||||
tgen_gotoi(s, S390_CC_ALWAYS, lb->raddr);
|
tgen_gotoi(s, S390_CC_ALWAYS, lb->raddr);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
static bool tcg_out_fail_alignment(TCGContext *s, TCGLabelQemuLdst *l)
|
|
||||||
{
|
|
||||||
if (!patch_reloc(l->label_ptr[0], R_390_PC16DBL,
|
|
||||||
(intptr_t)tcg_splitwx_to_rx(s->code_ptr), 2)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
tcg_out_mov(s, TCG_TYPE_TL, TCG_REG_R3, l->addrlo_reg);
|
|
||||||
tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_R2, TCG_AREG0);
|
|
||||||
|
|
||||||
/* "Tail call" to the helper, with the return address back inline. */
|
|
||||||
tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R14, (uintptr_t)l->raddr);
|
|
||||||
tgen_gotoi(s, S390_CC_ALWAYS, (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 /* CONFIG_SOFTMMU */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For softmmu, perform the TLB load and compare.
|
* For softmmu, perform the TLB load and compare.
|
||||||
|
Loading…
Reference in New Issue
Block a user