ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/ppc: merge ppc_vsr_t and ppc_avr_t union types 

Since the VSX registers are actually a superset of the VMX registers then they
can be represented by the same type. Merge ppc_avr_t into ppc_vsr_t and change
ppc_avr_t to be a simple typedef alias.

Note that due to a difference in the naming of the float32 member between
ppc_avr_t and ppc_vsr_t, references to the ppc_avr_t f member must be replaced
with f32 instead.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2019-01-02 09:14:21 +00:00 committed by David Gibson
parent 7329fb6240
commit 05ee3e8aa0
3 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/ppc/cpu.h
View File

@ -218,7 +218,6 @@ typedef struct opc_handler_t opc_handler_t;
/* Types used to describe some PowerPC registers etc. */ /* Types used to describe some PowerPC registers etc. */
typedef struct DisasContext DisasContext; typedef struct DisasContext DisasContext;
typedef struct ppc_spr_t ppc_spr_t; typedef struct ppc_spr_t ppc_spr_t;
typedef union ppc_avr_t ppc_avr_t;
typedef union ppc_tlb_t ppc_tlb_t; typedef union ppc_tlb_t ppc_tlb_t;
typedef struct ppc_hash_pte64 ppc_hash_pte64_t; typedef struct ppc_hash_pte64 ppc_hash_pte64_t;
@ -242,22 +241,26 @@ struct ppc_spr_t {
#endif #endif
}; };
/* Altivec registers (128 bits) */ /* VSX/Altivec registers (128 bits) */
union ppc_avr_t { typedef union _ppc_vsr_t {
float32 f[4];
uint8_t u8[16]; uint8_t u8[16];
uint16_t u16[8]; uint16_t u16[8];
uint32_t u32[4]; uint32_t u32[4];
uint64_t u64[2];
int8_t s8[16]; int8_t s8[16];
int16_t s16[8]; int16_t s16[8];
int32_t s32[4]; int32_t s32[4];
uint64_t u64[2];
int64_t s64[2]; int64_t s64[2];
float32 f32[4];
float64 f64[2];
float128 f128;
#ifdef CONFIG_INT128 #ifdef CONFIG_INT128
__uint128_t u128; __uint128_t u128;
#endif #endif
Int128 s128; Int128 s128;
}; } ppc_vsr_t;
typedef ppc_vsr_t ppc_avr_t;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
/* Software TLB cache */ /* Software TLB cache */

54
target/ppc/int_helper.c
View File

