mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-03 19:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-sparc: fix fcmp{s,d,q} instructions wrt exception

Browse Source 
fcmp{s,d,q} instructions are supposed to ignore quiet NaN (contrary to
the fcmpe{s,d,q} instructions), but the current code is wrongly setting
the NV exception in that case. Moreover the current code is duplicated:
first the arguments are checked for NaN to generate an exception, and
later in case the comparison is unordered (which can only happens if one
of the argument is a NaN), the same check is done to generate an
exception.

Fix that by calling clear_float_exceptions() followed by
check_ieee_exceptions() as for the other floating point instructions.
Use the _compare_quiet functions for fcmp{s,d,q} and the _compare ones
for fcmpe{s,d,q}. Simplify the flag setting by not clearing a flag that
is set the line just below.

This fix allows the math glibc testsuite to pass.

Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Aurelien Jarno
2012-09-07 17:13:28 +02:00
committed by Blue Swirl
parent c29b1bee4b
commit 5acfc8320f
1 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
target-sparc/fop_helper.c
View File

@@ -334,34 +334,28 @@ void helper_fsqrtq(CPUSPARCState *env)
} }
#define GEN_FCMP(name, size, reg1, reg2, FS, E) \ #define GEN_FCMP(name, size, reg1, reg2, FS, E) \
void glue(helper_, name) (CPUSPARCState *env) \ void glue(helper_, name) (CPUSPARCState *env) \
{ \ { \
env->fsr &= FSR_FTT_NMASK; \ int ret; \
if (E && (glue(size, _is_any_nan)(reg1) || \ clear_float_exceptions(env); \
glue(size, _is_any_nan)(reg2)) && \ if (E) { \
(env->fsr & FSR_NVM)) { \ ret = glue(size, _compare)(reg1, reg2, &env->fp_status); \
env->fsr |= FSR_NVC; \ } else { \
env->fsr |= FSR_FTT_IEEE_EXCP; \ ret = glue(size, _compare_quiet)(reg1, reg2, \
helper_raise_exception(env, TT_FP_EXCP); \ &env->fp_status); \
} \ } \
switch (glue(size, _compare) (reg1, reg2, &env->fp_status)) { \ check_ieee_exceptions(env); \
switch (ret) { \
case float_relation_unordered: \ case float_relation_unordered: \
if ((env->fsr & FSR_NVM)) { \ env->fsr |= (FSR_FCC1 | FSR_FCC0) << FS; \
env->fsr |= FSR_NVC; \ env->fsr |= FSR_NVA; \
env->fsr |= FSR_FTT_IEEE_EXCP; \
helper_raise_exception(env, TT_FP_EXCP); \
} else { \
env->fsr &= ~((FSR_FCC1 | FSR_FCC0) << FS); \
env->fsr |= (FSR_FCC1 | FSR_FCC0) << FS; \
env->fsr |= FSR_NVA; \
} \
break; \ break; \
case float_relation_less: \ case float_relation_less: \
env->fsr &= ~((FSR_FCC1 | FSR_FCC0) << FS); \ env->fsr &= ~(FSR_FCC1) << FS; \
env->fsr |= FSR_FCC0 << FS; \ env->fsr |= FSR_FCC0 << FS; \
break; \ break; \
case float_relation_greater: \ case float_relation_greater: \
env->fsr &= ~((FSR_FCC1 | FSR_FCC0) << FS); \ env->fsr &= ~(FSR_FCC0) << FS; \
env->fsr |= FSR_FCC1 << FS; \ env->fsr |= FSR_FCC1 << FS; \
break; \ break; \
default: \ default: \
@@ -370,34 +364,27 @@ void helper_fsqrtq(CPUSPARCState *env)
} \ } \
} }
#define GEN_FCMP_T(name, size, FS, E) \ #define GEN_FCMP_T(name, size, FS, E) \
void glue(helper_, name)(CPUSPARCState *env, size src1, size src2) \ void glue(helper_, name)(CPUSPARCState *env, size src1, size src2) \
{ \ { \
env->fsr &= FSR_FTT_NMASK; \ int ret; \
if (E && (glue(size, _is_any_nan)(src1) || \ clear_float_exceptions(env); \
glue(size, _is_any_nan)(src2)) && \ if (E) { \
(env->fsr & FSR_NVM)) { \ ret = glue(size, _compare)(src1, src2, &env->fp_status); \
env->fsr |= FSR_NVC; \ } else { \
env->fsr |= FSR_FTT_IEEE_EXCP; \ ret = glue(size, _compare_quiet)(src1, src2, \
helper_raise_exception(env, TT_FP_EXCP); \ &env->fp_status); \
} \ } \
switch (glue(size, _compare) (src1, src2, &env->fp_status)) { \ check_ieee_exceptions(env); \
switch (ret) { \
case float_relation_unordered: \ case float_relation_unordered: \
if ((env->fsr & FSR_NVM)) { \ env->fsr |= (FSR_FCC1 | FSR_FCC0) << FS; \
env->fsr |= FSR_NVC; \
env->fsr |= FSR_FTT_IEEE_EXCP; \
helper_raise_exception(env, TT_FP_EXCP); \
} else { \
env->fsr &= ~((FSR_FCC1 | FSR_FCC0) << FS); \
env->fsr |= (FSR_FCC1 | FSR_FCC0) << FS; \
env->fsr |= FSR_NVA; \
} \
break; \ break; \
case float_relation_less: \ case float_relation_less: \
env->fsr &= ~((FSR_FCC1 | FSR_FCC0) << FS); \ env->fsr &= ~(FSR_FCC1 << FS); \
env->fsr |= FSR_FCC0 << FS; \ env->fsr |= FSR_FCC0 << FS; \
break; \ break; \
case float_relation_greater: \ case float_relation_greater: \
env->fsr &= ~((FSR_FCC1 | FSR_FCC0) << FS); \ env->fsr &= ~(FSR_FCC0 << FS); \
env->fsr |= FSR_FCC1 << FS; \ env->fsr |= FSR_FCC1 << FS; \
break; \ break; \
default: \ default: \