diff -urN vbox-clean-bk\src\VBox\VMM/include/EMInternal.h vbox-clean\src\VBox\VMM/include/EMInternal.h
old
|
new
|
|
73 | 73 | STAMCOUNTER Counter; |
74 | 74 | } CLISTAT, *PCLISTAT; |
75 | 75 | #ifdef IN_RING3 |
| 76 | #if !defined(RT_OS_OS2) |
76 | 77 | AssertCompileMemberAlignment(CLISTAT, Counter, 8); |
77 | 78 | #endif |
| 79 | #endif |
78 | 80 | |
79 | 81 | |
80 | 82 | /** |
diff -urN vbox-clean-bk\src\VBox\VMM/include/PDMInternal.h vbox-clean\src\VBox\VMM/include/PDMInternal.h
old
|
new
|
|
314 | 314 | /** Profiling the time the section is locked. */ |
315 | 315 | STAMPROFILEADV StatLocked; |
316 | 316 | } PDMCRITSECTINT; |
| 317 | #if !defined(RT_OS_OS2) |
317 | 318 | AssertCompileMemberAlignment(PDMCRITSECTINT, StatContentionRZLock, 8); |
| 319 | #endif |
318 | 320 | /** Pointer to private critical section data. */ |
319 | 321 | typedef PDMCRITSECTINT *PPDMCRITSECTINT; |
320 | 322 | |
… |
… |
|
374 | 376 | /** Profiling the time the section is write locked. */ |
375 | 377 | STAMPROFILEADV StatWriteLocked; |
376 | 378 | } PDMCRITSECTRWINT; |
| 379 | #if !defined(RT_OS_OS2) |
377 | 380 | AssertCompileMemberAlignment(PDMCRITSECTRWINT, StatContentionRZEnterExcl, 8); |
378 | 381 | AssertCompileMemberAlignment(PDMCRITSECTRWINT, Core.u64State, 8); |
| 382 | #endif |
379 | 383 | /** Pointer to private critical section data. */ |
380 | 384 | typedef PDMCRITSECTRWINT *PPDMCRITSECTRWINT; |
381 | 385 | |
… |
… |
|
1142 | 1146 | /** Number of times a critical section leave request needed to be queued for ring-3 execution. */ |
1143 | 1147 | STAMCOUNTER StatQueuedCritSectLeaves; |
1144 | 1148 | } PDM; |
| 1149 | #if !defined(RT_OS_OS2) |
1145 | 1150 | AssertCompileMemberAlignment(PDM, GCPhysVMMDevHeap, sizeof(RTGCPHYS)); |
1146 | 1151 | AssertCompileMemberAlignment(PDM, CritSect, 8); |
1147 | 1152 | AssertCompileMemberAlignment(PDM, StatQueuedCritSectLeaves, 8); |
| 1153 | #endif |
1148 | 1154 | /** Pointer to PDM VM instance data. */ |
1149 | 1155 | typedef PDM *PPDM; |
1150 | 1156 | |
diff -urN vbox-clean-bk\src\VBox\VMM/include/PGMInternal.h vbox-clean\src\VBox\VMM/include/PGMInternal.h
old
|
new
|
|
2009 | 2009 | /** The physical address for this entry. */ |
2010 | 2010 | RTHCPHYS HCPhys; |
2011 | 2011 | } PGMMAPSETENTRY; |
| 2012 | #if !defined(RT_OS_OS2) |
2012 | 2013 | AssertCompileMemberOffset(PGMMAPSETENTRY, iPage, RT_MAX(sizeof(RTR0PTR), sizeof(RTRCPTR))); |
2013 | 2014 | AssertCompileMemberAlignment(PGMMAPSETENTRY, HCPhys, sizeof(RTHCPHYS)); |
| 2015 | #endif |
2014 | 2016 | /** Pointer to a mapping cache usage set entry. */ |
2015 | 2017 | typedef PGMMAPSETENTRY *PPGMMAPSETENTRY; |
2016 | 2018 | |
… |
… |
|
2569 | 2571 | */ |
2570 | 2572 | PGMPOOLPAGE aPages[PGMPOOL_IDX_FIRST]; |
2571 | 2573 | } PGMPOOL, *PPGMPOOL, **PPPGMPOOL; |
| 2574 | #if !defined(RT_OS_OS2) |
2572 | 2575 | AssertCompileMemberAlignment(PGMPOOL, iModifiedHead, 8); |
2573 | 2576 | AssertCompileMemberAlignment(PGMPOOL, aDirtyPages, 8); |
2574 | 2577 | AssertCompileMemberAlignment(PGMPOOL, cUsedPages, 8); |
… |
… |
|
2576 | 2579 | AssertCompileMemberAlignment(PGMPOOL, StatAlloc, 8); |
2577 | 2580 | #endif |
2578 | 2581 | AssertCompileMemberAlignment(PGMPOOL, aPages, 8); |
| 2582 | #endif |
2579 | 2583 | |
2580 | 2584 | |
2581 | 2585 | /** @def PGMPOOL_PAGE_2_PTR |
… |
… |
|
3595 | 3599 | #endif |
3596 | 3600 | } PGM; |
3597 | 3601 | #ifndef IN_TSTVMSTRUCTGC /* HACK */ |
| 3602 | #if !defined(RT_OS_OS2) |
3598 | 3603 | AssertCompileMemberAlignment(PGM, paDynPageMap32BitPTEsGC, 8); |
3599 | 3604 | AssertCompileMemberAlignment(PGM, GCPtrMappingFixed, sizeof(RTGCPTR)); |
3600 | 3605 | AssertCompileMemberAlignment(PGM, HCPhysInterPD, 8); |
… |
… |
|
3604 | 3609 | AssertCompileMemberAlignment(PGM, HCPhysZeroPg, 8); |
3605 | 3610 | AssertCompileMemberAlignment(PGM, aHandyPages, 8); |
3606 | 3611 | AssertCompileMemberAlignment(PGM, cRelocations, 8); |
| 3612 | #endif |
3607 | 3613 | #endif /* !IN_TSTVMSTRUCTGC */ |
3608 | 3614 | /** Pointer to the PGM instance data. */ |
3609 | 3615 | typedef PGM *PPGM; |
diff -urN vbox-clean-bk\src\VBox\VMM/Makefile.kmk vbox-clean\src\VBox\VMM/Makefile.kmk
old
|
new
|
|
22 | 22 | ifndef VBOX_ONLY_EXTPACKS |
23 | 23 | include $(PATH_SUB_CURRENT)/tools/Makefile.kmk |
24 | 24 | endif |
25 | | include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk |
26 | | |
| 25 | # Disabled temporarily (Out-of-memory error in NASM) |
| 26 | ifn1of ($(KBUILD_TARGET),os2) |
| 27 | include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk |
| 28 | endif |
27 | 29 | |
28 | 30 | # |
29 | 31 | # Globals |
… |
… |
|
126 | 128 | VBoxVMM_INCS = \ |
127 | 129 | include \ |
128 | 130 | $(if-expr defined(VBOX_WITH_RAW_MODE),PATM,) |
129 | | VBoxVMM_ASINCS = . |
| 131 | VBoxVMM_ASINCS = . \ |
| 132 | VMMR3 |
130 | 133 | |
131 | 134 | VBoxVMM_SOURCES = \ |
132 | 135 | VBoxVMM.d \ |
… |
… |
|
279 | 282 | VMMSwitcher/AMD64ToPAE.asm |
280 | 283 | endif |
281 | 284 | VBoxVMM_SOURCES.x86 += \ |
282 | | VMMSwitcher/32BitToAMD64.asm \ |
283 | | VMMSwitcher/PAEToAMD64.asm \ |
284 | 285 | VMMSwitcher/X86Stub.asm |
285 | 286 | VBoxVMM_SOURCES.amd64 += \ |
| 287 | VMMSwitcher/32BitToAMD64.asm \ |
| 288 | VMMSwitcher/PAEToAMD64.asm \ |
286 | 289 | VMMSwitcher/AMD64Stub.asm |
287 | 290 | |
288 | 291 | VBoxVMM_LIBS = \ |
… |
… |
|
372 | 375 | |
373 | 376 | $$(VMMR0Imp_0_OUTDIR)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@) |
374 | 377 | ifeq ($(VBOX_LDR_FMT),lx) |
| 378 | # -e '/not-amd64/d' |
375 | 379 | $(SED) \ |
376 | 380 | -e '/not-os2/d' \ |
377 | | -e '/not-amd64/d' \ |
| 381 | -e '/not-x86/d' \ |
378 | 382 | -e 's/^[ \t][ \t]*\([a-zA-Z]\)/ _\1/' \ |
379 | 383 | -e 's/[ \t]DATA[ \t]*/ /' \ |
380 | 384 | --output $@ $< |
… |
… |
|
556 | 560 | |
557 | 561 | VMMR0_INCS = \ |
558 | 562 | include \ |
| 563 | VMMR0 \ |
559 | 564 | $(if-expr defined(VBOX_WITH_RAW_MODE),PATM,) |
560 | 565 | |
561 | 566 | VMMR0_SOURCES = \ |
diff -urN vbox-clean-bk\src\VBox\VMM/tools/Makefile.kmk vbox-clean\src\VBox\VMM/tools/Makefile.kmk
old
|
new
|
|
64 | 64 | $(PATH_STAGE_LIB)/SUPR3Static$(VBOX_SUFF_LIB) \ |
65 | 65 | $(VBOX_LIB_RUNTIME_STATIC) |
66 | 66 | VBoxCpuReport_LIBS.solaris = kstat contract |
67 | | |
| 67 | VBoxCpuReport_LIBS.os2 = c_omf386 |
68 | 68 | VBoxCpuReport_LDFLAGS.darwin = \ |
69 | 69 | -framework IOKit -framework CoreFoundation -framework CoreServices |
70 | 70 | |
diff -urN vbox-clean-bk\src\VBox\VMM/VMMR3/PDMDriver.cpp vbox-clean\src\VBox\VMM/VMMR3/PDMDriver.cpp
old
|
new
|
|
1536 | 1536 | return rc; |
1537 | 1537 | } |
1538 | 1538 | |
| 1539 | #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION |
1539 | 1540 | |
1540 | 1541 | /** @interface_method_impl{PDMDRVHLP,pfnAsyncCompletionTemplateCreate} */ |
1541 | 1542 | static DECLCALLBACK(int) pdmR3DrvHlp_AsyncCompletionTemplateCreate(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate, |
… |
… |
|
1553 | 1554 | return rc; |
1554 | 1555 | } |
1555 | 1556 | |
| 1557 | #endif |
1556 | 1558 | |
1557 | 1559 | #ifdef VBOX_WITH_NETSHAPER |
1558 | 1560 | /** @interface_method_impl{PDMDRVHLP,pfnNetShaperAttach} */ |
… |
… |
|
1816 | 1818 | pdmR3DrvHlp_SetAsyncNotification, |
1817 | 1819 | pdmR3DrvHlp_AsyncNotificationCompleted, |
1818 | 1820 | pdmR3DrvHlp_ThreadCreate, |
| 1821 | #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION |
1819 | 1822 | pdmR3DrvHlp_AsyncCompletionTemplateCreate, |
| 1823 | #else |
| 1824 | NULL, |
| 1825 | #endif |
1820 | 1826 | #ifdef VBOX_WITH_NETSHAPER |
1821 | 1827 | pdmR3DrvHlp_NetShaperAttach, |
1822 | 1828 | pdmR3DrvHlp_NetShaperDetach, |
| 1829 | #else |
| 1830 | NULL, |
| 1831 | NULL, |
1823 | 1832 | #endif /* VBOX_WITH_NETSHAPER */ |
1824 | 1833 | pdmR3DrvHlp_LdrGetRCInterfaceSymbols, |
1825 | 1834 | pdmR3DrvHlp_LdrGetR0InterfaceSymbols, |
diff -urN vbox-clean-bk\src\VBox\VMM/VMMR3/VMMSwitcher.cpp vbox-clean\src\VBox\VMM/VMMR3/VMMSwitcher.cpp
old
|
new
|
|
102 | 102 | static PVMMSWITCHERDEF g_apHmSwitchers[VMMSWITCHER_MAX] = |
103 | 103 | { |
104 | 104 | NULL, /* invalid entry */ |
105 | | #if HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL) |
| 105 | //// ??? #if HC_ARCH_BITS == 32 && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL) |
| 106 | #if HC_ARCH_BITS == 32 && defined(VBOX_WITH_HYBRID_32BIT_KERNEL) |
106 | 107 | NULL, //&vmmR3Switcher32BitTo32Bit_Def, |
107 | 108 | NULL, //&vmmR3Switcher32BitToPAE_Def, |
108 | 109 | &vmmR3Switcher32BitToAMD64_Def, |
diff -urN vbox-clean-bk\src\VBox\VMM/VMMRC/VMMRC.def vbox-clean\src\VBox\VMM/VMMRC/VMMRC.def
old
|
new
|
|
93 | 93 | RTAssertMsg1Weak |
94 | 94 | RTAssertMsg2Weak |
95 | 95 | RTAssertShouldPanic |
96 | | RTLogDefaultInstance |
| 96 | ; RTLogDefaultInstance ; (doubly defined) |
97 | 97 | RTTimeNanoTSLegacySyncInvarNoDelta |
98 | 98 | RTTimeNanoTSLegacySyncInvarWithDelta |
99 | 99 | RTTimeNanoTSLegacyAsync |