Changeset 100783 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 3, 2023 9:03:30 AM (18 months ago)

Author:

vboxsync

Message:

IEM: 32-bit SYSENTER/SYSEXIT always transitions to 32-bit protected mode, not just 32-bit mode. Plus logging fixes.

File:

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

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

@@ -4536 +4536 @@
     if ((uNewCs & X86_SEL_MASK_OFF_RPL) == 0)
     {
-        Log(("sysenter: SYSENTER_CS = %#x -> #GP(0)\n", uNewCs));
+        LogRel(("sysenter: SYSENTER_CS = %#x -> #GP(0)\n", uNewCs));
         return iemRaiseGeneralProtectionFault0(pVCpu);
     }
@@ -4560 +4560 @@
     if (fIsLongMode)
     {
-        Log(("sysenter: %04x:%016RX64 [efl=%#llx] -> %04x:%016RX64\n", pVCpu->cpum.GstCtx.cs, pVCpu->cpum.GstCtx.rip,
+        Log(("sysenter: %04x:%016RX64 [efl=%#llx] -> %04x:%016RX64\n", pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip,
              pVCpu->cpum.GstCtx.rflags.u, uNewCs & X86_SEL_MASK_OFF_RPL, pVCpu->cpum.GstCtx.SysEnter.eip));
         pVCpu->cpum.GstCtx.rip          = pVCpu->cpum.GstCtx.SysEnter.eip;
@@ -4571 +4571 @@
     else
     {
-        Log(("sysenter: %04x:%08RX32 [efl=%#llx] -> %04x:%08RX32\n", pVCpu->cpum.GstCtx.cs, (uint32_t)pVCpu->cpum.GstCtx.rip,
+        Log(("sysenter: %04x:%08RX32 [efl=%#llx] -> %04x:%08RX32\n", pVCpu->cpum.GstCtx.cs.Sel, (uint32_t)pVCpu->cpum.GstCtx.rip,
              pVCpu->cpum.GstCtx.rflags.u, uNewCs & X86_SEL_MASK_OFF_RPL, (uint32_t)pVCpu->cpum.GstCtx.SysEnter.eip));
         pVCpu->cpum.GstCtx.rip          = (uint32_t)pVCpu->cpum.GstCtx.SysEnter.eip;
@@ -4578 +4578 @@
                                         | X86DESCATTR_LIMIT_HIGH | X86_SEL_TYPE_ER_ACC;
         pVCpu->iem.s.fExec = (pVCpu->iem.s.fExec & ~(IEM_F_MODE_MASK | IEM_F_X86_CPL_MASK))
-                           | IEM_F_MODE_X86_32BIT
+                           | IEM_F_MODE_X86_32BIT_PROT
                            | iemCalc32BitFlatIndicatorEsDs(pVCpu);
     }
@@ -4657 +4657 @@
     if (enmEffOpSize == IEMMODE_64BIT)
     {
-        Log(("sysexit: %04x:%016RX64 [efl=%#llx] -> %04x:%016RX64\n", pVCpu->cpum.GstCtx.cs, pVCpu->cpum.GstCtx.rip,
+        Log(("sysexit: %04x:%016RX64 [efl=%#llx] -> %04x:%016RX64\n", pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip,
              pVCpu->cpum.GstCtx.rflags.u, (uNewCs | 3) + 32, pVCpu->cpum.GstCtx.rcx));
         pVCpu->cpum.GstCtx.rip          = pVCpu->cpum.GstCtx.rdx;
@@ -4674 +4674 @@
     else
     {
-        Log(("sysexit: %04x:%08RX64 [efl=%#llx] -> %04x:%08RX32\n", pVCpu->cpum.GstCtx.cs, pVCpu->cpum.GstCtx.rip,
+        Log(("sysexit: %04x:%08RX64 [efl=%#llx] -> %04x:%08RX32\n", pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip,
              pVCpu->cpum.GstCtx.rflags.u, (uNewCs | 3) + 16, (uint32_t)pVCpu->cpum.GstCtx.edx));
         pVCpu->cpum.GstCtx.rip          = pVCpu->cpum.GstCtx.edx;
@@ -4687 +4687 @@
         pVCpu->iem.s.fExec = (pVCpu->iem.s.fExec & ~(IEM_F_MODE_MASK | IEM_F_X86_CPL_MASK))
                            | (3 << IEM_F_X86_CPL_SHIFT)
-                           | IEM_F_MODE_X86_32BIT
+                           | IEM_F_MODE_X86_32BIT_PROT
                            | iemCalc32BitFlatIndicatorEsDs(pVCpu);
     }