1- # $Id: Makefile.kmk 111450 2025-10-19 10:35:10Z alexander.eichner @oracle.com $
1+ # $Id: Makefile.kmk 111695 2025-11-13 13:31:17Z knut.osmundsen @oracle.com $
22## @file
33# Top-level makefile for the VMM.
44#
@@ -109,86 +109,86 @@ endif
109109VBoxVMM_SOURCES = \
110110 VBoxVMM.d \
111111 VMMR3/VMMR3VTable.cpp \
112- VMMR3/APIC .cpp \
113- VMMR3/CFGM .cpp \
114- VMMR3/CPUM .cpp \
112+ VMMR3/APICR3 .cpp \
113+ VMMR3/CFGMR3 .cpp \
114+ VMMR3/CPUMR3 .cpp \
115115 VMMR3/target-x86/CPUMR3-x86.cpp \
116116 VMMR3/target-x86/CPUMR3CpuId-x86.cpp \
117117 VMMR3/target-x86/CPUMR3Msr-x86.cpp \
118118 VMMR3/target-x86/CPUMR3Dbg-x86.cpp \
119119 VMMR3/CPUMR3Db.cpp \
120120 VMMR3/CPUMR3CpuIdInfo.cpp \
121121 VMMR3/CPUMR3CpuIdInfo-x86.cpp \
122- VMMR3/DBGF .cpp \
123- VMMR3/DBGFAddr .cpp \
124- VMMR3/DBGFAddrSpace .cpp \
122+ VMMR3/DBGFR3 .cpp \
123+ VMMR3/DBGFR3Addr .cpp \
124+ VMMR3/DBGFR3AddrSpace .cpp \
125125 VMMR3/DBGFR3Bp.cpp \
126126 VMMR3/DBGFR3BugCheck.cpp \
127- VMMR3/DBGFCoreWrite .cpp \
128- VMMR3/DBGFCpu .cpp \
129- VMMR3/DBGFDisas .cpp \
130- VMMR3/DBGFInfo .cpp \
131- VMMR3/DBGFLog .cpp \
132- VMMR3/DBGFMem .cpp \
127+ VMMR3/DBGFR3CoreWrite .cpp \
128+ VMMR3/DBGFR3Cpu .cpp \
129+ VMMR3/DBGFR3Disas .cpp \
130+ VMMR3/DBGFR3Info .cpp \
131+ VMMR3/DBGFR3Log .cpp \
132+ VMMR3/DBGFR3Mem .cpp \
133133 VMMR3/DBGFR3ModInMem.cpp \
134- VMMR3/DBGFOS .cpp \
134+ VMMR3/DBGFR3OS .cpp \
135135 VMMR3/DBGFR3PlugIn.cpp \
136- VMMR3/DBGFReg .cpp \
137- VMMR3/DBGFStack .cpp \
136+ VMMR3/DBGFR3Reg .cpp \
137+ VMMR3/DBGFR3Stack .cpp \
138138 VMMR3/DBGFR3Flow.cpp \
139139 $(if-expr defined(VBOX_WITH_DBGF_FLOW_TRACING), VMMR3/DBGFR3FlowTrace.cpp,) \
140140 VMMR3/DBGFR3Trace.cpp \
141141 $(if-expr defined(VBOX_WITH_DBGF_TRACING), VMMR3/DBGFR3Tracer.cpp,) \
142142 VMMR3/DBGFR3SampleReport.cpp \
143143 VMMR3/DBGFR3Type.cpp \
144- VMMR3/EM .cpp \
144+ VMMR3/EMR3 .cpp \
145145 VMMR3/EMR3Dbg.cpp \
146- $(if-expr defined(VBOX_WITH_HWVIRT),VMMR3/EMHM .cpp,) \
146+ $(if-expr defined(VBOX_WITH_HWVIRT),VMMR3/EMR3HM .cpp,) \
147147 VMMR3/EMR3Nem.cpp \
148- VMMR3/GCM .cpp \
149- VMMR3/GIM .cpp \
150- VMMR3/GIMHv .cpp \
151- VMMR3/GIMKvm .cpp \
152- VMMR3/GIMMinimal .cpp \
148+ VMMR3/GCMR3 .cpp \
149+ VMMR3/GIMR3 .cpp \
150+ VMMR3/GIMR3Hv .cpp \
151+ VMMR3/GIMR3Kvm .cpp \
152+ VMMR3/GIMR3Minimal .cpp \
153153 VMMR3/IEMR3.cpp \
154- VMMR3/IOM .cpp \
154+ VMMR3/IOMR3 .cpp \
155155 VMMR3/IOMR3IoPort.cpp \
156156 VMMR3/IOMR3Mmio.cpp \
157- VMMR3/GMM .cpp \
157+ VMMR3/GMMR3 .cpp \
158158 VMMR3/GVMMR3.cpp \
159- VMMR3/MM .cpp \
160- VMMR3/MMHeap .cpp \
159+ VMMR3/MMR3 .cpp \
160+ VMMR3/MMR3Heap .cpp \
161161 VMMR3/NEMR3.cpp \
162- VMMR3/PDM .cpp \
163- VMMR3/PDMBlkCache .cpp \
164- VMMR3/PDMDevice .cpp \
165- VMMR3/PDMDevHlp .cpp \
166- $(if-expr defined(VBOX_WITH_DBGF_TRACING), VMMR3/PDMDevHlpTracing .cpp,) \
167- VMMR3/PDMDevMiscHlp .cpp \
168- VMMR3/PDMDriver .cpp \
169- VMMR3/PDMLdr .cpp \
170- VMMR3/PDMCritSect .cpp \
171- VMMR3/PDMQueue .cpp \
162+ VMMR3/PDMR3 .cpp \
163+ VMMR3/PDMR3BlkCache .cpp \
164+ VMMR3/PDMR3Device .cpp \
165+ VMMR3/PDMR3DevHlp .cpp \
166+ $(if-expr defined(VBOX_WITH_DBGF_TRACING), VMMR3/PDMR3DevHlpTracing .cpp,) \
167+ VMMR3/PDMR3DevMiscHlp .cpp \
168+ VMMR3/PDMR3Driver .cpp \
169+ VMMR3/PDMR3Ldr .cpp \
170+ VMMR3/PDMR3CritSect .cpp \
171+ VMMR3/PDMR3Queue .cpp \
172172 VMMR3/PDMR3Task.cpp \
173- VMMR3/PDMThread .cpp \
174- VMMR3/PGM .cpp \
175- VMMR3/PGMDbg .cpp \
176- VMMR3/PGMHandler .cpp \
177- VMMR3/PGMPhys .cpp \
178- VMMR3/PGMSavedState .cpp \
179- VMMR3/PGMSharedPage .cpp \
180- VMMR3/SELM .cpp \
181- VMMR3/SSM .cpp \
182- VMMR3/STAM .cpp \
183- VMMR3/TM .cpp \
184- VMMR3/TRPM .cpp \
185- VMMR3/VM .cpp \
186- VMMR3/VMEmt .cpp \
187- VMMR3/VMReq .cpp \
188- VMMR3/VMM .cpp \
189- VMMR3/VMMGuruMeditation .cpp \
190- VMMR3/VMMTests .cpp \
191- VMMR3/HM .cpp \
173+ VMMR3/PDMR3Thread .cpp \
174+ VMMR3/PGMR3 .cpp \
175+ VMMR3/PGMR3Dbg .cpp \
176+ VMMR3/PGMR3Handler .cpp \
177+ VMMR3/PGMR3Phys .cpp \
178+ VMMR3/PGMR3SavedState .cpp \
179+ VMMR3/PGMR3SharedPage .cpp \
180+ VMMR3/SELMR3 .cpp \
181+ VMMR3/SSMR3 .cpp \
182+ VMMR3/STAMR3 .cpp \
183+ VMMR3/TMR3 .cpp \
184+ VMMR3/TRPMR3 .cpp \
185+ VMMR3/VMR3 .cpp \
186+ VMMR3/VMR3Emt .cpp \
187+ VMMR3/VMR3Req .cpp \
188+ VMMR3/VMMR3 .cpp \
189+ VMMR3/VMMR3GuruMeditation .cpp \
190+ VMMR3/VMMR3Tests .cpp \
191+ VMMR3/HMR3 .cpp \
192192 VMMAll/APICAll.cpp \
193193 VMMAll/CPUMAllCpuId.cpp \
194194 VMMAll/CPUMAllRegs.cpp \
@@ -248,7 +248,7 @@ VBoxVMM_SOURCES = \
248248 VMMAll/VMMAll.cpp
249249ifn1of (VBOX_WITH_ONLY_PGM_NEM_MODE, $(VBoxVMM_DEFS))
250250 VBoxVMM_SOURCES += \
251- VMMR3/PGMPool .cpp \
251+ VMMR3/PGMR3Pool .cpp \
252252 VMMAll/PGMAllPool.cpp
253253endif
254254VBoxVMM_SOURCES.amd64 += \
@@ -260,18 +260,18 @@ VBoxVMM_SOURCES.arm64 += \
260260 VMMAll/target-x86/IEMAllAImpl-x86-arm64.S \
261261 VMMR3/CPUMR3CpuIdInfo-armv8.cpp
262262ifdef VBOX_WITH_VUSB
263- VBoxVMM_SOURCES += VMMR3/PDMUsb .cpp
263+ VBoxVMM_SOURCES += VMMR3/PDMR3Usb .cpp
264264endif
265265ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
266266 VBoxVMM_SOURCES += \
267- VMMR3/PDMAsyncCompletion .cpp \
268- VMMR3/PDMAsyncCompletionFile .cpp \
269- VMMR3/PDMAsyncCompletionFileFailsafe .cpp \
270- VMMR3/PDMAsyncCompletionFileNormal .cpp
267+ VMMR3/PDMR3AsyncCompletion .cpp \
268+ VMMR3/PDMR3AsyncCompletionFile .cpp \
269+ VMMR3/PDMR3AsyncCompletionFileFailsafe .cpp \
270+ VMMR3/PDMR3AsyncCompletionFileNormal .cpp
271271endif
272272ifdef VBOX_WITH_NETSHAPER
273273 VBoxVMM_SOURCES += \
274- VMMR3/PDMNetShaper .cpp \
274+ VMMR3/PDMR3NetShaper .cpp \
275275 VMMAll/PDMAllNetShaper.cpp
276276endif
277277
@@ -351,19 +351,19 @@ VBoxVMM_LDFLAGS.solaris = -mimpure-text
351351
352352# SSM wish to know the build type, host os and arch.
353353ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
354- VMMR3/SSM .cpp_DEFS += \
354+ VMMR3/SSMR3 .cpp_DEFS += \
355355 KBUILD_TYPE="$(KBUILD_TYPE)" \
356356 KBUILD_TARGET="$(KBUILD_TARGET)" \
357357 KBUILD_TARGET_ARCH="$(KBUILD_TARGET_ARCH)"
358358else
359- VMMR3/SSM .cpp_DEFS += \
359+ VMMR3/SSMR3 .cpp_DEFS += \
360360 KBUILD_TYPE=\"$(KBUILD_TYPE)\" \
361361 KBUILD_TARGET=\"$(KBUILD_TARGET)\" \
362362 KBUILD_TARGET_ARCH=\"$(KBUILD_TARGET_ARCH)\"
363363endif
364364
365365ifdef VBOX_WITH_GCC_SANITIZER
366- VMMR3/PGMPool .cpp_CXXFLAGS.linux += -fno-sanitize=address
366+ VMMR3/PGMR3Pool .cpp_CXXFLAGS.linux += -fno-sanitize=address
367367endif
368368
369369#ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
@@ -457,8 +457,8 @@ ifdef VBOX_WITH_VIRT_ARMV8
457457 VBoxVMMArm_SOURCES = \
458458 VBoxVMM.d \
459459 VMMR3/VMMR3VTable.cpp \
460- VMMR3/CFGM .cpp \
461- VMMR3/CPUM .cpp \
460+ VMMR3/CFGMR3 .cpp \
461+ VMMR3/CPUMR3 .cpp \
462462 VMMR3/target-armv8/CPUMR3-armv8.cpp \
463463 VMMR3/target-armv8/CPUMR3CpuId-armv8.cpp \
464464 VMMR3/target-armv8/CPUMR3SysReg-armv8.cpp \
@@ -467,70 +467,70 @@ ifdef VBOX_WITH_VIRT_ARMV8
467467 VMMR3/CPUMR3CpuIdInfo.cpp \
468468 VMMR3/CPUMR3CpuIdInfo-armv8.cpp \
469469 VMMAll/CPUMAllCpuId.cpp \
470- VMMR3/DBGF .cpp \
471- VMMR3/DBGFAddr .cpp \
472- VMMR3/DBGFAddrSpace .cpp \
470+ VMMR3/DBGFR3 .cpp \
471+ VMMR3/DBGFR3Addr .cpp \
472+ VMMR3/DBGFR3AddrSpace .cpp \
473473 VMMR3/DBGFR3Bp.cpp \
474474 VMMR3/DBGFR3BugCheck.cpp \
475- VMMR3/DBGFCoreWrite .cpp \
476- VMMR3/DBGFCpu .cpp \
477- VMMR3/DBGFDisas .cpp \
478- VMMR3/DBGFInfo .cpp \
479- VMMR3/DBGFLog .cpp \
480- VMMR3/DBGFMem .cpp \
475+ VMMR3/DBGFR3CoreWrite .cpp \
476+ VMMR3/DBGFR3Cpu .cpp \
477+ VMMR3/DBGFR3Disas .cpp \
478+ VMMR3/DBGFR3Info .cpp \
479+ VMMR3/DBGFR3Log .cpp \
480+ VMMR3/DBGFR3Mem .cpp \
481481 VMMR3/DBGFR3ModInMem.cpp \
482- VMMR3/DBGFOS .cpp \
482+ VMMR3/DBGFR3OS .cpp \
483483 VMMR3/DBGFR3PlugIn.cpp \
484- VMMR3/DBGFReg .cpp \
485- VMMR3/DBGFStack .cpp \
484+ VMMR3/DBGFR3Reg .cpp \
485+ VMMR3/DBGFR3Stack .cpp \
486486 VMMR3/DBGFR3Flow.cpp \
487487 VMMR3/DBGFR3FlowTrace.cpp \
488488 VMMR3/DBGFR3Trace.cpp \
489489 VMMR3/DBGFR3SampleReport.cpp \
490490 VMMR3/DBGFR3Type.cpp \
491- VMMR3/EM .cpp \
491+ VMMR3/EMR3 .cpp \
492492 VMMR3/EMR3Dbg.cpp \
493493 VMMR3/EMR3Nem.cpp \
494494 VMMR3/GICR3.cpp \
495- VMMR3/GIM .cpp \
495+ VMMR3/GIMR3 .cpp \
496496 VMMR3/IEMR3.cpp \
497- VMMR3/IOM .cpp \
497+ VMMR3/IOMR3 .cpp \
498498 VMMR3/IOMR3IoPort.cpp \
499499 VMMR3/IOMR3Mmio.cpp \
500- VMMR3/GMM .cpp \
500+ VMMR3/GMMR3 .cpp \
501501 VMMR3/GVMMR3.cpp \
502- VMMR3/MM .cpp \
503- VMMR3/MMHeap .cpp \
502+ VMMR3/MMR3 .cpp \
503+ VMMR3/MMR3Heap .cpp \
504504 VMMR3/NEMR3.cpp \
505- VMMR3/PDM .cpp \
506- VMMR3/PDMBlkCache .cpp \
507- VMMR3/PDMDevice .cpp \
508- VMMR3/PDMDevHlp .cpp \
509- VMMR3/PDMDevMiscHlp .cpp \
510- VMMR3/PDMDriver .cpp \
511- VMMR3/PDMLdr .cpp \
512- VMMR3/PDMCritSect .cpp \
513- VMMR3/PDMQueue .cpp \
505+ VMMR3/PDMR3 .cpp \
506+ VMMR3/PDMR3BlkCache .cpp \
507+ VMMR3/PDMR3Device .cpp \
508+ VMMR3/PDMR3DevHlp .cpp \
509+ VMMR3/PDMR3DevMiscHlp .cpp \
510+ VMMR3/PDMR3Driver .cpp \
511+ VMMR3/PDMR3Ldr .cpp \
512+ VMMR3/PDMR3CritSect .cpp \
513+ VMMR3/PDMR3Queue .cpp \
514514 VMMR3/PDMR3Task.cpp \
515- VMMR3/PDMThread .cpp \
516- VMMR3/PGM .cpp \
517- VMMR3/PGMDbg .cpp \
518- VMMR3/PGMHandler .cpp \
519- VMMR3/PGMPhys .cpp \
520- VMMR3/PGMSavedState .cpp \
521- VMMR3/PGMSharedPage .cpp \
515+ VMMR3/PDMR3Thread .cpp \
516+ VMMR3/PGMR3 .cpp \
517+ VMMR3/PGMR3Dbg .cpp \
518+ VMMR3/PGMR3Handler .cpp \
519+ VMMR3/PGMR3Phys .cpp \
520+ VMMR3/PGMR3SavedState .cpp \
521+ VMMR3/PGMR3SharedPage .cpp \
522522 VMMR3/PMUR3.cpp \
523- VMMR3/SSM .cpp \
524- VMMR3/STAM .cpp \
525- VMMR3/TM .cpp \
526- VMMR3/TRPM .cpp \
527- VMMR3/VM .cpp \
528- VMMR3/VMEmt .cpp \
529- VMMR3/VMReq .cpp \
530- VMMR3/VMM .cpp \
531- VMMR3/VMMGuruMeditation .cpp \
532- VMMR3/VMMTests .cpp \
533- VMMR3/HM -armv8.cpp \
523+ VMMR3/SSMR3 .cpp \
524+ VMMR3/STAMR3 .cpp \
525+ VMMR3/TMR3 .cpp \
526+ VMMR3/TRPMR3 .cpp \
527+ VMMR3/VMR3 .cpp \
528+ VMMR3/VMR3Emt .cpp \
529+ VMMR3/VMR3Req .cpp \
530+ VMMR3/VMMR3 .cpp \
531+ VMMR3/VMMR3GuruMeditation .cpp \
532+ VMMR3/VMMR3Tests .cpp \
533+ VMMR3/HMR3 -armv8.cpp \
534534 VMMAll/CPUMAllRegs-armv8.cpp \
535535 VMMAll/CPUMAllSysRegs-armv8.cpp \
536536 VMMAll/DBGFAll.cpp \
@@ -563,18 +563,18 @@ ifdef VBOX_WITH_VIRT_ARMV8
563563 VMMAll/VMAll.cpp \
564564 VMMAll/VMMAll.cpp
565565 ifdef VBOX_WITH_VUSB
566- VBoxVMMArm_SOURCES += VMMR3/PDMUsb .cpp
566+ VBoxVMMArm_SOURCES += VMMR3/PDMR3Usb .cpp
567567 endif
568568 ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
569569 VBoxVMMArm_SOURCES += \
570- VMMR3/PDMAsyncCompletion .cpp \
571- VMMR3/PDMAsyncCompletionFile .cpp \
572- VMMR3/PDMAsyncCompletionFileFailsafe .cpp \
573- VMMR3/PDMAsyncCompletionFileNormal .cpp
570+ VMMR3/PDMR3AsyncCompletion .cpp \
571+ VMMR3/PDMR3AsyncCompletionFile .cpp \
572+ VMMR3/PDMR3AsyncCompletionFileFailsafe .cpp \
573+ VMMR3/PDMR3AsyncCompletionFileNormal .cpp
574574 endif
575575 ifdef VBOX_WITH_NETSHAPER
576576 VBoxVMMArm_SOURCES += \
577- VMMR3/PDMNetShaper .cpp \
577+ VMMR3/PDMR3NetShaper .cpp \
578578 VMMAll/PDMAllNetShaper.cpp
579579 endif
580580 ifdef VBOX_WITH_IEM_TARGETING_ARM
@@ -1178,7 +1178,7 @@ ifndef VBOX_ONLY_BUILD
11781178 SSMStandalone_DEFS = VBOX_VMM_TARGET_AGNOSTIC VBOX_IN_VMM IN_VMM_R3 IN_VMM_STATIC SSM_STANDALONE CPUM_DB_STANDALONE $(VMM_COMMON_DEFS)
11791179 SSMStandalone_INCS = include
11801180 SSMStandalone_SOURCES = \
1181- VMMR3/SSM .cpp
1181+ VMMR3/SSMR3 .cpp
11821182endif # !VBOX_ONLY_BUILD
11831183
11841184
@@ -1257,7 +1257,7 @@ VMMAll/VMMAll.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
12571257# Disable annoying warnings about array subscript above array bounds in aPages[]
12581258#
12591259ifneq ($(KBUILD_TARGET),win)
1260- VMMR3/PGMPool .cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
1260+ VMMR3/PGMR3Pool .cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
12611261 VMMAll/PGMAllPool.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
12621262 VMMAll/PGMAll.cpp_CXXFLAGS = -Wno-unused-function
12631263 VMMAll/IEMAll.cpp_CXXFLAGS = -Wno-unused-function
0 commit comments