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

target/ppc: remove getVSR()/putVSR() from mem_helper.c 



Since commit 8a14d31b "target/ppc: switch fpr/vsrl registers so all VSX
registers are in host endian order" functions getVSR() and putVSR() which used
to convert the VSR registers into host endian order are no longer required.

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

target/ppc/mem_helper.c

+12 −11
Original line number Diff line number Diff line
@@ -417,26 +417,27 @@ STVE(stvewx, cpu_stl_data_ra, bswap32, u32) 
void helper_##name(CPUPPCState *env, target_ulong addr,                 \

                   target_ulong xt_num, target_ulong rb)                \

{                                                                       \

    int i;                                                              \

    ppc_vsr_t xt;                                                       \

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

    ppc_vsr_t t;                                                        \

    uint64_t nb = GET_NB(rb);                                           \

    int i;                                                              \

                                                                        \

    xt.s128 = int128_zero();                                            \

    t.s128 = int128_zero();                                             \

    if (nb) {                                                           \

        nb = (nb >= 16) ? 16 : nb;                                      \

        if (msr_le && !lj) {                                            \

            for (i = 16; i > 16 - nb; i--) {                            \

                xt.VsrB(i - 1) = cpu_ldub_data_ra(env, addr, GETPC());  \

                t.VsrB(i - 1) = cpu_ldub_data_ra(env, addr, GETPC());   \

                addr = addr_add(env, addr, 1);                          \

            }                                                           \

        } else {                                                        \

            for (i = 0; i < nb; i++) {                                  \

                xt.VsrB(i) = cpu_ldub_data_ra(env, addr, GETPC());      \

                t.VsrB(i) = cpu_ldub_data_ra(env, addr, GETPC());       \

                addr = addr_add(env, addr, 1);                          \

            }                                                           \

        }                                                               \

    }                                                                   \

    putVSR(xt_num, &xt, env);                                           \

    *xt = t;                                                            \

}



VSX_LXVL(lxvl, 0)
@@ -447,23 +448,23 @@ VSX_LXVL(lxvll, 1) 
void helper_##name(CPUPPCState *env, target_ulong addr,           \

                   target_ulong xt_num, target_ulong rb)          \

{                                                                 \

    int i;                                                        \

    ppc_vsr_t xt;                                                 \

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

    target_ulong nb = GET_NB(rb);                                 \

    int i;                                                        \

                                                                  \

    if (!nb) {                                                    \

        return;                                                   \

    }                                                             \

    getVSR(xt_num, &xt, env);                                     \

                                                                  \

    nb = (nb >= 16) ? 16 : nb;                                    \

    if (msr_le && !lj) {                                          \

        for (i = 16; i > 16 - nb; i--) {                          \

            cpu_stb_data_ra(env, addr, xt.VsrB(i - 1), GETPC());  \

            cpu_stb_data_ra(env, addr, xt->VsrB(i - 1), GETPC()); \

            addr = addr_add(env, addr, 1);                        \

        }                                                         \

    } else {                                                      \

        for (i = 0; i < nb; i++) {                                \

            cpu_stb_data_ra(env, addr, xt.VsrB(i), GETPC());      \

            cpu_stb_data_ra(env, addr, xt->VsrB(i), GETPC());     \

            addr = addr_add(env, addr, 1);                        \

        }                                                         \

    }                                                             \