Commit 37da91f1 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

target/ppc: improve avr64_offset() and use it to simplify get_avr64()/set_avr64() 



By using the VsrD macro in avr64_offset() the same offset calculation can be
used regardless of the host endian. This allows get_avr64() and set_avr64() to
be simplified accordingly.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20190307180520.13868-6-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 c82a8a85

target/ppc/cpu.h

+5 −0
Original line number Diff line number Diff line
@@ -2608,6 +2608,11 @@ static inline uint64_t *cpu_vsrl_ptr(CPUPPCState *env, int i) 
    return (uint64_t *)((uintptr_t)env + vsrl_offset(i));

}



static inline long avr64_offset(int i, bool high)

{

    return offsetof(CPUPPCState, vsr[32 + i].VsrD(high ? 0 : 1));

}



static inline int avr_full_offset(int i)

{

    return vsr_full_offset(i + 32);

target/ppc/translate.c

+2 −14
Original line number Diff line number Diff line
@@ -6687,24 +6687,12 @@ static inline void set_fpr(int regno, TCGv_i64 src) 


static inline void get_avr64(TCGv_i64 dst, int regno, bool high)

{

#ifdef HOST_WORDS_BIGENDIAN

    tcg_gen_ld_i64(dst, cpu_env, offsetof(CPUPPCState,

                                          vsr[32 + regno].u64[(high ? 0 : 1)]));

#else

    tcg_gen_ld_i64(dst, cpu_env, offsetof(CPUPPCState,

                                          vsr[32 + regno].u64[(high ? 1 : 0)]));

#endif

    tcg_gen_ld_i64(dst, cpu_env, avr64_offset(regno, high));

}



static inline void set_avr64(int regno, TCGv_i64 src, bool high)

{

#ifdef HOST_WORDS_BIGENDIAN

    tcg_gen_st_i64(src, cpu_env, offsetof(CPUPPCState,

                                          vsr[32 + regno].u64[(high ? 0 : 1)]));

#else

    tcg_gen_st_i64(src, cpu_env, offsetof(CPUPPCState,

                                          vsr[32 + regno].u64[(high ? 1 : 0)]));

#endif

    tcg_gen_st_i64(src, cpu_env, avr64_offset(regno, high));

}



#include "translate/fp-impl.inc.c"

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

+0 −5
Original line number Diff line number Diff line
@@ -14,11 +14,6 @@ static inline TCGv_ptr gen_avr_ptr(int reg) 
    return r;

}



static inline long avr64_offset(int reg, bool high)

{

    return offsetof(CPUPPCState, vsr[32 + reg].u64[(high ? 0 : 1)]);

}



#define GEN_VR_LDX(name, opc2, opc3)                                          \

static void glue(gen_, name)(DisasContext *ctx)                                       \

{                                                                             \