Ticket #1: vmm.diff

\src\VBox\VMM/include/EMInternal.h

@@ -73 +73 @@
     STAMCOUNTER             Counter;
 } CLISTAT, *PCLISTAT;
 #ifdef IN_RING3
+#if !defined(RT_OS_OS2)
 AssertCompileMemberAlignment(CLISTAT, Counter, 8);
 #endif
+#endif
 
 
 /**

\src\VBox\VMM/include/IEMInternal.h

@@ -664 +664 @@
  * @param   a_ArgList           The argument list enclosed in parentheses.
  */
 
-#if defined(__GNUC__) && defined(RT_ARCH_X86)
+#if defined(__GNUC__) && defined(RT_ARCH_X86) && !defined(__EMX__)
 # define IEM_DECL_IMPL_TYPE(a_RetType, a_Name, a_ArgList) \
     __attribute__((__fastcall__)) a_RetType (a_Name) a_ArgList
 # define IEM_DECL_IMPL_DEF(a_RetType, a_Name, a_ArgList) \

\src\VBox\VMM/include/PDMInternal.h

@@ -314 +314 @@
     /** Profiling the time the section is locked. */
     STAMPROFILEADV                  StatLocked;
 } PDMCRITSECTINT;
+#if !defined(RT_OS_OS2)
 AssertCompileMemberAlignment(PDMCRITSECTINT, StatContentionRZLock, 8);
+#endif
 /** Pointer to private critical section data. */
 typedef PDMCRITSECTINT *PPDMCRITSECTINT;
 
@@ -374 +376 @@
     /** Profiling the time the section is write locked. */
     STAMPROFILEADV                      StatWriteLocked;
 } PDMCRITSECTRWINT;
+#if !defined(RT_OS_OS2)
 AssertCompileMemberAlignment(PDMCRITSECTRWINT, StatContentionRZEnterExcl, 8);
 AssertCompileMemberAlignment(PDMCRITSECTRWINT, Core.u64State, 8);
+#endif
 /** Pointer to private critical section data. */
 typedef PDMCRITSECTRWINT *PPDMCRITSECTRWINT;
 
@@ -1142 +1146 @@
     /** Number of times a critical section leave request needed to be queued for ring-3 execution. */
     STAMCOUNTER                     StatQueuedCritSectLeaves;
 } PDM;
+#if !defined(RT_OS_OS2)
 AssertCompileMemberAlignment(PDM, GCPhysVMMDevHeap, sizeof(RTGCPHYS));
 AssertCompileMemberAlignment(PDM, CritSect, 8);
 AssertCompileMemberAlignment(PDM, StatQueuedCritSectLeaves, 8);
+#endif
 /** Pointer to PDM VM instance data. */
 typedef PDM *PPDM;
 

\src\VBox\VMM/include/PGMInternal.h

@@ -2005 +2005 @@
     /** The physical address for this entry. */
     RTHCPHYS                    HCPhys;
 } PGMMAPSETENTRY;
+#if !defined(RT_OS_OS2)
 AssertCompileMemberOffset(PGMMAPSETENTRY, iPage, RT_MAX(sizeof(RTR0PTR), sizeof(RTRCPTR)));
 AssertCompileMemberAlignment(PGMMAPSETENTRY, HCPhys, sizeof(RTHCPHYS));
+#endif
 /** Pointer to a mapping cache usage set entry. */
 typedef PGMMAPSETENTRY *PPGMMAPSETENTRY;
 
@@ -2565 +2567 @@
      */
     PGMPOOLPAGE                 aPages[PGMPOOL_IDX_FIRST];
 } PGMPOOL, *PPGMPOOL, **PPPGMPOOL;
+#if !defined(RT_OS_OS2)
 AssertCompileMemberAlignment(PGMPOOL, iModifiedHead, 8);
 AssertCompileMemberAlignment(PGMPOOL, aDirtyPages, 8);
 AssertCompileMemberAlignment(PGMPOOL, cUsedPages, 8);
@@ -2572 +2575 @@
 AssertCompileMemberAlignment(PGMPOOL, StatAlloc, 8);
 #endif
 AssertCompileMemberAlignment(PGMPOOL, aPages, 8);
+#endif
 
 
 /** @def PGMPOOL_PAGE_2_PTR
@@ -3591 +3595 @@
 #endif
 } PGM;
 #ifndef IN_TSTVMSTRUCTGC /* HACK */
+#if !defined(RT_OS_OS2)
 AssertCompileMemberAlignment(PGM, paDynPageMap32BitPTEsGC, 8);
 AssertCompileMemberAlignment(PGM, GCPtrMappingFixed, sizeof(RTGCPTR));
 AssertCompileMemberAlignment(PGM, HCPhysInterPD, 8);
@@ -3600 +3605 @@
 AssertCompileMemberAlignment(PGM, HCPhysZeroPg, 8);
 AssertCompileMemberAlignment(PGM, aHandyPages, 8);
 AssertCompileMemberAlignment(PGM, cRelocations, 8);
+#endif
 #endif /* !IN_TSTVMSTRUCTGC */
 /** Pointer to the PGM instance data. */
 typedef PGM *PPGM;

\src\VBox\VMM/Makefile.kmk

@@ -22 +22 @@
 ifndef VBOX_ONLY_EXTPACKS
  include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
 endif
-include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
-
+# Disabled temporarily (Out-of-memory error in NASM)
+ifn1of ($(KBUILD_TARGET),os2)
+ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
+endif
 
 # Fail on unsupported hosts.
 ifeq ($(KBUILD_TARGET_ARCH),x86)
