|
From: <sv...@va...> - 2008-05-13 09:36:02
|
Author: sewardj
Date: 2008-05-13 10:36:07 +0100 (Tue, 13 May 2008)
New Revision: 1846
Log:
Merge r1838 (generate correct IR for some obscure REP-prefixed string
instructions). (#152818)
Modified:
branches/VEX_3_3_BRANCH/priv/guest-x86/toIR.c
Modified: branches/VEX_3_3_BRANCH/priv/guest-x86/toIR.c
===================================================================
--- branches/VEX_3_3_BRANCH/priv/guest-x86/toIR.c 2008-05-13 09:28:37 UTC (rev 1845)
+++ branches/VEX_3_3_BRANCH/priv/guest-x86/toIR.c 2008-05-13 09:36:07 UTC (rev 1846)
@@ -13347,7 +13347,7 @@
/* 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 @@
/* 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++;
|