|
From: <sv...@va...> - 2016-10-05 13:22:20
|
Author: sewardj
Date: Wed Oct 5 14:22:13 2016
New Revision: 3255
Log:
Merge from trunk:
r3252 Fix rounding mode check and instruction stxvl
Modified:
branches/VEX_3_12_BRANCH/ (props changed)
branches/VEX_3_12_BRANCH/priv/guest_ppc_toIR.c
branches/VEX_3_12_BRANCH/priv/host_ppc_isel.c
Modified: branches/VEX_3_12_BRANCH/priv/guest_ppc_toIR.c
==============================================================================
--- branches/VEX_3_12_BRANCH/priv/guest_ppc_toIR.c (original)
+++ branches/VEX_3_12_BRANCH/priv/guest_ppc_toIR.c Wed Oct 5 14:22:13 2016
@@ -20181,10 +20181,10 @@
{
UInt ea_off = 0;
IRExpr* irx_addr;
- IRTemp word0 = newTemp( Ity_I32 );
- IRTemp word1 = newTemp( Ity_I32 );
- IRTemp word2 = newTemp( Ity_I32 );
- IRTemp word3 = newTemp( Ity_I32 );
+ IRTemp word0 = newTemp( Ity_I64 );
+ IRTemp word1 = newTemp( Ity_I64 );
+ IRTemp word2 = newTemp( Ity_I64 );
+ IRTemp word3 = newTemp( Ity_I64 );
DIP("stxvx %d,r%u,r%u\n", (UInt)XS, rA_addr, rB_addr);
assign( word0, binop( Iop_Shr64,
@@ -20346,7 +20346,7 @@
mkexpr( shift ) ),
mkexpr( nb_mask ) ),
binop( Iop_AndV128,
- unop( Iop_Not64, mkexpr( nb_mask ) ),
+ unop( Iop_NotV128, mkexpr( nb_mask ) ),
mkexpr( current_mem) ) ) );
} else {
Modified: branches/VEX_3_12_BRANCH/priv/host_ppc_isel.c
==============================================================================
--- branches/VEX_3_12_BRANCH/priv/host_ppc_isel.c (original)
+++ branches/VEX_3_12_BRANCH/priv/host_ppc_isel.c Wed Oct 5 14:22:13 2016
@@ -1238,7 +1238,7 @@
return False;
vassert(mode->Iex.Const.con->tag == Ico_U32);
- vassert(mode->Iex.Const.con->Ico.U8 == 0x8);
+ vassert(mode->Iex.Const.con->Ico.U32 == 0x8);
return True;
}
|