[Qemu-devel] [6741] Sparse fixes: dubious mixing of bitwise and logical operations

[Blue Swirl]

Revision: 6741
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6741
Author:   blueswir1
Date:     2009-03-07 16:03:05 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Sparse fixes: dubious mixing of bitwise and logical operations

Modified Paths:
--------------
    trunk/fpu/softfloat-specialize.h
    trunk/hw/cirrus_vga.c

Modified: trunk/fpu/softfloat-specialize.h
===================================================================
--- trunk/fpu/softfloat-specialize.h    2009-03-07 15:59:09 UTC (rev 6740)
+++ trunk/fpu/softfloat-specialize.h    2009-03-07 16:03:05 UTC (rev 6741)
@@ -166,7 +166,7 @@
         res = bIsNaN ? bv : av;
     }
     else if ( aIsNaN ) {
-        if ( bIsSignalingNaN | ! bIsNaN )
+        if ( bIsSignalingNaN || ! bIsNaN )
             res = av;
         else {
  returnLargerSignificand:
@@ -301,7 +301,7 @@
         res = bIsNaN ? bv : av;
     }
     else if ( aIsNaN ) {
-        if ( bIsSignalingNaN | ! bIsNaN )
+        if ( bIsSignalingNaN || ! bIsNaN )
             res = av;
         else {
  returnLargerSignificand:
@@ -441,7 +441,7 @@
         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 @@
         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;

Modified: trunk/hw/cirrus_vga.c
===================================================================
--- trunk/hw/cirrus_vga.c       2009-03-07 15:59:09 UTC (rev 6740)
+++ trunk/hw/cirrus_vga.c       2009-03-07 16:03:05 UTC (rev 6741)
@@ -2246,7 +2246,7 @@
     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)