vbox的更動 66262 路徑 trunk/src/recompiler

時間撮記:

2017-3-27 上午10:25:29 (8 年 以前)

作者:

vboxsync

訊息:

REM: Do not mess with the TSS busy flag in CPU. Make sure that when loading TSS, the busy flag is set, not cleared. (bugref:8818)

位置:

trunk/src/recompiler

檔案:

• VBoxRecompiler.c (修改) (7 筆差異)
• target-i386/op_helper.c (修改) (6 筆差異)

trunk/src/recompiler/VBoxRecompiler.c

@@ -2404 +2404 @@
     pVM->rem.s.Env.tr.limit       = pCtx->tr.u32Limit;
     pVM->rem.s.Env.tr.flags       = (pCtx->tr.Attr.u & SEL_FLAGS_SMASK) << SEL_FLAGS_SHIFT;
-    /* Note! do_interrupt will fault if the busy flag is still set... */ /** @todo so fix do_interrupt then! */
-    pVM->rem.s.Env.tr.flags      &= ~DESC_TSS_BUSY_MASK;
 
     /*
@@ -2713 +2711 @@
         ||  pCtx->tr.u64Base  != pVM->rem.s.Env.tr.base
         ||  pCtx->tr.u32Limit != pVM->rem.s.Env.tr.limit
-            /* Qemu and AMD/Intel have different ideas about the busy flag ... */ /** @todo just fix qemu! */
-        ||  pCtx->tr.Attr.u   != (  (pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT) & (SEL_FLAGS_SMASK & ~DESC_INTEL_UNUSABLE)
-                                  ? (pVM->rem.s.Env.tr.flags | DESC_TSS_BUSY_MASK) >> SEL_FLAGS_SHIFT
-                                  : 0)
+        ||  pCtx->tr.Attr.u   != ((pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT) & SEL_FLAGS_SMASK)
         ||  !(pCtx->tr.fFlags & CPUMSELREG_FLAGS_VALID)
        )
@@ -2723 +2718 @@
              pCtx->tr.Sel, pCtx->tr.u64Base, pCtx->tr.u32Limit, pCtx->tr.Attr.u,
              pVM->rem.s.Env.tr.selector, (uint64_t)pVM->rem.s.Env.tr.base, pVM->rem.s.Env.tr.limit,
-             (pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT) & (SEL_FLAGS_SMASK & ~DESC_INTEL_UNUSABLE)
-             ? (pVM->rem.s.Env.tr.flags | DESC_TSS_BUSY_MASK) >> SEL_FLAGS_SHIFT : 0));
+             pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT));
         pCtx->tr.Sel        = pVM->rem.s.Env.tr.selector;
         pCtx->tr.ValidSel   = pVM->rem.s.Env.tr.selector;
@@ -2731 +2725 @@
         pCtx->tr.u32Limit   = pVM->rem.s.Env.tr.limit;
         pCtx->tr.Attr.u     = (pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT) & SEL_FLAGS_SMASK;
-        if (pCtx->tr.Attr.u & ~DESC_INTEL_UNUSABLE)
-            pCtx->tr.Attr.u |= DESC_TSS_BUSY_MASK >> SEL_FLAGS_SHIFT;
+        Assert(pCtx->tr.Attr.u & ~DESC_INTEL_UNUSABLE);
         STAM_COUNTER_INC(&gStatREMTRChange);
 #ifdef VBOX_WITH_RAW_MODE
@@ -2969 +2962 @@
         ||  pCtx->tr.u64Base  != pVM->rem.s.Env.tr.base
         ||  pCtx->tr.u32Limit != pVM->rem.s.Env.tr.limit
-            /* Qemu and AMD/Intel have different ideas about the busy flag ... */
-        ||  pCtx->tr.Attr.u   != (  (pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT) & (SEL_FLAGS_SMASK & ~DESC_INTEL_UNUSABLE)
-                                  ? (pVM->rem.s.Env.tr.flags | DESC_TSS_BUSY_MASK) >> SEL_FLAGS_SHIFT
-                                  : 0)
+        ||  pCtx->tr.Attr.u   != ((pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT) & SEL_FLAGS_SMASK)
         ||  !(pCtx->tr.fFlags & CPUMSELREG_FLAGS_VALID)
        )
