OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20190307180520.13868-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2019-03-07 18:05:15 +00:00 committed by David Gibson
parent e7d3b272ed
commit 45141dfd23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/ppc/cpu.h
View File

@ -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)

12
target/ppc/translate/vsx-impl.inc.c
View File

@ -1,13 +1,13 @@
/*** 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);
}