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

target/ppc: introduce single fpr_offset() function 



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

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-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 5f366667

target/ppc/cpu.h

+6 −1
Original line number Diff line number Diff line
@@ -2563,9 +2563,14 @@ static inline bool lsw_reg_in_range(int start, int nregs, int rx) 
}



/* Accessors for FP, VMX and VSX registers */

static inline int fpr_offset(int i)

{

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

}



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

{

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

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

}



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

target/ppc/translate.c

+2 −2
Original line number Diff line number Diff line
@@ -6677,12 +6677,12 @@ GEN_TM_PRIV_NOOP(trechkpt); 


static inline void get_fpr(TCGv_i64 dst, int regno)

{

    tcg_gen_ld_i64(dst, cpu_env, offsetof(CPUPPCState, vsr[regno].u64[0]));

    tcg_gen_ld_i64(dst, cpu_env, fpr_offset(regno));

}



static inline void set_fpr(int regno, TCGv_i64 src)

{

    tcg_gen_st_i64(src, cpu_env, offsetof(CPUPPCState, vsr[regno].u64[0]));

    tcg_gen_st_i64(src, cpu_env, fpr_offset(regno));

}



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