diff options
| -rw-r--r-- | fpu/softfloat-specialize.h | 8 | ||||
| -rw-r--r-- | hw/cirrus_vga.c | 2 |
2 files changed, 5 insertions, 5 deletions
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; diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 8aade8484..ec0297fc5 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2246,7 +2246,7 @@ static void cirrus_cursor_invalidate(VGAState *s1) CirrusVGAState *s = (CirrusVGAState *)s1; int size; - if (!s->sr[0x12] & CIRRUS_CURSOR_SHOW) { + if (!(s->sr[0x12] & CIRRUS_CURSOR_SHOW)) { size = 0; } else { if (s->sr[0x12] & CIRRUS_CURSOR_LARGE) |