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

Timestamp:

Mar 27, 2017 10:25:29 AM (8 years ago)

Author:

vboxsync

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

114183

Message:

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)

File:

• trunk/src/recompiler/target-i386/op_helper.c (modified) (6 diffs)

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;