Changeset 8849 in vbox

Timestamp:

May 15, 2008 1:16:14 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30864

Message:

load the modrm value before parsing it (CMPXCHG8B/16B). Updated s->pc comment.

File:

• trunk/src/recompiler/target-i386/translate.c (modified) (3 diffs)

trunk/src/recompiler/target-i386/translate.c

@@ -3238 +3238 @@
 static bool is_invalid_lock_sequence(DisasContext *s, target_ulong pc_start, int b)
 {
-#if 0 /** @todo test this properly! */
+#if 1 /** @todo test this properly! */
     target_ulong pc = s->pc;
     int modrm, mod, op;
@@ -3338 +3338 @@
                 /* /1: CMPXCHG8B mem64 or CMPXCHG16B mem128 */
                 case 0xc7:
+                    modrm = ldub_code(pc++);
                     op = (modrm >> 3) & 7;
                     if (op != 1)
@@ -3346 +3347 @@
     }
 
-    /* illegal sequence. */
+    /* illegal sequence. The s->pc is past the lock prefix and that
+       is sufficient for the TB, I think. */
     Log(("illegal lock sequence %VGv (b=%#x)\n", pc_start, b));
-    /* exception 6 (UD) is a fault, therefore the PC must not be changed */
     return true;
 #else