@@ -2979 +2969 @@
              pCtx->tr.Sel, pCtx->tr.u64Base, pCtx->tr.u32Limit, pCtx->tr.Attr.u,
              pVM->rem.s.Env.tr.selector, (uint64_t)pVM->rem.s.Env.tr.base, pVM->rem.s.Env.tr.limit,
-             (pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT) & (SEL_FLAGS_SMASK & ~DESC_INTEL_UNUSABLE)
-             ? (pVM->rem.s.Env.tr.flags | DESC_TSS_BUSY_MASK) >> SEL_FLAGS_SHIFT : 0));
+             pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT));
         pCtx->tr.Sel        = pVM->rem.s.Env.tr.selector;
         pCtx->tr.ValidSel   = pVM->rem.s.Env.tr.selector;
@@ -2987 +2976 @@
         pCtx->tr.u32Limit   = pVM->rem.s.Env.tr.limit;
         pCtx->tr.Attr.u     = (pVM->rem.s.Env.tr.flags >> SEL_FLAGS_SHIFT) & SEL_FLAGS_SMASK;
-        if (pCtx->tr.Attr.u & ~DESC_INTEL_UNUSABLE)
-            pCtx->tr.Attr.u |= DESC_TSS_BUSY_MASK >> SEL_FLAGS_SHIFT;
+        Assert(pCtx->tr.Attr.u & ~DESC_INTEL_UNUSABLE);
         STAM_COUNTER_INC(&gStatREMTRChange);
 #ifdef VBOX_WITH_RAW_MODE

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

@@ -311 +311 @@
         cpu_abort(env, "invalid tss");
     type = (env->tr.flags >> DESC_TYPE_SHIFT) & 0xf;
-    if ((type & 7) != 1)
+    if ((type & 7) != 3)
         cpu_abort(env, "invalid tss type");
     shift = type >> 3;
@@ -596 +596 @@
     env->tr.flags = e2 & ~DESC_TSS_BUSY_MASK;
 #else
-    env->tr.flags = e2 & (DESC_RAW_FLAG_BITS & ~(DESC_TSS_BUSY_MASK)); /** @todo stop clearing the busy bit, VT-x and AMD-V seems to set it in the hidden bits. */
+    env->tr.flags = (e2 | DESC_TSS_BUSY_MASK) & DESC_RAW_FLAG_BITS;
     env->tr.fVBoxFlags  = CPUMSELREG_FLAGS_VALID;
     env->tr.newselector = 0;
@@ -704 +704 @@
     /* TSS must be a valid 32 bit one */
     if (!(env->tr.flags & DESC_P_MASK) ||
-        ((env->tr.flags >> DESC_TYPE_SHIFT) & 0xf) != 9 ||
+        ((env->tr.flags >> DESC_TYPE_SHIFT) & 0xf) != 11 ||
         env->tr.limit < 103)
         goto fail;
@@ -1127 +1127 @@
     /* TSS must be a valid 32 bit one */
     if (!(env->tr.flags & DESC_P_MASK) ||
-        ((env->tr.flags >> DESC_TYPE_SHIFT) & 0xf) != 9 ||
+        ((env->tr.flags >> DESC_TYPE_SHIFT) & 0xf) != 11 ||
         env->tr.limit < 103)
         goto fail;
@@ -2639 +2639 @@
             load_seg_cache_raw_dt(&env->tr, e1, e2);
         }
+        env->tr.flags |= DESC_TSS_BUSY_MASK;
         e2 |= DESC_TSS_BUSY_MASK;
         stl_kernel(ptr + 4, e2);
@@ -6123 +6124 @@
         cpu_abort(env, "invalid tss");
     type = (env->tr.flags >> DESC_TYPE_SHIFT) & 0xf;
-    if ((type & 7) != 1)
+    if ((type & 7) != 3)
         cpu_abort(env, "invalid tss type %d", type);
     shift = type >> 3;