Changeset 92216 in vbox

Timestamp:

Nov 4, 2021 6:51:54 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148049

Message:

VMM/EMAll: Rename EMR0HistoryUpdatePC to EMHistoryUpdatePC and make it accessible from R3 as well, bugref:10136 and bugref:9044

Location:

trunk

Files:

• include/VBox/vmm/em.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/em.h

@@ -251 +251 @@
                                                         uint64_t uTimestamp);
 #endif
-#ifdef IN_RING0
-VMMR0_INT_DECL(void)            EMR0HistoryUpdatePC(PVMCPU pVCpu, uint64_t uFlatPC, bool fFlattened);
-#endif
+VMM_INT_DECL(void)              EMHistoryUpdatePC(PVMCPUCC pVCpu, uint64_t uFlatPC, bool fFlattened);
 VMM_INT_DECL(PCEMEXITREC)       EMHistoryUpdateFlagsAndType(PVMCPUCC pVCpu, uint32_t uFlagsAndType);
 VMM_INT_DECL(PCEMEXITREC)       EMHistoryUpdateFlagsAndTypeAndPC(PVMCPUCC pVCpu, uint32_t uFlagsAndType, uint64_t uFlatPC);

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

@@ -784 +784 @@
 
 
-#ifdef IN_RING0
 /**
  * Interface that VT-x uses to supply the PC of an exit when CS:RIP is being read.
@@ -792 +791 @@
  * @param   fFlattened      Set if RIP was subjected to CS.BASE, clear if not.
  */
-VMMR0_INT_DECL(void) EMR0HistoryUpdatePC(PVMCPU pVCpu, uint64_t uFlatPC, bool fFlattened)
-{
+VMM_INT_DECL(void) EMHistoryUpdatePC(PVMCPUCC pVCpu, uint64_t uFlatPC, bool fFlattened)
+{
+    VMCPU_ASSERT_EMT(pVCpu);
+
     AssertCompile(RT_ELEMENTS(pVCpu->em.s.aExitHistory) == 256);
     uint64_t     uExitNo    = pVCpu->em.s.iNextExit - 1;
@@ -803 +804 @@
         pHistEntry->uFlagsAndType |= EMEXIT_F_UNFLATTENED_PC;
 }
-#endif
 
 

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

@@ -7591 +7591 @@
 
         pCtx->rip = u64Val;
-        EMR0HistoryUpdatePC(pVCpu, pCtx->rip, false);
+        EMHistoryUpdatePC(pVCpu, pCtx->rip, false);
         pCtx->fExtrn &= ~CPUMCTX_EXTRN_RIP;
     }
@@ -7738 +7738 @@
                     if (fRealOnV86Active)
                         pCtx->cs.Attr.u = pVmcsInfoShared->RealMode.AttrCS.u;
-                    EMR0HistoryUpdatePC(pVCpu, pCtx->cs.u64Base + pCtx->rip, true /* fFlattened */);
+                    EMHistoryUpdatePC(pVCpu, pCtx->cs.u64Base + pCtx->rip, true /* fFlattened */);
                 }
                 if (fWhat & CPUMCTX_EXTRN_SS)