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