From 70c14705c36ccbab58b25a00c59a83cdc6a8449f Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Sat, 7 Mar 2009 16:03:05 +0000 Subject: Sparse fixes: dubious mixing of bitwise and logical operations git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6741 c046a42c-6fe2-441c-8c8c-71466251a162 --- fpu/softfloat-specialize.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'fpu') diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h index d279210ae..f607e1939 100644 --- a/fpu/softfloat-specialize.h +++ b/fpu/softfloat-specialize.h @@ -166,7 +166,7 @@ static float32 propagateFloat32NaN( float32 a, float32 b STATUS_PARAM) res = bIsNaN ? bv : av; } else if ( aIsNaN ) { - if ( bIsSignalingNaN | ! bIsNaN ) + if ( bIsSignalingNaN || ! bIsNaN ) res = av; else { returnLargerSignificand: @@ -301,7 +301,7 @@ static float64 propagateFloat64NaN( float64 a, float64 b STATUS_PARAM) res = bIsNaN ? bv : av; } else if ( aIsNaN ) { - if ( bIsSignalingNaN | ! bIsNaN ) + if ( bIsSignalingNaN || ! bIsNaN ) res = av; else { returnLargerSignificand: @@ -441,7 +441,7 @@ static floatx80 propagateFloatx80NaN( floatx80 a, floatx80 b STATUS_PARAM) return bIsNaN ? b : a; } else if ( aIsNaN ) { - if ( bIsSignalingNaN | ! bIsNaN ) return a; + if ( bIsSignalingNaN || ! bIsNaN ) return a; returnLargerSignificand: if ( a.low < b.low ) return b; if ( b.low < a.low ) return a; @@ -567,7 +567,7 @@ static float128 propagateFloat128NaN( float128 a, float128 b STATUS_PARAM) return bIsNaN ? b : a; } else if ( aIsNaN ) { - if ( bIsSignalingNaN | ! bIsNaN ) return a; + if ( bIsSignalingNaN || ! bIsNaN ) return a; returnLargerSignificand: if ( lt128( a.high<<1, a.low, b.high<<1, b.low ) ) return b; if ( lt128( b.high<<1, b.low, a.high<<1, a.low ) ) return a; -- cgit v1.2.3