From: Julian Seward <jseward@acm.org>
Date: Sun, 27 Feb 2005 13:39:25 +0000 (+0000)
Subject: Placate Icc in the usual way.
X-Git-Tag: svn/VALGRIND_3_0_1^2~350
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9501705e833cde945a1d594cce2da84984c2690;p=thirdparty%2Fvalgrind.git

Placate Icc in the usual way.


git-svn-id: svn://svn.valgrind.org/vex/trunk@984
---

diff --git a/VEX/priv/guest-amd64/toIR.c b/VEX/priv/guest-amd64/toIR.c
index 679ccf5c18..1e28a6ab1b 100644
--- a/VEX/priv/guest-amd64/toIR.c
+++ b/VEX/priv/guest-amd64/toIR.c
@@ -1174,7 +1174,7 @@ static HChar* nameIRegRexB ( Int sz, Prefix pfx, UInt lo3bits )
    vassert(IS_VALID_PFX(pfx));
    vassert(sz == 8 || sz == 4 || sz == 2 || sz == 1);
    return nameIReg( sz, lo3bits | (getRexB(pfx) << 3), 
-                        sz==1 && !haveREX(pfx) );
+                        toBool(sz==1 && !haveREX(pfx)) );
 }
 
 static IRExpr* getIRegRexB ( Int sz, Prefix pfx, UInt lo3bits )
@@ -1184,7 +1184,7 @@ static IRExpr* getIRegRexB ( Int sz, Prefix pfx, UInt lo3bits )
    vassert(sz == 8 || sz == 4 || sz == 2 || sz == 1);
    return IRExpr_Get(
              offsetIReg( sz, lo3bits | (getRexB(pfx) << 3), 
-                             sz==1 && !haveREX(pfx) ),
+                             toBool(sz==1 && !haveREX(pfx)) ),
              szToITy(sz)
           );
 }
@@ -1196,7 +1196,7 @@ static void putIRegRexB ( Int sz, Prefix pfx, UInt lo3bits, IRExpr* e )
    vassert(typeOfIRExpr(irbb->tyenv, e) == szToITy(sz));
    stmt( IRStmt_Put( 
             offsetIReg( sz, lo3bits | (getRexB(pfx) << 3), 
-                            sz==1 && !haveREX(pfx) ),
+                            toBool(sz==1 && !haveREX(pfx)) ),
             sz==4 ? unop(Iop_32Uto64,e) : e
    ));
 }
@@ -1245,7 +1245,7 @@ static UInt offsetIRegG ( Int sz, Prefix pfx, UChar mod_reg_rm )
    vassert(IS_VALID_PFX(pfx));
    vassert(sz == 8 || sz == 4 || sz == 2 || sz == 1);
    reg = gregOfRexRM( pfx, mod_reg_rm );
-   return offsetIReg( sz, reg, sz == 1 && !haveREX(pfx) );
+   return offsetIReg( sz, reg, toBool(sz == 1 && !haveREX(pfx)) );
 }
 
 static 
@@ -1269,7 +1269,7 @@ static
 HChar* nameIRegG ( Int sz, Prefix pfx, UChar mod_reg_rm )
 {
    return nameIReg( sz, gregOfRexRM(pfx,mod_reg_rm),
-                        sz==1 && !haveREX(pfx) );
+                        toBool(sz==1 && !haveREX(pfx)) );
 }
 
 
@@ -1285,7 +1285,7 @@ static UInt offsetIRegE ( Int sz, Prefix pfx, UChar mod_reg_rm )
    vassert(IS_VALID_PFX(pfx));
    vassert(sz == 8 || sz == 4 || sz == 2 || sz == 1);
    reg = eregOfRexRM( pfx, mod_reg_rm );
-   return offsetIReg( sz, reg, sz == 1 && !haveREX(pfx) );
+   return offsetIReg( sz, reg, toBool(sz == 1 && !haveREX(pfx)) );
 }
 
 static 
@@ -1309,7 +1309,7 @@ static
 HChar* nameIRegE ( Int sz, Prefix pfx, UChar mod_reg_rm )
 {
    return nameIReg( sz, eregOfRexRM(pfx,mod_reg_rm),
-                        sz==1 && !haveREX(pfx) );
+                        toBool(sz==1 && !haveREX(pfx)) );
 }