Changeset 61636 in vbox for trunk/src/VBox

Timestamp:

Jun 9, 2016 6:46:31 PM (9 years ago)

Author:

vboxsync

Message:

IEM: Tiny fixes + enable callgate emulation (2nd try).

File:

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

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

@@ -1020 +1020 @@
 IEM_CIMPL_DEF_4(iemCImpl_BranchCallGate, uint16_t, uSel, IEMBRANCH, enmBranch, IEMMODE, enmEffOpSize, PIEMSELDESC, pDesc)
 {
+#define IEM_IMPLEMENTS_CALLGATE
 #ifndef IEM_IMPLEMENTS_CALLGATE
     IEM_RETURN_ASPECT_NOT_IMPLEMENTED();
@@ -1204 +1205 @@
         /* Calls are much more complicated. */
 
-        if (DescCS.Legacy.Gen.u2Dpl < pIemCpu->uCpl)
+        if (!(DescCS.Legacy.Gen.u4Type & X86_SEL_TYPE_CONF) && (DescCS.Legacy.Gen.u2Dpl < pIemCpu->uCpl))
         {
             uint16_t    offNewStack;    /* Offset of new stack in TSS. */
@@ -1228 +1229 @@
 
             /* Figure out where the new stack pointer is stored in the TSS. */
-            uNewCSDpl = uNewCS & X86_SEL_RPL;
+            uNewCSDpl = DescCS.Legacy.Gen.u2Dpl;
             if (!IEM_IS_LONG_MODE(pIemCpu))
             {