|
From: <sv...@va...> - 2006-01-25 03:26:33
|
Author: sewardj
Date: 2006-01-25 03:26:27 +0000 (Wed, 25 Jan 2006)
New Revision: 1549
Log:
C89 fixes.
Modified:
trunk/priv/guest-ppc/toIR.c
trunk/priv/host-ppc/isel.c
trunk/priv/ir/irdefs.c
trunk/priv/ir/iropt.c
Modified: trunk/priv/guest-ppc/toIR.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/guest-ppc/toIR.c 2006-01-25 03:01:09 UTC (rev 1548)
+++ trunk/priv/guest-ppc/toIR.c 2006-01-25 03:26:27 UTC (rev 1549)
@@ -365,11 +365,12 @@
*/
static UInt MASK32( UInt begin, UInt end )
{
+ UInt m1, m2, mask;
vassert(begin < 32);
vassert(end < 32);
- UInt m1 =3D ((UInt)(-1)) << begin;
- UInt m2 =3D ((UInt)(-1)) << end << 1;
- UInt mask =3D m1 ^ m2;
+ m1 =3D ((UInt)(-1)) << begin;
+ m2 =3D ((UInt)(-1)) << end << 1;
+ mask =3D m1 ^ m2;
if (begin > end) mask =3D ~mask; // wrap mask
return mask;
}
@@ -377,11 +378,12 @@
/* ditto for 64bit mask */
static ULong MASK64( UInt begin, UInt end )
{
+ ULong m1, m2, mask;
vassert(begin < 64);
vassert(end < 64);
- ULong m1 =3D ((ULong)(-1)) << begin;
- ULong m2 =3D ((ULong)(-1)) << end << 1;
- ULong mask =3D m1 ^ m2;
+ m1 =3D ((ULong)(-1)) << begin;
+ m2 =3D ((ULong)(-1)) << end << 1;
+ mask =3D m1 ^ m2;
if (begin > end) mask =3D ~mask; // wrap mask
return mask;
}
@@ -848,8 +850,8 @@
/* Signed/Unsigned IR widens I8/I16/I32 -> I32/I64 */
static IRExpr* mkSzWiden8 ( IRType ty, IRExpr* src, Bool sined )
{
+ IROp op;
vassert(ty =3D=3D Ity_I32 || ty =3D=3D Ity_I64);
- IROp op;
if (sined) op =3D (ty=3D=3DIty_I32) ? Iop_8Sto32 : Iop_8Sto64;
else op =3D (ty=3D=3DIty_I32) ? Iop_8Uto32 : Iop_8Uto64;
return unop(op, src);
@@ -857,8 +859,8 @@
=20
static IRExpr* mkSzWiden16 ( IRType ty, IRExpr* src, Bool sined )
{
+ IROp op;
vassert(ty =3D=3D Ity_I32 || ty =3D=3D Ity_I64);
- IROp op;
if (sined) op =3D (ty=3D=3DIty_I32) ? Iop_16Sto32 : Iop_16Sto64;
else op =3D (ty=3D=3DIty_I32) ? Iop_16Uto32 : Iop_16Uto64;
return unop(op, src);
@@ -1436,29 +1438,33 @@
=20
static void putXER_SO ( IRExpr* e )
{
+ IRExpr* so;
vassert(typeOfIRExpr(irbb->tyenv, e) =3D=3D Ity_I8);
- IRExpr* so =3D binop(Iop_And8, e, mkU8(1));
+ so =3D binop(Iop_And8, e, mkU8(1));
stmt( IRStmt_Put( OFFB_XER_SO, so ) );
}
=20
static void putXER_OV ( IRExpr* e )
{
+ IRExpr* ov;
vassert(typeOfIRExpr(irbb->tyenv, e) =3D=3D Ity_I8);
- IRExpr* ov =3D binop(Iop_And8, e, mkU8(1));
+ ov =3D binop(Iop_And8, e, mkU8(1));
stmt( IRStmt_Put( OFFB_XER_OV, ov ) );
}
=20
static void putXER_CA ( IRExpr* e )
{
+ IRExpr* ca;
vassert(typeOfIRExpr(irbb->tyenv, e) =3D=3D Ity_I8);
- IRExpr* ca =3D binop(Iop_And8, e, mkU8(1));
+ ca =3D binop(Iop_And8, e, mkU8(1));
stmt( IRStmt_Put( OFFB_XER_CA, ca ) );
}
=20
static void putXER_BC ( IRExpr* e )
{
+ IRExpr* bc;
vassert(typeOfIRExpr(irbb->tyenv, e) =3D=3D Ity_I8);
- IRExpr* bc =3D binop(Iop_And8, e, mkU8(0x7F));
+ bc =3D binop(Iop_And8, e, mkU8(0x7F));
stmt( IRStmt_Put( OFFB_XER_BC, bc ) );
}
=20
Modified: trunk/priv/host-ppc/isel.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/host-ppc/isel.c 2006-01-25 03:01:09 UTC (rev 1548)
+++ trunk/priv/host-ppc/isel.c 2006-01-25 03:26:27 UTC (rev 1549)
@@ -1517,13 +1517,14 @@
break;
case Iop_Clz32:
case Iop_Clz64: {
+ HReg r_src, r_dst;
PPCUnaryOp op_clz =3D (op_unop =3D=3D Iop_Clz32) ? Pun_CLZ32 :
Pun_CLZ64;
if (op_unop =3D=3D Iop_Clz64 && !mode64)
goto irreducible;
/* Count leading zeroes. */
- HReg r_dst =3D newVRegI(env);
- HReg r_src =3D iselWordExpr_R(env, e->Iex.Unop.arg);
+ r_dst =3D newVRegI(env);
+ r_src =3D iselWordExpr_R(env, e->Iex.Unop.arg);
addInstr(env, PPCInstr_Unary(op_clz,r_dst,r_src));
return r_dst;
}
Modified: trunk/priv/ir/irdefs.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/ir/irdefs.c 2006-01-25 03:01:09 UTC (rev 1548)
+++ trunk/priv/ir/irdefs.c 2006-01-25 03:26:27 UTC (rev 1549)
@@ -75,8 +75,8 @@
=20
void ppIRConst ( IRConst* con )
{
+ union { ULong i64; Double f64; } u;
vassert(sizeof(ULong) =3D=3D sizeof(Double));
- union { ULong i64; Double f64; } u;
switch (con->tag) {
case Ico_U1: vex_printf( "%d:I1", con->Ico.U1 ? 1 : 0); b=
reak;
case Ico_U8: vex_printf( "0x%x:I8", (UInt)(con->Ico.U8)); b=
reak;
Modified: trunk/priv/ir/iropt.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/priv/ir/iropt.c 2006-01-25 03:01:09 UTC (rev 1548)
+++ trunk/priv/ir/iropt.c 2006-01-25 03:26:27 UTC (rev 1549)
@@ -3621,6 +3621,7 @@
=20
/* Consider current stmt. */
if (st->tag =3D=3D Ist_Tmp && uses[st->Ist.Tmp.tmp] <=3D 1) {
+ IRExpr *e, *e2;
=20
/* optional extra: dump dead bindings as we find them.
Removes the need for a prior dead-code removal pass. */
@@ -3632,8 +3633,8 @@
=20
/* ok, we have 't =3D E', occ(t)=3D=3D1. Do the abovementioned
actions. */
- IRExpr* e =3D st->Ist.Tmp.data;
- IRExpr* e2 =3D atbSubst_Expr(env, e);
+ e =3D st->Ist.Tmp.data;
+ e2 =3D atbSubst_Expr(env, e);
addToEnvFront(env, st->Ist.Tmp.tmp, e2);
setHints_Expr(&env[0].doesLoad, &env[0].doesGet, e2);
/* don't advance j, as we are deleting this stmt and instead
|