Changeset 6726 in vbox for trunk/src

Timestamp:

Feb 1, 2008 5:05:19 PM (17 years ago)

Author:

vboxsync

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

27808

Message:

2 fixes from qemu: fix cmpxchg8b detection and fix DR6 single step exception status bit

Location:

trunk/src/recompiler/target-i386

Files:

• exec.h (modified) (1 diff)
• helper.c (modified) (1 diff)
• op.c (modified) (1 diff)
• translate.c (modified) (2 diffs)

trunk/src/recompiler/target-i386/exec.h

@@ -197 +197 @@
 void helper_bswapq_T0(void);
 void helper_cmpxchg8b(void);
+void helper_single_step(void);
 void helper_cpuid(void);
 void helper_enter_level(int level, int data32);

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

@@ -1772 +1772 @@
     }
     CC_SRC = eflags;
+}
+
+void helper_single_step()
+{
+    env->dr[6] |= 0x4000;
+    raise_exception(EXCP01_SSTP);
 }
 

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

@@ -801 +801 @@
 {
     helper_cmpxchg8b();
+}
+
+void OPPROTO op_single_step(void)
+{
+    helper_single_step();
 }
 

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

@@ -2342 +2342 @@
         gen_op_debug();
     } else if (s->tf) {
-        gen_op_raise_exception(EXCP01_SSTP);
+        gen_op_single_step();
     } else {
         gen_op_movl_T0_0();
@@ -3873 +3873 @@
         modrm = ldub_code(s->pc++);
         mod = (modrm >> 6) & 3;
-        if (mod == 3)
+        if ((mod == 3) || ((modrm & 0x38) != 0x8))
             goto illegal_op;
         if (s->cc_op != CC_OP_DYNAMIC)