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

target/ppc: Update float_invalid_cvt for new flags 

Now that vxsnan is computed directly by softfloat,
we don't need to recompute it via classes.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20211119160502.17432-13-richard.henderson@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Richard Henderson 2021-12-17 17:57:14 +01:00 committed by Cédric Le Goater
parent f2e2504676
commit 353464ea16
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
target/ppc/fpu_helper.c
View File

@ -585,11 +585,11 @@ float64 helper_fdiv(CPUPPCState *env, float64 arg1, float64 arg2)
return ret; return ret;
} }
static void float_invalid_cvt(CPUPPCState *env, bool set_fprc, static void float_invalid_cvt(CPUPPCState *env, int flags,
uintptr_t retaddr, int class1) bool set_fprc, uintptr_t retaddr)
{ {
float_invalid_op_vxcvi(env, set_fprc, retaddr); float_invalid_op_vxcvi(env, set_fprc, retaddr);
if (class1 & is_snan) { if (flags & float_flag_invalid_snan) {
float_invalid_op_vxsnan(env, retaddr); float_invalid_op_vxsnan(env, retaddr);
} }
} }
@ -598,10 +598,10 @@ static void float_invalid_cvt(CPUPPCState *env, bool set_fprc,
uint64_t helper_##op(CPUPPCState *env, float64 arg) \ uint64_t helper_##op(CPUPPCState *env, float64 arg) \
{ \ { \
uint64_t ret = float64_to_##cvt(arg, &env->fp_status); \ uint64_t ret = float64_to_##cvt(arg, &env->fp_status); \
int status = get_float_exception_flags(&env->fp_status); \ int flags = get_float_exception_flags(&env->fp_status); \
\ \
if (unlikely(status & float_flag_invalid)) { \ if (unlikely(flags & float_flag_invalid)) { \
float_invalid_cvt(env, 1, GETPC(), float64_classify(arg)); \ float_invalid_cvt(env, flags, 1, GETPC()); \
ret = nanval; \ ret = nanval; \
} \ } \
return ret; \ return ret; \
@ -2794,7 +2794,7 @@ void helper_##op(CPUPPCState *env, ppc_vsr_t *xt, ppc_vsr_t *xb) \
t.tfld = stp##_to_##ttp##_round_to_zero(xb->sfld, &env->fp_status); \ t.tfld = stp##_to_##ttp##_round_to_zero(xb->sfld, &env->fp_status); \
flags = env->fp_status.float_exception_flags; \ flags = env->fp_status.float_exception_flags; \
if (unlikely(flags & float_flag_invalid)) { \ if (unlikely(flags & float_flag_invalid)) { \
float_invalid_cvt(env, 0, GETPC(), stp##_classify(xb->sfld)); \ float_invalid_cvt(env, flags, 0, GETPC()); \
t.tfld = rnan; \ t.tfld = rnan; \
} \ } \
all_flags |= flags; \ all_flags |= flags; \
@ -2837,10 +2837,12 @@ void helper_##op(CPUPPCState *env, uint32_t opcode, \
ppc_vsr_t *xt, ppc_vsr_t *xb) \ ppc_vsr_t *xt, ppc_vsr_t *xb) \
{ \ { \
ppc_vsr_t t = { }; \ ppc_vsr_t t = { }; \
int flags; \
\ \
t.tfld = stp##_to_##ttp##_round_to_zero(xb->sfld, &env->fp_status); \ t.tfld = stp##_to_##ttp##_round_to_zero(xb->sfld, &env->fp_status); \
if (env->fp_status.float_exception_flags & float_flag_invalid) { \ flags = get_float_exception_flags(&env->fp_status); \
float_invalid_cvt(env, 0, GETPC(), stp##_classify(xb->sfld)); \ if (flags & float_flag_invalid) { \
float_invalid_cvt(env, flags, 0, GETPC()); \
t.tfld = rnan; \ t.tfld = rnan; \
} \ } \
\ \