Changeset 60821 in vbox for trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

Timestamp:

May 4, 2016 11:28:05 AM (9 years ago)

Author:

vboxsync

Message:

CPUMSetGuestGDTR/IDTR/TR/LDTR: drop the #ifdef VBOX_WITH_IEM guard, since IEM is already active and needs the force flags to be set by CPUM.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (4 diffs)

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

@@ -578 +578 @@
 VMMDECL(int) CPUMSetGuestGDTR(PVMCPU pVCpu, uint64_t GCPtrBase, uint16_t cbLimit)
 {
-#ifdef VBOX_WITH_IEM
-# ifdef VBOX_WITH_RAW_MODE_NOT_R0
+#ifdef VBOX_WITH_RAW_MODE_NOT_R0
     if (!HMIsEnabled(pVCpu->CTX_SUFF(pVM)))
         VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_GDT);
-# endif
 #endif
     pVCpu->cpum.s.Guest.gdtr.cbGdt = cbLimit;
@@ -592 +590 @@
 VMMDECL(int) CPUMSetGuestIDTR(PVMCPU pVCpu, uint64_t GCPtrBase, uint16_t cbLimit)
 {
-#ifdef VBOX_WITH_IEM
-# ifdef VBOX_WITH_RAW_MODE_NOT_R0
+#ifdef VBOX_WITH_RAW_MODE_NOT_R0
     if (!HMIsEnabled(pVCpu->CTX_SUFF(pVM)))
         VMCPU_FF_SET(pVCpu, VMCPU_FF_TRPM_SYNC_IDT);
-# endif
 #endif
     pVCpu->cpum.s.Guest.idtr.cbIdt = cbLimit;
@@ -606 +602 @@
 VMMDECL(int) CPUMSetGuestTR(PVMCPU pVCpu, uint16_t tr)
 {
-#ifdef VBOX_WITH_IEM
-# ifdef VBOX_WITH_RAW_MODE_NOT_R0
+#ifdef VBOX_WITH_RAW_MODE_NOT_R0
     if (!HMIsEnabled(pVCpu->CTX_SUFF(pVM)))
         VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_TSS);
-# endif
 #endif
     pVCpu->cpum.s.Guest.tr.Sel  = tr;
@@ -619 +613 @@
 VMMDECL(int) CPUMSetGuestLDTR(PVMCPU pVCpu, uint16_t ldtr)
 {
-#ifdef VBOX_WITH_IEM
-# ifdef VBOX_WITH_RAW_MODE_NOT_R0
+#ifdef VBOX_WITH_RAW_MODE_NOT_R0
     if (   (   ldtr != 0
             || pVCpu->cpum.s.Guest.ldtr.Sel != 0)
         && !HMIsEnabled(pVCpu->CTX_SUFF(pVM)))
         VMCPU_FF_SET(pVCpu, VMCPU_FF_SELM_SYNC_LDT);
-# endif
 #endif
     pVCpu->cpum.s.Guest.ldtr.Sel      = ldtr;