Changeset 83066 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Feb 13, 2020 4:15:25 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HM: SVM: Drop 32-bit guest switcher and use the 64-bit switcher for all guest code.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -742 +742 @@
 
         /*
+         * Initialize the hardware-assisted SVM guest-execution handler.
+         * We now use a single handler for both 32-bit and 64-bit guests, see @bugref{6208#c73}.
+         */
+        pVCpu->hm.s.svm.pfnVMRun = SVMR0VMRun;
+
+        /*
          * Allocate one page for the host-context VM control block (VMCB). This is used for additional host-state (such as
          * FS, GS, Kernel GS Base, etc.) apart from the host-state save area specified in MSR_K8_VM_HSAVE_PA.
@@ -2178 +2184 @@
 
 /**
- * Selects the appropriate function to run guest code.
- *
- * @param   pVCpu   The cross context virtual CPU structure.
- *
- * @remarks No-long-jump zone!!!
- */
-DECLINLINE(void) hmR0SvmSelectVMRunHandler(PVMCPUCC pVCpu)
-{
-    if (pVCpu->CTX_SUFF(pVM)->hm.s.fAllow64BitGuests)
-    {
-# if HC_ARCH_BITS != 64 || ARCH_BITS != 64
-#  error "Only 64-bit hosts are supported!"
-# endif
-        /* Guest may enter long mode, always use 64-bit handler. */
-        pVCpu->hm.s.svm.pfnVMRun = SVMR0VMRun;
-    }
-    else
-    {
-        /* Guest is 32-bit only, use the 32-bit handler. */
-        pVCpu->hm.s.svm.pfnVMRun = SVMR0VMRun32;
-    }
-}
-
-
-/**
  * Enters the AMD-V session.
  *
@@ -2355 +2336 @@
         hmR0SvmExportGuestXcptIntercepts(pVCpu, pVmcb);
     }
-
-    hmR0SvmSelectVMRunHandler(pVCpu);
 
     /* Clear any bits that may be set but exported unconditionally or unused/reserved bits. */