Changeset 70953 in vbox

Timestamp:

Feb 10, 2018 4:40:22 PM (7 years ago)

Author:

vboxsync

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

120796

Message:

VMM: Clarified docs on fRecompilerUser/Supervisor and did some related cleanups.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (2 diffs)
• src/VBox/VMM/VMMR3/CSAM.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/VM.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/vm.h

@@ -1069 +1069 @@
     uint8_t const               bMainExecutionEngine;
 
-    /** Whether to recompile user mode code or run it raw/hm. */
+    /** Whether to recompile user mode code or run it raw/hm/nem.
+     * In non-raw-mode both fRecompileUser and fRecompileSupervisor must be set
+     * to recompiler stuff. */
     bool                        fRecompileUser;
-    /** Whether to recompile supervisor mode code or run it raw/hm. */
+    /** Whether to recompile supervisor mode code or run it raw/hm/nem.
+     * In non-raw-mode both fRecompileUser and fRecompileSupervisor must be set
+     * to recompiler stuff. */
     bool                        fRecompileSupervisor;
-    /** Whether raw mode supports ring-1 code or not. */
+    /** Whether raw mode supports ring-1 code or not.
+     * This will be cleared when not in raw-mode.  */
     bool                        fRawRing1Enabled;
     /** PATM enabled flag.
-     * This is placed here for performance reasons. */
+     * This is placed here for performance reasons.
+     * This will be cleared when not in raw-mode. */
     bool                        fPATMEnabled;
     /** CSAM enabled flag.
-     * This is placed here for performance reasons. */
+     * This is placed here for performance reasons.
+     * This will be cleared when not in raw-mode. */
     bool                        fCSAMEnabled;
+
     /** Hardware VM support is available and enabled.
      * Determined very early during init.
@@ -1089 +1097 @@
      * This is never set on 64-bit hosts, only 32-bit hosts requires it. */
     bool                        fHMNeedRawModeCtx;
+
     /** Set when this VM is the master FT node.
      * @todo This doesn't need to be here, FTM should store it in it's own

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -2516 +2516 @@
 {
     Assert(VM_IS_RAW_MODE_ENABLED(pVM));
-    if (EMIsRawRing0Enabled(pVM) == false || PATMIsPatchGCAddr(pVM, pInstrGC) == true)
+    if (!EMIsRawRing0Enabled(pVM) || PATMIsPatchGCAddr(pVM, pInstrGC) == true)
     {
         // No use
@@ -2546 +2546 @@
     Assert(VM_IS_RAW_MODE_ENABLED(pVM));
 
-    if (    EMIsRawRing0Enabled(pVM) == false
+    if (    !EMIsRawRing0Enabled(pVM)
         ||  PATMIsPatchGCAddr(pVM, pInstrGC) == true)
     {
@@ -2693 +2693 @@
 
     AssertReturn(VM_IS_RAW_MODE_ENABLED(pVM), VERR_CSAM_HM_IPE);
-    if (EMIsRawRing0Enabled(pVM) == false)
+    if (!EMIsRawRing0Enabled(pVM))
     {
         /* Enabling interrupt gates only works when raw ring 0 is enabled. */

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -148 +148 @@
     }
 
-    Log(("EMR3Init: fRecompileUser=%RTbool fRecompileSupervisor=%RTbool fRawRing1Enabled=%RTbool fIemExecutesAll=%RTbool fGuruOnTripleFault=%RTbool\n",
-         pVM->fRecompileUser, pVM->fRecompileSupervisor, pVM->fRawRing1Enabled, pVM->em.s.fIemExecutesAll, pVM->em.s.fGuruOnTripleFault));
+    LogRel(("EMR3Init: fRecompileUser=%RTbool fRecompileSupervisor=%RTbool fRawRing1Enabled=%RTbool fIemExecutesAll=%RTbool fGuruOnTripleFault=%RTbool\n",
+            pVM->fRecompileUser, pVM->fRecompileSupervisor, pVM->fRawRing1Enabled, pVM->em.s.fIemExecutesAll, pVM->em.s.fGuruOnTripleFault));
 
 #ifdef VBOX_WITH_REM
@@ -660 +660 @@
                 break;
             case EMEXECPOLICY_RECOMPILE_RING3:
-                pVM->fRecompileUser = pArgs->fEnforce;
+                pVM->fRecompileUser       = pArgs->fEnforce;
                 break;
             case EMEXECPOLICY_IEM_ALL:
@@ -668 +668 @@
                 AssertFailedReturn(VERR_INVALID_PARAMETER);
         }
-        Log(("emR3SetExecutionPolicy: fRecompileUser=%RTbool fRecompileSupervisor=%RTbool fIemExecutesAll=%RTbool\n",
-              pVM->fRecompileUser, pVM->fRecompileSupervisor, pVM->em.s.fIemExecutesAll));
+        LogRel(("emR3SetExecutionPolicy: fRecompileUser=%RTbool fRecompileSupervisor=%RTbool fIemExecutesAll=%RTbool\n",
+                pVM->fRecompileUser, pVM->fRecompileSupervisor, pVM->em.s.fIemExecutesAll));
     }
 

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -789 +789 @@
      * Base EM and HM config properties.
      */
+    /** @todo We don't need to read any of this here.  The relevant modules reads
+     *        them again and will be in a better position to set them correctly. */
     Assert(pVM->fRecompileUser == false); /* ASSUMES all zeros at this point */
-#ifdef VBOX_WITH_RAW_MODE
     bool        fEnabled;
     rc = CFGMR3QueryBoolDef(pRoot, "RawR3Enabled", &fEnabled, false); AssertRCReturn(rc, rc);
@@ -796 +797 @@
     rc = CFGMR3QueryBoolDef(pRoot, "RawR0Enabled", &fEnabled, false); AssertRCReturn(rc, rc);
     pVM->fRecompileSupervisor = !fEnabled;
+#ifdef VBOX_WITH_RAW_MODE
 # ifdef VBOX_WITH_RAW_RING1
     rc = CFGMR3QueryBoolDef(pRoot, "RawR1Enabled", &pVM->fRawRing1Enabled, false);
@@ -809 +811 @@
             pVM->fHMEnabled, pVM->fRecompileUser, pVM->fRecompileSupervisor,
             pVM->fRawRing1Enabled, pVM->fCSAMEnabled, pVM->fPATMEnabled));
-
 
     /*