Changeset 47709 in vbox for trunk/src/recompiler/target-i386/cpu.h

Timestamp:

Aug 13, 2013 7:34:18 PM (12 years ago)

Author:

vboxsync

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

87948

Message:

REM: Attempt at better selector attribute handling, to avoid further weird bits turning up.

File:

• trunk/src/recompiler/target-i386/cpu.h (modified) (5 diffs)

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

@@ -117 +117 @@
 #define DESC_TSS_BUSY_MASK (1 << 9)
 #ifdef VBOX
-# define DESC_INTEL_UNUSABLE    RT_BIT_32(16+8) /**< Internal VT-x bit for NULL sectors. */
+# define DESC_INTEL_UNUSABLE    RT_BIT_32(16+8)      /**< Internal VT-x bit for NULL sectors. */
+# define DESC_RAW_FLAG_BITS     UINT32_C(0x00ffffff) /**< Flag bits we load from the descriptor. */
 #endif
 
@@ -934 +935 @@
 /* this function must always be used to load data in the segment
    cache: it synchronizes the hflags with the segment cache values */
+#ifndef VBOX
 static inline void cpu_x86_load_seg_cache(CPUX86State *env,
                                           int seg_reg, unsigned int selector,
@@ -939 +941 @@
                                           unsigned int limit,
                                           unsigned int flags)
+#else
+static inline void cpu_x86_load_seg_cache_with_clean_flags(CPUX86State *env,
+                                                           int seg_reg, unsigned int selector,
+                                                           target_ulong base,
+                                                           unsigned int limit,
+                                                           unsigned int flags)
+#endif
 {
     SegmentCache *sc;
@@ -947 +956 @@
     sc->base = base;
     sc->limit = limit;
-#ifndef VBOX
     sc->flags = flags;
-#else
-    if (flags & DESC_P_MASK)
-    {
-        flags |= DESC_A_MASK;           /* Make sure the A bit is set to avoid trouble. */
-        flags &= ~DESC_INTEL_UNUSABLE;
-    }
-    else if (selector < 4U)
-        flags |= DESC_INTEL_UNUSABLE;
-    else
-        flags &= ~DESC_INTEL_UNUSABLE;
-    sc->flags = flags;
+#ifdef VBOX
     sc->newselector = 0;
     sc->fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
@@ -1006 +1004 @@
 }
 
+#ifdef VBOX
+/* Raw input, adjust the flags adding the stupid intel flag when applicable. */
+static inline void cpu_x86_load_seg_cache(CPUX86State *env,
+                                          int seg_reg, unsigned int selector,
+                                          target_ulong base,
+                                          unsigned int limit,
+                                          unsigned int flags)
+{
+    flags &= DESC_RAW_FLAG_BITS;
+    if (flags & DESC_P_MASK)
+        flags |= DESC_A_MASK;           /* Make sure the A bit is set to avoid trouble. */
+    else if (selector < 4U)
+        flags |= DESC_INTEL_UNUSABLE;
+    cpu_x86_load_seg_cache_with_clean_flags(env, seg_reg, selector, base, limit, flags);
+}
+#endif
+
 static inline void cpu_x86_load_seg_cache_sipi(CPUX86State *env,
                                                int sipi_vector)