Work around gcc's mips define, spotted by Stefan Weil.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2786 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-05-08 20:51:26 +00:00
parent 565d28951e
commit 09c69c5b23

View file

@ -1647,22 +1647,22 @@ unsigned int ieee_rm[] = {
#define RESTORE_ROUNDING_MODE \ #define RESTORE_ROUNDING_MODE \
set_float_rounding_mode(ieee_rm[env->fcr31 & 3], &env->fp_status) set_float_rounding_mode(ieee_rm[env->fcr31 & 3], &env->fp_status)
inline char ieee_ex_to_mips(char ieee) inline char ieee_ex_to_mips(char xcpt)
{ {
return (ieee & float_flag_inexact) >> 5 | return (xcpt & float_flag_inexact) >> 5 |
(ieee & float_flag_underflow) >> 3 | (xcpt & float_flag_underflow) >> 3 |
(ieee & float_flag_overflow) >> 1 | (xcpt & float_flag_overflow) >> 1 |
(ieee & float_flag_divbyzero) << 1 | (xcpt & float_flag_divbyzero) << 1 |
(ieee & float_flag_invalid) << 4; (xcpt & float_flag_invalid) << 4;
} }
inline char mips_ex_to_ieee(char mips) inline char mips_ex_to_ieee(char xcpt)
{ {
return (mips & FP_INEXACT) << 5 | return (xcpt & FP_INEXACT) << 5 |
(mips & FP_UNDERFLOW) << 3 | (xcpt & FP_UNDERFLOW) << 3 |
(mips & FP_OVERFLOW) << 1 | (xcpt & FP_OVERFLOW) << 1 |
(mips & FP_DIV0) >> 1 | (xcpt & FP_DIV0) >> 1 |
(mips & FP_INVALID) >> 4; (xcpt & FP_INVALID) >> 4;
} }
inline void update_fcr31(void) inline void update_fcr31(void)