From 21a2ec9f25b7bffc240d968b4549ff2dd7478f28 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Tue, 13 May 2008 09:36:07 +0000 Subject: [PATCH] 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 --- VEX/priv/guest-x86/toIR.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VEX/priv/guest-x86/toIR.c b/VEX/priv/guest-x86/toIR.c index f34a0b9a72..f58d09bd09 100644 --- 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++; -- 2.47.2