Changeset 42407 in vbox for trunk/src/recompiler/target-i386

Timestamp:

Jul 26, 2012 11:41:35 AM (13 years ago)

Author:

vboxsync

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

79503

Message:

VMM: Futher work on dealing with hidden segment register, esp. when going stale.

Location:

trunk/src/recompiler/target-i386

Files:

• cpu.h (modified) (3 diffs)
• op_helper.c (modified) (12 diffs)

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

@@ -65 +65 @@
 # include <VBox/vmm/vmm.h>
 # include <VBox/vmm/stam.h>
+# include <VBox/vmm/cpumctx.h>
 #endif /* VBOX */
 
@@ -532 +533 @@
 typedef struct SegmentCache {
     uint32_t selector;
+#ifdef VBOX
+    /** The new selector is saved here when we are unable to sync it before invoking the recompiled code. */
+    uint16_t newselector;
+    uint16_t fVBoxFlags;
+#endif
     target_ulong base;
     uint32_t limit;
     uint32_t flags;
-#ifdef VBOX
-    /** The new selector is saved here when we are unable to sync it before invoking the recompiled code. */
-    uint32_t newselector;
-#endif
 } SegmentCache;
 
@@ -942 +944 @@
     sc->base = base;
     sc->limit = limit;
+#ifndef VBOX
     sc->flags = flags;
-#ifdef VBOX
+#else
+    if (flags & DESC_P_MASK)
+        flags |= DESC_A_MASK;           /* Make sure the A bit is set to avoid trouble. */
+    sc->flags = flags;
     sc->newselector = 0;
+    sc->fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
 #endif
 

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

@@ -254 +254 @@
     sc->limit = get_seg_limit(e1, e2);
     sc->flags = e2;
+#ifdef VBOX
+    sc->newselector = 0;
+    sc->fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
+#endif
 }
 
@@ -557 +561 @@
     env->tr.limit = tss_limit;
     env->tr.flags = e2 & ~DESC_TSS_BUSY_MASK;
+#ifdef VBOX
+    env->tr.fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
+    env->tr.newselector = 0;
+#endif
 
     if ((type & 8) && (env->cr[0] & CR0_PG_MASK)) {
@@ -596 +604 @@
     env->ldt.limit = 0;
     env->ldt.flags = 0;
+#ifdef VBOX
+    env->ldt.fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
+    env->ldt.newselector = 0;
+#endif
 
     /* load the LDT */
@@ -1954 +1966 @@
     env->ldt.limit = ldl_phys(sm_state + 0x7e74);
     env->ldt.flags = (lduw_phys(sm_state + 0x7e72) & 0xf0ff) << 8;
+#ifdef VBOX
+    env->ldt.fVBoxFlags = CPUMSELREG_FLAGS_VALID;
+    env->ldt.newselector = 0;
+#endif
 
     env->idt.base = ldq_phys(sm_state + 0x7e88);
@@ -1962 +1978 @@
     env->tr.limit = ldl_phys(sm_state + 0x7e94);
     env->tr.flags = (lduw_phys(sm_state + 0x7e92) & 0xf0ff) << 8;
+#ifdef VBOX
+    env->tr.fVBoxFlags = CPUMSELREG_FLAGS_VALID;
+    env->tr.newselector = 0;
+#endif
 
     EAX = ldq_phys(sm_state + 0x7ff8);
@@ -2008 +2028 @@
     env->tr.limit = ldl_phys(sm_state + 0x7f60);
     env->tr.flags = (ldl_phys(sm_state + 0x7f5c) & 0xf0ff) << 8;
+#ifdef VBOX
+    env->tr.fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
+    env->tr.newselector = 0;
+#endif
 
     env->ldt.selector = ldl_phys(sm_state + 0x7fc0) & 0xffff;
@@ -2013 +2037 @@
     env->ldt.limit = ldl_phys(sm_state + 0x7f7c);
     env->ldt.flags = (ldl_phys(sm_state + 0x7f78) & 0xf0ff) << 8;
+#ifdef VBOX
+    env->ldt.fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
+    env->ldt.newselector = 0;
+#endif
 
     env->gdt.base = ldl_phys(sm_state + 0x7f74);
@@ -2448 +2476 @@
         env->ldt.base = 0;
         env->ldt.limit = 0;
+#ifdef VBOX
+        env->ldt.fVBoxFlags = CPUMSELREG_FLAGS_VALID;
+        env->ldt.newselector = 0;
+#endif
     } else {
         if (selector & 0x4)
@@ -2510 +2542 @@
         env->tr.limit = 0;
         env->tr.flags = 0;
+#ifdef VBOX
+        env->tr.fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
+        env->tr.newselector = 0;
+#endif
     } else {
         if (selector & 0x4)
@@ -5724 +5760 @@
 
         /* Successful sync. */
-        env1->segs[seg_reg].newselector = 0;
+        Assert(env1->segs[seg_reg].newselector == 0);
     }
     else
@@ -5741 +5777 @@
                 load_segment(&e1, &e2, selector);
                 cpu_x86_load_seg_cache(env, R_CS, selector,
-                               get_seg_base(e1, e2),
-                               get_seg_limit(e1, e2),
-                               e2);
+                                       get_seg_base(e1, e2),
+                                       get_seg_limit(e1, e2),
+                                       e2);
             }
             else
@@ -5753 +5789 @@
 
             /* Successful sync. */
-            env1->segs[seg_reg].newselector = 0;
+            Assert(env1->segs[seg_reg].newselector == 0);
         }
         else