VirtualBox

Changeset 98437 in vbox


Ignore:
Timestamp:
Feb 2, 2023 12:46:41 PM (2 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
155684
Message:

VMM/*.kmk: Automatic scm cleanups. bugref:10348

Location:
trunk/src/VBox/VMM
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/Config.kmk

    r98103 r98437  
    4747endif
    4848ifdef VBOX_WITH_IEM_TLB ## @todo VMX code doesn't compile with TLBs enabled.
    49   VMM_COMMON_DEFS += IEM_WITH_CODE_TLB IEM_WITH_DATA_TLB
     49 VMM_COMMON_DEFS += IEM_WITH_CODE_TLB IEM_WITH_DATA_TLB
    5050else
    5151 ifdef VBOX_WITH_NESTED_HWVIRT_VMX

  • trunk/src/VBox/VMM/Makefile.kmk

    r98256 r98437  
    4444ifeq ($(KBUILD_TARGET_ARCH),x86)
    4545 ifeq ($(KBUILD_TARGET),darwin)
    46 $(error 32-bit darwin is no longer a supported VirtualBox host. Go back to 4.3 or older for 32-bit host support.)
     46  $(error 32-bit darwin is no longer a supported VirtualBox host. Go back to 4.3 or older for 32-bit host support.)
    4747 else ifeq ($(KBUILD_TARGET),solaris)
    48 $(error 32-bit solaris is no longer a supported VirtualBox host. Go back to 4.2 or older for 32-bit host support.)
     48  $(error 32-bit solaris is no longer a supported VirtualBox host. Go back to 4.2 or older for 32-bit host support.)
    4949 else ifn1of ($(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS))
    50 $(error 32-bit builds of the VirtualBox host are no longer supported. Go back to 6.0 or older for 32-bit host support.)
     50  $(error 32-bit builds of the VirtualBox host are no longer supported. Go back to 6.0 or older for 32-bit host support.)
    5151 endif
    5252endif
    … …  
    6565## @todo eliminate IN_GMM_R3
    6666ifdef VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
    67 VBoxVMM_DEFS    += VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
     67 VBoxVMM_DEFS   += VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
    6868endif
    6969ifdef VBOX_WITH_VUSB
    70 VBoxVMM_DEFS    += VBOX_WITH_USB
     70 VBoxVMM_DEFS   += VBOX_WITH_USB
    7171endif
    7272ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
    73 VBoxVMM_DEFS    += VBOX_WITH_PDM_ASYNC_COMPLETION
     73 VBoxVMM_DEFS   += VBOX_WITH_PDM_ASYNC_COMPLETION
    7474endif
    7575ifdef VBOX_WITH_NETSHAPER
    76 VBoxVMM_DEFS    += VBOX_WITH_NETSHAPER
     76 VBoxVMM_DEFS   += VBOX_WITH_NETSHAPER
    7777endif
    7878ifdef VBOX_WITH_IOMMU_AMD
    79 VBoxVMM_DEFS    += VBOX_WITH_IOMMU_AMD
     79 VBoxVMM_DEFS   += VBOX_WITH_IOMMU_AMD
    8080endif
    8181ifdef VBOX_WITH_IOMMU_INTEL
    82 VBoxVMM_DEFS    += VBOX_WITH_IOMMU_INTEL
     82 VBoxVMM_DEFS   += VBOX_WITH_IOMMU_INTEL
    8383endif
    8484ifdef VBOX_WITH_DBGF_TRACING
    85 VBoxVMM_DEFS    += VBOX_WITH_DBGF_TRACING
     85 VBoxVMM_DEFS   += VBOX_WITH_DBGF_TRACING
    8686endif
    8787ifdef VBOX_WITH_DBGF_FLOW_TRACING
    88 VBoxVMM_DEFS    += VBOX_WITH_DBGF_FLOW_TRACING
     88 VBoxVMM_DEFS   += VBOX_WITH_DBGF_FLOW_TRACING
    8989endif
    9090if "$(KBUILD_TYPE)" == "debug" && "$(USERNAME)" == "bird" && 0
    91 VBoxVMM_DEFS    += RTMEM_WRAP_TO_EF_APIS
     91 VBoxVMM_DEFS   += RTMEM_WRAP_TO_EF_APIS
    9292endif
    9393
    … …  
    103103VBoxVMM_SOURCES  = \
    104104        VBoxVMM.d \
    105        VMMR3/VMMR3VTable.cpp \
     105        VMMR3/VMMR3VTable.cpp \
    106106        VMMR3/APIC.cpp \
    107107        VMMR3/CFGM.cpp \
    … …  
    230230        VMMAll/VMMAllA.asm
    231231ifdef VBOX_WITH_VUSB
    232 VBoxVMM_SOURCES += VMMR3/PDMUsb.cpp
     232 VBoxVMM_SOURCES += VMMR3/PDMUsb.cpp
    233233endif
    234234ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
    235 VBoxVMM_SOURCES += \
    236         VMMR3/PDMAsyncCompletion.cpp \
    237         VMMR3/PDMAsyncCompletionFile.cpp \
    238         VMMR3/PDMAsyncCompletionFileFailsafe.cpp \
    239         VMMR3/PDMAsyncCompletionFileNormal.cpp
     235 VBoxVMM_SOURCES += \
     236        VMMR3/PDMAsyncCompletion.cpp \
     237        VMMR3/PDMAsyncCompletionFile.cpp \
     238        VMMR3/PDMAsyncCompletionFileFailsafe.cpp \
     239        VMMR3/PDMAsyncCompletionFileNormal.cpp
    240240endif
    241241ifdef VBOX_WITH_NETSHAPER
    242 VBoxVMM_SOURCES += \
    243         VMMR3/PDMNetShaper.cpp \
    244         VMMAll/PDMAllNetShaper.cpp
     242 VBoxVMM_SOURCES += \
     243        VMMR3/PDMNetShaper.cpp \
     244        VMMAll/PDMAllNetShaper.cpp
    245245endif
    246246
    247247ifdef VBOX_WITH_NATIVE_NEM
    248 VBoxVMM_SOURCES.linux.amd64 += VMMR3/NEMR3Native-linux.cpp
    249 
    250 VBoxVMM_SOURCES.win.amd64 += VMMR3/NEMR3Native-win.cpp
    251 VBoxVMM_DEFS.win.amd64    += VBOX_WITH_NATIVE_NEM
    252 VBoxVMM_SDKS.win          += VBoxNtDll
    253 VMMR3/NEMR3Native-win.cpp_DEFS.amd64 = _AMD64_
    254 VMMR3/NEMR3Native-win.cpp_INCS = \
    255         $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
    256         $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
    257 
    258 VBoxVMM_SOURCES.darwin.amd64 += \
    259         VMMR3/NEMR3Native-darwin.cpp
    260 VBoxVMM_DEFS.darwin.amd64    += VBOX_WITH_NATIVE_NEM
     248 VBoxVMM_SOURCES.linux.amd64 += VMMR3/NEMR3Native-linux.cpp
     249
     250 VBoxVMM_SOURCES.win.amd64 += VMMR3/NEMR3Native-win.cpp
     251 VBoxVMM_DEFS.win.amd64   += VBOX_WITH_NATIVE_NEM
     252 VBoxVMM_SDKS.win         += VBoxNtDll
     253 VMMR3/NEMR3Native-win.cpp_DEFS.amd64 = _AMD64_
     254 VMMR3/NEMR3Native-win.cpp_INCS = \
     255        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
     256        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
     257
     258 VBoxVMM_SOURCES.darwin.amd64 += \
     259        VMMR3/NEMR3Native-darwin.cpp
     260 VBoxVMM_DEFS.darwin.amd64   += VBOX_WITH_NATIVE_NEM
    261261endif
    262262
    … …  
    264264        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    265265ifdef VBOX_WITH_DEBUGGER
    266 VBoxVMM_LIBS += \
    267         $(PATH_STAGE_LIB)/Debugger$(VBOX_SUFF_LIB)
     266 VBoxVMM_LIBS += \
     267        $(PATH_STAGE_LIB)/Debugger$(VBOX_SUFF_LIB)
    268268endif
    269269VBoxVMM_LIBS += \
    … …  
    278278# SSM wish to know the build type, host os and arch.
    279279ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    280 VMMR3/SSM.cpp_DEFS +=\
    281         KBUILD_TYPE="$(KBUILD_TYPE)" \
    282         KBUILD_TARGET="$(KBUILD_TARGET)" \
    283         KBUILD_TARGET_ARCH="$(KBUILD_TARGET_ARCH)"
     280 VMMR3/SSM.cpp_DEFS += \
     281        KBUILD_TYPE="$(KBUILD_TYPE)" \
     282        KBUILD_TARGET="$(KBUILD_TARGET)" \
     283        KBUILD_TARGET_ARCH="$(KBUILD_TARGET_ARCH)"
    284284else
    285 VMMR3/SSM.cpp_DEFS += \
    286         KBUILD_TYPE=\"$(KBUILD_TYPE)\" \
    287         KBUILD_TARGET=\"$(KBUILD_TARGET)\" \
    288         KBUILD_TARGET_ARCH=\"$(KBUILD_TARGET_ARCH)\"
     285 VMMR3/SSM.cpp_DEFS += \
     286        KBUILD_TYPE=\"$(KBUILD_TYPE)\" \
     287        KBUILD_TARGET=\"$(KBUILD_TARGET)\" \
     288        KBUILD_TARGET_ARCH=\"$(KBUILD_TARGET_ARCH)\"
    289289endif
    290290
    291291ifdef VBOX_WITH_GCC_SANITIZER
    292 VMMR3/PGMPool.cpp_CXXFLAGS.linux += -fno-sanitize=address
     292 VMMR3/PGMPool.cpp_CXXFLAGS.linux += -fno-sanitize=address
    293293endif
    294294
    … …  
    300300
    301301if "$(USERNAME)" == "bird" && "$(KBUILD_TARGET)" == "win"
    302 VBoxVMM_VMMAll/IEMAll.cpp_CXXFLAGS                          = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    303 VBoxVMM_VMMAll/IEMAllInstructionsInterpretOnly.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    304 VBoxVMM_VMMAll/IEMAllAImplC.cpp_CXXFLAGS                    = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    305 VBoxVMM_VMMAll/PGMAll.cpp_CXXFLAGS                          = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    306 VBoxVMM_VMMAll/PDMAllCritSect.cpp_CXXFLAGS                  = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    307 VBoxVMM_CLEAN += $(addprefix $(VBoxVMM_0_OUTDIR)/VMMAll/, IEMAll.cod IEMAllAImplC.cod IEMAllInstructionsInterpretOnly.cod PGMAll.cod PDMAllCritSect.cod)
     302 VBoxVMM_VMMAll/IEMAll.cpp_CXXFLAGS                         = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     303 VBoxVMM_VMMAll/IEMAllInstructionsInterpretOnly.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     304 VBoxVMM_VMMAll/IEMAllAImplC.cpp_CXXFLAGS                   = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     305 VBoxVMM_VMMAll/PGMAll.cpp_CXXFLAGS                         = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     306 VBoxVMM_VMMAll/PDMAllCritSect.cpp_CXXFLAGS                 = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     307 VBoxVMM_CLEAN += $(addprefix $(VBoxVMM_0_OUTDIR)/VMMAll/, IEMAll.cod IEMAllAImplC.cod IEMAllInstructionsInterpretOnly.cod PGMAll.cod PDMAllCritSect.cod)
    308308endif
    309309
    … …  
    384384
    385385if "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
    386 #
    387 # Debug type info hack for VMCPU, VM and similar.
    388 #
    389 # The microsoft linker seems to be using the last occurence of the structures
    390 # when writing the module PDB file.  So, we put the fully complete structures
    391 # in a library which is at the end of the library list.
    392 #
    393 VBoxVMM_LIBS    += $(VBoxVMMPdbTypeHack_1_TARGET)
    394 VBoxVMM_LDFLAGS += /Export:PdbTypeHack
    395 
    396 LIBRARIES += VBoxVMMPdbTypeHack
    397 VBoxVMMPdbTypeHack_TEMPLATE       = $(VBoxVMM_TEMPLATE)
    398 VBoxVMMPdbTypeHack_SOURCES        = VMMAll/AllPdbTypeHack.cpp
    399 VBoxVMMPdbTypeHack_DEFS           = $(VBoxVMM_DEFS)
    400 VBoxVMMPdbTypeHack_DEFS.win       = $(VBoxVMM_DEFS.win)
    401 VBoxVMMPdbTypeHack_DEFS.win.x86   = $(VBoxVMM_DEFS.win.x86)
    402 VBoxVMMPdbTypeHack_DEFS.win.amd64 = $(VBoxVMM_DEFS.win.amd64)
    403 VBoxVMMPdbTypeHack_INCS           = $(VBoxVMM_INCS)
    404 VBoxVMMPdbTypeHack_INTERMEDIATES = $(VBoxVMM_INTERMEDIATES)
     386 #
     387 # Debug type info hack for VMCPU, VM and similar.
     388 #
     389 # The microsoft linker seems to be using the last occurence of the structures
     390 # when writing the module PDB file.  So, we put the fully complete structures
     391 # in a library which is at the end of the library list.
     392 #
     393 VBoxVMM_LIBS   += $(VBoxVMMPdbTypeHack_1_TARGET)
     394 VBoxVMM_LDFLAGS += /Export:PdbTypeHack
     395
     396 LIBRARIES += VBoxVMMPdbTypeHack
     397 VBoxVMMPdbTypeHack_TEMPLATE      = $(VBoxVMM_TEMPLATE)
     398 VBoxVMMPdbTypeHack_SOURCES       = VMMAll/AllPdbTypeHack.cpp
     399 VBoxVMMPdbTypeHack_DEFS          = $(VBoxVMM_DEFS)
     400 VBoxVMMPdbTypeHack_DEFS.win      = $(VBoxVMM_DEFS.win)
     401 VBoxVMMPdbTypeHack_DEFS.win.x86  = $(VBoxVMM_DEFS.win.x86)
     402 VBoxVMMPdbTypeHack_DEFS.win.amd64 = $(VBoxVMM_DEFS.win.amd64)
     403 VBoxVMMPdbTypeHack_INCS          = $(VBoxVMM_INCS)
     404 VBoxVMMPdbTypeHack_INTERMEDIATES = $(VBoxVMM_INTERMEDIATES)
    405405endif
    406406
    407407
    408408if1of ($(VBOX_LDR_FMT), pe lx)
    409 #
    410 # VMMR0Imp.lib
    411 #
    412 LIBRARIES += VMMR0Imp
    413 VMMR0Imp_TEMPLATE = VBoxR0
    414 VMMR0Imp_SOURCES = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
    415 VMMR0Imp_CLEAN    = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
     409 #
     410 # VMMR0Imp.lib
     411 #
     412 LIBRARIES += VMMR0Imp
     413 VMMR0Imp_TEMPLATE = VBoxR0
     414 VMMR0Imp_SOURCES = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
     415 VMMR0Imp_CLEAN   = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
    416416 ifeq ($(KBUILD_TARGET),win) # Experiment: Let's see how blunt the ones messing our NULL_THUNK_DATA entries on W10 are.
    417 VMMR0Imp_POST_CMDS = $(KLIBTWEAKER_EXT) --clear-timestamps --fill-null_thunk_data $(out)
    418  endif
    419 $(call KB_FN_DO_PASS0_ON_TARGET,VMMR0Imp)
    420 
    421 $(call KB_FN_AUTO_CMD_DEPS,$(VMMR0Imp_0_OUTDIR)/VMMR0.def)
    422 $(VMMR0Imp_0_OUTDIR)/VMMR0.def: $(VMMR0Imp_DEFPATH)/VMMR0/VMMR0.def | $$(dir $$@)
     417  VMMR0Imp_POST_CMDS = $(KLIBTWEAKER_EXT) --clear-timestamps --fill-null_thunk_data $(out)
     418 endif
     419 $(call KB_FN_DO_PASS0_ON_TARGET,VMMR0Imp)
     420
     421 $(call KB_FN_AUTO_CMD_DEPS,$(VMMR0Imp_0_OUTDIR)/VMMR0.def)
     422 $(VMMR0Imp_0_OUTDIR)/VMMR0.def: $(VMMR0Imp_DEFPATH)/VMMR0/VMMR0.def | $$(dir $$@)
    423423        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
    424424 ifeq ($(VBOX_LDR_FMT),lx)
    … …  
    530530        VMMRZ/VMMRZ.cpp \
    531531        VMMAll/APICAll.cpp \
    532         VMMAll/CPUMAllCpuId.cpp \
     532        VMMAll/CPUMAllCpuId.cpp \
    533533        VMMAll/CPUMAllRegs.cpp \
    534534        VMMAll/CPUMAllMsrs.cpp \
    … …  
    546546        VMMAll/IEMAll.cpp \
    547547        VMMAll/IEMAllInstructionsInterpretOnly.cpp \
    548         $(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/IEMAllAImpl.asm,) \
     548        $(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/IEMAllAImpl.asm,) \
    549549        VMMAll/IEMAllAImplC.cpp \
    550550        VMMAll/IEMAllCImpl.cpp \
    … …  
    649649
    650650ifndef VBOX_ONLY_EXTPACKS
    651 #
    652 # SSMStandalone.lib/a for linking with VBoxSVC and other executables.
    653 #
    654 LIBRARIES += SSMStandalone
    655 SSMStandalone_TEMPLATE = VBoxR3Exe
    656 SSMStandalone_DEFS     = VBOX_IN_VMM IN_VMM_R3 IN_VMM_STATIC SSM_STANDALONE CPUM_DB_STANDALONE $(VMM_COMMON_DEFS)
    657 SSMStandalone_INCS     = include
    658 SSMStandalone_SOURCES = \
    659         VMMR3/SSM.cpp \
    660         VMMR3/CPUMR3Db.cpp
     651 #
     652 # SSMStandalone.lib/a for linking with VBoxSVC and other executables.
     653 #
     654 LIBRARIES += SSMStandalone
     655 SSMStandalone_TEMPLATE = VBoxR3Exe
     656 SSMStandalone_DEFS    = VBOX_IN_VMM IN_VMM_R3 IN_VMM_STATIC SSM_STANDALONE CPUM_DB_STANDALONE $(VMM_COMMON_DEFS)
     657 SSMStandalone_INCS    = include
     658 SSMStandalone_SOURCES = \
     659        VMMR3/SSM.cpp \
     660        VMMR3/CPUMR3Db.cpp
    661661endif # !VBOX_ONLY_EXTPACKS
    662662
    663663
    664 if !defined(VBOX_ONLY_EXTPACKS) \
    665  && (   defined(VBOX_WITH_DTRACE_R3) \
    666      || defined(VBOX_WITH_DTRACE_R0) \
    667      || defined(VBOX_WITH_DTRACE_RC))
    668 #
    669 # Install the dtrace library files.
    670 #
    671 INSTALLS += VMMLibDTrace
    672 VMMLibDTrace_INST    = $(VBOX_INST_DTRACE_LIB)$(KBUILD_TARGET_ARCH)/
    673 VMMLibDTrace_SOURCES = \
    674         dtrace/lib/vbox-types.d \
    675         dtrace/lib/$(KBUILD_TARGET_ARCH)/vbox-arch-types.d \
    676         $(VMMLibDTrace_0_OUTDIR)/vm.d \
    677         $(VMMLibDTrace_0_OUTDIR)/cpumctx.d \
    678         $(VMMLibDTrace_0_OUTDIR)/cpum.d \
    679         $(VMMLibDTrace_0_OUTDIR)/CPUMInternal.d \
    680         $(VMMLibDTrace_0_OUTDIR)/x86.d
    681 $(call KB_FN_DO_PASS0_ON_TARGET,VMMLibDTrace)
    682 
    683 
    684 ##
    685 # Turn the header $2 into the DTrace library script $1.
    686 #
     664if   !defined(VBOX_ONLY_EXTPACKS) \
     665  && (   defined(VBOX_WITH_DTRACE_R3) \
     666      || defined(VBOX_WITH_DTRACE_R0) \
     667  || defined(VBOX_WITH_DTRACE_RC))
     668 #
     669 # Install the dtrace library files.
     670 #
     671 INSTALLS += VMMLibDTrace
     672 VMMLibDTrace_INST   = $(VBOX_INST_DTRACE_LIB)$(KBUILD_TARGET_ARCH)/
     673 VMMLibDTrace_SOURCES = \
     674        dtrace/lib/vbox-types.d \
     675        dtrace/lib/$(KBUILD_TARGET_ARCH)/vbox-arch-types.d \
     676        $(VMMLibDTrace_0_OUTDIR)/vm.d \
     677        $(VMMLibDTrace_0_OUTDIR)/cpumctx.d \
     678        $(VMMLibDTrace_0_OUTDIR)/cpum.d \
     679        $(VMMLibDTrace_0_OUTDIR)/CPUMInternal.d \
     680        $(VMMLibDTrace_0_OUTDIR)/x86.d
     681 $(call KB_FN_DO_PASS0_ON_TARGET,VMMLibDTrace)
     682
     683
     684 ##
     685 # Turn the header $2 into the DTrace library script $1.
     686 #
    687687 define def_vmm_lib_dtrace_preprocess
    688 $$(call KB_FN_AUTO_CMD_DEPS,$$(VMMLibDTrace_0_OUTDIR)/$1)
    689 $$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@)
     688  $$(call KB_FN_AUTO_CMD_DEPS,$$(VMMLibDTrace_0_OUTDIR)/$1)
     689  $$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@)
    690690        $$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
    691691        $$(QUIET)$$(call MSG_GENERATE,VMMLibDTrace,$$@,$2)
    … …  
    714714        $$(QUIET)$$(CHMOD) 644 $$@
    715715
    716  VMMLibDTrace_CLEAN += $(VMMLibDTrace_0_OUTDIR)/$1
     716  VMMLibDTrace_CLEAN += $(VMMLibDTrace_0_OUTDIR)/$1
    717717 endef
    718 $(evalcall2 def_vmm_lib_dtrace_preprocess,vm.d,$(PATH_ROOT)/include/VBox/vmm/vm.h)
    719 $(evalcall2 def_vmm_lib_dtrace_preprocess,cpumctx.d,$(PATH_ROOT)/include/VBox/vmm/cpumctx.h)
    720 $(evalcall2 def_vmm_lib_dtrace_preprocess,cpum.d,$(PATH_ROOT)/include/VBox/vmm/cpum.h)
    721 $(evalcall2 def_vmm_lib_dtrace_preprocess,CPUMInternal.d,$(PATH_SUB_CURRENT)/include/CPUMInternal.h)
    722 $(evalcall2 def_vmm_lib_dtrace_preprocess,x86.d,$(PATH_ROOT)/include/iprt/x86.h)
     718 $(evalcall2 def_vmm_lib_dtrace_preprocess,vm.d,$(PATH_ROOT)/include/VBox/vmm/vm.h)
     719 $(evalcall2 def_vmm_lib_dtrace_preprocess,cpumctx.d,$(PATH_ROOT)/include/VBox/vmm/cpumctx.h)
     720 $(evalcall2 def_vmm_lib_dtrace_preprocess,cpum.d,$(PATH_ROOT)/include/VBox/vmm/cpum.h)
     721 $(evalcall2 def_vmm_lib_dtrace_preprocess,CPUMInternal.d,$(PATH_SUB_CURRENT)/include/CPUMInternal.h)
     722 $(evalcall2 def_vmm_lib_dtrace_preprocess,x86.d,$(PATH_ROOT)/include/iprt/x86.h)
    723723
    724724endif
    … …  
    735735#
    736736ifneq ($(KBUILD_TARGET),win)
    737 VMMR3/PGMPool.cpp_CXXFLAGS     = $(VBOX_GCC_Wno-array_bounds)
    738 VMMAll/PGMAllPool.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
    739 VMMAll/PGMAll.cpp_CXXFLAGS     = -Wno-unused-function
    740 VMMAll/IEMAll.cpp_CXXFLAGS     = -Wno-unused-function
    741 VMMR0/GMMR0.cpp_CXXFLAGS       = -Wno-unused-value
     737 VMMR3/PGMPool.cpp_CXXFLAGS    = $(VBOX_GCC_Wno-array_bounds)
     738 VMMAll/PGMAllPool.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
     739 VMMAll/PGMAll.cpp_CXXFLAGS    = -Wno-unused-function
     740 VMMAll/IEMAll.cpp_CXXFLAGS    = -Wno-unused-function
     741 VMMR0/GMMR0.cpp_CXXFLAGS      = -Wno-unused-value
    742742endif
    743743
    … …  
    748748if "$(KBUILD_TYPE)" == "release" || ($(USERNAME) != "aeichner")
    749749 if1of ($(KBUILD_TARGET), win)
    750 # -noover is recognized despite the statement saying otherwise. It silences these warnings:
    751 # cl : Command line warning D9025 : overriding '/Od' with '/O2'
    752 # cl : Command line warning D9025 : overriding '/Oy-' with '/Oy'
    753 VMMAll/IEMAll.cpp_CXXFLAGS                          += -noover -O2xy
    754 VMMAll/IEMAllAImplC.cpp_CXXFLAGS                    += -noover -O2xy
    755 VMMAll/IEMAllCImpl.cpp_CXXFLAGS                     += -noover -O2xy
    756 VMMAll/IEMAllCImplSvmInstr.cpp_CXXFLAGS             += -noover -O2xy
    757 VMMAll/IEMAllCImplVmxInstr.cpp_CXXFLAGS             += -noover -O2xy
    758 VMMAll/IEMAllInstructionsInterpretOnly.cpp_CXXFLAGS += -noover -O2xy
     750  # -noover is recognized despite the statement saying otherwise. It silences these warnings:
     751  # cl : Command line warning D9025 : overriding '/Od' with '/O2'
     752  # cl : Command line warning D9025 : overriding '/Oy-' with '/Oy'
     753  VMMAll/IEMAll.cpp_CXXFLAGS                        += -noover -O2xy
     754  VMMAll/IEMAllAImplC.cpp_CXXFLAGS                  += -noover -O2xy
     755  VMMAll/IEMAllCImpl.cpp_CXXFLAGS                   += -noover -O2xy
     756  VMMAll/IEMAllCImplSvmInstr.cpp_CXXFLAGS           += -noover -O2xy
     757  VMMAll/IEMAllCImplVmxInstr.cpp_CXXFLAGS           += -noover -O2xy
     758  VMMAll/IEMAllInstructionsInterpretOnly.cpp_CXXFLAGS += -noover -O2xy
    759759 else
    760 # Omitting the frame pointer results in larger code, but it might be worth it. (esp addressing vs ebp?)
    761 VMMAll/IEMAll.cpp_CXXFLAGS                          += -O2 -fomit-frame-pointer
    762 VMMAll/IEMAllCImpl.cpp_CXXFLAGS                     += -O2 -fomit-frame-pointer
    763 VMMAll/IEMAllCImplSvmInstr.cpp_CXXFLAGS             += -O2 -fomit-frame-pointer
    764 VMMAll/IEMAllCImplVmxInstr.cpp_CXXFLAGS             += -O2 -fomit-frame-pointer
    765 VMMAll/IEMAllInstructionsInterpretOnly.cpp_CXXFLAGS += -O2 -fomit-frame-pointer
     760  # Omitting the frame pointer results in larger code, but it might be worth it. (esp addressing vs ebp?)
     761  VMMAll/IEMAll.cpp_CXXFLAGS                        += -O2 -fomit-frame-pointer
     762  VMMAll/IEMAllCImpl.cpp_CXXFLAGS                   += -O2 -fomit-frame-pointer
     763  VMMAll/IEMAllCImplSvmInstr.cpp_CXXFLAGS           += -O2 -fomit-frame-pointer
     764  VMMAll/IEMAllCImplVmxInstr.cpp_CXXFLAGS           += -O2 -fomit-frame-pointer
     765  VMMAll/IEMAllInstructionsInterpretOnly.cpp_CXXFLAGS += -O2 -fomit-frame-pointer
    766766 endif
    767767endif # bird wants good stacks (aeichner as well)
    … …  
    778778
    779779define def_vbox_vmm_py_check
    780 $(eval name:=$(basename $(notdir $(py))))
    781 
    782 pylint:    $(name)-py-phony.o
    783 $(name).o: $(name)-py-phony.o
    784 $(PATH_TARGET)/pylint/$(name).o $(name)-py-phony.o:: $(py) | $(PATH_TARGET)/pylint/
    785 ifdef VBOX_WITH_PYLINT
     780 $(eval name:=$(basename $(notdir $(py))))
     781
     782 pylint: $(name)-py-phony.o
     783 $(name).o: $(name)-py-phony.o
     784 $(PATH_TARGET)/pylint/$(name).o $(name)-py-phony.o:: $(py) | $(PATH_TARGET)/pylint/
     785 ifdef VBOX_WITH_PYLINT
    786786        $(QUIET2)$(call MSG_L1,Subjecting $(py) to pylint...)
    787787        $(QUIET)$(REDIRECT) -C "$(dir $(py))" -E LC_ALL=C -- \
    788788                $(VBOX_PYLINT) --rcfile=$(PATH_TARGET)/no-such-pylintrc \
    789789                        $$(VBOX_PYLINT_FLAGS) $$($(py)_VBOX_PYLINT_FLAGS) ./$(notdir $(py))
    790 endif
     790 endif
    791791        $(QUIET)$(APPEND) -t "$(PATH_TARGET)/pylint/$(name).o"
    792792
    793 TESTING += $(name)-py-phony.o
     793 TESTING += $(name)-py-phony.o
    794794endef # def_vbox_vmm_py_check
    795795
    … …  
    801801
    802802# Alias the PGM templates to the object in which they are defined.
    803 PGMInternal.o:  PGM.o
    804 
    805 PGMAllBth.o     PGMAllGst.o     PGMAllShw.o \
    806 PGMAllBth.obj   PGMAllGst.obj   PGMAllShw.obj:  PGMAll.o
    807 
    808 PGMRCBth.o      PGMRCGst.o      PGMRCShw.o \
    809 PGMRCBth.obj    PGMRCGst.obj    PGMRCShw.obj:   PGMRC.o
    810 
    811 PGMPhysRWTmpl.o PGMPhysRWTmpl.obj:              PGMPhys.o
    812 
    813 PGMInline.o     PGMInline.obj:                  PGMDbg.o
     803PGMInternal.o: PGM.o
     804
     805PGMAllBth.o PGMAllGst.o PGMAllShw.o \
     806PGMAllBth.obj PGMAllGst.obj PGMAllShw.obj: PGMAll.o
     807
     808PGMRCBth.o PGMRCGst.o PGMRCShw.o \
     809PGMRCBth.obj PGMRCGst.obj PGMRCShw.obj: PGMRC.o
     810
     811PGMPhysRWTmpl.o PGMPhysRWTmpl.obj: PGMPhys.o
     812
     813PGMInline.o PGMInline.obj: PGMDbg.o
    814814
    815815# Alias the IEM templates to the object in which they are instantiated.
    816 IEMAllInstructions.cpp.o           IEMAllInstructions.cpp.obj \
    817 IEMAllInstructionsOneByte.cpp.o    IEMAllInstructionsOneByte.cpp.obj \
    818 IEMAllInstructionsTwoByte0f.cpp.o  IEMAllInstructionsTwoByte0f.cpp.obj \
    819 IEMAllInstructionsThree0f38.cpp.o  IEMAllInstructionsThree0f38.cpp.obj \
    820 IEMAllInstructionsThree0f3a.cpp.o  IEMAllInstructionsThree0f3a.cpp.obj \
    821 IEMAllInstructionsVexMap1.cpp.o    IEMAllInstructionsVexMap1.cpp.obj \
    822 IEMAllInstructionsVexMap2.cpp.o    IEMAllInstructionsVexMap2.cpp.obj \
    823 IEMAllInstructionsVexMap3.cpp.o    IEMAllInstructionsVexMap3.cpp.obj \
    824 IEMAllInstructions3DNow.cpp.o      IEMAllInstructions3DNow.cpp.obj: IEMAllInstructionsInterpretOnly.o
    825 
    826 IEMInternal.o                      IEMInternal.obj: IEMAll.o
    827 
    828 IEMAllCImplStrInstr.cpp.o          IEMAllCImplStrInstr.cpp.obj: IEMAllCImpl.o
     816IEMAllInstructions.cpp.o IEMAllInstructions.cpp.obj \
     817IEMAllInstructionsOneByte.cpp.o IEMAllInstructionsOneByte.cpp.obj \
     818IEMAllInstructionsTwoByte0f.cpp.o IEMAllInstructionsTwoByte0f.cpp.obj \
     819IEMAllInstructionsThree0f38.cpp.o IEMAllInstructionsThree0f38.cpp.obj \
     820IEMAllInstructionsThree0f3a.cpp.o IEMAllInstructionsThree0f3a.cpp.obj \
     821IEMAllInstructionsVexMap1.cpp.o IEMAllInstructionsVexMap1.cpp.obj \
     822IEMAllInstructionsVexMap2.cpp.o IEMAllInstructionsVexMap2.cpp.obj \
     823IEMAllInstructionsVexMap3.cpp.o IEMAllInstructionsVexMap3.cpp.obj \
     824IEMAllInstructions3DNow.cpp.o IEMAllInstructions3DNow.cpp.obj: IEMAllInstructionsInterpretOnly.o
     825
     826IEMInternal.o IEMInternal.obj: IEMAll.o
     827
     828IEMAllCImplStrInstr.cpp.o IEMAllCImplStrInstr.cpp.obj: IEMAllCImpl.o
    829829
    830830# Alias the NEM template to the objects where it is used:
    831 NEMAllNativeTemplate-win.cpp.o:    NEMR3Native-win.o
     831NEMAllNativeTemplate-win.cpp.o: NEMR3Native-win.o
    832832
    833833# Alias the VMX template onto HMVMXR0 or darwin specific NEM object:
    834834ifeq ($(KBUILD_TARGET),darwin)
    835 VMXAllTemplate.cpp.o:    NEMR3Native-darwin.o
     835 VMXAllTemplate.cpp.o: NEMR3Native-darwin.o
    836836else
    837 VMXAllTemplate.cpp.o:    HMVMXR0.o
    838 endif
    839 
     837 VMXAllTemplate.cpp.o: HMVMXR0.o
     838endif
     839

  • trunk/src/VBox/VMM/testcase/Instructions/Makefile.kmk

    r98169 r98437  
    3333#
    3434ifdef VBOX_WITH_PYLINT
    35 TESTING +=
     35 TESTING +=
    3636endif
    3737BLDDIRS += $(PATH_TARGET)/pylint
    3838
    3939define def_vbox_instructions_py_check
    40 $(eval name:=$(basename $(notdir $(py))))
     40 $(eval name:=$(basename $(notdir $(py))))
    4141
    42 pylint:    $(name)-py-phony.o
    43 $(name).o: $(name)-py-phony.o
    44 $(PATH_TARGET)/pylint/$(name).o $(name)-py-phony.o:: $(py) | $(PATH_TARGET)/pylint/
    45 ifdef VBOX_WITH_PYLINT
     42 pylint: $(name)-py-phony.o
     43 $(name).o: $(name)-py-phony.o
     44 $(PATH_TARGET)/pylint/$(name).o $(name)-py-phony.o:: $(py) | $(PATH_TARGET)/pylint/
     45 ifdef VBOX_WITH_PYLINT
    4646        $(QUIET2)$(call MSG_L1,Subjecting $(py) to pylint...)
    4747        $(QUIET)$(REDIRECT_EXT) -E LC_ALL=C -E PYTHONPATH="$(dir $(py))" -C $(dir $(py)) \
    4848                -- $$(VBOX_PYLINT) $$(VBOX_PYLINT_FLAGS) $$($(py)_VBOX_PYLINT_FLAGS) ./$(notdir $(py))
    49 endif
     49 endif
    5050        $(QUIET)$(APPEND) -t "$(PATH_TARGET)/pylint/$(name).o"
    5151
    52 TESTING += $(name)-py-phony.o
     52 TESTING += $(name)-py-phony.o
    5353endef # def_vbox_instructions_py_check
    5454
    … …  
    6666tstVBInsTstR3_SOURCES = \
    6767        tstVBInsTstR3.cpp \
    68        $(tstVBInsTstR3_0_OUTDIR)/tstVBInsTstR3A.asm
     68        $(tstVBInsTstR3_0_OUTDIR)/tstVBInsTstR3A.asm
    6969tstVBInsTstR3_CLEAN = \
    70        $(tstVBInsTstR3_0_OUTDIR)/tstVBInsTstR3A.asm
     70        $(tstVBInsTstR3_0_OUTDIR)/tstVBInsTstR3A.asm
    7171
    7272$$(tstVBInsTstR3_0_OUTDIR)/tstVBInsTstR3A.asm: $(PATH_SUB_CURRENT)/InstructionTestGen.py

  • trunk/src/VBox/VMM/testcase/Makefile.kmk

    r98249 r98437  
    4343 PROGRAMS  += tstVMStructRC tstAsmStructsRC
    4444endif
    45 if !defined(VBOX_ONLY_EXTPACKS) \
    46  && (   defined(VBOX_WITH_DTRACE_R3) \
    47      || defined(VBOX_WITH_DTRACE_R0) \
    48      || defined(VBOX_WITH_DTRACE_RC))
    49 PROGRAMS += tstVMStructDTrace
    50 INSTALLS += VMMLibDTraceStructTest
     45if   !defined(VBOX_ONLY_EXTPACKS) \
     46  && (   defined(VBOX_WITH_DTRACE_R3) \
     47      || defined(VBOX_WITH_DTRACE_R0) \
     48  || defined(VBOX_WITH_DTRACE_RC))
     49 PROGRAMS += tstVMStructDTrace
     50 INSTALLS += VMMLibDTraceStructTest
    5151endif
    5252ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
    5353 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    54 PROGRAMS += tstGlobalConfigHardened
    55 DLL      += tstGlobalConfig
     54  PROGRAMS += tstGlobalConfigHardened
     55  DLL    += tstGlobalConfig
    5656 else
    57 PROGRAMS += tstGlobalConfig
     57  PROGRAMS += tstGlobalConfig
    5858 endif
    5959
    6060 ifdef VBOX_WITH_RAW_MODE
    6161  if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    62 PROGRAMS += tstVMMHardened
    63 DLLS     += tstVMM
     62   PROGRAMS += tstVMMHardened
     63   DLLS  += tstVMM
    6464  else
    65 PROGRAMS += tstVMM tstVMM-HM
     65   PROGRAMS += tstVMM tstVMM-HM
    6666  endif
    6767  ifneq ($(KBUILD_TARGET),win)
    68 PROGRAMS += tstVMMFork
     68   PROGRAMS += tstVMMFork
    6969  endif
    7070 endif
    7171 ifdef VBOX_WITH_TESTCASES
    7272  if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    73 PROGRAMS += tstCFGMHardened tstVMREQHardened tstAnimateHardened
    74 DLLS     += tstCFGM tstVMREQ tstAnimate
     73   PROGRAMS += tstCFGMHardened tstVMREQHardened tstAnimateHardened
     74   DLLS  += tstCFGM tstVMREQ tstAnimate
    7575  else
    76 PROGRAMS += tstCFGM tstVMREQ tstAnimate
    77   endif
    78 PROGRAMS += \
    79         tstCompressionBenchmark \
    80         tstIEMCheckMc \
    81         tstIEMAImpl \
    82         tstPDMQueue \
    83         tstSSM
    84 PROGRAMS.amd64 += tstIEMAImplAsm
    85 
    86   if1of ($(KBUILD_TARGET_ARCH),amd64 x86)
    87 PROGRAMS += \
    88         tstVMMR0CallHost-1 \
    89         tstX86-FpuSaveRestore
    90    ifn1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), solaris.x86 solaris.amd64 win.amd64 ) ## TODO: Fix the code.
    91 PROGRAMS += tstX86-1
     76   PROGRAMS += tstCFGM tstVMREQ tstAnimate
     77  endif
     78  PROGRAMS += \
     79        tstCompressionBenchmark \
     80        tstIEMCheckMc \
     81        tstIEMAImpl \
     82        tstPDMQueue \
     83        tstSSM
     84  PROGRAMS.amd64 += tstIEMAImplAsm
     85
     86  if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
     87   PROGRAMS += \
     88        tstVMMR0CallHost-1 \
     89        tstX86-FpuSaveRestore
     90   ifn1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), solaris.x86 solaris.amd64 win.amd64) ## TODO: Fix the code.
     91    PROGRAMS += tstX86-1
    9292   endif
    9393  endif
    9494  ifdef VBOX_WITH_RAW_MODE
    9595   if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    96 PROGRAMS += tstMicroHardened
    97 DLLS    += tstMicro
     96    PROGRAMS += tstMicroHardened
     97    DLLS += tstMicro
    9898   else
    99 PROGRAMS += tstMicro
     99    PROGRAMS += tstMicro
    100100   endif
    101 SYSMODS  += tstMicroRC
     101   SYSMODS += tstMicroRC
    102102  endif
    103103  ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
    104104   if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    105 PROGRAMS += tstPDMAsyncCompletionHardened tstPDMAsyncCompletionStressHardened
    106 DLLS    += tstPDMAsyncCompletion tstPDMAsyncCompletionStress
     105    PROGRAMS += tstPDMAsyncCompletionHardened tstPDMAsyncCompletionStressHardened
     106    DLLS += tstPDMAsyncCompletion tstPDMAsyncCompletionStress
    107107   else
    108 PROGRAMS += tstPDMAsyncCompletion tstPDMAsyncCompletionStress
     108    PROGRAMS += tstPDMAsyncCompletion tstPDMAsyncCompletionStress
    109109   endif
    110110  endif
    … …  
    122122ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    123123 ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
    124 OTHERS += \
    125         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
    126         $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
     124  OTHERS += \
     125        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
     126        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
    127127 endif
    128128endif
    … …  
    154154#
    155155ifdef VBOX_WITH_RAW_MODE
    156 tstVMStructRC_TEMPLATE = VBoxRcExe
    157 tstVMStructRC_DEFS      = VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
     156 tstVMStructRC_TEMPLATE = VBoxRcExe
     157 tstVMStructRC_DEFS     = VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
    158158 ifdef VBOX_WITH_R0_LOGGING
    159 tstVMStructRC_DEFS     += VBOX_WITH_R0_LOGGING
    160  endif
    161 tstVMStructRC_SOURCES   = tstVMStructRC.cpp
    162 tstVMStructRC_INCS      = \
    163         $(VBOX_PATH_VMM_SRC)/include \
    164         $(VBOX_PATH_VMM_SRC)/PATM
    165 endif
    166 
    167 tstVMStructSize_TEMPLATE= VBoxR3AutoTest
     159  tstVMStructRC_DEFS   += VBOX_WITH_R0_LOGGING
     160 endif
     161 tstVMStructRC_SOURCES  = tstVMStructRC.cpp
     162 tstVMStructRC_INCS     = \
     163        $(VBOX_PATH_VMM_SRC)/include \
     164        $(VBOX_PATH_VMM_SRC)/PATM
     165endif
     166
     167tstVMStructSize_TEMPLATE = VBoxR3AutoTest
    168168ifneq ($(KBUILD_TARGET),win)
    169 tstVMStructSize_CXXFLAGS += $(VBOX_GCC_Wno-invalid-offsetof)
     169 tstVMStructSize_CXXFLAGS += $(VBOX_GCC_Wno-invalid-offsetof)
    170170endif
    171171tstVMStructSize_DEFS    = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
    172172ifdef VBOX_WITH_RAW_MODE
    173 tstVMStructSize_DEFS   += VBOX_WITH_RAW_MODE
     173 tstVMStructSize_DEFS  += VBOX_WITH_RAW_MODE
    174174endif
    175175tstVMStructSize_INCS    = \
    … …  
    179179tstVMStructSize_SOURCES = tstVMStructSize.cpp
    180180ifdef VBOX_WITH_RAW_MODE
    181 tstVMStructSize.cpp_DEPS= $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructRC.h
     181 tstVMStructSize.cpp_DEPS = $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructRC.h
    182182endif
    183183ifdef VBOX_WITH_R0_LOGGING
    184 tstVMStructSize_DEFS   += VBOX_WITH_R0_LOGGING
     184 tstVMStructSize_DEFS  += VBOX_WITH_R0_LOGGING
    185185endif
    186186
    187187tstAsmStructs_TEMPLATE  = VBoxR3AutoTest
    188188ifneq ($(KBUILD_TARGET),win)
    189 tstAsmStructSize_CXXFLAGS += $(VBOX_GCC_Wno-invalid-offsetof)
     189 tstAsmStructSize_CXXFLAGS += $(VBOX_GCC_Wno-invalid-offsetof)
    190190endif
    191191tstAsmStructs_DEFS      = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
    192192ifdef VBOX_WITH_RAW_MODE
    193 tstAsmStructs_DEFS     += VBOX_WITH_RAW_MODE
     193 tstAsmStructs_DEFS    += VBOX_WITH_RAW_MODE
    194194endif
    195195ifdef VBOX_WITH_R0_LOGGING
    196 tstAsmStructs_DEFS     += VBOX_WITH_R0_LOGGING
     196 tstAsmStructs_DEFS    += VBOX_WITH_R0_LOGGING
    197197endif
    198198tstAsmStructs_INCS      = \
    … …  
    203203
    204204ifdef VBOX_WITH_RAW_MODE
    205 tstAsmStructsRC_TEMPLATE= VBoxRcExe
    206 tstAsmStructsRC_DEFS    = VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
     205 tstAsmStructsRC_TEMPLATE = VBoxRcExe
     206 tstAsmStructsRC_DEFS   = VBOX_IN_VMM IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
    207207 ifdef VBOX_WITH_R0_LOGGING
    208 tstAsmStructsRC_DEFS  += VBOX_WITH_R0_LOGGING
    209  endif
    210 tstAsmStructsRC_INCS    = \
    211         $(VBOX_PATH_VMM_SRC)/include \
    212         $(VBOX_VMM_TESTCASE_OUT_DIR)
    213 tstAsmStructsRC_SOURCES = tstAsmStructs.cpp
    214 tstAsmStructs.cpp_DEPS += $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsRC.h
     208  tstAsmStructsRC_DEFS += VBOX_WITH_R0_LOGGING
     209 endif
     210 tstAsmStructsRC_INCS   = \
     211        $(VBOX_PATH_VMM_SRC)/include \
     212        $(VBOX_VMM_TESTCASE_OUT_DIR)
     213 tstAsmStructsRC_SOURCES = tstAsmStructs.cpp
     214 tstAsmStructs.cpp_DEPS += $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsRC.h
    215215endif # VBOX_WITH_RAW_MODE
    216216
    … …  
    220220#
    221221if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    222 tstGlobalConfigHardened_TEMPLATE = VBoxR3HardenedTstExe
    223 tstGlobalConfigHardened_NAME     = tstGlobalConfig
     222 tstGlobalConfigHardened_TEMPLATE = VBoxR3HardenedTstExe
     223 tstGlobalConfigHardened_NAME    = tstGlobalConfig
    224224 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    225 tstGlobalConfigHardened_DEFS     = PROGRAM_NAME_STR="tstGlobalConfig"
     225  tstGlobalConfigHardened_DEFS   = PROGRAM_NAME_STR="tstGlobalConfig"
    226226 else
    227 tstGlobalConfigHardened_DEFS     = PROGRAM_NAME_STR=\"tstGlobalConfig\"
    228  endif
    229 tstGlobalConfigHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
    230 tstGlobalConfig_TEMPLATE = VBoxR3HardenedTstDll
     227  tstGlobalConfigHardened_DEFS   = PROGRAM_NAME_STR=\"tstGlobalConfig\"
     228 endif
     229 tstGlobalConfigHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
     230 tstGlobalConfig_TEMPLATE = VBoxR3HardenedTstDll
    231231else
    232 tstGlobalConfig_TEMPLATE = VBoxR3TstExe
     232 tstGlobalConfig_TEMPLATE = VBoxR3TstExe
    233233endif
    234234tstGlobalConfig_SOURCES  = tstGlobalConfig.cpp
    … …  
    373373## @param 1   The sub-name of the file in question.
    374374define def_tstIEMAImplData_adjust
    375 $$(tstIEMAImpl_0_OUTDIR)/tstIEMAImplData$(1).cpp: \
    376                 $$(tstIEMAImpl_DEFPATH)/tstIEMAImplData$(1).cpp \
    377                 $$(tstIEMAImpl_DEFPATH)/tstIEMAImplData.sh \
    378                 $$(tstIEMAImpl_DEFPATH)/tstIEMAImpl.h \
    379                 | $$(tstIEMAImpl_0_OUTDIR)/
     375 $$(tstIEMAImpl_0_OUTDIR)/tstIEMAImplData$(1).cpp: \
     376                $$(tstIEMAImpl_DEFPATH)/tstIEMAImplData$(1).cpp \
     377                $$(tstIEMAImpl_DEFPATH)/tstIEMAImplData.sh \
     378                $$(tstIEMAImpl_DEFPATH)/tstIEMAImpl.h \
     379                | $$(tstIEMAImpl_0_OUTDIR)/
    380380        $$(ASH) "$$(tstIEMAImpl_DEFPATH)/tstIEMAImplData.sh" \
    381381                "$$(CP_EXT)" \
    … …  
    410410tstIEMCheckMc_LIBS      = $(LIB_RUNTIME)
    411411ifeq ($(KBUILD_TARGET),win)
    412 tstIEMCheckMc_CXXFLAGS = $(VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS) -wd4189 # local variable is initialized but not used.
     412 tstIEMCheckMc_CXXFLAGS = $(VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS) -wd4189 # local variable is initialized but not used.
    413413else
    414 tstIEMCheckMc_CXXFLAGS = $(VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS) -Wno-unused-value -Wno-unused-variable
     414 tstIEMCheckMc_CXXFLAGS = $(VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS) -Wno-unused-value -Wno-unused-variable
    415415endif
    416416
    … …  
    428428#
    429429if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    430 tstCFGMHardened_TEMPLATE = VBoxR3HardenedTstExe
    431 tstCFGMHardened_NAME     = tstCFGM
     430 tstCFGMHardened_TEMPLATE = VBoxR3HardenedTstExe
     431 tstCFGMHardened_NAME    = tstCFGM
    432432 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    433 tstCFGMHardened_DEFS     = PROGRAM_NAME_STR="tstCFGM"
     433  tstCFGMHardened_DEFS   = PROGRAM_NAME_STR="tstCFGM"
    434434 else
    435 tstCFGMHardened_DEFS     = PROGRAM_NAME_STR=\"tstCFGM\"
    436  endif
    437 tstCFGMHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
    438 tstCFGM_TEMPLATE         = VBoxR3HardenedTstDll
     435  tstCFGMHardened_DEFS   = PROGRAM_NAME_STR=\"tstCFGM\"
     436 endif
     437 tstCFGMHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
     438 tstCFGM_TEMPLATE        = VBoxR3HardenedTstDll
    439439else
    440 tstCFGM_TEMPLATE         = VBoxR3TstExe
     440 tstCFGM_TEMPLATE        = VBoxR3TstExe
    441441endif
    442442tstCFGM_DEFS             = $(VMM_COMMON_DEFS)
    … …  
    467467#
    468468if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    469 tstVMREQHardened_TEMPLATE = VBoxR3HardenedExe
    470 tstVMREQHardened_NAME     = tstVMREQ
     469 tstVMREQHardened_TEMPLATE = VBoxR3HardenedExe
     470 tstVMREQHardened_NAME    = tstVMREQ
    471471 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    472 tstVMREQHardened_DEFS     = PROGRAM_NAME_STR="tstVMREQ"
     472  tstVMREQHardened_DEFS   = PROGRAM_NAME_STR="tstVMREQ"
    473473 else
    474 tstVMREQHardened_DEFS     = PROGRAM_NAME_STR=\"tstVMREQ\"
    475  endif
    476 tstVMREQHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    477 tstVMREQ_TEMPLATE         = VBoxR3Dll
     474  tstVMREQHardened_DEFS   = PROGRAM_NAME_STR=\"tstVMREQ\"
     475 endif
     476 tstVMREQHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     477 tstVMREQ_TEMPLATE        = VBoxR3Dll
    478478else
    479 tstVMREQ_TEMPLATE         = VBoxR3Exe
     479 tstVMREQ_TEMPLATE        = VBoxR3Exe
    480480endif
    481481tstVMREQ_DEFS             = $(VMM_COMMON_DEFS)
    … …  
    487487#
    488488if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    489 tstAnimateHardened_TEMPLATE = VBoxR3HardenedExe
    490 tstAnimateHardened_NAME     = tstAnimate
     489 tstAnimateHardened_TEMPLATE = VBoxR3HardenedExe
     490 tstAnimateHardened_NAME    = tstAnimate
    491491 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    492 tstAnimateHardened_DEFS     = PROGRAM_NAME_STR="tstAnimate"
     492  tstAnimateHardened_DEFS   = PROGRAM_NAME_STR="tstAnimate"
    493493 else
    494 tstAnimateHardened_DEFS     = PROGRAM_NAME_STR=\"tstAnimate\"
    495  endif
    496 tstAnimateHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    497 tstAnimate_TEMPLATE         = VBoxR3Dll
     494  tstAnimateHardened_DEFS   = PROGRAM_NAME_STR=\"tstAnimate\"
     495 endif
     496 tstAnimateHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     497 tstAnimate_TEMPLATE        = VBoxR3Dll
    498498else
    499 tstAnimate_TEMPLATE         = VBoxR3Exe
     499 tstAnimate_TEMPLATE        = VBoxR3Exe
    500500endif
    501501tstAnimate_DEFS             = $(VMM_COMMON_DEFS)
    … …  
    518518 #
    519519 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    520 tstVMMHardened_TEMPLATE = VBoxR3HardenedExe
    521 tstVMMHardened_NAME     = tstVMM
    522  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    523 tstVMMHardened_DEFS     = PROGRAM_NAME_STR="tstVMM"
     520  tstVMMHardened_TEMPLATE = VBoxR3HardenedExe
     521  tstVMMHardened_NAME   = tstVMM
     522  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
     523   tstVMMHardened_DEFS  = PROGRAM_NAME_STR="tstVMM"
     524  else
     525   tstVMMHardened_DEFS  = PROGRAM_NAME_STR=\"tstVMM\"
     526  endif
     527  tstVMMHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     528  tstVMM_TEMPLATE       = VBoxR3Dll
    524529 else
    525 tstVMMHardened_DEFS     = PROGRAM_NAME_STR=\"tstVMM\"
    526  endif
    527 tstVMMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    528 tstVMM_TEMPLATE         = VBoxR3Dll
     530  tstVMM_TEMPLATE       = VBoxR3Exe
     531 endif
     532 tstVMM_SOURCES         = tstVMM.cpp
     533 tstVMM_LIBS            = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     534
     535 #
     536 # HM VMM testcase.
     537 #
     538 tstVMM-HM_TEMPLATE    = VBoxR3Exe
     539 tstVMM-HM_SOURCES     = tstVMM-HM.cpp
     540 tstVMM-HM_LIBS        = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     541
     542 #
     543 # VMM host process fork test case (memory ++).
     544 #
     545 tstVMMFork_TEMPLATE   = VBoxR3Exe
     546 tstVMMFork_SOURCES    = tstVMMFork.cpp
     547 tstVMMFork_LIBS       = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     548
     549 #
     550 # Raw-mode micro benchmark.
     551 #
     552 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
     553  tstMicroHardened_TEMPLATE = VBoxR3HardenedExe
     554  tstMicroHardened_NAME   = tstMicro
     555  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
     556   tstMicroHardened_DEFS  = PROGRAM_NAME_STR="tstMicro"
     557  else
     558   tstMicroHardened_DEFS  = PROGRAM_NAME_STR=\"tstMicro\"
     559  endif
     560  tstMicroHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     561  tstMicro_TEMPLATE       = VBoxR3Dll
    529562 else
    530 tstVMM_TEMPLATE         = VBoxR3Exe
    531  endif
    532 tstVMM_SOURCES          = tstVMM.cpp
    533 tstVMM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    534 
    535 #
    536 # HM VMM testcase.
    537 #
    538 tstVMM-HM_TEMPLATE     = VBoxR3Exe
    539 tstVMM-HM_SOURCES      = tstVMM-HM.cpp
    540 tstVMM-HM_LIBS         = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    541 
    542 #
    543 # VMM host process fork test case (memory ++).
    544 #
    545 tstVMMFork_TEMPLATE    = VBoxR3Exe
    546 tstVMMFork_SOURCES     = tstVMMFork.cpp
    547 tstVMMFork_LIBS        = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    548 
    549 #
    550 # Raw-mode micro benchmark.
    551 #
    552  if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    553 tstMicroHardened_TEMPLATE = VBoxR3HardenedExe
    554 tstMicroHardened_NAME     = tstMicro
    555  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    556 tstMicroHardened_DEFS     = PROGRAM_NAME_STR="tstMicro"
    557  else
    558 tstMicroHardened_DEFS     = PROGRAM_NAME_STR=\"tstMicro\"
    559  endif
    560 tstMicroHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    561 tstMicro_TEMPLATE         = VBoxR3Dll
    562  else
    563 tstMicro_TEMPLATE         = VBoxR3Exe
    564  endif
    565 tstMicro_SOURCES          = tstMicro.cpp
    566 tstMicro_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    567 tstMicro_DEFS             = $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
    568 
    569 tstMicroRC_TEMPLATE       = VBoxRc
    570 tstMicroRC_SOURCES        = tstMicroRC.cpp tstMicroRCA.asm
    571 tstMicroRC_DEFS           = $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
    572 tstMicroRC_INCS           = $(VBOX_PATH_VMM_SRC)/testcase
     563  tstMicro_TEMPLATE       = VBoxR3Exe
     564 endif
     565 tstMicro_SOURCES         = tstMicro.cpp
     566 tstMicro_LIBS            = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     567 tstMicro_DEFS            = $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
     568
     569 tstMicroRC_TEMPLATE      = VBoxRc
     570 tstMicroRC_SOURCES       = tstMicroRC.cpp tstMicroRCA.asm
     571 tstMicroRC_DEFS          = $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
     572 tstMicroRC_INCS          = $(VBOX_PATH_VMM_SRC)/testcase
    573573 ifeq ($(VBOX_LDR_FMT32),pe)
    574 tstMicroRC_LDFLAGS        = -Entry:tstMicroRC
    575  endif
    576 tstMicroRC_SYSSUFF        = .gc
    577 tstMicroRC_LIBS           = \
    578         $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
    579         $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
     574  tstMicroRC_LDFLAGS      = -Entry:tstMicroRC
     575 endif
     576 tstMicroRC_SYSSUFF       = .gc
     577 tstMicroRC_LIBS          = \
     578        $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
     579        $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
    580580 ifeq ($(filter-out pe lx,$(VBOX_LDR_FMT32)),)
    581 tstMicroRC_LIBS          += \
    582         $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
    583         $(LIB_VMMRC)
    584  endif
    585 tstMicroRC_SOURCES.win = tstMicroRC.def
     581  tstMicroRC_LIBS        += \
     582        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
     583        $(LIB_VMMRC)
     584 endif
     585 tstMicroRC_SOURCES.win = tstMicroRC.def
    586586
    587587endif # VBOX_WITH_RAW_MODE
    … …  
    589589
    590590if !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
    591 #
    592 # Special NEM host testcase.
    593 #
    594  if ("$(KBUILD_TARGET_ARCH).$(KBUILD_TARGET_ARCH)" == "darwin.amd64" && (defined(VBOX_WITH_NATIVE_NEM) || "$(USERNAME)" == "bird")) \
    595  || ("$(KBUILD_TARGET_ARCH).$(KBUILD_TARGET_ARCH)" == "linux.amd64"  && (defined(VBOX_WITH_NATIVE_NEM) || "$(USERNAME)" == "bird")) \
    596  || ("$(KBUILD_TARGET_ARCH).$(KBUILD_TARGET_ARCH)" == "win.amd64"    &&  defined(VBOX_WITH_NATIVE_NEM))
    597 PROGRAMS += NemRawBench-1
    598 NemRawBench-1_TEMPLATE = VBoxR3Static
    599 NemRawBench-1_SOURCES = NemRawBench-1.cpp
    600 NemRawBench-1_BLD_TYPE = release
    601 NemRawBench-1_INCS.win = \
    602         $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
    603         $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
    604 NemRawBench-1_CXXFLAGS.darwin = \
    605         -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform//Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks
    606 #NemRawBench-1_LDFLAGS.darwin =  \
     591 #
     592 # Special NEM host testcase.
     593 #
     594 if   ("$(KBUILD_TARGET_ARCH).$(KBUILD_TARGET_ARCH)" == "darwin.amd64" && (defined(VBOX_WITH_NATIVE_NEM) || "$(USERNAME)" == "bird")) \
     595   || ("$(KBUILD_TARGET_ARCH).$(KBUILD_TARGET_ARCH)" == "linux.amd64"  && (defined(VBOX_WITH_NATIVE_NEM) || "$(USERNAME)" == "bird")) \
     596   || ("$(KBUILD_TARGET_ARCH).$(KBUILD_TARGET_ARCH)" == "win.amd64"    &&  defined(VBOX_WITH_NATIVE_NEM))
     597  PROGRAMS += NemRawBench-1
     598  NemRawBench-1_TEMPLATE = VBoxR3Static
     599  NemRawBench-1_SOURCES = NemRawBench-1.cpp
     600  NemRawBench-1_BLD_TYPE = release
     601  NemRawBench-1_INCS.win = \
     602        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
     603        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
     604  NemRawBench-1_CXXFLAGS.darwin = \
     605        -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform//Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks
     606  #NemRawBench-1_LDFLAGS.darwin =  \
    607607#       -F/System/Library/Frameworks \
    608608#       -framework Hypervisor
    609 NemRawBench-1_LDFLAGS.darwin = \
    610         /System/Library/Frameworks/Hypervisor.framework/Hypervisor
     609  NemRawBench-1_LDFLAGS.darwin = \
     610        /System/Library/Frameworks/Hypervisor.framework/Hypervisor
    611611 endif
    612612endif
    … …  
    622622
    623623ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
    624 #
    625 # PDM asynchronous completation test.
    626 #
     624 #
     625 # PDM asynchronous completation test.
     626 #
    627627 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    628 tstPDMAsyncCompletionHardened_TEMPLATE = VBoxR3HardenedExe
    629 tstPDMAsyncCompletionHardened_NAME     = tstPDMAsyncCompletion
     628  tstPDMAsyncCompletionHardened_TEMPLATE = VBoxR3HardenedExe
     629  tstPDMAsyncCompletionHardened_NAME   = tstPDMAsyncCompletion
    630630  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    631 tstPDMAsyncCompletionHardened_DEFS     = PROGRAM_NAME_STR="tstPDMAsyncCompletion"
     631   tstPDMAsyncCompletionHardened_DEFS  = PROGRAM_NAME_STR="tstPDMAsyncCompletion"
    632632  else
    633 tstPDMAsyncCompletionHardened_DEFS     = PROGRAM_NAME_STR=\"tstPDMAsyncCompletion\"
    634   endif
    635 tstPDMAsyncCompletionHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    636 tstPDMAsyncCompletion_TEMPLATE         = VBoxR3Dll
     633   tstPDMAsyncCompletionHardened_DEFS  = PROGRAM_NAME_STR=\"tstPDMAsyncCompletion\"
     634  endif
     635  tstPDMAsyncCompletionHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     636  tstPDMAsyncCompletion_TEMPLATE       = VBoxR3Dll
    637637 else
    638 tstPDMAsyncCompletion_TEMPLATE         = VBoxR3Exe
    639  endif
    640 tstPDMAsyncCompletion_DEFS             = $(VMM_COMMON_DEFS)
    641 tstPDMAsyncCompletion_INCS             = $(VBOX_PATH_VMM_SRC)/include
    642 tstPDMAsyncCompletion_SOURCES          = tstPDMAsyncCompletion.cpp
    643 tstPDMAsyncCompletion_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    644 
    645 #
    646 # PDM asynchronous completation stress test.
    647 #
     638  tstPDMAsyncCompletion_TEMPLATE       = VBoxR3Exe
     639 endif
     640 tstPDMAsyncCompletion_DEFS            = $(VMM_COMMON_DEFS)
     641 tstPDMAsyncCompletion_INCS            = $(VBOX_PATH_VMM_SRC)/include
     642 tstPDMAsyncCompletion_SOURCES         = tstPDMAsyncCompletion.cpp
     643 tstPDMAsyncCompletion_LIBS            = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     644
     645 #
     646 # PDM asynchronous completation stress test.
     647 #
    648648 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    649 tstPDMAsyncCompletionStressHardened_TEMPLATE = VBoxR3HardenedExe
    650 tstPDMAsyncCompletionStressHardened_NAME     = tstPDMAsyncCompletionStress
     649  tstPDMAsyncCompletionStressHardened_TEMPLATE = VBoxR3HardenedExe
     650  tstPDMAsyncCompletionStressHardened_NAME   = tstPDMAsyncCompletionStress
    651651  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    652 tstPDMAsyncCompletionStressHardened_DEFS     = PROGRAM_NAME_STR="tstPDMAsyncCompletionStress"
     652   tstPDMAsyncCompletionStressHardened_DEFS  = PROGRAM_NAME_STR="tstPDMAsyncCompletionStress"
    653653  else
    654 tstPDMAsyncCompletionStressHardened_DEFS     = PROGRAM_NAME_STR=\"tstPDMAsyncCompletionStress\"
    655   endif
    656 tstPDMAsyncCompletionStressHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    657 tstPDMAsyncCompletionStress_TEMPLATE  = VBoxR3Dll
     654   tstPDMAsyncCompletionStressHardened_DEFS  = PROGRAM_NAME_STR=\"tstPDMAsyncCompletionStress\"
     655  endif
     656  tstPDMAsyncCompletionStressHardened_SOURCES = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     657  tstPDMAsyncCompletionStress_TEMPLATE = VBoxR3Dll
    658658 else
    659 tstPDMAsyncCompletionStress_TEMPLATE  = VBoxR3Exe
    660  endif
    661 tstPDMAsyncCompletionStress_DEFS       = $(VMM_COMMON_DEFS)
    662 tstPDMAsyncCompletionStress_INCS       = $(VBOX_PATH_VMM_SRC)/include
    663 tstPDMAsyncCompletionStress_SOURCES    = tstPDMAsyncCompletionStress.cpp
    664 tstPDMAsyncCompletionStress_LIBS       = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     659  tstPDMAsyncCompletionStress_TEMPLATE = VBoxR3Exe
     660 endif
     661 tstPDMAsyncCompletionStress_DEFS      = $(VMM_COMMON_DEFS)
     662 tstPDMAsyncCompletionStress_INCS      = $(VBOX_PATH_VMM_SRC)/include
     663 tstPDMAsyncCompletionStress_SOURCES   = tstPDMAsyncCompletionStress.cpp
     664 tstPDMAsyncCompletionStress_LIBS      = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    665665endif
    666666
    667667ifndef VBOX_ONLY_EXTPACKS
    668 PROGRAMS += tstSSM-2
    669 tstSSM-2_TEMPLATE       = VBoxR3TstExe
    670 tstSSM-2_DEFS           = IN_VMM_STATIC
    671 tstSSM-2_SOURCES        = tstSSM-2.cpp
    672 tstSSM-2_LIBS           = $(PATH_STAGE_LIB)/SSMStandalone$(VBOX_SUFF_LIB)
     668 PROGRAMS += tstSSM-2
     669 tstSSM-2_TEMPLATE      = VBoxR3TstExe
     670 tstSSM-2_DEFS          = IN_VMM_STATIC
     671 tstSSM-2_SOURCES       = tstSSM-2.cpp
     672 tstSSM-2_LIBS          = $(PATH_STAGE_LIB)/SSMStandalone$(VBOX_SUFF_LIB)
    673673endif
    674674
    … …  
    676676# Generate VM structure tests.
    677677#
    678 if !defined(VBOX_ONLY_EXTPACKS) \
    679  && (   defined(VBOX_WITH_DTRACE_R3) \
    680      || defined(VBOX_WITH_DTRACE_R0) \
    681      || defined(VBOX_WITH_DTRACE_RC))
    682 tstVMStructDTrace_TEMPLATE = VBoxR3AutoTest
    683 tstVMStructDTrace_DEFS     = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
     678if   !defined(VBOX_ONLY_EXTPACKS) \
     679  && (   defined(VBOX_WITH_DTRACE_R3) \
     680      || defined(VBOX_WITH_DTRACE_R0) \
     681  || defined(VBOX_WITH_DTRACE_RC))
     682 tstVMStructDTrace_TEMPLATE = VBoxR3AutoTest
     683 tstVMStructDTrace_DEFS    = VBOX_IN_VMM IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
    684684 ifdef VBOX_WITH_RAW_MODE
    685 tstVMStructDTrace_DEFS    += VBOX_WITH_RAW_MODE
    686  endif
    687 tstVMStructDTrace_INCS     = \
    688         $(VBOX_PATH_VMM_SRC)/include \
    689         $(VBOX_PATH_VMM_SRC)/PATM \
    690         $(VBOX_VMM_TESTCASE_OUT_DIR)
    691 tstVMStructDTrace_SOURCES = tstVMStructDTrace.cpp
     685  tstVMStructDTrace_DEFS  += VBOX_WITH_RAW_MODE
     686 endif
     687 tstVMStructDTrace_INCS    = \
     688        $(VBOX_PATH_VMM_SRC)/include \
     689        $(VBOX_PATH_VMM_SRC)/PATM \
     690        $(VBOX_VMM_TESTCASE_OUT_DIR)
     691 tstVMStructDTrace_SOURCES = tstVMStructDTrace.cpp
    692692 ifdef VBOX_WITH_R0_LOGGING
    693 tstVMStructDTrace_DEFS    += VBOX_WITH_R0_LOGGING
    694  endif
    695 
    696 
    697 VMMLibDTraceStructTest_INST = $(VBOX_INST_DTRACE_TST)$(KBUILD_TARGET_ARCH)/
    698 VMMLibDTraceStructTest_SOURCES = \
    699         $(tstVMStructDTrace_0_OUTDIR)/vbox-vm-struct-test.d
    700 VMMLibDTraceStructTest_CLEAN = \
    701         $(tstVMStructDTrace_0_OUTDIR)/vbox-vm-struct-test.d
    702 
    703 $$(tstVMStructDTrace_0_OUTDIR)/vbox-vm-struct-test.d: \
    704                 $$(tstVMStructDTrace_1_STAGE_TARGET) | $$(dir $$@)
     693  tstVMStructDTrace_DEFS  += VBOX_WITH_R0_LOGGING
     694 endif
     695
     696
     697 VMMLibDTraceStructTest_INST = $(VBOX_INST_DTRACE_TST)$(KBUILD_TARGET_ARCH)/
     698 VMMLibDTraceStructTest_SOURCES = \
     699        $(tstVMStructDTrace_0_OUTDIR)/vbox-vm-struct-test.d
     700 VMMLibDTraceStructTest_CLEAN = \
     701        $(tstVMStructDTrace_0_OUTDIR)/vbox-vm-struct-test.d
     702
     703 $$(tstVMStructDTrace_0_OUTDIR)/vbox-vm-struct-test.d: \
     704                $$(tstVMStructDTrace_1_STAGE_TARGET) | $$(dir $$@)
    705705        $(QUIET)$(RM) -f $@
    706706        $< > $@
    … …  
    716716#
    717717MY_ASA_ASM_STUFF = \
    718                 $(addprefix -D, \
    719                         $(DEFS) \
    720                         $(DEFS.$(KBUILD_TYPE)) \
    721                         $(DEFS.$(KBUILD_TARGET)) \
    722                         IN_RING3 $(ARCH_BITS_DEFS) \
    723                         $(DEFS.$(KBUILD_TARGET_ARCH)) \
    724                         $(DEFS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
    725                        $(VMM_COMMON_DEFS) \
    726                 ) \
    727                 -f $(if $(eq $(KBUILD_TARGET),darwin),macho,elf) \
    728                 $(foreach inc,$(INCS) $(VBOX_PATH_VMM_SRC)/testcase $(VBOX_PATH_VMM_SRC)/include $(VBOX_VMM_TESTCASE_OUT_DIR)\
    729                         ,-I$(inc)/)
     718        $(addprefix -D, \
     719        $(DEFS) \
     720        $(DEFS.$(KBUILD_TYPE)) \
     721        $(DEFS.$(KBUILD_TARGET)) \
     722        IN_RING3 $(ARCH_BITS_DEFS) \
     723        $(DEFS.$(KBUILD_TARGET_ARCH)) \
     724        $(DEFS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
     725        $(VMM_COMMON_DEFS) \
     726        ) \
     727        -f $(if $(eq $(KBUILD_TARGET),darwin),macho,elf) \
     728        $(foreach inc,$(INCS) $(VBOX_PATH_VMM_SRC)/testcase $(VBOX_PATH_VMM_SRC)/include $(VBOX_VMM_TESTCASE_OUT_DIR) \
     729        ,-I$(inc)/)
    730730
    731731# 1a. make a header file which makes all the structures+members globals.
    … …  
    826826
    827827ifdef VBOX_WITH_RAW_MODE
    828 # 1. Manually dump selected structures and members.
    829 $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructRC.h: $$(tstVMStructRC_1_STAGE_TARGET) | $$(dir $$@)
     828 # 1. Manually dump selected structures and members.
     829 $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructRC.h: $$(tstVMStructRC_1_STAGE_TARGET) | $$(dir $$@)
    830830        $(call MSG_GENERATE,tstVMStructSize,$@)
    831831        $(QUIET)$(REDIRECT) -wo $@ -- $<

  • trunk/src/VBox/VMM/tools/Makefile.kmk

    r98155 r98437  
    3434#
    3535ifdef VBOX_WITH_HARDENING
    36 PROGRAMS += VBoxVMMPreloadHardened
    37 DLLS     += VBoxVMMPreload
     36 PROGRAMS += VBoxVMMPreloadHardened
     37 DLLS    += VBoxVMMPreload
    3838else
    39 PROGRAMS += VBoxVMMPreload
     39 PROGRAMS += VBoxVMMPreload
    4040endif
    4141
    … …  
    5656VBoxVMMPreload_LIBS = $(LIB_RUNTIME)
    5757ifdef VBOX_WITH_HARDENING
    58 VBoxVMMPreload_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxVMMPreload.dylib
     58 VBoxVMMPreload_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxVMMPreload.dylib
    5959endif
    6060
    … …  
    6464#
    6565if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
    66 PROGRAMS += VBoxCpuReport
     66 PROGRAMS += VBoxCpuReport
    6767endif
    6868VBoxCpuReport_TEMPLATE := VBoxR3Static
    … …  
    7979VBoxCpuReport_LIBS      = \
    8080        $(PATH_STAGE_LIB)/SUPR3Static$(VBOX_SUFF_LIB) \
    81        $(VBOX_LIB_RUNTIME_STATIC)
     81        $(VBOX_LIB_RUNTIME_STATIC)
    8282VBoxCpuReport_LIBS.solaris = kstat contract
    8383
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette