Blame SOURCES/valgrind-3.13.0-ppc64-timebase.patch

ba4a9b
commit 6a55b1e82ccda3f0d663d2cc89eb543ae2d096bf
ba4a9b
Author: Carl Love <carll@us.ibm.com>
ba4a9b
Date:   Tue Oct 31 13:45:28 2017 -0500
ba4a9b
ba4a9b
    Fix access to time base register to return 64-bits.
ba4a9b
ba4a9b
diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
ba4a9b
index f63146e7e..4ec37f5f9 100644
ba4a9b
--- a/VEX/priv/guest_ppc_toIR.c
ba4a9b
+++ b/VEX/priv/guest_ppc_toIR.c
ba4a9b
@@ -9419,26 +9419,60 @@ static Bool dis_proc_ctl ( const VexAbiInfo* vbi, UInt theInstr )
ba4a9b
          putIReg( rD_addr, getGST( PPC_GST_SPRG3_RO ) );
ba4a9b
          break;
ba4a9b
 
ba4a9b
-      /* Even a lowly PPC7400 can run the associated helper, so no
ba4a9b
-         obvious need for feature testing at this point. */
ba4a9b
-      case 268 /* 0x10C */:
ba4a9b
-      case 269 /* 0x10D */: {
ba4a9b
-         UInt     arg  = SPR==268 ? 0 : 1;
ba4a9b
-         IRTemp   val  = newTemp(Ity_I32);
ba4a9b
-         IRExpr** args = mkIRExprVec_1( mkU32(arg) );
ba4a9b
+      case 268 /* 0x10C  TB  - 64 bit time base register */:
ba4a9b
+      {
ba4a9b
+         IRTemp   val  = newTemp(Ity_I64);
ba4a9b
+         IRExpr** args = mkIRExprVec_0();
ba4a9b
          IRDirty* d    = unsafeIRDirty_1_N(
ba4a9b
-                            val,
ba4a9b
-                            0/*regparms*/,
ba4a9b
-                            "ppc32g_dirtyhelper_MFSPR_268_269",
ba4a9b
-                            fnptr_to_fnentry
ba4a9b
-                               (vbi, &ppc32g_dirtyhelper_MFSPR_268_269),
ba4a9b
-                            args
ba4a9b
-                         );
ba4a9b
+                                           val,
ba4a9b
+                                           0/*regparms*/,
ba4a9b
+                                           "ppcg_dirtyhelper_MFTB",
ba4a9b
+                                           fnptr_to_fnentry(vbi,
ba4a9b
+                                                            &ppcg_dirtyhelper_MFTB),
ba4a9b
+                                           args );
ba4a9b
+         /* execute the dirty call, dumping the result in val. */
ba4a9b
+         stmt( IRStmt_Dirty(d) );
ba4a9b
+         putIReg( rD_addr, (mode64) ? mkexpr(val) :
ba4a9b
+                                      unop(Iop_64to32, mkexpr(val)) );
ba4a9b
+
ba4a9b
+         break;
ba4a9b
+      }
ba4a9b
+      case 269 /* 0x10D  TBU - upper 32-bits of time base register */:
ba4a9b
+      {
ba4a9b
+         DIP("mfspr r%u,%u", rD_addr, SPR);
ba4a9b
+         IRTemp   val  = newTemp(Ity_I64);
ba4a9b
+         IRExpr** args = mkIRExprVec_0();
ba4a9b
+         IRDirty* d    = unsafeIRDirty_1_N(
ba4a9b
+                                           val,
ba4a9b
+                                           0/*regparms*/,
ba4a9b
+                                           "ppcg_dirtyhelper_MFTB",
ba4a9b
+                                           fnptr_to_fnentry(vbi,
ba4a9b
+                                                            &ppcg_dirtyhelper_MFTB),
ba4a9b
+                                           args );
ba4a9b
          /* execute the dirty call, dumping the result in val. */
ba4a9b
          stmt( IRStmt_Dirty(d) );
ba4a9b
          putIReg( rD_addr,
ba4a9b
-                  mkWidenFrom32(ty, mkexpr(val), False/*unsigned*/) );
ba4a9b
+                  mkWidenFrom32(ty, unop(Iop_64HIto32, mkexpr(val)),
ba4a9b
+                                /* Signed */False) );
ba4a9b
+         break;
ba4a9b
+      }
ba4a9b
+      case 284 /* 0x1  TBL - lower 32-bits of time base register */:
ba4a9b
+      {
ba4a9b
          DIP("mfspr r%u,%u", rD_addr, SPR);
ba4a9b
+         IRTemp   val  = newTemp(Ity_I64);
ba4a9b
+         IRExpr** args = mkIRExprVec_0();
ba4a9b
+         IRDirty* d    = unsafeIRDirty_1_N(
ba4a9b
+                                           val,
ba4a9b
+                                           0/*regparms*/,
ba4a9b
+                                           "ppcg_dirtyhelper_MFTB",
ba4a9b
+                                           fnptr_to_fnentry(vbi,
ba4a9b
+                                                            &ppcg_dirtyhelper_MFTB),
ba4a9b
+                                           args );
ba4a9b
+         /* execute the dirty call, dumping the result in val. */
ba4a9b
+         stmt( IRStmt_Dirty(d) );
ba4a9b
+         putIReg( rD_addr,
ba4a9b
+                  mkWidenFrom32(ty, unop(Iop_64to32, mkexpr(val)),
ba4a9b
+                                /* Signed */False) );
ba4a9b
          break;
ba4a9b
       }
ba4a9b
 
ba4a9b
@@ -9493,6 +9527,12 @@ static Bool dis_proc_ctl ( const VexAbiInfo* vbi, UInt theInstr )
ba4a9b
          putIReg( rD_addr, (mode64) ? mkexpr(val) :
ba4a9b
                                       unop(Iop_64to32, mkexpr(val)) );
ba4a9b
          break;
ba4a9b
+      case 284:
ba4a9b
+         DIP("mftbl r%u", rD_addr);
ba4a9b
+         putIReg( rD_addr,
ba4a9b
+                  mkWidenFrom32(ty, unop(Iop_64to32, mkexpr(val)),
ba4a9b
+                                /* Signed */False) );
ba4a9b
+         break;
ba4a9b
       default:
ba4a9b
          return False; /* illegal instruction */
ba4a9b
       }