Changeset 47445 in vbox for trunk/include/VBox/vmm

Timestamp:

Jul 29, 2013 12:37:37 AM (11 years ago)

Author:

vboxsync

Message:

IEM,HM,PGM: Started on string I/O optimizations using IEM (disabled). Cleaned up confusing status code handling in hmR0VmxCheckForceFlags (involving PGM) as well as some use of incorrect doxygen groups (@name).

Location:

trunk/include/VBox/vmm

Files:

• hm_vmx.h (modified) (6 diffs)
• iem.h (modified) (3 diffs)
• pgm.h (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -788 +788 @@
 #define MSR_IA32_VMX_BASIC_INFO_VMCS_MEM_TYPE(a)                (((a) >> 50) & 0xF)
 /** Whether the processor provides additional information for exits due to INS/OUTS. */
-#define MSR_IA32_VMX_BASIC_INFO_VMCS_INS_OUTS(a)                (((a) >> 54) & 1)
+#define MSR_IA32_VMX_BASIC_INFO_VMCS_INS_OUTS(a)                RT_BOOL((a) & RT_BIT_64(54))
 /** @} */
 
@@ -1413 +1413 @@
  */
 /** 0-2:   IO operation width. */
-#define VMX_EXIT_QUALIFICATION_IO_WIDTH(a)                      (a & 7)
+#define VMX_EXIT_QUALIFICATION_IO_WIDTH(a)                      ((a) & 7)
 /** 3:     IO operation direction. */
-#define VMX_EXIT_QUALIFICATION_IO_DIRECTION(a)                  ((a >> 3) & 1)
-/** 4:     String IO operation. */
-#define VMX_EXIT_QUALIFICATION_IO_STRING(a)                     ((a >> 4) & 1)
+#define VMX_EXIT_QUALIFICATION_IO_DIRECTION(a)                  (((a) >> 3) & 1)
+/** 4:     String IO operation (INS / OUTS). */
+#define VMX_EXIT_QUALIFICATION_IO_IS_STRING(a)                  RT_BOOL((a) & RT_BIT_64(4))
 /** 5:     Repeated IO operation. */
-#define VMX_EXIT_QUALIFICATION_IO_REP(a)                        ((a >> 5) & 1)
+#define VMX_EXIT_QUALIFICATION_IO_IS_REP(a)                     RT_BOOL((a) & RT_BIT_64(5))
 /** 6:     Operand encoding. */
-#define VMX_EXIT_QUALIFICATION_IO_ENCODING(a)                   ((a >> 6) & 1)
+#define VMX_EXIT_QUALIFICATION_IO_ENCODING(a)                   (((a) >> 6) & 1)
 /** 16-31: IO Port (0-0xffff). */
-#define VMX_EXIT_QUALIFICATION_IO_PORT(a)                       ((a >> 16) & 0xffff)
+#define VMX_EXIT_QUALIFICATION_IO_PORT(a)                       (((a) >> 16) & 0xffff)
 /* Rest reserved. */
 /** @} */
@@ -1776 +1776 @@
  *
  * @returns VBox status code
+ * @retval  VINF_SUCCESS
+ * @retval  VERR_VMX_INVALID_VMCS_PTR
+ * @retval  VERR_VMX_INVALID_VMCS_FIELD
+ *
  * @param   idxField        VMCS index
  * @param   u32Val          32 bits value
+ *
+ * @remarks The values of the two status codes can be ORed together, the result
+ *          will be VERR_VMX_INVALID_VMCS_PTR.
  */
 #if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS) || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
@@ -1837 +1844 @@
  *
  * @returns VBox status code
+ * @retval  VINF_SUCCESS
+ * @retval  VERR_VMX_INVALID_VMCS_PTR
+ * @retval  VERR_VMX_INVALID_VMCS_FIELD
+ *
  * @param   idxField        VMCS index
  * @param   u64Val          16, 32 or 64 bits value
+ *
+ * @remarks The values of the two status codes can be ORed together, the result
+ *          will be VERR_VMX_INVALID_VMCS_PTR.
  */
 #if !defined(RT_ARCH_X86) || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
@@ -1901 +1915 @@
  *
  * @returns VBox status code
+ * @retval  VINF_SUCCESS
+ * @retval  VERR_VMX_INVALID_VMCS_PTR
+ * @retval  VERR_VMX_INVALID_VMCS_FIELD
+ *
  * @param   idxField        VMCS index
  * @param   pData           Ptr to store VM field value
+ *
+ * @remarks The values of the two status codes can be ORed together, the result
+ *          will be VERR_VMX_INVALID_VMCS_PTR.
  */
 #if ((RT_INLINE_ASM_EXTERNAL || !defined(RT_ARCH_X86)) && !VMX_USE_MSC_INTRINSICS) || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
@@ -1972 +1993 @@
  *
  * @returns VBox status code
+ * @retval  VINF_SUCCESS
+ * @retval  VERR_VMX_INVALID_VMCS_PTR
+ * @retval  VERR_VMX_INVALID_VMCS_FIELD
+ *
  * @param   idxField        VMCS index
  * @param   pData           Ptr to store VM field value
+ *
+ * @remarks The values of the two status codes can be ORed together, the result
+ *          will be VERR_VMX_INVALID_VMCS_PTR.
  */
 #if (!defined(RT_ARCH_X86) && !VMX_USE_MSC_INTRINSICS) || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)

trunk/include/VBox/vmm/iem.h

@@ -29 +29 @@
 #include <VBox/types.h>
 #include <VBox/vmm/trpm.h>
+#include <iprt/assert.h>
 
 
@@ -37 +38 @@
  */
 
+
+/**
+ * Operand or addressing mode.
+ */
+typedef enum IEMMODE
+{
+    IEMMODE_16BIT = 0,
+    IEMMODE_32BIT,
+    IEMMODE_64BIT
+} IEMMODE;
+AssertCompileSize(IEMMODE, 4);
 
 
@@ -54 +66 @@
 /** @name Given Instruction Interpreters
  * @{ */
-
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecStringIoWrite(PVMCPU pVCpu, uint8_t cbValue, IEMMODE enmAddrMode,
+                                                 bool fRepPrefix, uint8_t cbInstr, uint8_t iEffSeg);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecStringIoRead(PVMCPU pVCpu, uint8_t cbValue, IEMMODE enmAddrMode,
+                                                bool fRepPrefix, uint8_t cbInstr);
 /** @}  */
 

trunk/include/VBox/vmm/pgm.h

@@ -334 +334 @@
 VMMDECL(int)        PGMGstModifyPage(PVMCPU pVCpu, RTGCPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask);
 VMM_INT_DECL(int)   PGMGstGetPaePdpes(PVMCPU pVCpu, PX86PDPE paPdpes);
-VMM_INT_DECL(int)   PGMGstUpdatePaePdpes(PVMCPU pVCpu, PCX86PDPE paPdpes);
+VMM_INT_DECL(void)  PGMGstUpdatePaePdpes(PVMCPU pVCpu, PCX86PDPE paPdpes);
 
 VMMDECL(int)        PGMInvalidatePage(PVMCPU pVCpu, RTGCPTR GCPtrPage);