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

diff --git a/VEX/priv/guest-x86/toIR.c b/VEX/priv/guest-x86/toIR.c
index 6a1203710836910ee60467983aaf2a786b898678..fee7cb1cf4e7db71540d7a76269b8dda064770af 100644 (file)
--- 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++;