Changeset 26437 in vbox

Timestamp:

Feb 11, 2010 3:06:15 PM (15 years ago)

Author:

vboxsync

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

57572

Message:

VMM: VBOX_WITH_RAW_MODE fixes

Location:

trunk/src/VBox/VMM

Files:

• PDMLdr.cpp (modified) (10 diffs)
• PGM.cpp (modified) (3 diffs)
• VMM.cpp (modified) (1 diff)
• VMMSwitcher.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -97 +97 @@
 int pdmR3LdrInitU(PUVM pUVM)
 {
-#ifdef PDMLDR_FAKE_MODE
+#if defined(PDMLDR_FAKE_MODE) || !defined(VBOX_WITH_RAW_MODE)
     return VINF_SUCCESS;
 
@@ -148 +148 @@
             }
 
+#ifdef VBOX_WITH_RAW_MODE
             case PDMMOD_TYPE_RC:
+#endif
             case PDMMOD_TYPE_R3:
                 /* MM will free this memory for us - it's alloc only memory. :-) */
@@ -177 +179 @@
 VMMR3DECL(void) PDMR3LdrRelocateU(PUVM pUVM, RTGCINTPTR offDelta)
 {
+#ifdef VBOX_WITH_RAW_MODE
     LogFlow(("PDMR3LdrRelocate: offDelta=%RGv\n", offDelta));
 
@@ -217 +220 @@
         }
     }
+#endif
 }
 
@@ -302 +306 @@
 
 
+#ifdef VBOX_WITH_RAW_MODE
 /**
  * Resolve an external symbol during RTLdrGetBits() of a RC module.
@@ -538 +543 @@
     return rc;
 }
+#endif /* VBOX_WITH_RAW_MODE */
 
 
@@ -776 +782 @@
 VMMR3DECL(int) PDMR3LdrGetSymbolRC(PVM pVM, const char *pszModule, const char *pszSymbol, PRTRCPTR pRCPtrValue)
 {
-#ifdef PDMLDR_FAKE_MODE
+#if defined(PDMLDR_FAKE_MODE) || !defined(VBOX_WITH_RAW_MODE)
     *pRCPtrValue = 0xfeedf00d;
     return VINF_SUCCESS;
@@ -832 +838 @@
 VMMR3DECL(int) PDMR3LdrGetSymbolRCLazy(PVM pVM, const char *pszModule, const char *pszSymbol, PRTRCPTR pRCPtrValue)
 {
-#ifdef PDMLDR_FAKE_MODE
+#if defined(PDMLDR_FAKE_MODE) || !defined(PDMR3LdrLoadRC)
     *pRCPtrValue = 0xfeedf00d;
     return VINF_SUCCESS;
@@ -1179 +1185 @@
         switch (enmType)
         {
+#ifdef VBOX_WITH_RAW_MODE
             case PDMMOD_TYPE_RC:
             {
@@ -1191 +1198 @@
                 break;
             }
+#endif
 
             case PDMMOD_TYPE_R0:

trunk/src/VBox/VMM/PGM.cpp

@@ -1192 +1192 @@
      * Init the structure.
      */
+#ifdef PGM_WITHOUT_MAPPINGS
+    pVM->pgm.s.fMappingsDisabled = true;
+#endif
     pVM->pgm.s.offVM       = RT_OFFSETOF(VM, pgm.s);
     pVM->pgm.s.offVCpuPGM  = RT_OFFSETOF(VMCPU, pgm.s);
@@ -3065 +3068 @@
     VMMSWITCHER enmSwitcher;
     PGMMODE     enmShadowMode = pgmR3CalcShadowMode(pVM, enmGuestMode, pVM->pgm.s.enmHostMode, pVCpu->pgm.s.enmShadowMode, &enmSwitcher);
+
+#ifdef VBOX_WITH_RAW_MODE
     if (enmSwitcher != VMMSWITCHER_INVALID)
     {
@@ -3077 +3082 @@
         }
     }
+#endif
 
     /*

trunk/src/VBox/VMM/VMM.cpp

@@ -752 +752 @@
      * Recalc the RC address.
      */
+#ifdef VBOX_WITH_RAW_MODE
     pVM->vmm.s.pvCoreCodeRC = MMHyperR3ToRC(pVM, pVM->vmm.s.pvCoreCodeR3);
+#endif
 
     /*

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -103 +103 @@
 int vmmR3SwitcherInit(PVM pVM)
 {
+#ifndef VBOX_WITH_RAW_MODE
+    return VINF_SUCCESS;
+#else
     /*
      * Calc the size.
@@ -223 +226 @@
     pVM->vmm.s.pvCoreCodeRC = 0;
     return rc;
+#endif
 }
 
@@ -233 +237 @@
 void vmmR3SwitcherRelocate(PVM pVM, RTGCINTPTR offDelta)
 {
+#ifdef VBOX_WITH_RAW_MODE
     /*
      * Relocate all the switchers.
@@ -263 +268 @@
 
 //    AssertFailed();
+#endif
 }