From: Florian Krohm <florian@eich-krohm.de>
Date: Fri, 1 Feb 2013 16:11:51 +0000 (+0000)
Subject: Fix a few more HReg <-> UInt mixups.
X-Git-Tag: svn/VALGRIND_3_9_0^2~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22f9ddf7ee2beaae7f2e99509208f37b4a9a0121;p=thirdparty%2Fvalgrind.git

Fix a few more HReg <-> UInt mixups.


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

diff --git a/VEX/priv/host_amd64_isel.c b/VEX/priv/host_amd64_isel.c
index 6fe511dc7a..59df608533 100644
--- a/VEX/priv/host_amd64_isel.c
+++ b/VEX/priv/host_amd64_isel.c
@@ -3443,7 +3443,7 @@ static HReg iselVecExpr_wrk ( ISelEnv* env, IRExpr* e )
       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;
    }
diff --git a/VEX/priv/host_ppc_defs.c b/VEX/priv/host_ppc_defs.c
index 32e88fa579..184620f02d 100644
--- a/VEX/priv/host_ppc_defs.c
+++ b/VEX/priv/host_ppc_defs.c
@@ -1827,7 +1827,7 @@ void ppPPCInstr ( PPCInstr* i, Bool mode64 )
       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" : "";
diff --git a/VEX/priv/host_ppc_isel.c b/VEX/priv/host_ppc_isel.c
index 00a8cffb28..992acb5287 100644
--- a/VEX/priv/host_ppc_isel.c
+++ b/VEX/priv/host_ppc_isel.c
@@ -2304,7 +2304,7 @@ static Bool sane_AMode ( ISelEnv* env, PPCAMode* am )
       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");
    }