Changeset 80053 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jul 29, 2019 8:41:19 PM (5 years ago)

Author:

vboxsync

Message:

Main: Kicking out raw-mode - CPUM*Hyper*(). bugref:9517 bugref:9511

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (4 diffs)
• CPUMStack.cpp (deleted)

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

@@ -88 +88 @@
 {
     pVCpu->cpum.s.Hyper.cr3 = cr3;
-
-#ifdef IN_RC
-    /* Update the current CR3. */
-    ASMSetCR3(cr3);
-#endif
 }
 
@@ -98 +93 @@
 {
     return pVCpu->cpum.s.Hyper.cr3;
-}
-
-
-VMMDECL(void) CPUMSetHyperESP(PVMCPU pVCpu, uint32_t u32ESP)
-{
-    pVCpu->cpum.s.Hyper.esp = u32ESP;
-}
-
-
-VMMDECL(void) CPUMSetHyperEIP(PVMCPU pVCpu, uint32_t u32EIP)
-{
-    pVCpu->cpum.s.Hyper.eip = u32EIP;
 }
 
@@ -117 +100 @@
  */
 #ifdef IN_RING0
-# if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS)
-#  define MAYBE_LOAD_DRx(a_pVCpu, a_fnLoad, a_uValue) \
-    do { \
-        if (!CPUMIsGuestInLongModeEx(&(a_pVCpu)->cpum.s.Guest)) \
-            a_fnLoad(a_uValue); \
-        else \
-            (a_pVCpu)->cpum.s.fUseFlags |= CPUM_SYNC_DEBUG_REGS_HYPER; \
-    } while (0)
-# else
-#  define MAYBE_LOAD_DRx(a_pVCpu, a_fnLoad, a_uValue) \
-    do { \
-        a_fnLoad(a_uValue); \
-    } while (0)
-# endif
-
-#elif defined(IN_RC)
-# define MAYBE_LOAD_DRx(a_pVCpu, a_fnLoad, a_uValue) \
-    do { \
-        if ((a_pVCpu)->cpum.s.fUseFlags & CPUM_USED_DEBUG_REGS_HYPER) \
-        { a_fnLoad(a_uValue); } \
-    } while (0)
-
+# define MAYBE_LOAD_DRx(a_pVCpu, a_fnLoad, a_uValue) do { a_fnLoad(a_uValue); } while (0)
 #else
 # define MAYBE_LOAD_DRx(a_pVCpu, a_fnLoad, a_uValue) do { } while (0)
@@ -180 +142 @@
 {
     pVCpu->cpum.s.Hyper.dr[7] = uDr7;
-#ifdef IN_RC
-    MAYBE_LOAD_DRx(pVCpu, ASMSetDR7, uDr7);
-#endif
 }