From: Julian Seward <jseward@acm.org>
Date: Sun, 23 Nov 2014 11:56:09 +0000 (+0000)
Subject: Merge, from trunk, r2957:
X-Git-Tag: svn/VALGRIND_3_10_1^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=befbeb12082d933dbe75c44de5b178e7282fad13;p=thirdparty%2Fvalgrind.git

Merge, from trunk, r2957:
339336  PPC64 store quad instruction (stq) is not supposed to
        change the address register contents



git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_10_BRANCH@3001
---

diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
index adabf64123..8c1e70a3f9 100644
--- a/VEX/priv/guest_ppc_toIR.c
+++ b/VEX/priv/guest_ppc_toIR.c
@@ -5350,9 +5350,7 @@ static Bool dis_int_store ( UInt theInstr, VexAbiInfo* vbi )
             /* lower half of upper 64-bits */
             assign( EA_lo, ea_rAor0_simm( rA_addr, simm16+12 ) );
          }
-         putIReg( rA_addr, mkexpr(EA_hi) );
          store( mkexpr(EA_hi), mkexpr(rS) );
-         putIReg( rA_addr, mkexpr( EA_lo) );
          store( mkexpr(EA_lo), getIReg( rS_addr+1 ) );
          break;
       }