From d3d37ff214f4782e17d7b15ccd4f94571d0586eb Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Sun, 29 Apr 2007 09:49:38 +0000 Subject: [PATCH] Merge r1737 (Handle the (bizarre) no-op "26 2E 64 65 90 %es:%cs:%fs:%gs:nop") git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH@1752 --- VEX/priv/guest-x86/toIR.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/VEX/priv/guest-x86/toIR.c b/VEX/priv/guest-x86/toIR.c index 6a12037108..fee7cb1cf4 100644 --- a/VEX/priv/guest-x86/toIR.c +++ b/VEX/priv/guest-x86/toIR.c @@ -7272,6 +7272,18 @@ DisResult disInstr_X86_WRK ( switch (getIByte(delta)) { case 0x3E: /* %DS: */ case 0x26: /* %ES: */ + /* Sun's JVM 1.5.0 uses the following as a NOP: + 26 2E 64 65 90 %es:%cs:%fs:%gs:nop */ + { + UChar* code = (UChar*)(guest_code + delta); + if (code[0] == 0x26 && code[1] == 0x2E && code[2] == 0x64 + && code[3] == 0x65 && code[4] == 0x90) { + DIP("%%es:%%cs:%%fs:%%gs:nop\n"); + delta += 5; + goto decode_success; + } + /* else fall through */ + } case 0x64: /* %FS: */ case 0x65: /* %GS: */ sorb = getIByte(delta); delta++; -- 2.47.2