Changeset 45786 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 26, 2013 10:35:59 PM (12 years ago)

Author:

vboxsync

Message:

Move HMRCA.asm into the switcher code so we don't need VMMRC.rc.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllMap.cpp (modified) (12 diffs)
• SELMAll.cpp (modified) (3 diffs)

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

@@ -259 +259 @@
 }
 
-
-#ifdef VBOX_WITH_RAW_MODE_NOT_R0
+#ifndef PGM_WITHOUT_MAPPINGS
+
 /**
  * Sets all PDEs involved with the mapping in the shadow page table.
@@ -357 +357 @@
                 if (!pgmPoolIsPageLocked(pPoolPagePd))
                     pgmPoolLockPage(pPool, pPoolPagePd);
-#ifdef VBOX_STRICT
+# ifdef VBOX_STRICT
                 else if (pShwPaePd->a[iPaePde].u & PGM_PDFLAGS_MAPPING)
                 {
@@ -369 +369 @@
                                    ("%RX64 vs %RX64\n", pShwPaePd->a[iPaePde+1].u & X86_PDE_PAE_PG_MASK, pMap->aPTs[i].HCPhysPaePT1));
                 }
-#endif
+# endif
 
                 /*
@@ -542 +542 @@
     PGM_DYNMAP_UNUSED_HINT_VM(pVM, pCurrentShwPdpt);
 }
-#endif /* VBOX_WITH_RAW_MODE_NOT_R0 */
-
+
+#endif /* PGM_WITHOUT_MAPPINGS */
 #if defined(VBOX_STRICT) && !defined(IN_RING0)
+
 /**
  * Clears all PDEs involved with the mapping in the shadow page table.
@@ -653 +654 @@
     pgmUnlock(pVM);
 }
+
 #endif /* defined(VBOX_STRICT) && !defined(IN_RING0) */
-
-#ifdef VBOX_WITH_RAW_MODE_NOT_R0
+#ifndef PGM_WITHOUT_MAPPINGS
 
 /**
@@ -741 +742 @@
     if (!pgmMapAreMappingsFloating(pVM))
         return false;
-
-    Assert(pVM->cCpus == 1);
+    AssertReturn(pgmMapAreMappingsEnabled(pVM), false);
 
     /* This only applies to raw mode where we only support 1 VCPU. */
@@ -771 +771 @@
                     STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->StatR3DetectedConflicts);
 
-#ifdef IN_RING3
+# ifdef IN_RING3
                     Log(("PGMHasMappingConflicts: Conflict was detected at %08RX32 for mapping %s (32 bits)\n"
                          "                        iPDE=%#x iPT=%#x PDE=%RGp.\n",
                         (iPT + iPDE) << X86_PD_SHIFT, pCur->pszDesc,
                         iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
-#else
+# else
                     Log(("PGMHasMappingConflicts: Conflict was detected at %08RX32 for mapping (32 bits)\n"
                          "                        iPDE=%#x iPT=%#x PDE=%RGp.\n",
                         (iPT + iPDE) << X86_PD_SHIFT,
                         iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
-#endif
+# endif
                     return true;
                 }
@@ -802 +802 @@
                 {
                     STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->StatR3DetectedConflicts);
-#ifdef IN_RING3
+# ifdef IN_RING3
                     Log(("PGMHasMappingConflicts: Conflict was detected at %RGv for mapping %s (PAE)\n"
                          "                        PDE=%016RX64.\n",
                         GCPtr, pCur->pszDesc, Pde.u));
-#else
+# else
                     Log(("PGMHasMappingConflicts: Conflict was detected at %RGv for mapping (PAE)\n"
                          "                        PDE=%016RX64.\n",
                         GCPtr, Pde.u));
-#endif
+# endif
                     return true;
                 }
@@ -866 +866 @@
                     STAM_COUNTER_INC(&pVM->pgm.s.CTX_SUFF(pStats)->StatR3DetectedConflicts);
 
-#ifdef IN_RING3
+# ifdef IN_RING3
                     Log(("PGMHasMappingConflicts: Conflict was detected at %08RX32 for mapping %s (32 bits)\n"
                          "                        iPDE=%#x iPT=%#x PDE=%RGp.\n",
@@ -874 +874 @@
                     AssertRCReturn(rc, rc);
                     break;
-#else
+# else
                     Log(("PGMHasMappingConflicts: Conflict was detected at %08RX32 for mapping (32 bits)\n"
                          "                        iPDE=%#x iPT=%#x PDE=%RGp.\n",
@@ -880 +880 @@
                          iPDE, iPT, pPD->a[iPDE + iPT].au32[0]));
                     return VINF_PGM_SYNC_CR3;
-#endif
+# endif
                 }
             }
@@ -931 +931 @@
 }
 
-#endif /* VBOX_WITH_RAW_MODE_NOT_R0 */
-
+#endif /* PGM_WITHOUT_MAPPINGS */
+

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

@@ -867 +867 @@
 #endif
 
+
 #ifdef VBOX_WITH_RAW_MODE_NOT_R0
-
 /**
  * Gets ss:esp for ring1 in main Hypervisor's TSS.
@@ -954 +954 @@
     return VINF_SUCCESS;
 }
-
+#endif /* VBOX_WITH_RAW_MODE_NOT_R0 */
+
+
+#if defined(VBOX_WITH_RAW_MODE) || (HC_ARCH_BITS != 64 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL))
 
 /**
@@ -1028 +1031 @@
 }
 
-#endif /* VBOX_WITH_RAW_MODE_NOT_R0 */
+#endif /* defined(VBOX_WITH_RAW_MODE) || (HC_ARCH_BITS != 64 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)) */
 
 /**