@@ -133 +135 @@
 VBoxVMM_INCS     = \
         include \
         $(if-expr defined(VBOX_WITH_RAW_MODE),PATM,)
-VBoxVMM_ASINCS   = .
+VBoxVMM_ASINCS   = . \
+        VMMR3
 
 VBoxVMM_SOURCES  = \
         VBoxVMM.d \
@@ -285 +288 @@
         VMMSwitcher/AMD64ToPAE.asm
 endif
 VBoxVMM_SOURCES.x86 += \
-        VMMSwitcher/32BitToAMD64.asm \
-        VMMSwitcher/PAEToAMD64.asm \
         VMMSwitcher/X86Stub.asm
 VBoxVMM_SOURCES.amd64 += \
+        VMMSwitcher/32BitToAMD64.asm \
+        VMMSwitcher/PAEToAMD64.asm \
         VMMSwitcher/AMD64Stub.asm
 
 VBoxVMM_LIBS = \
@@ -305 +308 @@
 VBoxVMM_LDFLAGS.linux = -Wl,--no-undefined
 VBoxVMM_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxVMM.dylib
 VBoxVMM_LDFLAGS.solaris = -mimpure-text
+# VBoxVMM_LIBS.os2 = $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
 
 # SSM wish to know the build type, host os and arch.
 VMMR3/SSM.cpp_DEFS +=   \
@@ -381 +385 @@
 
  $$(VMMR0Imp_0_OUTDIR)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@)
  ifeq ($(VBOX_LDR_FMT),lx)
+        #       -e '/not-amd64/d'
         $(SED) \
                 -e '/not-os2/d' \
-                -e '/not-amd64/d' \
+                -e '/not-x86/d' \
                 -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' \
                 -e 's/[ \t]DATA[ \t]*/ /'  \
                 --output $@ $<
@@ -560 +565 @@
 
  VMMR0_INCS      = \
         include \
+        VMMR0 \
         $(if-expr defined(VBOX_WITH_RAW_MODE),PATM,)
 
  VMMR0_SOURCES   = \

\src\VBox\VMM/tools/Makefile.kmk

@@ -64 +64 @@
         $(PATH_STAGE_LIB)/SUPR3Static$(VBOX_SUFF_LIB) \
        $(VBOX_LIB_RUNTIME_STATIC)
 VBoxCpuReport_LIBS.solaris = kstat contract
-
+VBoxCpuReport_LIBS.os2 = c_omf386
 VBoxCpuReport_LDFLAGS.darwin = \
         -framework IOKit -framework CoreFoundation -framework CoreServices
 

\src\VBox\VMM/VMMR3/PDMDriver.cpp

@@ -1533 +1533 @@
     return rc;
 }
 
+#ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
 
 /** @interface_method_impl{PDMDRVHLP,pfnAsyncCompletionTemplateCreate} */
 static DECLCALLBACK(int) pdmR3DrvHlp_AsyncCompletionTemplateCreate(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate,
@@ -1550 +1551 @@
     return rc;
 }
 
+#endif
 
 #ifdef VBOX_WITH_NETSHAPER
 /** @interface_method_impl{PDMDRVHLP,pfnNetShaperAttach} */
@@ -1813 +1815 @@
     pdmR3DrvHlp_SetAsyncNotification,
     pdmR3DrvHlp_AsyncNotificationCompleted,
     pdmR3DrvHlp_ThreadCreate,
+#ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
     pdmR3DrvHlp_AsyncCompletionTemplateCreate,
+#else
+    NULL,
+#endif
 #ifdef VBOX_WITH_NETSHAPER
     pdmR3DrvHlp_NetShaperAttach,
     pdmR3DrvHlp_NetShaperDetach,
+#else
+    NULL,
+    NULL,
 #endif /* VBOX_WITH_NETSHAPER */
     pdmR3DrvHlp_LdrGetRCInterfaceSymbols,
     pdmR3DrvHlp_LdrGetR0InterfaceSymbols,

\src\VBox\VMM/VMMR3/SSM.cpp

@@ -1801 +1801 @@
  * @param   pszName         Data unit name.
  * @remark  Only for dynamic data units.
  */
-VMMR3DECL(int) SSMR3DeregisterExternal(PUVM pUVM, const char *pszName)
+VMMR3DECL(int) SSMR3DeregisterExternal(PVM pVM, const char *pszName)
 {
-    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
-    PVM pVM = pUVM->pVM;
     VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    PUVM pUVM = pVM->pUVM;
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
 
     return ssmR3DeregisterByNameAndType(pVM, pszName, SSMUNITTYPE_EXTERNAL);
 }

\src\VBox\VMM/VMMR3/VMMSwitcher.cpp

@@ -98 +98 @@
 static PVMMSWITCHERDEF g_apHmSwitchers[VMMSWITCHER_MAX] =
 {
     NULL, /* invalid entry */
-#if HC_ARCH_BITS == 32
+// ??? #if HC_ARCH_BITS == 32
+#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
     NULL,   //&vmmR3Switcher32BitTo32Bit_Def,
     NULL,   //&vmmR3Switcher32BitToPAE_Def,
     &vmmR3Switcher32BitToAMD64_Def,

\src\VBox\VMM/VMMRC/VMMRC.def

@@ -93 +93 @@
     RTAssertMsg1Weak
     RTAssertMsg2Weak
     RTAssertShouldPanic
-    RTLogDefaultInstance
+;    RTLogDefaultInstance ; (doubly defined)
     RTTimeNanoTSLegacySyncInvarNoDelta
     RTTimeNanoTSLegacySyncInvarWithDelta
     RTTimeNanoTSLegacyAsync