|
From: <sv...@va...> - 2005-05-11 10:03:18
|
Author: sewardj
Date: 2005-05-11 11:03:08 +0100 (Wed, 11 May 2005)
New Revision: 1183
Modified:
trunk/priv/guest-amd64/toIR.c
trunk/priv/host-amd64/hdefs.c
Log:
Placate icc.
Modified: trunk/priv/guest-amd64/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-amd64/toIR.c 2005-05-11 02:55:54 UTC (rev 1182)
+++ trunk/priv/guest-amd64/toIR.c 2005-05-11 10:03:08 UTC (rev 1183)
@@ -891,7 +891,7 @@
/* Return True iff pfx has any of 66, F2 and F3 set */
static Bool have66orF2orF3 ( Prefix pfx )
{
- return ! haveNo66noF2noF3(pfx);
+ return toBool( ! haveNo66noF2noF3(pfx) );
}
=20
/* Clear all the segment-override bits in a prefix. */
@@ -2017,7 +2017,7 @@
return xmm_names[xmmreg];
}
=20
-static HChar* nameMMXGran ( UChar gran )
+static HChar* nameMMXGran ( Int gran )
{
switch (gran) {
case 0: return "b";
@@ -4305,7 +4305,7 @@
Need to check ST(0)'s tag on read, but not on write.
*/
static
-void fp_do_op_mem_ST_0 ( IRTemp addr, UChar* op_txt, UChar* dis_buf,=20
+void fp_do_op_mem_ST_0 ( IRTemp addr, HChar* op_txt, HChar* dis_buf,=20
IROp op, Bool dbl )
{
DIP("f%s%c %s\n", op_txt, dbl?'l':'s', dis_buf);
@@ -5039,7 +5039,7 @@
=20
case 0xC0 ... 0xC7: /* FCMOVB ST(i), ST(0) */
r_src =3D (UInt)modrm - 0xC0;
- DIP("fcmovb %%st(%d), %%st(0)\n", r_src);
+ DIP("fcmovb %%st(%u), %%st(0)\n", r_src);
put_ST_UNCHECKED(0,=20
IRExpr_Mux0X(=20
unop(Iop_1Uto8,
@@ -5197,7 +5197,7 @@
=20
case 0xC0 ... 0xC7: /* FCMOVNB ST(i), ST(0) */
r_src =3D (UInt)modrm - 0xC0;
- DIP("fcmovnb %%st(%d), %%st(0)\n", r_src);
+ DIP("fcmovnb %%st(%u), %%st(0)\n", r_src);
put_ST_UNCHECKED(0,=20
IRExpr_Mux0X(=20
unop(Iop_1Uto8,
@@ -5883,7 +5883,7 @@
ULong dis_MMXop_regmem_to_reg ( Prefix pfx,
ULong delta,
UChar opc,
- Char* name,
+ HChar* name,
Bool show_granularity )
{
HChar dis_buf[50];
@@ -5898,7 +5898,7 @@
Bool invG =3D False;
IROp op =3D Iop_INVALID;
void* hAddr =3D NULL;
- Char* hName =3D NULL;
+ HChar* hName =3D NULL;
Bool eLeft =3D False;
=20
# define XXX(_name) do { hAddr =3D &_name; hName =3D #_name; } while (0=
)
@@ -6115,7 +6115,7 @@
vassert(epartIsReg(rm));
vassert(gregLO3ofRM(rm) =3D=3D 2=20
|| gregLO3ofRM(rm) =3D=3D 4 || gregLO3ofRM(rm) =3D=3D 6);
- amt =3D (Int)(getUChar(delta+1));
+ amt =3D getUChar(delta+1);
delta +=3D 2;
DIP("%s $%d,%s\n", opname,
(Int)amt,
@@ -6461,12 +6461,11 @@
case 0x72:=20
case 0x73: {
/* (sz=3D=3D4): PSLLgg/PSRAgg/PSRLgg mmxreg by imm8 */
- UChar byte1, byte2, subopc;
+ UChar byte2, subopc;
if (sz !=3D 4)=20
goto mmx_decode_failure;
- byte1 =3D opc; /* 0x71/72/73 */
- byte2 =3D getUChar(delta); /* amode / sub-opcode */
- subopc =3D (byte2 >> 3) & 7;
+ byte2 =3D getUChar(delta); /* amode / sub-opcode */
+ subopc =3D toUChar( (byte2 >> 3) & 7 );
=20
# define SHIFT_BY_IMM(_name,_op) \
do { delta =3D dis_MMX_shiftE_imm(delta,_name,_op); \
@@ -7755,7 +7754,7 @@
vassert(epartIsReg(rm));
vassert(gregLO3ofRM(rm) =3D=3D 2=20
|| gregLO3ofRM(rm) =3D=3D 4 || gregLO3ofRM(rm) =3D=3D 6);
- amt =3D (Int)(getUChar(delta+1));
+ amt =3D getUChar(delta+1);
delta +=3D 2;
DIP("%s $%d,%s\n", opname,
(Int)amt,
@@ -9223,7 +9222,7 @@
&& insn[0] =3D=3D 0x0F && (insn[1] =3D=3D 0x15 || insn[1] =3D=3D =
0x14)) {
IRTemp sV, dV;
IRTemp s3, s2, s1, s0, d3, d2, d1, d0;
- Bool hi =3D insn[1] =3D=3D 0x15;
+ Bool hi =3D toBool(insn[1] =3D=3D 0x15);
sV =3D newTemp(Ity_V128);
dV =3D newTemp(Ity_V128);
s3 =3D s2 =3D s1 =3D s0 =3D d3 =3D d2 =3D d1 =3D d0 =3D IRTemp_INV=
ALID;
@@ -9489,7 +9488,7 @@
IRTemp rmode =3D newTemp(Ity_I32);
IRTemp f64lo =3D newTemp(Ity_F64);
IRTemp f64hi =3D newTemp(Ity_F64);
- Bool r2zero =3D insn[1] =3D=3D 0x2C;
+ Bool r2zero =3D toBool(insn[1] =3D=3D 0x2C);
=20
do_MMX_preamble();
modrm =3D getUChar(delta+2);
Modified: trunk/priv/host-amd64/hdefs.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/hdefs.c 2005-05-11 02:55:54 UTC (rev 1182)
+++ trunk/priv/host-amd64/hdefs.c 2005-05-11 10:03:08 UTC (rev 1183)
@@ -1593,9 +1593,9 @@
return;
case Ain_Sse64Fx2:
vassert(i->Ain.Sse64Fx2.op !=3D Asse_MOV);
- unary =3D i->Ain.Sse64Fx2.op =3D=3D Asse_RCPF
- || i->Ain.Sse64Fx2.op =3D=3D Asse_RSQRTF
- || i->Ain.Sse64Fx2.op =3D=3D Asse_SQRTF;
+ unary =3D toBool( i->Ain.Sse64Fx2.op =3D=3D Asse_RCPF
+ || i->Ain.Sse64Fx2.op =3D=3D Asse_RSQRTF
+ || i->Ain.Sse64Fx2.op =3D=3D Asse_SQRTF );
addHRegUse(u, HRmRead, i->Ain.Sse64Fx2.src);
addHRegUse(u, unary ? HRmWrite : HRmModify,=20
i->Ain.Sse64Fx2.dst);
@@ -3238,7 +3238,7 @@
p =3D doAMode_R(p, vreg2ireg(i->Ain.Sse64Fx2.dst),
vreg2ireg(i->Ain.Sse64Fx2.src) );
if (xtra & 0x100)
- *p++ =3D (UChar)(xtra & 0xFF);
+ *p++ =3D toUChar(xtra & 0xFF);
goto done;
=20
case Ain_Sse32FLo:
|