ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
blueswir1 2009-03-07 16:03:05 +00:00
parent 50773fd23d
commit 70c14705c3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fpu/softfloat-specialize.h
View File

@ -166,7 +166,7 @@ static float32 propagateFloat32NaN( float32 a, float32 b STATUS_PARAM)
res = bIsNaN ? bv : av; res = bIsNaN ? bv : av;
} }
else if ( aIsNaN ) { else if ( aIsNaN ) {
if ( bIsSignalingNaN | ! bIsNaN ) if ( bIsSignalingNaN || ! bIsNaN )
res = av; res = av;
else { else {
returnLargerSignificand: returnLargerSignificand:
@ -301,7 +301,7 @@ static float64 propagateFloat64NaN( float64 a, float64 b STATUS_PARAM)
res = bIsNaN ? bv : av; res = bIsNaN ? bv : av;
} }
else if ( aIsNaN ) { else if ( aIsNaN ) {
if ( bIsSignalingNaN | ! bIsNaN ) if ( bIsSignalingNaN || ! bIsNaN )
res = av; res = av;
else { else {
returnLargerSignificand: returnLargerSignificand:
@ -441,7 +441,7 @@ static floatx80 propagateFloatx80NaN( floatx80 a, floatx80 b STATUS_PARAM)
return bIsNaN ? b : a; return bIsNaN ? b : a;
} }
else if ( aIsNaN ) { else if ( aIsNaN ) {
if ( bIsSignalingNaN | ! bIsNaN ) return a; if ( bIsSignalingNaN || ! bIsNaN ) return a;
returnLargerSignificand: returnLargerSignificand:
if ( a.low < b.low ) return b; if ( a.low < b.low ) return b;
if ( b.low < a.low ) return a; if ( b.low < a.low ) return a;
@ -567,7 +567,7 @@ static float128 propagateFloat128NaN( float128 a, float128 b STATUS_PARAM)
return bIsNaN ? b : a; return bIsNaN ? b : a;
} }
else if ( aIsNaN ) { else if ( aIsNaN ) {
if ( bIsSignalingNaN | ! bIsNaN ) return a; if ( bIsSignalingNaN || ! bIsNaN ) return a;
returnLargerSignificand: returnLargerSignificand:
if ( lt128( a.high<<1, a.low, b.high<<1, b.low ) ) return b; 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; if ( lt128( b.high<<1, b.low, a.high<<1, a.low ) ) return a;

2
hw/cirrus_vga.c
View File

@ -2246,7 +2246,7 @@ static void cirrus_cursor_invalidate(VGAState *s1)
CirrusVGAState *s = (CirrusVGAState *)s1; CirrusVGAState *s = (CirrusVGAState *)s1;
int size; int size;
if (!s->sr[0x12] & CIRRUS_CURSOR_SHOW) { if (!(s->sr[0x12] & CIRRUS_CURSOR_SHOW)) {
size = 0; size = 0;
} else { } else {
if (s->sr[0x12] & CIRRUS_CURSOR_LARGE) if (s->sr[0x12] & CIRRUS_CURSOR_LARGE)