67a252
commit b7d65cab4f3e9a6f66a496e723e53ed736c4d2e7
67a252
Author: Mark Wielaard <mark@klomp.org>
67a252
Date:   Sun Dec 9 00:55:42 2018 +0100
67a252
67a252
    Implement ppc64 lxvd2x as 128-bit load with double word swap for ppc64le.
67a252
    
67a252
    This makes it possible for memcheck to know which part of the 128bit
67a252
    vector is defined, even if the load is partly beyond an addressable block.
67a252
    
67a252
    Partially resolves bug 386945.
67a252
67a252
diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
67a252
index a81dace..7af4973 100644
67a252
--- a/VEX/priv/guest_ppc_toIR.c
67a252
+++ b/VEX/priv/guest_ppc_toIR.c
67a252
@@ -20590,16 +20590,22 @@ dis_vx_load ( UInt theInstr )
67a252
    }
67a252
    case 0x34C: // lxvd2x
67a252
    {
67a252
-      IROp addOp = ty == Ity_I64 ? Iop_Add64 : Iop_Add32;
67a252
-      IRExpr * high, *low;
67a252
-      ULong ea_off = 8;
67a252
-      IRExpr* high_addr;
67a252
+      IRExpr *t128;
67a252
       DIP("lxvd2x %d,r%u,r%u\n", XT, rA_addr, rB_addr);
67a252
-      high = load( Ity_I64, mkexpr( EA ) );
67a252
-      high_addr = binop( addOp, mkexpr( EA ), ty == Ity_I64 ? mkU64( ea_off )
67a252
-            : mkU32( ea_off ) );
67a252
-      low = load( Ity_I64, high_addr );
67a252
-      putVSReg( XT, binop( Iop_64HLtoV128, high, low ) );
67a252
+      t128 = load( Ity_V128, mkexpr( EA ) );
67a252
+
67a252
+      /* The data in the vec register should be in big endian order.
67a252
+         So if we just did a little endian load then swap around the
67a252
+         high and low double words. */
67a252
+      if (host_endness == VexEndnessLE) {
67a252
+         IRTemp high = newTemp(Ity_I64);
67a252
+         IRTemp low = newTemp(Ity_I64);
67a252
+         assign( high, unop(Iop_V128HIto64, t128) );
67a252
+         assign( low, unop(Iop_V128to64, t128) );
67a252
+         t128 = binop( Iop_64HLtoV128, mkexpr (low), mkexpr (high) );
67a252
+      }
67a252
+
67a252
+      putVSReg( XT, t128 );
67a252
       break;
67a252
    }
67a252
    case 0x14C: // lxvdsx