Changeset 47549 in vbox for trunk/src/recompiler

Timestamp:

Aug 6, 2013 3:59:00 AM (11 years ago)

Author:

vboxsync

Message:

REM: Set more access bits on selectors, clear/set the unusable flag more.

Location:

trunk/src/recompiler/target-i386

Files:

• cpu.h (modified) (1 diff)
• op_helper.c (modified) (4 diffs)

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

@@ -952 +952 @@
     if (flags & DESC_P_MASK)
         flags |= DESC_A_MASK;           /* Make sure the A bit is set to avoid trouble. */
-    if (selector < 4U && (env->hflags & HF_CS64_MASK))
+    else if (selector < 4U)
         flags |= DESC_INTEL_UNUSABLE;
     else

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

@@ -960 +960 @@
     if (load_segment(&e1, &e2, selector) != 0)
         raise_exception_err(EXCP0D_GPF, selector & 0xfffc);
+#ifdef VBOX /** @todo figure out when this is done one day... */
+    if (!(e2 & DESC_A_MASK))
+        e2 = set_segment_accessed(selector, e2);
+#endif
     if (!(e2 & DESC_S_MASK) || !(e2 & (DESC_CS_MASK)))
         raise_exception_err(EXCP0D_GPF, selector & 0xfffc);
@@ -976 +980 @@
         if (load_segment(&ss_e1, &ss_e2, ss) != 0)
             raise_exception_err(EXCP0A_TSS, ss & 0xfffc);
+#ifdef VBOX /** @todo figure out when this is done one day... */
+        if (!(ss_e2 & DESC_A_MASK))
+            ss_e2 = set_segment_accessed(ss, ss_e2);
+#endif
         ss_dpl = (ss_e2 >> DESC_DPL_SHIFT) & 3;
         if (ss_dpl != dpl)
@@ -2768 +2776 @@
             !(env->hflags & HF_LMA_MASK) && !(e2 & DESC_L_MASK))
             raise_exception_err(EXCP0D_GPF, new_cs & 0xfffc);
+#ifdef VBOX
+        if (!(e2 & DESC_A_MASK))
+            e2 = set_segment_accessed(new_cs, e2);
+#endif
         cpu_x86_load_seg_cache(env, R_CS, (new_cs & 0xfffc) | cpl,
                        get_seg_base(e1, e2), limit, e2);
@@ -2893 +2905 @@
         if (!(e2 & DESC_P_MASK))
             raise_exception_err(EXCP0B_NOSEG, new_cs & 0xfffc);
+#ifdef VBOX
+        if (!(e2 & DESC_A_MASK))
+            e2 = set_segment_accessed(new_cs, e2);
+#endif
 
 #ifdef TARGET_X86_64