@ -548,8 +548,8 @@ VARITH_DO(muluwm, *, u32)
{ \ { \
int i; \ int i; \
\ \
for (i = 0; i < ARRAY_SIZE(r->f); i++) { \ for (i = 0; i < ARRAY_SIZE(r->f32); i++) { \
r->f[i] = func(a->f[i], b->f[i], &env->vec_status); \ r->f32[i] = func(a->f32[i], b->f32[i], &env->vec_status); \
} \ } \
} }
VARITHFP(addfp, float32_add) VARITHFP(addfp, float32_add)
@ -563,8 +563,8 @@ VARITHFP(maxfp, float32_max)
ppc_avr_t *b, ppc_avr_t *c) \ ppc_avr_t *b, ppc_avr_t *c) \
{ \ { \
int i; \ int i; \
for (i = 0; i < ARRAY_SIZE(r->f); i++) { \ for (i = 0; i < ARRAY_SIZE(r->f32); i++) { \
r->f[i] = float32_muladd(a->f[i], c->f[i], b->f[i], \ r->f32[i] = float32_muladd(a->f32[i], c->f32[i], b->f32[i], \
type, &env->vec_status); \ type, &env->vec_status); \
} \ } \
} }
@ -670,9 +670,9 @@ VABSDU(w, u32)
{ \ { \
int i; \ int i; \
\ \
for (i = 0; i < ARRAY_SIZE(r->f); i++) { \ for (i = 0; i < ARRAY_SIZE(r->f32); i++) { \
float32 t = cvt(b->element[i], &env->vec_status); \ float32 t = cvt(b->element[i], &env->vec_status); \
r->f[i] = float32_scalbn(t, -uim, &env->vec_status); \ r->f32[i] = float32_scalbn(t, -uim, &env->vec_status); \
} \ } \
} }
VCF(ux, uint32_to_float32, u32) VCF(ux, uint32_to_float32, u32)
@ -782,9 +782,9 @@ VCMPNE(w, u32, uint32_t, 0)
uint32_t none = 0; \ uint32_t none = 0; \
int i; \ int i; \
\ \
for (i = 0; i < ARRAY_SIZE(r->f); i++) { \ for (i = 0; i < ARRAY_SIZE(r->f32); i++) { \
uint32_t result; \ uint32_t result; \
int rel = float32_compare_quiet(a->f[i], b->f[i], \ int rel = float32_compare_quiet(a->f32[i], b->f32[i], \
&env->vec_status); \ &env->vec_status); \
if (rel == float_relation_unordered) { \ if (rel == float_relation_unordered) { \
result = 0; \ result = 0; \
@ -816,14 +816,16 @@ static inline void vcmpbfp_internal(CPUPPCState *env, ppc_avr_t *r,
int i; int i;
int all_in = 0; int all_in = 0;
for (i = 0; i < ARRAY_SIZE(r->f); i++) { for (i = 0; i < ARRAY_SIZE(r->f32); i++) {
int le_rel = float32_compare_quiet(a->f[i], b->f[i], &env->vec_status); int le_rel = float32_compare_quiet(a->f32[i], b->f32[i],
&env->vec_status);
if (le_rel == float_relation_unordered) { if (le_rel == float_relation_unordered) {
r->u32[i] = 0xc0000000; r->u32[i] = 0xc0000000;
all_in = 1; all_in = 1;
} else { } else {
float32 bneg = float32_chs(b->f[i]); float32 bneg = float32_chs(b->f32[i]);
int ge_rel = float32_compare_quiet(a->f[i], bneg, &env->vec_status); int ge_rel = float32_compare_quiet(a->f32[i], bneg,
&env->vec_status);
int le = le_rel != float_relation_greater; int le = le_rel != float_relation_greater;
int ge = ge_rel != float_relation_less; int ge = ge_rel != float_relation_less;
@ -856,11 +858,11 @@ void helper_vcmpbfp_dot(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *a,
float_status s = env->vec_status; \ float_status s = env->vec_status; \
\ \
set_float_rounding_mode(float_round_to_zero, &s); \ set_float_rounding_mode(float_round_to_zero, &s); \
for (i = 0; i < ARRAY_SIZE(r->f); i++) { \ for (i = 0; i < ARRAY_SIZE(r->f32); i++) { \
if (float32_is_any_nan(b->f[i])) { \ if (float32_is_any_nan(b->f32[i])) { \
r->element[i] = 0; \ r->element[i] = 0; \
} else { \ } else { \
float64 t = float32_to_float64(b->f[i], &s); \ float64 t = float32_to_float64(b->f32[i], &s); \
int64_t j; \ int64_t j; \
\ \
t = float64_scalbn(t, uim, &s); \ t = float64_scalbn(t, uim, &s); \
@ -1661,8 +1663,8 @@ void helper_vrefp(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *b)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(r->f); i++) { for (i = 0; i < ARRAY_SIZE(r->f32); i++) {
r->f[i] = float32_div(float32_one, b->f[i], &env->vec_status); r->f32[i] = float32_div(float32_one, b->f32[i], &env->vec_status);
} }
} }
@ -1674,8 +1676,8 @@ void helper_vrefp(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *b)
float_status s = env->vec_status; \ float_status s = env->vec_status; \
\ \
set_float_rounding_mode(rounding, &s); \ set_float_rounding_mode(rounding, &s); \
for (i = 0; i < ARRAY_SIZE(r->f); i++) { \ for (i = 0; i < ARRAY_SIZE(r->f32); i++) { \
r->f[i] = float32_round_to_int (b->f[i], &s); \ r->f32[i] = float32_round_to_int (b->f32[i], &s); \
} \ } \
} }
VRFI(n, float_round_nearest_even) VRFI(n, float_round_nearest_even)
@ -1705,10 +1707,10 @@ void helper_vrsqrtefp(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *b)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(r->f); i++) { for (i = 0; i < ARRAY_SIZE(r->f32); i++) {
float32 t = float32_sqrt(b->f[i], &env->vec_status); float32 t = float32_sqrt(b->f32[i], &env->vec_status);
r->f[i] = float32_div(float32_one, t, &env->vec_status); r->f32[i] = float32_div(float32_one, t, &env->vec_status);
} }
} }
@ -1751,8 +1753,8 @@ void helper_vexptefp(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *b)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(r->f); i++) { for (i = 0; i < ARRAY_SIZE(r->f32); i++) {
r->f[i] = float32_exp2(b->f[i], &env->vec_status); r->f32[i] = float32_exp2(b->f32[i], &env->vec_status);
} }
} }
@ -1760,8 +1762,8 @@ void helper_vlogefp(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *b)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(r->f); i++) { for (i = 0; i < ARRAY_SIZE(r->f32); i++) {
r->f[i] = float32_log2(b->f[i], &env->vec_status); r->f32[i] = float32_log2(b->f32[i], &env->vec_status);
} }
} }

11
target/ppc/internal.h
View File

@ -204,17 +204,6 @@ EXTRACT_HELPER(IMM8, 11, 8);
EXTRACT_HELPER(DCMX, 16, 7); EXTRACT_HELPER(DCMX, 16, 7);
EXTRACT_HELPER_SPLIT_3(DCMX_XV, 5, 16, 0, 1, 2, 5, 1, 6, 6); EXTRACT_HELPER_SPLIT_3(DCMX_XV, 5, 16, 0, 1, 2, 5, 1, 6, 6);
typedef union _ppc_vsr_t {
uint8_t u8[16];
uint16_t u16[8];
uint32_t u32[4];
uint64_t u64[2];
float32 f32[4];
float64 f64[2];
float128 f128;
Int128 s128;
} ppc_vsr_t;
#if defined(HOST_WORDS_BIGENDIAN) #if defined(HOST_WORDS_BIGENDIAN)
#define VsrB(i) u8[i] #define VsrB(i) u8[i]
#define VsrH(i) u16[i] #define VsrH(i) u16[i]