gwj / at91sam9263 · Commits

Commit 70c14705c36ccbab58b25a00c59a83cdc6a8449f

Authored by blueswir1
1 parent 50773fd2

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
Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
fpu/softfloat-specialize.h
  View file @70c1470
... ... @@ -166,7 +166,7 @@ static float32 propagateFloat32NaN( float32 a, float32 b STATUS_PARAM)
166 166 res = bIsNaN ? bv : av;
167 167 }
168 168 else if ( aIsNaN ) {
169   - if ( bIsSignalingNaN | ! bIsNaN )
  169 + if ( bIsSignalingNaN || ! bIsNaN )
170 170 res = av;
171 171 else {
172 172 returnLargerSignificand:
... ... @@ -301,7 +301,7 @@ static float64 propagateFloat64NaN( float64 a, float64 b STATUS_PARAM)
301 301 res = bIsNaN ? bv : av;
302 302 }
303 303 else if ( aIsNaN ) {
304   - if ( bIsSignalingNaN | ! bIsNaN )
  304 + if ( bIsSignalingNaN || ! bIsNaN )
305 305 res = av;
306 306 else {
307 307 returnLargerSignificand:
... ... @@ -441,7 +441,7 @@ static floatx80 propagateFloatx80NaN( floatx80 a, floatx80 b STATUS_PARAM)
441 441 return bIsNaN ? b : a;
442 442 }
443 443 else if ( aIsNaN ) {
444   - if ( bIsSignalingNaN | ! bIsNaN ) return a;
  444 + if ( bIsSignalingNaN || ! bIsNaN ) return a;
445 445 returnLargerSignificand:
446 446 if ( a.low < b.low ) return b;
447 447 if ( b.low < a.low ) return a;
... ... @@ -567,7 +567,7 @@ static float128 propagateFloat128NaN( float128 a, float128 b STATUS_PARAM)
567 567 return bIsNaN ? b : a;
568 568 }
569 569 else if ( aIsNaN ) {
570   - if ( bIsSignalingNaN | ! bIsNaN ) return a;
  570 + if ( bIsSignalingNaN || ! bIsNaN ) return a;
571 571 returnLargerSignificand:
572 572 if ( lt128( a.high<<1, a.low, b.high<<1, b.low ) ) return b;
573 573 if ( lt128( b.high<<1, b.low, a.high<<1, a.low ) ) return a;
... ...
hw/cirrus_vga.c
  View file @70c1470
... ... @@ -2246,7 +2246,7 @@ static void cirrus_cursor_invalidate(VGAState *s1)
2246 2246 CirrusVGAState *s = (CirrusVGAState *)s1;
2247 2247 int size;
2248 2248  
2249   - if (!s->sr[0x12] & CIRRUS_CURSOR_SHOW) {
  2249 + if (!(s->sr[0x12] & CIRRUS_CURSOR_SHOW)) {
2250 2250 size = 0;
2251 2251 } else {
2252 2252 if (s->sr[0x12] & CIRRUS_CURSOR_LARGE)
... ...