Merge r1838 (generate correct IR for some obscure REP-prefixed string

instructions).  (#152818)

git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_3_BRANCH@1846

diff --git a/VEX/priv/guest-x86/toIR.c b/VEX/priv/guest-x86/toIR.c
index f34a0b9a72b0e8be996ee7e703c53ae3a3707467..f58d09bd09a6a574c76cceb6f60cc4a83e315b7c 100644 (file)
--- a/VEX/priv/guest-x86/toIR.c
+++ b/VEX/priv/guest-x86/toIR.c
@@ -13347,7 +13347,7 @@ DisResult disInstr_X86_WRK (
 
    /* REPNE prefix insn */
    case 0xF2: { 
-      Addr32 eip_orig = guest_EIP_bbstart + delta - 1;
+      Addr32 eip_orig = guest_EIP_bbstart + delta_start;
       if (sorb != 0) goto decode_failure;
       abyte = getIByte(delta); delta++;
 
@@ -13390,7 +13390,7 @@ DisResult disInstr_X86_WRK (
    /* REP/REPE prefix insn (for SCAS and CMPS, 0xF3 means REPE,
       for the rest, it means REP) */
    case 0xF3: { 
-      Addr32 eip_orig = guest_EIP_bbstart + delta - 1;
+      Addr32 eip_orig = guest_EIP_bbstart + delta_start;
       if (sorb != 0) goto decode_failure;
       abyte = getIByte(delta); delta++;