Changeset 53108 in vbox for trunk/src/VBox

Timestamp:

Oct 21, 2014 4:26:54 PM (10 years ago)

Author:

vboxsync

Message:

IEM: Call gate TSS access needs to check TSS bitness, not gate, duh.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -1209 +1209 @@
             if (!IEM_IS_LONG_MODE(pIemCpu))
             {
-                if (pDesc->Legacy.Gate.u4Type == X86_SEL_TYPE_SYS_386_CALL_GATE)
+                if (pCtx->tr.Attr.n.u4Type == X86_SEL_TYPE_SYS_386_TSS_BUSY)
                 {
                     offNewStack = RT_OFFSETOF(X86TSS32, esp0) + uNewCSDpl * 8;
@@ -1216 +1216 @@
                 else
                 {
-                    Assert(pDesc->Legacy.Gate.u4Type == X86_SEL_TYPE_SYS_286_CALL_GATE);
+                    Assert(pCtx->tr.Attr.n.u4Type == X86_SEL_TYPE_SYS_286_TSS_BUSY);
                     offNewStack = RT_OFFSETOF(X86TSS16, sp0) + uNewCSDpl * 4;
                     cbNewStack  = RT_SIZEOFMEMB(X86TSS16, sp0) + RT_SIZEOFMEMB(X86TSS16, ss0);
@@ -1223 +1223 @@
             else
             {
-                Assert(pDesc->Legacy.Gate.u4Type == AMD64_SEL_TYPE_SYS_CALL_GATE);
+                Assert(pCtx->tr.Attr.n.u4Type == AMD64_SEL_TYPE_SYS_TSS_BUSY);
                 offNewStack = RT_OFFSETOF(X86TSS64, rsp0) + uNewCSDpl * RT_SIZEOFMEMB(X86TSS64, rsp0);
                 cbNewStack  = RT_SIZEOFMEMB(X86TSS64, rsp0);
@@ -1245 +1245 @@
             if (!IEM_IS_LONG_MODE(pIemCpu))
             {
-                if (pDesc->Legacy.Gate.u4Type == X86_SEL_TYPE_SYS_386_CALL_GATE)
+                if (pCtx->tr.Attr.n.u4Type == X86_SEL_TYPE_SYS_386_TSS_BUSY)
                 {
                     uNewRsp = uPtrTSS.pu32[0];
@@ -1252 +1252 @@
                 else
                 {
-                    Assert(pDesc->Legacy.Gate.u4Type == X86_SEL_TYPE_SYS_286_CALL_GATE);
+                    Assert(pCtx->tr.Attr.n.u4Type == X86_SEL_TYPE_SYS_286_TSS_BUSY);
                     uNewRsp = uPtrTSS.pu16[0];
                     uNewSS  = uPtrTSS.pu16[1];
@@ -1259 +1259 @@
             else
             {
-                Assert(pDesc->Legacy.Gate.u4Type == AMD64_SEL_TYPE_SYS_CALL_GATE);
+                Assert(pCtx->tr.Attr.n.u4Type == AMD64_SEL_TYPE_SYS_TSS_BUSY);
                 /* SS will be a NULL selector, but that's valid. */
                 uNewRsp = uPtrTSS.pu64[0];