Commit 45141dfd authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by David Gibson
Browse files

target/ppc: introduce single vsrl_offset() function 



Instead of having multiple copies of the offset calculation logic, move it to a
single vsrl_offset() function.

This commit also renames the existing get_vsr()/set_vsr() functions to
get_vsrl()/set_vsrl() which better describes their purpose.

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

target/ppc/cpu.h

+6 −1
Original line number Diff line number Diff line
@@ -2573,9 +2573,14 @@ static inline uint64_t *cpu_fpr_ptr(CPUPPCState *env, int i) 
    return (uint64_t *)((uintptr_t)env + fpr_offset(i));

}



static inline int vsrl_offset(int i)

{

    return offsetof(CPUPPCState, vsr[i].u64[1]);

}



static inline uint64_t *cpu_vsrl_ptr(CPUPPCState *env, int i)

{

    return &env->vsr[i].u64[1];

    return (uint64_t *)((uintptr_t)env + vsrl_offset(i));

}



static inline ppc_avr_t *cpu_avr_ptr(CPUPPCState *env, int i)

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

+6 −6
Original line number Diff line number Diff line 
/***                           VSX extension                               ***/



static inline void get_vsr(TCGv_i64 dst, int n)

static inline void get_vsrl(TCGv_i64 dst, int n)

{

    tcg_gen_ld_i64(dst, cpu_env, offsetof(CPUPPCState, vsr[n].u64[1]));

    tcg_gen_ld_i64(dst, cpu_env, vsrl_offset(n));

}



static inline void set_vsr(int n, TCGv_i64 src)

static inline void set_vsrl(int n, TCGv_i64 src)

{

    tcg_gen_st_i64(src, cpu_env, offsetof(CPUPPCState, vsr[n].u64[1]));

    tcg_gen_st_i64(src, cpu_env, vsrl_offset(n));

}



static inline int vsr_full_offset(int n)
@@ -27,7 +27,7 @@ static inline void get_cpu_vsrh(TCGv_i64 dst, int n) 
static inline void get_cpu_vsrl(TCGv_i64 dst, int n)

{

    if (n < 32) {

        get_vsr(dst, n);

        get_vsrl(dst, n);

    } else {

        get_avr64(dst, n - 32, false);

    }
@@ -45,7 +45,7 @@ static inline void set_cpu_vsrh(int n, TCGv_i64 src) 
static inline void set_cpu_vsrl(int n, TCGv_i64 src)

{

    if (n < 32) {

        set_vsr(n, src);

        set_vsrl(n, src);

    } else {

        set_avr64(n - 32, src, false);

    }