Changeset 56607 in vbox for trunk/src/VBox

Timestamp:

Jun 23, 2015 4:33:36 PM (9 years ago)

Author:

vboxsync

Message:

IOM,IEM: split up VBOX_WITH_2ND_IEM_STEP into two steps, the first one being ring-0 and (possibly) ring-3, the next raw-mode too.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• VMMAll/IOMAllMMIO.cpp (modified) (7 diffs)
• VMMRC/IOMRC.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -35 +35 @@
 ifdef VBOX_WITH_2ND_IEM_STEP
  VMM_COMMON_DEFS += VBOX_WITH_2ND_IEM_STEP
+endif
+ifdef VBOX_WITH_3RD_IEM_STEP
+ VMM_COMMON_DEFS += VBOX_WITH_3RD_IEM_STEP
 endif
 #ifdef VBOX_WITH_IEM

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

@@ -45 +45 @@
 #include <iprt/asm.h>
 #include <iprt/string.h>
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** @def IEM_USE_IEM_INSTEAD
+ * Use IEM instead of IOM for interpreting MMIO accesses.
+ * Because of PATM/CSAM issues in raw-mode, we've split this up into 2nd and 3rd
+ * IEM deployment step. */
+#if  ((defined(IN_RING3) || defined(IN_RING0)) && defined(VBOX_WITH_2ND_IEM_STEP)) \
+  || defined(VBOX_WITH_3RD_IEM_STEP)
+# define IEM_USE_IEM_INSTEAD
+#endif
 
 
@@ -720 +732 @@
 
 
-#ifndef VBOX_WITH_2ND_IEM_STEP
+#ifndef IEM_USE_IEM_INSTEAD
 
 /**
@@ -1647 +1659 @@
 }
 
-#endif /* !VBOX_WITH_2ND_IEM_STEP */
+#endif /* !IEM_USE_IEM_INSTEAD */
 
 /**
@@ -1737 +1749 @@
     }
 
-#ifdef VBOX_WITH_2ND_IEM_STEP
+#ifdef IEM_USE_IEM_INSTEAD
 
     /*
@@ -1896 +1908 @@
     iomMmioReleaseRange(pVM, pRange);
     return rc;
-#endif /* !VBOX_WITH_2ND_IEM_STEP */
+#endif /* !IEM_USE_IEM_INSTEAD */
 }
 
@@ -2257 +2269 @@
 
 #endif /* IN_RING3 - only used by REM. */
-#ifndef VBOX_WITH_2ND_IEM_STEP
+#ifndef IEM_USE_IEM_INSTEAD
 
 /**
@@ -2579 +2591 @@
 }
 
-#endif /* !VBOX_WITH_2ND_IEM_STEP */
+#endif /* !IEM_USE_IEM_INSTEAD */
 
 

trunk/src/VBox/VMM/VMMRC/IOMRC.cpp

@@ -43 +43 @@
 
 
-#ifdef VBOX_WITH_2ND_IEM_STEP
+#ifdef VBOX_WITH_3RD_IEM_STEP
 /**
  * Converts disassembler mode to IEM mode.
@@ -200 +200 @@
 static VBOXSTRICTRC iomRCInterpretINS(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
-#ifdef VBOX_WITH_2ND_IEM_STEP
+#ifdef VBOX_WITH_3RD_IEM_STEP
     uint8_t cbValue = pCpu->pCurInstr->uOpcode == OP_INSB ? 1
                     : pCpu->uOpMode == DISCPUMODE_16BIT ? 2 : 4;       /* dword in both 32 & 64 bits mode */
@@ -254 +254 @@
 static VBOXSTRICTRC iomRCInterpretOUTS(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, PDISCPUSTATE pCpu)
 {
-#ifdef VBOX_WITH_2ND_IEM_STEP
+#ifdef VBOX_WITH_3RD_IEM_STEP
     uint8_t cbValue = pCpu->pCurInstr->uOpcode == OP_OUTSB ? 1
                     : pCpu->uOpMode == DISCPUMODE_16BIT ? 2 : 4;       /* dword in both 32 & 64 bits mode */