From: Cerion Armour-Brown <cerion@valgrind.org>
Date: Mon, 21 Feb 2005 16:30:45 +0000 (+0000)
Subject: coupl'a small fixes for ppc32
X-Git-Tag: svn/VALGRIND_3_0_1^2~391
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaa0a411ba4648246f1032296ef10689d53284c7;p=thirdparty%2Fvalgrind.git

coupl'a small fixes for ppc32

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

diff --git a/VEX/priv/guest-ppc32/toIR.c b/VEX/priv/guest-ppc32/toIR.c
index 748e77eb5d..bb9f1a1074 100644
--- a/VEX/priv/guest-ppc32/toIR.c
+++ b/VEX/priv/guest-ppc32/toIR.c
@@ -1550,8 +1550,8 @@ static Bool dis_int_logic ( UInt theInstr )
    IRTemp Rb = newTemp(Ity_I32);
    IRTemp Sign = newTemp(Ity_I32);
    
-   assign( Rs, getIReg(Ra_addr) );
-   assign( Rb, getIReg(Ra_addr) );
+   assign( Rs, getIReg(Rs_addr) );
+   assign( Rb, getIReg(Rb_addr) );
    
    switch (opc1) {
    case 0x1C: // andi. (AND Immediate, p388)
@@ -2489,7 +2489,7 @@ static Bool dis_branch ( UInt theInstr, DisResult *whatNext )
             vex_printf("dis_int_branch(PPC32)(bcctr,BO)\n");
             return False;
          }
-         DIP("bcctr%s 0x%x, 0x%x,\n", flag_LK ? "l" : "", BO, BI);
+         DIP("bcctr%s 0x%x, 0x%x\n", flag_LK ? "l" : "", BO, BI);
          
          assign( cond_ok, branch_cond_ok( BO, BI ) );
          
@@ -2511,7 +2511,7 @@ static Bool dis_branch ( UInt theInstr, DisResult *whatNext )
          break;
          
       case 0x010: // bclr (Branch Cond. to Link Register, p395) 
-         DIP("bclr%s 0x%x, 0x%x,\n", flag_LK ? "l" : "", BO, BI);
+         DIP("bclr%s 0x%x, 0x%x\n", flag_LK ? "l" : "", BO, BI);
 
          if (!(BO & 0x4)) {
             stmt( IRStmt_Put(OFFB_CTR, binop(Iop_Sub32,
diff --git a/VEX/switchback/switchback.c b/VEX/switchback/switchback.c
index 0ecabb2afb..51189fe6ef 100644
--- a/VEX/switchback/switchback.c
+++ b/VEX/switchback/switchback.c
@@ -573,7 +573,8 @@ static void run_simulator ( void )
          }
 #        elif defined(__powerpc__)
          {
-            gst.guest_GPR3 = serviceFn( gst.guest_GPR4, gst.guest_GPR5 );
+// CAB: ?  Need to send gpr3 as arg1, but what about return param?
+            gst.guest_GPR3 = serviceFn( gst.guest_GPR3, gst.guest_GPR4 );
             gst.guest_CIA  = gst.guest_LR;
             next_guest     = gst.guest_CIA;
          }