Changeset 72560 in vbox for trunk/include/VBox

Timestamp:

Jun 15, 2018 11:00:02 AM (7 years ago)

Author:

vboxsync

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

123054

Message:

EM,HM: Replaced HM exit history with the EM one. VT-x now reads TSC on every exit even when VMX_VMCS_CTRL_PROC_EXEC_RDTSC_EXIT is set. VT-x needed an API for updating the PC as RIP and CS are fetched from the VMCB. bugref:9044

File:

• trunk/include/VBox/vmm/em.h (modified) (2 diffs)

trunk/include/VBox/vmm/em.h

@@ -215 +215 @@
  *
  * @{  */
-#define EMEXIT_F_TYPE_MASK  UINT32_C(0x0fff)    /**< The exit type mask. */
-#define EMEXIT_F_KIND_EM    UINT32_C(0x0000)    /**< EMEXITTYPE */
-#define EMEXIT_F_KIND_VMX   UINT32_C(0x1000)    /**< VT-x exit codes. */
-#define EMEXIT_F_KIND_SVM   UINT32_C(0x2000)    /**< SVM exit codes. */
-#define EMEXIT_F_KIND_NEM   UINT32_C(0x3000)    /**< NEMEXITTYPE */
-#define EMEXIT_F_KIND_XCPT  UINT32_C(0x4000)    /**< Exception numbers (raw-mode). */
-#define EMEXIT_F_KIND_MASK  UINT32_C(0x7000)
-#define EMEXIT_F_CS_EIP     UINT32_C(0x8000)
+#define EMEXIT_F_TYPE_MASK      UINT32_C(0x00000fff)    /**< The exit type mask. */
+#define EMEXIT_F_KIND_EM        UINT32_C(0x00000000)    /**< EMEXITTYPE */
+#define EMEXIT_F_KIND_VMX       UINT32_C(0x00001000)    /**< VT-x exit codes. */
+#define EMEXIT_F_KIND_SVM       UINT32_C(0x00002000)    /**< SVM exit codes. */
+#define EMEXIT_F_KIND_NEM       UINT32_C(0x00003000)    /**< NEMEXITTYPE */
+#define EMEXIT_F_KIND_XCPT      UINT32_C(0x00004000)    /**< Exception numbers (raw-mode). */
+#define EMEXIT_F_KIND_MASK      UINT32_C(0x00007000)
+#define EMEXIT_F_CS_EIP         UINT32_C(0x00008000)    /**< The PC is EIP in the low dword and CS in the high. */
+#define EMEXIT_F_UNFLATTENED_PC UINT32_C(0x00010000)    /**< The PC hasn't had CS.BASE added to it. */
 /** Combines flags and exit type into EMHistoryAddExit() input. */
 #define EMEXIT_MAKE_FLAGS_AND_TYPE(a_fFlags, a_uType)   ((a_fFlags) | (uint32_t)(a_uType))
@@ -239 +240 @@
 VMMRC_INT_DECL(void)            EMRCHistoryAddExitNoTs(PVMCPU pVCpu, uint32_t uFlagsAndType, uint16_t uCs, uint32_t uEip);
 #endif
+#ifdef IN_RING0
+VMMR0_INT_DECL(void)            EMR0HistoryUpdatePC(PVMCPU pVCpu, uint64_t uFlatPC, bool fFlattened);
+#endif
+
 
 /** @name Deprecated interpretation related APIs (use IEM).