On 2015-08-07 19:03, Alvise Rigo wrote:
> Implement exclusive variants of qemu_{ld,st}_{i32,i64} for tcg-i386.
> The lookup for the proper memory helper has been rewritten to take
> into account the new exclusive helpers.
>
> Suggested-by: Jani Kokkonen <jani.kokko...@huawei.com>
> Suggested-by: Claudio Fontana <claudio.font...@huawei.com>
> Signed-off-by: Alvise Rigo <a.r...@virtualopensystems.com>
> ---
> tcg/i386/tcg-target.c | 148
> +++++++++++++++++++++++++++++++++++++++++++-------
> 1 file changed, 129 insertions(+), 19 deletions(-)
>
> diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c
> index ff4d9cf..011907c 100644
> --- a/tcg/i386/tcg-target.c
> +++ b/tcg/i386/tcg-target.c
> @@ -1137,6 +1137,28 @@ static void * const qemu_ld_helpers[16] = {
> [MO_BEQ] = helper_be_ldq_mmu,
> };
>
> +/* LoadLink helpers, only unsigned. Use the macro below to access them. */
> +static void * const qemu_ldex_helpers[16] = {
> + [MO_UB] = helper_ret_ldlinkub_mmu,
> +
> + [MO_LEUW] = helper_le_ldlinkuw_mmu,
> + [MO_LEUL] = helper_le_ldlinkul_mmu,
> + [MO_LEQ] = helper_le_ldlinkq_mmu,
> +
> + [MO_BEUW] = helper_be_ldlinkuw_mmu,
> + [MO_BEUL] = helper_be_ldlinkul_mmu,
> + [MO_BEQ] = helper_be_ldlinkq_mmu,
> +};
> +
> +static inline tcg_insn_unit *ld_helper(TCGMemOp opc)
> +{
> + if (opc & MO_EXCL) {
> + return qemu_ldex_helpers[((int)opc - MO_EXCL) & (MO_BSWAP |
> MO_SSIZE)];
> + }
> +
> + return qemu_ld_helpers[opc & ~MO_SIGN];
> +}
> +
> /* helper signature: helper_ret_st_mmu(CPUState *env, target_ulong addr,
> * uintxx_t val, int mmu_idx, uintptr_t
> ra)
> */
> @@ -1150,6 +1172,26 @@ static void * const qemu_st_helpers[16] = {
> [MO_BEQ] = helper_be_stq_mmu,
> };
>
> +/* StoreConditional helpers. Use the macro below to access them. */
> +static void * const qemu_stex_helpers[16] = {
> + [MO_UB] = helper_ret_stcondb_mmu,
> + [MO_LEUW] = helper_le_stcondw_mmu,
> + [MO_LEUL] = helper_le_stcondl_mmu,
> + [MO_LEQ] = helper_le_stcondq_mmu,
> + [MO_BEUW] = helper_be_stcondw_mmu,
> + [MO_BEUL] = helper_be_stcondl_mmu,
> + [MO_BEQ] = helper_be_stcondq_mmu,
> +};
> +
> +static inline tcg_insn_unit *st_helper(TCGMemOp opc)
> +{
> + if (opc & MO_EXCL) {
> + return qemu_stex_helpers[((int)opc - MO_EXCL) & (MO_BSWAP |
> MO_SSIZE)];
> + }
> +
> + return qemu_st_helpers[opc];
> +}
> +
> /* Perform the TLB load and compare.
>
> Inputs:
> @@ -1245,6 +1287,7 @@ static inline void tcg_out_tlb_load(TCGContext *s,
> TCGReg addrlo, TCGReg addrhi,
> * for a load or store, so that we can later generate the correct helper code
> */
> static void add_qemu_ldst_label(TCGContext *s, bool is_ld, TCGMemOpIdx oi,
> + TCGReg llsc_success,
> TCGReg datalo, TCGReg datahi,
> TCGReg addrlo, TCGReg addrhi,
> tcg_insn_unit *raddr,
> @@ -1253,6 +1296,7 @@ static void add_qemu_ldst_label(TCGContext *s, bool
> is_ld, TCGMemOpIdx oi,
> TCGLabelQemuLdst *label = new_ldst_label(s);
>
> label->is_ld = is_ld;
> + label->llsc_success = llsc_success;
> label->oi = oi;
> label->datalo_reg = datalo;
> label->datahi_reg = datahi;
> @@ -1307,7 +1351,7 @@ static void tcg_out_qemu_ld_slow_path(TCGContext *s,
> TCGLabelQemuLdst *l)
> (uintptr_t)l->raddr);
> }
>
> - tcg_out_call(s, qemu_ld_helpers[opc & (MO_BSWAP | MO_SIZE)]);
> + tcg_out_call(s, ld_helper(opc));
>
> data_reg = l->datalo_reg;
> switch (opc & MO_SSIZE) {
> @@ -1411,9 +1455,16 @@ static void tcg_out_qemu_st_slow_path(TCGContext *s,
> TCGLabelQemuLdst *l)
> }
> }
>
> - /* "Tail call" to the helper, with the return address back inline. */
> - tcg_out_push(s, retaddr);
> - tcg_out_jmp(s, qemu_st_helpers[opc & (MO_BSWAP | MO_SIZE)]);
> + if (opc & MO_EXCL) {
> + tcg_out_call(s, st_helper(opc));
> + /* Save the output of the StoreConditional */
> + tcg_out_mov(s, TCG_TYPE_I32, l->llsc_success, TCG_REG_EAX);
> + tcg_out_jmp(s, l->raddr);
> + } else {
> + /* "Tail call" to the helper, with the return address back inline.
> */
> + tcg_out_push(s, retaddr);
> + tcg_out_jmp(s, st_helper(opc));
> + }
> }
I am not sure it's a good idea to try to use the existing code. For
LL/SC ops, we don't have the slow path and the fast path, as we always
call the helpers. It's probably better to use dedicated code for calling
the helper.
Also given that TCG is already able to handle call helpers, and that the
LL/SC ops basically always call an helper, I do wonder if we can handle
LL/SC ops just like we do for some arithmetic ops, see in tcg-runtime.c
and tcg/tcg-runtime.h. That way the op will be implemented automatically
for all backends. Of course we might still want a wrapper so that the
tcg_gen_* functions transparently call the right helper.
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net
