From: Julian Seward <jseward@acm.org>
Date: Tue, 28 Aug 2007 16:39:52 +0000 (+0000)
Subject: Support td (64-bit counterpart to r1784).
X-Git-Tag: svn/VALGRIND_3_3_1^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0f24e5b483c67f556e3aabb88f14b5b05ae6fa0;p=thirdparty%2Fvalgrind.git

Support td (64-bit counterpart to r1784).


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

diff --git a/VEX/priv/guest-ppc/toIR.c b/VEX/priv/guest-ppc/toIR.c
index dbfa4c887d..35a066e423 100644
--- a/VEX/priv/guest-ppc/toIR.c
+++ b/VEX/priv/guest-ppc/toIR.c
@@ -4653,8 +4653,7 @@ static Bool dis_trapi ( UInt theInstr,
       uncond = do_trap( TO, 
                         mode64 ? unop(Iop_64to32, getIReg(rA_addr)) 
                                : getIReg(rA_addr),
-                        mode64 ? mkU64( (ULong)simm16 ) 
-                               : mkU32( (UInt)simm16 ),
+                        mkU32( (UInt)simm16 ),
                         cia );
       if (TO == 4) {
          DIP("tweqi r%u,%d\n", (UInt)rA_addr, (Int)simm16);
@@ -4716,6 +4715,16 @@ static Bool dis_trap ( UInt theInstr,
          DIP("tw%d r%u,r%u\n", (Int)TO, (UInt)rA_addr, (UInt)rB_addr);
       }
       break;
+   case 0x044: // td (Trap Doubleword, PPC64 p534)
+      if (!mode64)
+         return False;
+      uncond = do_trap( TO, getIReg(rA_addr), getIReg(rB_addr), cia );
+      if (TO == 4) {
+         DIP("tdeq r%u,r%u\n", (UInt)rA_addr, (UInt)rB_addr);
+      } else {
+         DIP("td%d r%u,r%u\n", (Int)TO, (UInt)rA_addr, (UInt)rB_addr);
+      }
+      break;
    default:
       return False;
    }
@@ -9326,12 +9335,9 @@ DisResult disInstr_PPC_WRK (
 //zz          goto decode_failure;
 
       /* Trap Instructions */
-      case 0x004:                         // tw
+      case 0x004: case 0x044:             // tw,   td
          if (dis_trap(theInstr, &dres)) goto decode_success;
          goto decode_failure;
-//zz       case 0x044:                         // td
-//zz          DIP("trap op (td) => not implemented\n");
-//zz          goto decode_failure;
 
       /* Floating Point Load Instructions */
       case 0x217: case 0x237: case 0x257: // lfsx, lfsux, lfdx