Commit 2aba168e authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

target/ppc: decode target register in VSX_VECTOR_LOAD_STORE_LENGTH at translation time 



Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20190616123751.781-14-mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 6ae4a57a

target/ppc/helper.h

+4 −4
Original line number Diff line number Diff line
@@ -279,10 +279,10 @@ DEF_HELPER_3(stvebx, void, env, avr, tl) 
DEF_HELPER_3(stvehx, void, env, avr, tl)

DEF_HELPER_3(stvewx, void, env, avr, tl)

#if defined(TARGET_PPC64)

DEF_HELPER_4(lxvl, void, env, tl, tl, tl)

DEF_HELPER_4(lxvll, void, env, tl, tl, tl)

DEF_HELPER_4(stxvl, void, env, tl, tl, tl)

DEF_HELPER_4(stxvll, void, env, tl, tl, tl)

DEF_HELPER_4(lxvl, void, env, tl, vsr, tl)

DEF_HELPER_4(lxvll, void, env, tl, vsr, tl)

DEF_HELPER_4(stxvl, void, env, tl, vsr, tl)

DEF_HELPER_4(stxvll, void, env, tl, vsr, tl)

#endif

DEF_HELPER_4(vsumsws, void, env, avr, avr, avr)

DEF_HELPER_4(vsum2sws, void, env, avr, avr, avr)

target/ppc/mem_helper.c

+2 −4
Original line number Diff line number Diff line
@@ -415,9 +415,8 @@ STVE(stvewx, cpu_stl_data_ra, bswap32, u32) 


#define VSX_LXVL(name, lj)                                              \

void helper_##name(CPUPPCState *env, target_ulong addr,                 \

                   target_ulong xt_num, target_ulong rb)                \

                   ppc_vsr_t *xt, target_ulong rb)                      \

{                                                                       \

    ppc_vsr_t *xt = &env->vsr[xt_num];                                  \

    ppc_vsr_t t;                                                        \

    uint64_t nb = GET_NB(rb);                                           \

    int i;                                                              \
@@ -446,9 +445,8 @@ VSX_LXVL(lxvll, 1) 


#define VSX_STXVL(name, lj)                                       \

void helper_##name(CPUPPCState *env, target_ulong addr,           \

                   target_ulong xt_num, target_ulong rb)          \

                   ppc_vsr_t *xt, target_ulong rb)                \

{                                                                 \

    ppc_vsr_t *xt = &env->vsr[xt_num];                            \

    target_ulong nb = GET_NB(rb);                                 \

    int i;                                                        \

                                                                  \

target/ppc/translate/vsx-impl.inc.c

+24 −23
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ VSX_VECTOR_STORE(stxvx, st_i64, 1) 
#define VSX_VECTOR_LOAD_STORE_LENGTH(name)                         \

static void gen_##name(DisasContext *ctx)                          \

{                                                                  \

    TCGv EA, xt;                                                \

    TCGv EA;                                                       \

    TCGv_ptr xt;                                                   \

                                                                   \

    if (xT(ctx->opcode) < 32) {                                    \

        if (unlikely(!ctx->vsx_enabled)) {                         \
@@ -361,12 +362,12 @@ static void gen_##name(DisasContext *ctx) \ 
        }                                                          \

    }                                                              \

    EA = tcg_temp_new();                                           \

    xt = tcg_const_tl(xT(ctx->opcode));                         \

    xt = gen_vsr_ptr(xT(ctx->opcode));                             \

    gen_set_access_type(ctx, ACCESS_INT);                          \

    gen_addr_register(ctx, EA);                                    \

    gen_helper_##name(cpu_env, EA, xt, cpu_gpr[rB(ctx->opcode)]);  \

    tcg_temp_free(EA);                                             \

    tcg_temp_free(xt);                                          \

    tcg_temp_free_ptr(xt);                                         \

}



VSX_VECTOR_LOAD_STORE_LENGTH(lxvl)