From 09c69c5b23e904bf59608942da15650bf9428921 Mon Sep 17 00:00:00 2001
From: ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Tue, 8 May 2007 20:51:26 +0000
Subject: [PATCH] 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
---
 target-mips/op.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/target-mips/op.c b/target-mips/op.c
index 899892f68c..aedd7bd84e 100644
--- a/target-mips/op.c
+++ b/target-mips/op.c
@@ -1647,22 +1647,22 @@ unsigned int ieee_rm[] = {
 #define RESTORE_ROUNDING_MODE \
     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 |
-           (ieee & float_flag_underflow) >> 3 |
-           (ieee & float_flag_overflow) >> 1 |
-           (ieee & float_flag_divbyzero) << 1 |
-           (ieee & float_flag_invalid) << 4;
+    return (xcpt & float_flag_inexact) >> 5 |
+           (xcpt & float_flag_underflow) >> 3 |
+           (xcpt & float_flag_overflow) >> 1 |
+           (xcpt & float_flag_divbyzero) << 1 |
+           (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 |
-           (mips & FP_UNDERFLOW) << 3 |
-           (mips & FP_OVERFLOW) << 1 |
-           (mips & FP_DIV0) >> 1 |
-           (mips & FP_INVALID) >> 4;
+    return (xcpt & FP_INEXACT) << 5 |
+           (xcpt & FP_UNDERFLOW) << 3 |
+           (xcpt & FP_OVERFLOW) << 1 |
+           (xcpt & FP_DIV0) >> 1 |
+           (xcpt & FP_INVALID) >> 4;
 }
 
 inline void update_fcr31(void)