Commit 5ba5335d authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

target/ppc: decode target register in VSX_EXTRACT_INSERT 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-15-mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 2aba168e

target/ppc/helper.h

+2 −2
Original line number Diff line number Diff line
@@ -534,8 +534,8 @@ DEF_HELPER_3(xvrspip, void, env, vsr, vsr) 
DEF_HELPER_3(xvrspiz, void, env, vsr, vsr)

DEF_HELPER_4(xxperm, void, env, vsr, vsr, vsr)

DEF_HELPER_4(xxpermr, void, env, vsr, vsr, vsr)

DEF_HELPER_4(xxextractuw, void, env, tl, tl, i32)

DEF_HELPER_4(xxinsertw, void, env, tl, tl, i32)

DEF_HELPER_4(xxextractuw, void, env, vsr, vsr, i32)

DEF_HELPER_4(xxinsertw, void, env, vsr, vsr, i32)

DEF_HELPER_3(xvxsigsp, void, env, vsr, vsr)



DEF_HELPER_2(efscfsi, i32, env, i32)

target/ppc/int_helper.c

+4 −8
Original line number Diff line number Diff line
@@ -1899,11 +1899,9 @@ VEXTRACT(uw, u32) 
VEXTRACT(d, u64)

#undef VEXTRACT



void helper_xxextractuw(CPUPPCState *env, target_ulong xtn,

                        target_ulong xbn, uint32_t index)

void helper_xxextractuw(CPUPPCState *env, ppc_vsr_t *xt,

                        ppc_vsr_t *xb, uint32_t index)

{

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

    ppc_vsr_t *xb = &env->vsr[xbn];

    ppc_vsr_t t = { };

    size_t es = sizeof(uint32_t);

    uint32_t ext_index;
@@ -1917,11 +1915,9 @@ void helper_xxextractuw(CPUPPCState *env, target_ulong xtn, 
    *xt = t;

}



void helper_xxinsertw(CPUPPCState *env, target_ulong xtn,

                      target_ulong xbn, uint32_t index)

void helper_xxinsertw(CPUPPCState *env, ppc_vsr_t *xt,

                      ppc_vsr_t *xb, uint32_t index)

{

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

    ppc_vsr_t *xb = &env->vsr[xbn];

    ppc_vsr_t t = *xt;

    size_t es = sizeof(uint32_t);

    int ins_index, i = 0;

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

+5 −5
Original line number Diff line number Diff line
@@ -1632,7 +1632,7 @@ static void gen_xxsldwi(DisasContext *ctx) 
#define VSX_EXTRACT_INSERT(name)                                \

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

{                                                               \

    TCGv xt, xb;                                                \

    TCGv_ptr xt, xb;                                            \

    TCGv_i32 t0;                                                \

    TCGv_i64 t1;                                                \

    uint8_t uimm = UIMM4(ctx->opcode);                          \
@@ -1641,8 +1641,8 @@ static void gen_##name(DisasContext *ctx) \ 
        gen_exception(ctx, POWERPC_EXCP_VSXU);                  \

        return;                                                 \

    }                                                           \

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

    xb = tcg_const_tl(xB(ctx->opcode));                         \

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

    xb = gen_vsr_ptr(xB(ctx->opcode));                          \

    t0 = tcg_temp_new_i32();                                    \

    t1 = tcg_temp_new_i64();                                    \

    /*                                                          \
@@ -1657,8 +1657,8 @@ static void gen_##name(DisasContext *ctx) \ 
    }                                                           \

    tcg_gen_movi_i32(t0, uimm);                                 \

    gen_helper_##name(cpu_env, xt, xb, t0);                     \

    tcg_temp_free(xb);                                          \

    tcg_temp_free(xt);                                          \

    tcg_temp_free_ptr(xb);                                      \

    tcg_temp_free_ptr(xt);                                      \

    tcg_temp_free_i32(t0);                                      \

    tcg_temp_free_i64(t1);                                      \

}