|
From: <sv...@va...> - 2005-05-02 15:52:47
|
Author: sewardj
Date: 2005-05-02 16:52:44 +0100 (Mon, 02 May 2005)
New Revision: 1154
Modified:
trunk/priv/guest-amd64/ghelpers.c
trunk/priv/host-amd64/isel.c
trunk/priv/ir/iropt.c
Log:
Minor cleanups.
Modified: trunk/priv/guest-amd64/ghelpers.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-amd64/ghelpers.c 2005-05-02 10:54:34 UTC (rev 1153)
+++ trunk/priv/guest-amd64/ghelpers.c 2005-05-02 15:52:44 UTC (rev 1154)
@@ -836,9 +836,9 @@
=20
static Bool isU64 ( IRExpr* e, ULong n )
{
- return e->tag =3D=3D Iex_Const
- && e->Iex.Const.con->tag =3D=3D Ico_U64
- && e->Iex.Const.con->Ico.U64 =3D=3D n;
+ return toBool( e->tag =3D=3D Iex_Const
+ && e->Iex.Const.con->tag =3D=3D Ico_U64
+ && e->Iex.Const.con->Ico.U64 =3D=3D n );
}
=20
IRExpr* guest_amd64_spechelper ( HChar* function_name,
Modified: trunk/priv/host-amd64/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-amd64/isel.c 2005-05-02 10:54:34 UTC (rev 1153)
+++ trunk/priv/host-amd64/isel.c 2005-05-02 15:52:44 UTC (rev 1154)
@@ -83,16 +83,6 @@
return IRExpr_Binop(op, a1, a2);
}
=20
-//.. static IRExpr* mkU64 ( ULong i )
-//.. {
-//.. return IRExpr_Const(IRConst_U64(i));
-//.. }
-
-static IRExpr* mkU32 ( UInt i )
-{
- return IRExpr_Const(IRConst_U32(i));
-}
-
static IRExpr* bind ( Int binder )
{
return IRExpr_Binder(binder);
@@ -1197,8 +1187,8 @@
case Iop_16Uto32: {
HReg dst =3D newVRegI(env);
HReg src =3D iselIntExpr_R(env, e->Iex.Unop.arg);
- Bool srcIs16 =3D e->Iex.Unop.op=3D=3DIop_16Uto32
- || e->Iex.Unop.op=3D=3DIop_16Uto64;
+ Bool srcIs16 =3D toBool( e->Iex.Unop.op=3D=3DIop_16Uto32
+ || e->Iex.Unop.op=3D=3DIop_16Uto64 );
UInt mask =3D srcIs16 ? 0xFFFF : 0xFF;
addInstr(env, mk_iMOVsd_RR(src,dst) );
addInstr(env, AMD64Instr_Alu64R(Aalu_AND,
@@ -1212,8 +1202,8 @@
case Iop_16Sto64: {
HReg dst =3D newVRegI(env);
HReg src =3D iselIntExpr_R(env, e->Iex.Unop.arg);
- Bool srcIs16 =3D e->Iex.Unop.op=3D=3DIop_16Sto32
- || e->Iex.Unop.op=3D=3DIop_16Sto64;
+ Bool srcIs16 =3D toBool( e->Iex.Unop.op=3D=3DIop_16Sto32
+ || e->Iex.Unop.op=3D=3DIop_16Sto64 );
UInt amt =3D srcIs16 ? 48 : 56;
addInstr(env, mk_iMOVsd_RR(src,dst) );
addInstr(env, AMD64Instr_Sh64(Ash_SHL, amt, AMD64RM_Reg(dst)=
));
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 2005-05-02 10:54:34 UTC (rev 1153)
+++ trunk/priv/ir/iropt.c 2005-05-02 15:52:44 UTC (rev 1154)
@@ -964,8 +964,8 @@
- (e->Iex.Unop.arg->Iex.Const.con->Ico.U32)));
break;
case Iop_Neg8:
- e2 =3D IRExpr_Const(IRConst_U8(
- - (e->Iex.Unop.arg->Iex.Const.con->Ico.U8)));
+ e2 =3D IRExpr_Const(IRConst_U8(toUChar(
+ - (e->Iex.Unop.arg->Iex.Const.con->Ico.U8))));
break;
=20
case Iop_64to8: {
|