|
From: <sv...@va...> - 2013-02-01 16:12:02
|
florian 2013-02-01 16:11:51 +0000 (Fri, 01 Feb 2013)
New Revision: 2673
Log:
Fix a few more HReg <-> UInt mixups.
Modified files:
trunk/priv/host_amd64_isel.c
trunk/priv/host_ppc_defs.c
trunk/priv/host_ppc_isel.c
Modified: trunk/priv/host_amd64_isel.c (+1 -1)
===================================================================
--- trunk/priv/host_amd64_isel.c 2013-01-31 02:04:02 +00:00 (rev 2672)
+++ trunk/priv/host_amd64_isel.c 2013-02-01 16:11:51 +00:00 (rev 2673)
@@ -3443,7 +3443,7 @@
HReg r0 = iselVecExpr(env, e->Iex.ITE.iffalse);
HReg dst = newVRegV(env);
addInstr(env, mk_vMOVsd_RR(r1,dst));
- HReg cc = iselCondCode(env, e->Iex.ITE.cond);
+ AMD64CondCode cc = iselCondCode(env, e->Iex.ITE.cond);
addInstr(env, AMD64Instr_SseCMov(cc ^ 1, r0, dst));
return dst;
}
Modified: trunk/priv/host_ppc_isel.c (+1 -1)
===================================================================
--- trunk/priv/host_ppc_isel.c 2013-01-31 02:04:02 +00:00 (rev 2672)
+++ trunk/priv/host_ppc_isel.c 2013-02-01 16:11:51 +00:00 (rev 2673)
@@ -2304,7 +2304,7 @@
return toBool( hregClass(am->Pam.RR.base) == HRcGPR(mode64) &&
hregIsVirtual(am->Pam.RR.base) &&
hregClass(am->Pam.RR.index) == HRcGPR(mode64) &&
- hregIsVirtual(am->Pam.IR.index) );
+ hregIsVirtual(am->Pam.RR.index) );
default:
vpanic("sane_AMode: unknown ppc amode tag");
}
Modified: trunk/priv/host_ppc_defs.c (+1 -1)
===================================================================
--- trunk/priv/host_ppc_defs.c 2013-01-31 02:04:02 +00:00 (rev 2672)
+++ trunk/priv/host_ppc_defs.c 2013-02-01 16:11:51 +00:00 (rev 2673)
@@ -1827,7 +1827,7 @@
const HChar* str_size;
if (i->Pin.AvLdSt.addr->tag == Pam_IR) {
ppLoadImm(hregPPC_GPR30(mode64),
- i->Pin.AvLdSt.addr->Pam.RR.index, mode64);
+ i->Pin.AvLdSt.addr->Pam.IR.index, mode64);
vex_printf(" ; ");
}
str_size = sz==1 ? "eb" : sz==2 ? "eh" : sz==4 ? "ew" : "";
|