VirtualBox

Changeset 75173 in vbox


Ignore:
Timestamp:
Oct 30, 2018 10:51:36 AM (6 years ago)
Author:
vboxsync
Message:

VMM: Re-indenting makefiles.

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

Legend:

Unmodified
Added
Removed

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

    r74242 r75173  
    3434ifeq ($(KBUILD_TARGET_ARCH),x86)
    3535 ifeq ($(KBUILD_TARGET),darwin)
    36   $(error 32-bit darwin is no longer a supported VirtualBox host. Go back to 4.3 or older for 32-bit support.)
     36$(error 32-bit darwin is no longer a supported VirtualBox host. Go back to 4.3 or older for 32-bit support.)
    3737 else ifeq ($(KBUILD_TARGET),solaris)
    38   $(error 32-bit solaris is no longer a supported VirtualBox host. Go back to 4.2 or older for 32-bit support.)
     38$(error 32-bit solaris is no longer a supported VirtualBox host. Go back to 4.2 or older for 32-bit support.)
    3939 endif
    4040endif
    … …  
    5353## @todo eliminate IN_GMM_R3
    5454ifdef VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
    55  VBoxVMM_DEFS   += VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
     55VBoxVMM_DEFS    += VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
    5656endif
    5757ifdef VBOX_WITH_VUSB
    58  VBoxVMM_DEFS   += VBOX_WITH_USB
     58VBoxVMM_DEFS    += VBOX_WITH_USB
    5959endif
    6060ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
    61  VBoxVMM_DEFS   += VBOX_WITH_PDM_ASYNC_COMPLETION
     61VBoxVMM_DEFS    += VBOX_WITH_PDM_ASYNC_COMPLETION
    6262endif
    6363ifdef VBOX_WITH_NETSHAPER
    64  VBoxVMM_DEFS   += VBOX_WITH_NETSHAPER
     64VBoxVMM_DEFS    += VBOX_WITH_NETSHAPER
    6565endif
    6666ifdef VBOX_WITH_RAW_MODE
    67  VBoxVMM_DEFS   += VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0
     67VBoxVMM_DEFS    += VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0
    6868endif
    6969ifdef VBOX_WITH_VMM_R0_SWITCH_STACK
    70  VBoxVMM_DEFS   += VMM_R0_SWITCH_STACK
     70VBoxVMM_DEFS    += VMM_R0_SWITCH_STACK
    7171endif
    7272if "$(KBUILD_TYPE)" == "debug" && "$(USERNAME)" == "bird"
    73  VBoxVMM_DEFS   += RTMEM_WRAP_TO_EF_APIS
     73VBoxVMM_DEFS    += RTMEM_WRAP_TO_EF_APIS
    7474endif
    7575VBoxVMM_DEFS.darwin = VMM_R0_SWITCH_STACK
    … …  
    214214        ,)
    215215ifdef VBOX_WITH_VUSB
    216  VBoxVMM_SOURCES += VMMR3/PDMUsb.cpp
     216VBoxVMM_SOURCES += VMMR3/PDMUsb.cpp
    217217endif
    218218ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
    219  VBoxVMM_SOURCES += \
    220         VMMR3/PDMAsyncCompletion.cpp \
    221         VMMR3/PDMAsyncCompletionFile.cpp \
    222         VMMR3/PDMAsyncCompletionFileFailsafe.cpp \
    223         VMMR3/PDMAsyncCompletionFileNormal.cpp
     219VBoxVMM_SOURCES += \
     220        VMMR3/PDMAsyncCompletion.cpp \
     221        VMMR3/PDMAsyncCompletionFile.cpp \
     222        VMMR3/PDMAsyncCompletionFileFailsafe.cpp \
     223        VMMR3/PDMAsyncCompletionFileNormal.cpp
    224224endif
    225225ifdef VBOX_WITH_NETSHAPER
    226  VBoxVMM_SOURCES += \
    227         VMMR3/PDMNetShaper.cpp \
    228         VMMAll/PDMAllNetShaper.cpp
     226VBoxVMM_SOURCES += \
     227        VMMR3/PDMNetShaper.cpp \
     228        VMMAll/PDMAllNetShaper.cpp
    229229endif
    230230ifdef VBOX_WITH_REM
    231  VBoxVMM_SOURCES += \
     231VBoxVMM_SOURCES += \
    232232        VMMAll/REMAll.cpp
    233233endif
    234234ifdef VBOX_WITH_RAW_MODE
    235  VBoxVMM_SOURCES.x86 += \
    236         VMMSwitcher/32BitTo32Bit.asm \
    237         VMMSwitcher/32BitToPAE.asm \
    238         VMMSwitcher/PAETo32Bit.asm \
    239         VMMSwitcher/PAEToPAE.asm
    240  VBoxVMM_SOURCES.amd64 = \
    241         VMMSwitcher/AMD64To32Bit.asm \
    242         VMMSwitcher/AMD64ToPAE.asm
    243 endif
    244235VBoxVMM_SOURCES.x86 += \
    245         VMMSwitcher/32BitToAMD64.asm \
    246         VMMSwitcher/PAEToAMD64.asm \
     236        VMMSwitcher/32BitTo32Bit.asm \
     237        VMMSwitcher/32BitToPAE.asm \
     238        VMMSwitcher/PAETo32Bit.asm \
     239        VMMSwitcher/PAEToPAE.asm
     240VBoxVMM_SOURCES.amd64 = \
     241        VMMSwitcher/AMD64To32Bit.asm \
     242        VMMSwitcher/AMD64ToPAE.asm
     243endif
     244VBoxVMM_SOURCES.x86 += \
     245        VMMSwitcher/32BitToAMD64.asm \
     246        VMMSwitcher/PAEToAMD64.asm \
    247247        VMMSwitcher/X86Stub.asm
    248248VBoxVMM_SOURCES.amd64 += \
    … …  
    250250
    251251ifdef VBOX_WITH_NATIVE_NEM
    252  VBoxVMM_SOURCES.win.amd64 += VMMR3/NEMR3Native-win.cpp
    253  VBoxVMM_DEFS.win.amd64    += VBOX_WITH_NATIVE_NEM
    254  VBoxVMM_SDKS.win          += VBOX_NTDLL
    255  VMMR3/NEMR3Native-win.cpp_DEFS.amd64 = _AMD64_
    256  VMMR3/NEMR3Native-win.cpp_INCS = \
    257         $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
    258         $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
     252VBoxVMM_SOURCES.win.amd64 += VMMR3/NEMR3Native-win.cpp
     253VBoxVMM_DEFS.win.amd64    += VBOX_WITH_NATIVE_NEM
     254VBoxVMM_SDKS.win          += VBOX_NTDLL
     255VMMR3/NEMR3Native-win.cpp_DEFS.amd64 = _AMD64_
     256VMMR3/NEMR3Native-win.cpp_INCS = \
     257        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
     258        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
    259259endif
    260260
    … …  
    262262        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    263263ifdef VBOX_WITH_DEBUGGER
    264  VBoxVMM_LIBS += \
    265         $(PATH_STAGE_LIB)/Debugger$(VBOX_SUFF_LIB)
     264VBoxVMM_LIBS += \
     265        $(PATH_STAGE_LIB)/Debugger$(VBOX_SUFF_LIB)
    266266endif
    267267VBoxVMM_LIBS += \
    … …  
    281281
    282282ifdef VBOX_WITH_GCC_SANITIZER
    283  VMMR3/PGMPool.cpp_CXXFLAGS.linux += -fno-sanitize=address
     283VMMR3/PGMPool.cpp_CXXFLAGS.linux += -fno-sanitize=address
    284284endif
    285285
    … …  
    291291
    292292if "$(USERNAME)" == "bird" && "$(KBUILD_TARGET)" == "win"
    293  VBoxVMM_VMMAll/IEMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    294  VBoxVMM_VMMAll/IEMAllAImplC.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    295  VBoxVMM_VMMAll/PGMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    296  VBoxVMM_VMMAll/PDMAllCritSect.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     293VBoxVMM_VMMAll/IEMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     294VBoxVMM_VMMAll/IEMAllAImplC.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     295VBoxVMM_VMMAll/PGMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     296VBoxVMM_VMMAll/PDMAllCritSect.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    297297endif
    298298
    … …  
    326326        $(QUIET)$(SED) \
    327327                -e '/IEMOP_MNEMONIC\(\|[01234]\|[01234]EX\)(/!d' \
    328                -e ':look-for-end-of-invocation' \
    329                -e '/)/bend-of-invocation' \
    330                -e 'N' \
    331                -e 'blook-for-end-of-invocation' \
    332                -e ':end-of-invocation' \
    333                -e 's/\n/ /g' \
    334                -e 's/  */ /g' \
    335                -e 's/^.*IEMOP_MNEMONIC\(\|[01234]\|[01234]EX\)(/IEM_DO_INSTR_STAT\1(/' \
    336                -e 's/;.*$(DOLLAR)//' \
     328                -e ':look-for-end-of-invocation' \
     329                -e '/)/bend-of-invocation' \
     330                -e 'N' \
     331                -e 'blook-for-end-of-invocation' \
     332                -e ':end-of-invocation' \
     333                -e 's/\n/ /g' \
     334                -e 's/  */ /g' \
     335                -e 's/^.*IEMOP_MNEMONIC\(\|[01234]\|[01234]EX\)(/IEM_DO_INSTR_STAT\1(/' \
     336                -e 's/;.*$(DOLLAR)//' \
    337337                --output "$@.tmp" $(filter %.cpp.h,$^)
    338338# Windows sort does some kind of seeking. So, we must use a temporary file and kmk_cat to define and undefine our macros.
    339339        $(QUIET)$(REDIRECT) -wto "$@.sorted" -- sort "$@.tmp"
    340340        $(QUIET)$(APPEND) -nt "$@" \
    341         '/* Warning autogenerated by VMM/Makefile.kmk. */ ' \
     341                '/* Warning autogenerated by VMM/Makefile.kmk. */ ' \
    342342                '#define IEM_DO_INSTR_STAT0(f,u,l,fd,fi)                   IEM_DO_INSTR_STAT(l,  #l)' \
    343343                '#define IEM_DO_INSTR_STAT1(f,u,l,o1,fd,fi)                IEM_DO_INSTR_STAT(l ## _ ## o1,                                   #l " " #o1)' \
    … …  
    353353        $(QUIET)$(REDIRECT) -ato "$@" -- $(CAT_EXT) "$@.sorted"
    354354        $(QUIET)$(APPEND) -n "$@" \
    355                '' \
     355                '' \
    356356                '#undef IEM_DO_INSTR_STAT0' \
    357357                '#undef IEM_DO_INSTR_STAT1' \
    … …  
    364364                '#undef IEM_DO_INSTR_STAT3EX' \
    365365                '#undef IEM_DO_INSTR_STAT4EX' \
    366                ''
     366                ''
    367367        $(QUIET)$(RM) -f -- "$@.tmp" "$@.sorted"
    368368        $(QUIET)$(CP) -v -f --changed -- "$@" "$(patsubst %.ts,%,$@)"
    … …  
    371371
    372372if "$(KBUILD_TARGET)" == "win" && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
    373  #
    374  # Debug type info hack for VMCPU, VM and similar.
    375  #
    376  # The microsoft linker seems to be using the last occurence of the structures
    377  # when writing the module PDB file.  So, we put the fully complete structures
    378  # in a library which is at the end of the library list.
    379  #
    380  VBoxVMM_LIBS    += $(VBoxVMMPdbTypeHack_1_TARGET)
    381  VBoxVMM_LDFLAGS += /Export:PdbTypeHack
    382 
    383  LIBRARIES += VBoxVMMPdbTypeHack
    384  VBoxVMMPdbTypeHack_TEMPLATE       = $(VBoxVMM_TEMPLATE)
    385  VBoxVMMPdbTypeHack_SOURCES        = VMMAll/AllPdbTypeHack.cpp
    386  VBoxVMMPdbTypeHack_DEFS           = $(VBoxVMM_DEFS)
    387  VBoxVMMPdbTypeHack_DEFS.win       = $(VBoxVMM_DEFS.win)
    388  VBoxVMMPdbTypeHack_DEFS.win.x86   = $(VBoxVMM_DEFS.win.x86)
    389  VBoxVMMPdbTypeHack_DEFS.win.amd64 = $(VBoxVMM_DEFS.win.amd64)
    390  VBoxVMMPdbTypeHack_INCS           = $(VBoxVMM_INCS)
    391  VBoxVMMPdbTypeHack_INTERMEDIATES  = $(VBoxVMM_INTERMEDIATES)
     373#
     374# Debug type info hack for VMCPU, VM and similar.
     375#
     376# The microsoft linker seems to be using the last occurence of the structures
     377# when writing the module PDB file.  So, we put the fully complete structures
     378# in a library which is at the end of the library list.
     379#
     380VBoxVMM_LIBS    += $(VBoxVMMPdbTypeHack_1_TARGET)
     381VBoxVMM_LDFLAGS += /Export:PdbTypeHack
     382
     383LIBRARIES += VBoxVMMPdbTypeHack
     384VBoxVMMPdbTypeHack_TEMPLATE       = $(VBoxVMM_TEMPLATE)
     385VBoxVMMPdbTypeHack_SOURCES        = VMMAll/AllPdbTypeHack.cpp
     386VBoxVMMPdbTypeHack_DEFS           = $(VBoxVMM_DEFS)
     387VBoxVMMPdbTypeHack_DEFS.win       = $(VBoxVMM_DEFS.win)
     388VBoxVMMPdbTypeHack_DEFS.win.x86   = $(VBoxVMM_DEFS.win.x86)
     389VBoxVMMPdbTypeHack_DEFS.win.amd64 = $(VBoxVMM_DEFS.win.amd64)
     390VBoxVMMPdbTypeHack_INCS           = $(VBoxVMM_INCS)
     391VBoxVMMPdbTypeHack_INTERMEDIATES  = $(VBoxVMM_INTERMEDIATES)
    392392endif
    393393
    … …  
    395395if defined(VBOX_WITH_RAW_MODE) && $(intersects $(VBOX_LDR_FMT32), pe lx)
    396396
    397  #
    398  # VMMRCBuiltin.lib
    399  #
    400  LIBRARIES += VMMRCBuiltin
    401  VMMRCBuiltin_TEMPLATE = VBoxRc
     397#
     398# VMMRCBuiltin.lib
     399#
     400LIBRARIES += VMMRCBuiltin
     401VMMRCBuiltin_TEMPLATE = VBoxRc
    402402 ifeq ($(VBOX_LDR_FMT32),pe)
    403   VMMRCBuiltin_SOURCES = VMMRC/VMMRCBuiltin.def
     403VMMRCBuiltin_SOURCES = VMMRC/VMMRCBuiltin.def
    404404 endif
    405405 ifeq ($(VBOX_LDR_FMT32),lx)
    406   VMMRCBuiltin_SOURCES = $(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def
    407   $$(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRCBuiltin.def | $$(dir $$@)
     406VMMRCBuiltin_SOURCES = $(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def
     407$$(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRCBuiltin.def | $$(dir $$@)
    408408        $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' --output $@ $<
    409409 endif
    410410
    411411
    412  #
    413  # VMMRCImp.lib
    414  #
    415  LIBRARIES += VMMRCImp
    416  VMMRCImp_TEMPLATE = VBoxRc
    417  VMMRCImp_SOURCES = $(VMMRCImp_0_OUTDIR)/VMMRC.def
    418  VMMRCImp_CLEAN   = $(VMMRCImp_0_OUTDIR)/VMMRC.def
    419  $(call KB_FN_DO_PASS0_ON_TARGET,VMMRCImp)
    420 
    421  $(call KB_FN_AUTO_CMD_DEPS,$(VMMRCImp_0_OUTDIR)/VMMRC.def)
    422  $(VMMRCImp_0_OUTDIR)/VMMRC.def: $(VMMRCImp_DEFPATH)/VMMRC/VMMRC.def | $$(dir $$@)
     412#
     413# VMMRCImp.lib
     414#
     415LIBRARIES += VMMRCImp
     416VMMRCImp_TEMPLATE = VBoxRc
     417VMMRCImp_SOURCES = $(VMMRCImp_0_OUTDIR)/VMMRC.def
     418VMMRCImp_CLEAN   = $(VMMRCImp_0_OUTDIR)/VMMRC.def
     419$(call KB_FN_DO_PASS0_ON_TARGET,VMMRCImp)
     420
     421$(call KB_FN_AUTO_CMD_DEPS,$(VMMRCImp_0_OUTDIR)/VMMRC.def)
     422$(VMMRCImp_0_OUTDIR)/VMMRC.def: $(VMMRCImp_DEFPATH)/VMMRC/VMMRC.def | $$(dir $$@)
    423423        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
    424424 ifeq ($(VBOX_LDR_FMT32),lx)
    … …  
    442442
    443443if1of ($(VBOX_LDR_FMT), pe lx)
    444  #
    445  # VMMR0Imp.lib
    446  #
    447  LIBRARIES += VMMR0Imp
    448  VMMR0Imp_TEMPLATE = VBoxR0
    449  VMMR0Imp_SOURCES  = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
    450  VMMR0Imp_CLEAN    = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
     444#
     445# VMMR0Imp.lib
     446#
     447LIBRARIES += VMMR0Imp
     448VMMR0Imp_TEMPLATE = VBoxR0
     449VMMR0Imp_SOURCES  = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
     450VMMR0Imp_CLEAN    = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
    451451 ifeq ($(KBUILD_TARGET),win) # Experiment: Let's see how blunt the ones messing our NULL_THUNK_DATA entries on W10 are.
    452   VMMR0Imp_POST_CMDS = $(KLIBTWEAKER_EXT) --clear-timestamps --fill-null_thunk_data $(out)
    453  endif
    454  $(call KB_FN_DO_PASS0_ON_TARGET,VMMR0Imp)
    455 
    456  $(call KB_FN_AUTO_CMD_DEPS,$(VMMR0Imp_0_OUTDIR)/VMMR0.def)
    457  $(VMMR0Imp_0_OUTDIR)/VMMR0.def: $(VMMR0Imp_DEFPATH)/VMMR0/VMMR0.def | $$(dir $$@)
     452VMMR0Imp_POST_CMDS = $(KLIBTWEAKER_EXT) --clear-timestamps --fill-null_thunk_data $(out)
     453 endif
     454$(call KB_FN_DO_PASS0_ON_TARGET,VMMR0Imp)
     455
     456$(call KB_FN_AUTO_CMD_DEPS,$(VMMR0Imp_0_OUTDIR)/VMMR0.def)
     457$(VMMR0Imp_0_OUTDIR)/VMMR0.def: $(VMMR0Imp_DEFPATH)/VMMR0/VMMR0.def | $$(dir $$@)
    458458        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
    459459 ifeq ($(VBOX_LDR_FMT),lx)
    … …  
    482482
    483483ifneq ($(VBOX_LIB_VMM_LAZY),$(LIB_VMM))
    484  #
    485  # VMMR3LazyImp.lib (experimental)
    486  #
    487  LIBRARIES += VMMR3LazyImp
    488  VMMR3LazyImp_TEMPLATE = VBoxR3Dll
    489  VMMR3LazyImp_INST     = $(INST_LIB)
    490  VMMR3LazyImp_SOURCES  = $(VMMR3LazyImp_0_OUTDIR)/VMMR3LazyLoad.asm
    491  VMMR3LazyImp_CLEAN    = $(VMMR3LazyImp_0_OUTDIR)/VMMR3LazyLoad.asm
    492  $(call KB_FN_DO_PASS0_ON_TARGET,VMMR3LazyImp)
    493 
    494  $(call KB_FN_AUTO_CMD_DEPS,$(VMMR3LazyImp_0_OUTDIR)/VMMR3LazyLoad.asm)
    495  $(VMMR3LazyImp_0_OUTDIR)/VMMR3LazyLoad.asm: $(VMMR3LazyImp_DEFPATH)/VMMR3/VMMR3.def $(VBOX_DEF_2_LAZY_LOAD) | $$(dir $$@)
     484#
     485# VMMR3LazyImp.lib (experimental)
     486#
     487LIBRARIES += VMMR3LazyImp
     488VMMR3LazyImp_TEMPLATE = VBoxR3Dll
     489VMMR3LazyImp_INST     = $(INST_LIB)
     490VMMR3LazyImp_SOURCES  = $(VMMR3LazyImp_0_OUTDIR)/VMMR3LazyLoad.asm
     491VMMR3LazyImp_CLEAN    = $(VMMR3LazyImp_0_OUTDIR)/VMMR3LazyLoad.asm
     492$(call KB_FN_DO_PASS0_ON_TARGET,VMMR3LazyImp)
     493
     494$(call KB_FN_AUTO_CMD_DEPS,$(VMMR3LazyImp_0_OUTDIR)/VMMR3LazyLoad.asm)
     495$(VMMR3LazyImp_0_OUTDIR)/VMMR3LazyLoad.asm: $(VMMR3LazyImp_DEFPATH)/VMMR3/VMMR3.def $(VBOX_DEF_2_LAZY_LOAD) | $$(dir $$@)
    496496        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
    497497        $(VBOX_DEF_2_LAZY_LOAD) --output $@ --library VBoxVMM $(VMMR3LazyImp_DEFPATH)/VMMR3/VMMR3.def
    … …  
    500500
    501501if defined(VBOX_WITH_RAW_MODE) && !defined(VBOX_ONLY_EXTPACKS)
    502  #
    503  # VMMRC.rc
    504  #
    505  SYSMODS += VMMRC
    506  VMMRC_TEMPLATE  = VBoxRc
    507  VMMRC_NAME      = VMMRC
    508 
    509  VMMRC_DEFS      = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0 IN_SUP_RC \
    510         $(VMM_COMMON_DEFS)
    511  VMMRC_DEFS := $(filter-out VBOX_WITH_NESTED_HWVIRT_SVM VBOX_WITH_NESTED_HWVIRT_VMX,$(VMMRC_DEFS))
     502#
     503# VMMRC.rc
     504#
     505SYSMODS += VMMRC
     506VMMRC_TEMPLATE  = VBoxRc
     507VMMRC_NAME      = VMMRC
     508
     509VMMRC_DEFS      = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0 IN_SUP_RC \
     510        $(VMM_COMMON_DEFS)
     511VMMRC_DEFS    := $(filter-out VBOX_WITH_NESTED_HWVIRT_SVM VBOX_WITH_NESTED_HWVIRT_VMX,$(VMMRC_DEFS))
    512512 ifdef VBOX_WITH_VMM_R0_SWITCH_STACK
    513   VMMRC_DEFS    += VMM_R0_SWITCH_STACK
    514  endif
    515 
    516  VMMRC_INCS      = \
    517         include \
    518         VMMRC \
    519         $(if-expr defined(VBOX_WITH_RAW_MODE),PATM,) \
    520         $(VBoxVMM_0_OUTDIR)/CommonGenIncs
    521 
    522  VMMRC_LIBS      = \
    523         $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
    524         $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB) \
    525         $(PATH_STAGE_LIB)/SUPRC$(VBOX_SUFF_LIB)
     513VMMRC_DEFS     += VMM_R0_SWITCH_STACK
     514 endif
     515
     516VMMRC_INCS      = \
     517        include \
     518        VMMRC \
     519        $(if-expr defined(VBOX_WITH_RAW_MODE),PATM,) \
     520        $(VBoxVMM_0_OUTDIR)/CommonGenIncs
     521
     522VMMRC_LIBS      = \
     523        $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
     524        $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB) \
     525        $(PATH_STAGE_LIB)/SUPRC$(VBOX_SUFF_LIB)
    526526 ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),)
    527   VMMRC_LIBS    += \
    528         $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
    529  endif
    530 
    531  VMMRC_SOURCES   = \
    532         VBoxVMM.d \
    533         VMMRC/VMMRC0.asm \
    534         VMMRC/VMMRCDeps.cpp \
    535         VMMRC/CPUMRC.cpp \
    536         VMMRC/CPUMRCA.asm \
    537         VMMRC/CPUMRCPatchHlp.asm \
    538         VMMRC/EMRCA.asm \
    539         VMMRC/IOMRC.cpp \
    540         VMMRC/MMRamRC.cpp \
    541         VMMRC/MMRamRCA.asm \
    542         VMMRC/PDMRCDevice.cpp \
    543         VMMRC/PGMRC.cpp \
    544         VMMRC/SELMRC.cpp \
    545         VMMRC/TRPMRC.cpp \
    546         VMMRC/TRPMRCHandlers.cpp \
    547         VMMRC/TRPMRCHandlersA.asm \
    548         VMMRC/VMMRC.cpp \
    549         VMMRC/VMMRCA.asm \
    550         $(if-expr defined(VBOX_WITH_RAW_MODE), \
    551         VMMRC/CSAMRC.cpp \
    552         VMMRC/PATMRC.cpp \
    553         ,) \
    554         VMMRZ/CPUMRZ.cpp \
    555         VMMRZ/CPUMRZA.asm \
    556         VMMRZ/DBGFRZ.cpp \
    557         VMMRZ/PGMRZDynMap.cpp \
    558         VMMRZ/VMMRZ.cpp \
    559         VMMAll/APICAll.cpp \
    560         VMMAll/CPUMAllRegs.cpp \
    561         VMMAll/CPUMAllMsrs.cpp \
    562         VMMAll/DBGFAll.cpp \
    563         VMMAll/IEMAll.cpp \
    564         VMMAll/IEMAllAImpl.asm \
    565         VMMAll/IEMAllAImplC.cpp \
    566         VMMAll/IOMAll.cpp \
    567         VMMAll/IOMAllMMIO.cpp \
    568         VMMAll/EMAll.cpp \
    569         VMMAll/FTMAll.cpp \
    570         VMMAll/GIMAll.cpp \
    571         VMMAll/GIMAllHv.cpp \
    572         VMMAll/GIMAllKvm.cpp \
    573         VMMAll/HMAll.cpp \
    574         VMMAll/HMSVMAll.cpp \
    575         VMMAll/HMVMXAll.cpp \
    576         VMMAll/MMAll.cpp \
    577         VMMAll/MMAllHyper.cpp \
    578         VMMAll/PDMAll.cpp \
    579         VMMAll/PDMAllCritSect.cpp \
    580         VMMAll/PDMAllCritSectRw.cpp \
    581         VMMAll/PDMAllCritSectBoth.cpp \
    582         VMMAll/PDMAllQueue.cpp \
    583         VMMAll/PGMAll.cpp \
    584         VMMAll/PGMAllHandler.cpp \
    585         VMMAll/PGMAllMap.cpp \
    586         VMMAll/PGMAllPhys.cpp \
    587         VMMAll/PGMAllPool.cpp \
    588         VMMAll/SELMAll.cpp \
    589         VMMAll/TMAll.cpp \
    590         VMMAll/TMAllCpu.cpp \
    591         VMMAll/TMAllReal.cpp \
    592         VMMAll/TMAllVirtual.cpp \
    593         VMMAll/TRPMAll.cpp \
    594         VMMAll/VMAll.cpp \
    595         VMMAll/VMMAll.cpp \
    596         VMMAll/VMMAllA.asm \
    597         $(if-expr defined(VBOX_WITH_RAW_MODE), \
    598         VMMAll/CSAMAll.cpp \
    599         VMMAll/PATMAll.cpp \
    600        ,)
     527VMMRC_LIBS     += \
     528        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
     529 endif
     530
     531VMMRC_SOURCES   = \
     532        VBoxVMM.d \
     533        VMMRC/VMMRC0.asm \
     534        VMMRC/VMMRCDeps.cpp \
     535        VMMRC/CPUMRC.cpp \
     536        VMMRC/CPUMRCA.asm \
     537        VMMRC/CPUMRCPatchHlp.asm \
     538        VMMRC/EMRCA.asm \
     539        VMMRC/IOMRC.cpp \
     540        VMMRC/MMRamRC.cpp \
     541        VMMRC/MMRamRCA.asm \
     542        VMMRC/PDMRCDevice.cpp \
     543        VMMRC/PGMRC.cpp \
     544        VMMRC/SELMRC.cpp \
     545        VMMRC/TRPMRC.cpp \
     546        VMMRC/TRPMRCHandlers.cpp \
     547        VMMRC/TRPMRCHandlersA.asm \
     548        VMMRC/VMMRC.cpp \
     549        VMMRC/VMMRCA.asm \
     550        $(if-expr defined(VBOX_WITH_RAW_MODE), \
     551        VMMRC/CSAMRC.cpp \
     552        VMMRC/PATMRC.cpp \
     553        ,) \
     554        VMMRZ/CPUMRZ.cpp \
     555        VMMRZ/CPUMRZA.asm \
     556        VMMRZ/DBGFRZ.cpp \
     557        VMMRZ/PGMRZDynMap.cpp \
     558        VMMRZ/VMMRZ.cpp \
     559        VMMAll/APICAll.cpp \
     560        VMMAll/CPUMAllRegs.cpp \
     561        VMMAll/CPUMAllMsrs.cpp \
     562        VMMAll/DBGFAll.cpp \
     563        VMMAll/IEMAll.cpp \
     564        VMMAll/IEMAllAImpl.asm \
     565        VMMAll/IEMAllAImplC.cpp \
     566        VMMAll/IOMAll.cpp \
     567        VMMAll/IOMAllMMIO.cpp \
     568        VMMAll/EMAll.cpp \
     569        VMMAll/FTMAll.cpp \
     570        VMMAll/GIMAll.cpp \
     571        VMMAll/GIMAllHv.cpp \
     572        VMMAll/GIMAllKvm.cpp \
     573        VMMAll/HMAll.cpp \
     574        VMMAll/HMSVMAll.cpp \
     575        VMMAll/HMVMXAll.cpp \
     576        VMMAll/MMAll.cpp \
     577        VMMAll/MMAllHyper.cpp \
     578        VMMAll/PDMAll.cpp \
     579        VMMAll/PDMAllCritSect.cpp \
     580        VMMAll/PDMAllCritSectRw.cpp \
     581        VMMAll/PDMAllCritSectBoth.cpp \
     582        VMMAll/PDMAllQueue.cpp \
     583        VMMAll/PGMAll.cpp \
     584        VMMAll/PGMAllHandler.cpp \
     585        VMMAll/PGMAllMap.cpp \
     586        VMMAll/PGMAllPhys.cpp \
     587        VMMAll/PGMAllPool.cpp \
     588        VMMAll/SELMAll.cpp \
     589        VMMAll/TMAll.cpp \
     590        VMMAll/TMAllCpu.cpp \
     591        VMMAll/TMAllReal.cpp \
     592        VMMAll/TMAllVirtual.cpp \
     593        VMMAll/TRPMAll.cpp \
     594        VMMAll/VMAll.cpp \
     595        VMMAll/VMMAll.cpp \
     596        VMMAll/VMMAllA.asm \
     597        $(if-expr defined(VBOX_WITH_RAW_MODE), \
     598        VMMAll/CSAMAll.cpp \
     599        VMMAll/PATMAll.cpp \
     600        ,)
    601601 ifeq ($(VBOX_LDR_FMT32),pe)
    602   VMMRC_SOURCES += VMMRC/VMMRC.def
     602VMMRC_SOURCES += VMMRC/VMMRC.def
    603603 endif
    604604 ifeq ($(VBOX_LDR_FMT32),lx)
    605   VMMRC_SOURCES += $(VMMRCImp_0_OUTDIR)/VMMRC.def
     605VMMRC_SOURCES += $(VMMRCImp_0_OUTDIR)/VMMRC.def
    606606 endif
    607607 ifdef VBOX_WITH_REM
    608   VMMRC_SOURCES += \
    609         VMMAll/REMAll.cpp
    610  endif
    611 
    612  # The very last one.
    613  VMMRC_SOURCES += \
    614         VMMRC/VMMRC99.asm
    615 
    616  VMMRC/VMMRCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMRCDeps.cpp to .c
    617 
    618  $(call VBOX_SET_VER_INFO_RC,VMMRC,VirtualBox VMM - raw-mode context parts) # Version info / description.
     608VMMRC_SOURCES += \
     609        VMMAll/REMAll.cpp
     610 endif
     611
     612# The very last one.
     613VMMRC_SOURCES += \
     614        VMMRC/VMMRC99.asm
     615
     616VMMRC/VMMRCDeps.cpp_CXXFLAGS.win = -Oi- -TC ## @todo rename VMMRCDeps.cpp to .c
     617
     618$(call VBOX_SET_VER_INFO_RC,VMMRC,VirtualBox VMM - raw-mode context parts) # Version info / description.
    619619
    620620 if "$(USERNAME)" == "bird" && "$(KBUILD_TARGET)" == "win"
    621   VMMRC_VMMAll/IEMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    622   VMMRC_VMMAll/IEMAllAImplC.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    623   VMMRC_VMMAll/PGMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    624  endif
    625 
    626  VMMRC_INTERMEDIATES += $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMInstructionStatisticsTmpl.h
     621VMMRC_VMMAll/IEMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     622VMMRC_VMMAll/IEMAllAImplC.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     623VMMRC_VMMAll/PGMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     624 endif
     625
     626VMMRC_INTERMEDIATES += $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMInstructionStatisticsTmpl.h
    627627
    628628 if "$(KBUILD_TARGET)" == "win"
    629   # Debug type info hack for VMCPU, VM and similar.  See VBoxVMM for details.
    630   VMMRC_LIBS    += $(VMMRCPdbTypeHack_1_TARGET)
    631   VMMRC_LDFLAGS += /Export:PdbTypeHack
    632 
    633   LIBRARIES += VMMRCPdbTypeHack
    634   VMMRCPdbTypeHack_TEMPLATE       = $(VMMRC_TEMPLATE)
    635   VMMRCPdbTypeHack_SOURCES        = VMMAll/AllPdbTypeHack.cpp
    636   VMMRCPdbTypeHack_DEFS           = $(VMMRC_DEFS)
    637   VMMRCPdbTypeHack_DEFS.win       = $(VMMRC_DEFS.win)
    638   VMMRCPdbTypeHack_DEFS.win.x86   = $(VMMRC_DEFS.win.x86)
    639   VMMRCPdbTypeHack_DEFS.win.amd64 = $(VMMRC_DEFS.win.amd64)
    640   VMMRCPdbTypeHack_INCS           = $(VMMRC_INCS)
    641   VMMRCPdbTypeHack_INTERMEDIATES  = $(VMMRC_INTERMEDIATES)
     629# Debug type info hack for VMCPU, VM and similar.  See VBoxVMM for details.
     630VMMRC_LIBS    += $(VMMRCPdbTypeHack_1_TARGET)
     631VMMRC_LDFLAGS += /Export:PdbTypeHack
     632
     633LIBRARIES += VMMRCPdbTypeHack
     634VMMRCPdbTypeHack_TEMPLATE       = $(VMMRC_TEMPLATE)
     635VMMRCPdbTypeHack_SOURCES        = VMMAll/AllPdbTypeHack.cpp
     636VMMRCPdbTypeHack_DEFS           = $(VMMRC_DEFS)
     637VMMRCPdbTypeHack_DEFS.win       = $(VMMRC_DEFS.win)
     638VMMRCPdbTypeHack_DEFS.win.x86   = $(VMMRC_DEFS.win.x86)
     639VMMRCPdbTypeHack_DEFS.win.amd64 = $(VMMRC_DEFS.win.amd64)
     640VMMRCPdbTypeHack_INCS           = $(VMMRC_INCS)
     641VMMRCPdbTypeHack_INTERMEDIATES  = $(VMMRC_INTERMEDIATES)
    642642 endif
    643643
    … …  
    646646
    647647ifndef VBOX_ONLY_EXTPACKS
    648  #
    649  # VMMR0.r0
    650  #
    651  SYSMODS += VMMR0
    652  VMMR0_TEMPLATE  = VBoxR0
    653  VMMR0_SYSSUFF   = .r0
    654 
    655  VMMR0_DEFS      = IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_GMM_R0 IN_INTNET_R0 \
    656         $(VMM_COMMON_DEFS) RTASSERT_HAVE_SHOULD_PANIC
    657  ## @todo eliminate IN_GVMM_R0 IN_GMM_R0
     648#
     649# VMMR0.r0
     650#
     651SYSMODS += VMMR0
     652VMMR0_TEMPLATE  = VBoxR0
     653VMMR0_SYSSUFF   = .r0
     654
     655VMMR0_DEFS      = IN_VMM_R0 IN_RT_R0 IN_DIS DIS_CORE_ONLY IN_GVMM_R0 IN_GMM_R0 IN_INTNET_R0 \
     656        $(VMM_COMMON_DEFS) RTASSERT_HAVE_SHOULD_PANIC
     657## @todo eliminate IN_GVMM_R0 IN_GMM_R0
    658658 ifdef VBOX_WITH_PCI_PASSTHROUGH
    659   VMMR0_DEFS    += IN_PCIRAW_R0
     659VMMR0_DEFS     += IN_PCIRAW_R0
    660660 endif
    661661 ifdef VBOX_WITH_TRIPLE_FAULT_HACK
    662   VMMR0_DEFS    += VBOX_WITH_TRIPLE_FAULT_HACK
     662VMMR0_DEFS     += VBOX_WITH_TRIPLE_FAULT_HACK
    663663 endif
    664664 ifdef VBOX_WITH_RAW_MODE
    665   VMMR0_DEFS    += VBOX_WITH_RAW_MODE
     665VMMR0_DEFS     += VBOX_WITH_RAW_MODE
    666666 endif
    667667 ifdef VBOX_WITH_VMM_R0_SWITCH_STACK
    668   VMMR0_DEFS    += VMM_R0_SWITCH_STACK
     668VMMR0_DEFS     += VMM_R0_SWITCH_STACK
    669669 endif
    670670 if1of ($(KBUILD_TARGET), darwin linux win)
    671   VMMR0_DEFS    += VMM_R0_TOUCH_FPU
    672  endif
    673  VMMR0_DEFS.darwin = VMM_R0_SWITCH_STACK
    674  VMMR0_DEFS.win.amd64  = VBOX_WITH_KERNEL_USING_XMM
     671VMMR0_DEFS     += VMM_R0_TOUCH_FPU
     672 endif
     673VMMR0_DEFS.darwin = VMM_R0_SWITCH_STACK
     674VMMR0_DEFS.win.amd64  = VBOX_WITH_KERNEL_USING_XMM
    675675
    676676 ifeq ($(VBOX_LDR_FMT),elf)
    677   VMMR0_CXXFLAGS += -Wunused -Wunused-variable -Wno-unused-parameter
    678  endif
    679 
    680  VMMR0_INCS      = \
    681         include \
    682         $(if-expr defined(VBOX_WITH_RAW_MODE),PATM,) \
    683         $(VBoxVMM_0_OUTDIR)/CommonGenIncs
    684 
    685  VMMR0_SOURCES   = \
    686         VBoxVMM.d \
    687         VMMR0/CPUMR0.cpp \
    688         VMMR0/CPUMR0A.asm \
    689         VMMR0/GIMR0.cpp \
    690         VMMR0/GIMR0Hv.cpp \
    691         VMMR0/GIMR0Kvm.cpp \
    692         VMMR0/GMMR0.cpp \
    693         VMMR0/GVMMR0.cpp \
    694         VMMR0/EMR0.cpp \
    695         VMMR0/HMR0.cpp \
    696         VMMR0/HMR0A.asm \
    697         VMMR0/HMVMXR0.cpp \
    698         VMMR0/HMSVMR0.cpp \
    699         VMMR0/PDMR0Device.cpp \
    700         VMMR0/PDMR0Driver.cpp \
    701         VMMR0/PGMR0.cpp \
    702         VMMR0/PGMR0SharedPage.cpp \
    703         VMMR0/TRPMR0.cpp \
    704         VMMR0/TRPMR0A.asm \
    705         VMMR0/VMMR0.cpp \
    706         VMMRZ/CPUMRZ.cpp \
    707         VMMRZ/CPUMRZA.asm \
    708         VMMRZ/DBGFRZ.cpp \
    709         VMMRZ/VMMRZ.cpp \
    710         VMMAll/APICAll.cpp \
    711         VMMAll/CPUMAllRegs.cpp \
    712         VMMAll/CPUMAllMsrs.cpp \
    713         VMMAll/CPUMStack.cpp \
    714         VMMAll/DBGFAll.cpp \
    715         VMMAll/EMAll.cpp \
    716         VMMAll/FTMAll.cpp \
    717         VMMAll/GIMAll.cpp \
    718         VMMAll/GIMAllHv.cpp \
    719         VMMAll/GIMAllKvm.cpp \
    720         VMMAll/HMAll.cpp \
    721         VMMAll/HMSVMAll.cpp \
    722         VMMAll/HMVMXAll.cpp \
    723         VMMAll/IEMAll.cpp \
    724         VMMAll/IEMAllAImpl.asm \
    725         VMMAll/IEMAllAImplC.cpp \
    726         VMMAll/IOMAll.cpp \
    727         VMMAll/IOMAllMMIO.cpp \
    728         VMMAll/MMAll.cpp \
    729         VMMAll/MMAllHyper.cpp \
    730         VMMAll/MMAllPagePool.cpp \
     677VMMR0_CXXFLAGS += -Wunused -Wunused-variable -Wno-unused-parameter
     678 endif
     679
     680VMMR0_INCS      = \
     681        include \
     682        $(if-expr defined(VBOX_WITH_RAW_MODE),PATM,) \
     683        $(VBoxVMM_0_OUTDIR)/CommonGenIncs
     684
     685VMMR0_SOURCES   = \
     686        VBoxVMM.d \
     687        VMMR0/CPUMR0.cpp \
     688        VMMR0/CPUMR0A.asm \
     689        VMMR0/GIMR0.cpp \
     690        VMMR0/GIMR0Hv.cpp \
     691        VMMR0/GIMR0Kvm.cpp \
     692        VMMR0/GMMR0.cpp \
     693        VMMR0/GVMMR0.cpp \
     694        VMMR0/EMR0.cpp \
     695        VMMR0/HMR0.cpp \
     696        VMMR0/HMR0A.asm \
     697        VMMR0/HMVMXR0.cpp \
     698        VMMR0/HMSVMR0.cpp \
     699        VMMR0/PDMR0Device.cpp \
     700        VMMR0/PDMR0Driver.cpp \
     701        VMMR0/PGMR0.cpp \
     702        VMMR0/PGMR0SharedPage.cpp \
     703        VMMR0/TRPMR0.cpp \
     704        VMMR0/TRPMR0A.asm \
     705        VMMR0/VMMR0.cpp \
     706        VMMRZ/CPUMRZ.cpp \
     707        VMMRZ/CPUMRZA.asm \
     708        VMMRZ/DBGFRZ.cpp \
     709        VMMRZ/VMMRZ.cpp \
     710        VMMAll/APICAll.cpp \
     711        VMMAll/CPUMAllRegs.cpp \
     712        VMMAll/CPUMAllMsrs.cpp \
     713        VMMAll/CPUMStack.cpp \
     714        VMMAll/DBGFAll.cpp \
     715        VMMAll/EMAll.cpp \
     716        VMMAll/FTMAll.cpp \
     717        VMMAll/GIMAll.cpp \
     718        VMMAll/GIMAllHv.cpp \
     719        VMMAll/GIMAllKvm.cpp \
     720        VMMAll/HMAll.cpp \
     721        VMMAll/HMSVMAll.cpp \
     722        VMMAll/HMVMXAll.cpp \
     723        VMMAll/IEMAll.cpp \
     724        VMMAll/IEMAllAImpl.asm \
     725        VMMAll/IEMAllAImplC.cpp \
     726        VMMAll/IOMAll.cpp \
     727        VMMAll/IOMAllMMIO.cpp \
     728        VMMAll/MMAll.cpp \
     729        VMMAll/MMAllHyper.cpp \
     730        VMMAll/MMAllPagePool.cpp \
    731731        VMMAll/NEMAll.cpp \
    732         VMMAll/PDMAll.cpp \
    733         VMMAll/PDMAllCritSect.cpp \
    734         VMMAll/PDMAllCritSectRw.cpp \
    735         VMMAll/PDMAllCritSectBoth.cpp \
    736         VMMAll/PDMAllQueue.cpp \
    737         VMMAll/PGMAll.cpp \
    738         VMMAll/PGMAllHandler.cpp \
    739         VMMAll/PGMAllMap.cpp \
    740         VMMAll/PGMAllPhys.cpp \
    741         VMMAll/PGMAllPool.cpp \
    742         VMMAll/SELMAll.cpp \
    743         VMMAll/TMAll.cpp \
    744         VMMAll/TMAllCpu.cpp \
    745         VMMAll/TMAllReal.cpp \
    746         VMMAll/TMAllVirtual.cpp \
    747         VMMAll/TRPMAll.cpp \
    748         VMMAll/VMAll.cpp \
    749         VMMAll/VMMAll.cpp \
    750         VMMAll/VMMAllA.asm
     732        VMMAll/PDMAll.cpp \
     733        VMMAll/PDMAllCritSect.cpp \
     734        VMMAll/PDMAllCritSectRw.cpp \
     735        VMMAll/PDMAllCritSectBoth.cpp \
     736        VMMAll/PDMAllQueue.cpp \
     737        VMMAll/PGMAll.cpp \
     738        VMMAll/PGMAllHandler.cpp \
     739        VMMAll/PGMAllMap.cpp \
     740        VMMAll/PGMAllPhys.cpp \
     741        VMMAll/PGMAllPool.cpp \
     742        VMMAll/SELMAll.cpp \
     743        VMMAll/TMAll.cpp \
     744        VMMAll/TMAllCpu.cpp \
     745        VMMAll/TMAllReal.cpp \
     746        VMMAll/TMAllVirtual.cpp \
     747        VMMAll/TRPMAll.cpp \
     748        VMMAll/VMAll.cpp \
     749        VMMAll/VMMAll.cpp \
     750        VMMAll/VMMAllA.asm
    751751 if1of ($(VBOX_LDR_FMT), pe lx)
    752   VMMR0_SOURCES += $(VMMR0Imp_0_OUTDIR)/VMMR0.def
     752VMMR0_SOURCES += $(VMMR0Imp_0_OUTDIR)/VMMR0.def
    753753 endif
    754754 ifdef VBOX_WITH_TRIPLE_FAULT_HACK
    755   VMMR0_SOURCES += \
    756         VMMR0/VMMR0TripleFaultHack.cpp \
    757         VMMR0/VMMR0TripleFaultHackA.asm
     755VMMR0_SOURCES += \
     756        VMMR0/VMMR0TripleFaultHack.cpp \
     757        VMMR0/VMMR0TripleFaultHackA.asm
    758758 endif
    759759 ifdef VBOX_WITH_NETSHAPER
    760   VMMR0_SOURCES += \
    761         VMMAll/PDMAllNetShaper.cpp
     760VMMR0_SOURCES += \
     761        VMMAll/PDMAllNetShaper.cpp
    762762 endif
    763763 ifdef VBOX_WITH_REM
    764   VMMR0_SOURCES += \
    765         VMMAll/REMAll.cpp
    766  endif
    767  VMMR0_SOURCES.amd64 = \
    768         VMMR0/VMMR0JmpA-amd64.asm
    769  VMMR0_SOURCES.x86 = \
    770         VMMR0/VMMR0JmpA-x86.asm
    771 
    772  VMMR0_LIBS = \
    773         $(PATH_STAGE_LIB)/ServicesR0$(VBOX_SUFF_LIB) \
    774         $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
    775         $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB)
     764VMMR0_SOURCES += \
     765        VMMAll/REMAll.cpp
     766 endif
     767VMMR0_SOURCES.amd64 = \
     768        VMMR0/VMMR0JmpA-amd64.asm
     769VMMR0_SOURCES.x86 = \
     770        VMMR0/VMMR0JmpA-x86.asm
     771
     772VMMR0_LIBS = \
     773        $(PATH_STAGE_LIB)/ServicesR0$(VBOX_SUFF_LIB) \
     774        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
     775        $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB)
    776776 ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),)
    777   VMMR0_LIBS += \
    778         $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
     777VMMR0_LIBS += \
     778        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    779779 endif
    780780 ifdef VBOX_WITH_NATIVE_NEM
    781   VMMR0_SOURCES.win.amd64 += VMMR0/NEMR0Native-win.cpp
    782   VMMR0_DEFS.win.amd64    += VBOX_WITH_NATIVE_NEM VBOX_WITH_NEM_R0
    783   VMMR0/NEMR0Native-win.cpp_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
    784  endif
    785 
    786  $(call VBOX_SET_VER_INFO_R0,VMMR0,VirtualBox VMM - ring-0 context parts) # Version info / description.
     781VMMR0_SOURCES.win.amd64 += VMMR0/NEMR0Native-win.cpp
     782VMMR0_DEFS.win.amd64    += VBOX_WITH_NATIVE_NEM VBOX_WITH_NEM_R0
     783VMMR0/NEMR0Native-win.cpp_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
     784 endif
     785
     786$(call VBOX_SET_VER_INFO_R0,VMMR0,VirtualBox VMM - ring-0 context parts) # Version info / description.
    787787
    788788 if "$(USERNAME)" == "bird" && "$(KBUILD_TARGET)" == "win"
    789   VMMR0_VMMAll/IEMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    790   VMMR0_VMMAll/IEMAllAImplC.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    791   VMMR0_VMMAll/PGMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
    792  endif
    793 
    794  VMMR0_INTERMEDIATES += $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMInstructionStatisticsTmpl.h
     789VMMR0_VMMAll/IEMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     790VMMR0_VMMAll/IEMAllAImplC.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     791VMMR0_VMMAll/PGMAll.cpp_CXXFLAGS = /FAcs /Fa$(subst /,\\,$(outbase).cod)
     792 endif
     793
     794VMMR0_INTERMEDIATES += $(VBoxVMM_0_OUTDIR)/CommonGenIncs/IEMInstructionStatisticsTmpl.h
    795795
    796796 if "$(KBUILD_TARGET)" == "win"
    797   # Debug type info hack for VMCPU, VM and similar.  See VBoxVMM for details.
    798   VMMR0_LIBS    += $(VMMR0PdbTypeHack_1_TARGET)
    799   VMMR0_LDFLAGS += /Export:PdbTypeHack
    800 
    801   LIBRARIES += VMMR0PdbTypeHack
    802   VMMR0PdbTypeHack_TEMPLATE       = $(VMMR0_TEMPLATE)
    803   VMMR0PdbTypeHack_SOURCES        = VMMAll/AllPdbTypeHack.cpp
    804   VMMR0PdbTypeHack_DEFS           = $(VMMR0_DEFS)
    805   VMMR0PdbTypeHack_DEFS.win       = $(VMMR0_DEFS.win)
    806   VMMR0PdbTypeHack_DEFS.win.x86   = $(VMMR0_DEFS.win.x86)
    807   VMMR0PdbTypeHack_DEFS.win.amd64 = $(VMMR0_DEFS.win.amd64)
    808   VMMR0PdbTypeHack_INCS           = $(VMMR0_INCS)
    809   VMMR0PdbTypeHack_INTERMEDIATES  = $(VMMR0_INTERMEDIATES)
     797# Debug type info hack for VMCPU, VM and similar.  See VBoxVMM for details.
     798VMMR0_LIBS    += $(VMMR0PdbTypeHack_1_TARGET)
     799VMMR0_LDFLAGS += /Export:PdbTypeHack
     800
     801LIBRARIES += VMMR0PdbTypeHack
     802VMMR0PdbTypeHack_TEMPLATE       = $(VMMR0_TEMPLATE)
     803VMMR0PdbTypeHack_SOURCES        = VMMAll/AllPdbTypeHack.cpp
     804VMMR0PdbTypeHack_DEFS           = $(VMMR0_DEFS)
     805VMMR0PdbTypeHack_DEFS.win       = $(VMMR0_DEFS.win)
     806VMMR0PdbTypeHack_DEFS.win.x86   = $(VMMR0_DEFS.win.x86)
     807VMMR0PdbTypeHack_DEFS.win.amd64 = $(VMMR0_DEFS.win.amd64)
     808VMMR0PdbTypeHack_INCS           = $(VMMR0_INCS)
     809VMMR0PdbTypeHack_INTERMEDIATES  = $(VMMR0_INTERMEDIATES)
    810810 endif
    811811
    … …  
    815815
    816816ifndef VBOX_ONLY_EXTPACKS
    817  #
    818  # SSMStandalone.lib/a for linking with VBoxSVC and other executables.
    819  #
    820  LIBRARIES += SSMStandalone
    821  SSMStandalone_TEMPLATE = VBOXR3EXE
    822  SSMStandalone_DEFS     = IN_VMM_R3 IN_VMM_STATIC SSM_STANDALONE CPUM_DB_STANDALONE
    823  SSMStandalone_INCS     = include
    824  SSMStandalone_SOURCES  = \
    825         VMMR3/SSM.cpp \
    826         VMMR3/CPUMR3Db.cpp
     817#
     818# SSMStandalone.lib/a for linking with VBoxSVC and other executables.
     819#
     820LIBRARIES += SSMStandalone
     821SSMStandalone_TEMPLATE = VBOXR3EXE
     822SSMStandalone_DEFS     = IN_VMM_R3 IN_VMM_STATIC SSM_STANDALONE CPUM_DB_STANDALONE
     823SSMStandalone_INCS     = include
     824SSMStandalone_SOURCES  = \
     825        VMMR3/SSM.cpp \
     826        VMMR3/CPUMR3Db.cpp
    827827endif # !VBOX_ONLY_EXTPACKS
    828828
    … …  
    832832     || defined(VBOX_WITH_DTRACE_R0) \
    833833     || defined(VBOX_WITH_DTRACE_RC))
    834  #
    835  # Install the dtrace library files.
    836  #
    837  INSTALLS += VMMLibDTrace
    838  VMMLibDTrace_INST    = $(VBOX_INST_DTRACE_LIB)$(KBUILD_TARGET_ARCH)/
    839  VMMLibDTrace_SOURCES = \
    840         dtrace/lib/vbox-types.d \
    841         dtrace/lib/$(KBUILD_TARGET_ARCH)/vbox-arch-types.d \
    842         $(VMMLibDTrace_0_OUTDIR)/vm.d \
    843         $(VMMLibDTrace_0_OUTDIR)/cpumctx.d \
    844         $(VMMLibDTrace_0_OUTDIR)/cpum.d \
    845         $(VMMLibDTrace_0_OUTDIR)/CPUMInternal.d \
    846         $(VMMLibDTrace_0_OUTDIR)/x86.d
    847  $(call KB_FN_DO_PASS0_ON_TARGET,VMMLibDTrace)
    848 
    849 
    850  ##
    851  # Turn the header $2 into the DTrace library script $1.
    852  #
     834#
     835# Install the dtrace library files.
     836#
     837INSTALLS += VMMLibDTrace
     838VMMLibDTrace_INST    = $(VBOX_INST_DTRACE_LIB)$(KBUILD_TARGET_ARCH)/
     839VMMLibDTrace_SOURCES = \
     840        dtrace/lib/vbox-types.d \
     841        dtrace/lib/$(KBUILD_TARGET_ARCH)/vbox-arch-types.d \
     842        $(VMMLibDTrace_0_OUTDIR)/vm.d \
     843        $(VMMLibDTrace_0_OUTDIR)/cpumctx.d \
     844        $(VMMLibDTrace_0_OUTDIR)/cpum.d \
     845        $(VMMLibDTrace_0_OUTDIR)/CPUMInternal.d \
     846        $(VMMLibDTrace_0_OUTDIR)/x86.d
     847$(call KB_FN_DO_PASS0_ON_TARGET,VMMLibDTrace)
     848
     849
     850##
     851# Turn the header $2 into the DTrace library script $1.
     852#
    853853 define def_vmm_lib_dtrace_preprocess
    854   $$(call KB_FN_AUTO_CMD_DEPS,$$(VMMLibDTrace_0_OUTDIR)/$1)
    855   $$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@)
     854$$(call KB_FN_AUTO_CMD_DEPS,$$(VMMLibDTrace_0_OUTDIR)/$1)
     855$$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@)
    856856        $$(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
    857857        $$(QUIET)$$(call MSG_GENERATE,VMMLibDTrace,$$@,$2)
    … …  
    880880        $$(QUIET)$$(CHMOD) 644 $$@
    881881 endef
    882  $(evalcall2 def_vmm_lib_dtrace_preprocess,vm.d,$(PATH_ROOT)/include/VBox/vmm/vm.h)
    883  $(evalcall2 def_vmm_lib_dtrace_preprocess,cpumctx.d,$(PATH_ROOT)/include/VBox/vmm/cpumctx.h)
    884  $(evalcall2 def_vmm_lib_dtrace_preprocess,cpum.d,$(PATH_ROOT)/include/VBox/vmm/cpum.h)
    885  $(evalcall2 def_vmm_lib_dtrace_preprocess,CPUMInternal.d,$(PATH_SUB_CURRENT)/include/CPUMInternal.h)
    886  $(evalcall2 def_vmm_lib_dtrace_preprocess,x86.d,$(PATH_ROOT)/include/iprt/x86.h)
     882$(evalcall2 def_vmm_lib_dtrace_preprocess,vm.d,$(PATH_ROOT)/include/VBox/vmm/vm.h)
     883$(evalcall2 def_vmm_lib_dtrace_preprocess,cpumctx.d,$(PATH_ROOT)/include/VBox/vmm/cpumctx.h)
     884$(evalcall2 def_vmm_lib_dtrace_preprocess,cpum.d,$(PATH_ROOT)/include/VBox/vmm/cpum.h)
     885$(evalcall2 def_vmm_lib_dtrace_preprocess,CPUMInternal.d,$(PATH_SUB_CURRENT)/include/CPUMInternal.h)
     886$(evalcall2 def_vmm_lib_dtrace_preprocess,x86.d,$(PATH_ROOT)/include/iprt/x86.h)
    887887
    888888endif
    … …  
    899899#
    900900ifneq ($(KBUILD_TARGET),win)
    901  VMMR3/PGMPool.cpp_CXXFLAGS       = $(VBOX_GCC_Wno-array_bounds)
    902  VMMAll/PGMAllPool.cpp_CXXFLAGS  = $(VBOX_GCC_Wno-array_bounds)
    903  VMMAll/PGMAll.cpp_CXXFLAGS       = -Wno-unused-function
    904  VMMAll/IEMAll.cpp_CXXFLAGS       = -Wno-unused-function
    905  VMMR0/GMMR0.cpp_CXXFLAGS         = -Wno-unused-value
     901VMMR3/PGMPool.cpp_CXXFLAGS     = $(VBOX_GCC_Wno-array_bounds)
     902VMMAll/PGMAllPool.cpp_CXXFLAGS = $(VBOX_GCC_Wno-array_bounds)
     903VMMAll/PGMAll.cpp_CXXFLAGS     = -Wno-unused-function
     904VMMAll/IEMAll.cpp_CXXFLAGS     = -Wno-unused-function
     905VMMR0/GMMR0.cpp_CXXFLAGS       = -Wno-unused-value
    906906endif
    907907
    … …  
    911911if $(USERNAME) != "bird" || "$(KBUILD_TYPE)" == "release" #|| "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.amd64"
    912912 if1of ($(KBUILD_TARGET), win)
    913   # -noover is recognized despite the statement saying otherwise. It silences these warnings:
    914   # cl : Command line warning D9025 : overriding '/Od' with '/O2'
    915   # cl : Command line warning D9025 : overriding '/Oy-' with '/Oy'
    916   VMMAll/IEMAll.cpp_CXXFLAGS += -noover -O2xy
     913# -noover is recognized despite the statement saying otherwise. It silences these warnings:
     914# cl : Command line warning D9025 : overriding '/Od' with '/O2'
     915# cl : Command line warning D9025 : overriding '/Oy-' with '/Oy'
     916VMMAll/IEMAll.cpp_CXXFLAGS += -noover -O2xy
    917917 else
    918   VMMAll/IEMAll.cpp_CXXFLAGS += -O2
    919   #VMMAll/IEMAll.cpp_CXXFLAGS += -fno-align-functions -fno-align-jumps -fno-align-loops # Saves a few of percents, not worth it.
    920   #VMMAll/IEMAll.cpp_CXXFLAGS += -fno-reorder-blocks    # Saves one or two percent ... never mind.
    921   VMMAll/IEMAll.cpp_CXXFLAGS += -fomit-frame-pointer # Omitting the frame pointer results in larger code, but it might be worth it. (esp addressing vs ebp?)
     918VMMAll/IEMAll.cpp_CXXFLAGS += -O2
     919#VMMAll/IEMAll.cpp_CXXFLAGS += -fno-align-functions -fno-align-jumps -fno-align-loops # Saves a few of percents, not worth it.
     920#VMMAll/IEMAll.cpp_CXXFLAGS += -fno-reorder-blocks    # Saves one or two percent ... never mind.
     921VMMAll/IEMAll.cpp_CXXFLAGS += -fomit-frame-pointer # Omitting the frame pointer results in larger code, but it might be worth it. (esp addressing vs ebp?)
    922922 endif
    923923endif # bird wants good stacks
    … …  
    957957#
    958958if1of ($(SYSMODS),VMMRC)
    959  test-undef-rc:: $(PATH_TARGET)/undef-rc.run
    960  OTHERS      += $(PATH_TARGET)/undef-rc.run
    961  CLEANS      += $(PATH_TARGET)/undef-rc.run
    962  $(call KB_FN_AUTO_CMD_DEPS,$(PATH_TARGET)/undef-rc.run)
    963  $(PATH_TARGET)/undef-rc.run: $$(VMMRC_1_TARGET)
     959test-undef-rc:: $(PATH_TARGET)/undef-rc.run
     960OTHERS      += $(PATH_TARGET)/undef-rc.run
     961CLEANS      += $(PATH_TARGET)/undef-rc.run
     962$(call KB_FN_AUTO_CMD_DEPS,$(PATH_TARGET)/undef-rc.run)
     963$(PATH_TARGET)/undef-rc.run: $$(VMMRC_1_TARGET)
    964964        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
    965965 ifn1of ($(KBUILD_TARGET), linux solaris)

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

    r69111 r75173  
    2323#
    2424ifdef VBOX_WITH_PYLINT
    25  TESTING +=
     25TESTING +=
    2626endif
    2727BLDDIRS += $(PATH_TARGET)/pylint

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

    r74725 r75173  
    3737     || defined(VBOX_WITH_DTRACE_R0) \
    3838     || defined(VBOX_WITH_DTRACE_RC))
    39  PROGRAMS += tstVMStructDTrace
    40  INSTALLS += VMMLibDTraceStructTest
     39PROGRAMS += tstVMStructDTrace
     40INSTALLS += VMMLibDTraceStructTest
    4141endif
    4242ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
    4343 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    44   PROGRAMS += tstGlobalConfigHardened
    45   DLL      += tstGlobalConfig
     44PROGRAMS += tstGlobalConfigHardened
     45DLL      += tstGlobalConfig
    4646 else
    47   PROGRAMS += tstGlobalConfig
     47PROGRAMS += tstGlobalConfig
    4848 endif
    4949
    5050 ifdef VBOX_WITH_RAW_MODE
    5151  if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    52    PROGRAMS += tstVMMHardened
    53    DLLS     += tstVMM
     52PROGRAMS += tstVMMHardened
     53DLLS     += tstVMM
    5454  else
    55    PROGRAMS += tstVMM tstVMM-HM
     55PROGRAMS += tstVMM tstVMM-HM
    5656  endif
    5757  ifneq ($(KBUILD_TARGET),win)
    58    PROGRAMS += tstVMMFork
     58PROGRAMS += tstVMMFork
    5959  endif
    6060 endif
    6161 ifdef VBOX_WITH_TESTCASES
    6262  if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    63    PROGRAMS += tstCFGMHardened tstSSMHardened tstVMREQHardened tstMMHyperHeapHardened tstAnimateHardened
    64    DLLS     += tstCFGM tstSSM tstVMREQ tstMMHyperHeap tstAnimate
     63PROGRAMS += tstCFGMHardened tstSSMHardened tstVMREQHardened tstMMHyperHeapHardened tstAnimateHardened
     64DLLS     += tstCFGM tstSSM tstVMREQ tstMMHyperHeap tstAnimate
    6565  else
    66    PROGRAMS += tstCFGM tstSSM tstVMREQ tstMMHyperHeap tstAnimate
     66PROGRAMS += tstCFGM tstSSM tstVMREQ tstMMHyperHeap tstAnimate
    6767  endif
    68   PROGRAMS += \
    69         tstCompressionBenchmark \
     68PROGRAMS += \
     69        tstCompressionBenchmark \
    7070        tstIEMCheckMc \
    71         tstVMMR0CallHost-1 \
    72         tstVMMR0CallHost-2 \
     71        tstVMMR0CallHost-1 \
     72        tstVMMR0CallHost-2 \
    7373        tstX86-FpuSaveRestore
    7474  ifn1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), solaris.x86 solaris.amd64 win.amd64 ) ## TODO: Fix the code.
    75    PROGRAMS += tstX86-1
     75PROGRAMS += tstX86-1
    7676  endif
    7777  ifdef VBOX_WITH_RAW_MODE
    7878   if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    79     PROGRAMS += tstMicroHardened
    80     DLLS     += tstMicro
     79PROGRAMS += tstMicroHardened
     80DLLS     += tstMicro
    8181   else
    82     PROGRAMS += tstMicro
     82PROGRAMS += tstMicro
    8383   endif
    84    SYSMODS   += tstMicroRC
     84SYSMODS   += tstMicroRC
    8585  endif
    8686  ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
    8787   if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    88     PROGRAMS += tstPDMAsyncCompletionHardened tstPDMAsyncCompletionStressHardened
    89     DLLS     += tstPDMAsyncCompletion tstPDMAsyncCompletionStress
     88PROGRAMS += tstPDMAsyncCompletionHardened tstPDMAsyncCompletionStressHardened
     89DLLS     += tstPDMAsyncCompletion tstPDMAsyncCompletionStress
    9090   else
    91     PROGRAMS += tstPDMAsyncCompletion tstPDMAsyncCompletionStress
     91PROGRAMS += tstPDMAsyncCompletion tstPDMAsyncCompletionStress
    9292   endif
    9393  endif
    … …  
    105105ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    106106 ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
    107   OTHERS += \
     107OTHERS += \
    108108        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
    109109        $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
    … …  
    137137#
    138138ifdef VBOX_WITH_RAW_MODE
    139  tstVMStructRC_TEMPLATE  = VBoxRcExe
    140  tstVMStructRC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
     139tstVMStructRC_TEMPLATE  = VBoxRcExe
     140tstVMStructRC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
    141141 ifdef VBOX_WITH_R0_LOGGING
    142   tstVMStructRC_DEFS    += VBOX_WITH_R0_LOGGING
     142tstVMStructRC_DEFS     += VBOX_WITH_R0_LOGGING
    143143 endif
    144144 ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    145   tstVMStructRC_DEFS    += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    146  endif
    147  tstVMStructRC_SOURCES   = tstVMStructRC.cpp
    148  tstVMStructRC_INCS      = \
     145tstVMStructRC_DEFS     += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
     146 endif
     147tstVMStructRC_SOURCES   = tstVMStructRC.cpp
     148tstVMStructRC_INCS      = \
    149149        $(VBOX_PATH_VMM_SRC)/include \
    150150        $(VBOX_PATH_VMM_SRC)/PATM
    … …  
    154154tstVMStructSize_DEFS    = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
    155155ifdef VBOX_WITH_RAW_MODE
    156  tstVMStructSize_DEFS  += VBOX_WITH_RAW_MODE
     156tstVMStructSize_DEFS   += VBOX_WITH_RAW_MODE
    157157endif
    158158tstVMStructSize_INCS    = \
    … …  
    162162tstVMStructSize_SOURCES = tstVMStructSize.cpp
    163163ifdef VBOX_WITH_RAW_MODE
    164  tstVMStructSize.cpp_DEPS= $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructRC.h
     164tstVMStructSize.cpp_DEPS= $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructRC.h
    165165endif
    166166ifdef VBOX_WITH_R0_LOGGING
    167  tstVMStructSize_DEFS  += VBOX_WITH_R0_LOGGING
     167tstVMStructSize_DEFS   += VBOX_WITH_R0_LOGGING
    168168endif
    169169ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    170  tstVMStructSize_DEFS  += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
     170tstVMStructSize_DEFS   += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    171171endif
    172172
    … …  
    174174tstAsmStructs_DEFS      = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
    175175ifdef VBOX_WITH_RAW_MODE
    176  tstAsmStructs_DEFS    += VBOX_WITH_RAW_MODE
     176tstAsmStructs_DEFS     += VBOX_WITH_RAW_MODE
    177177endif
    178178ifdef VBOX_WITH_R0_LOGGING
    179  tstAsmStructs_DEFS    += VBOX_WITH_R0_LOGGING
     179tstAsmStructs_DEFS     += VBOX_WITH_R0_LOGGING
    180180endif
    181181ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    182  tstAsmStructs_DEFS    += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
     182tstAsmStructs_DEFS     += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    183183endif
    184184tstAsmStructs_INCS      = \
    … …  
    189189
    190190ifdef VBOX_WITH_RAW_MODE
    191  tstAsmStructsRC_TEMPLATE= VBoxRcExe
    192  tstAsmStructsRC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
     191tstAsmStructsRC_TEMPLATE= VBoxRcExe
     192tstAsmStructsRC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
    193193 ifdef VBOX_WITH_R0_LOGGING
    194   tstAsmStructsRC_DEFS  += VBOX_WITH_R0_LOGGING
     194tstAsmStructsRC_DEFS   += VBOX_WITH_R0_LOGGING
    195195 endif
    196196 ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    197   tstAsmStructsRC_DEFS  += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    198  endif
    199  tstAsmStructsRC_INCS    = \
     197tstAsmStructsRC_DEFS   += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
     198 endif
     199tstAsmStructsRC_INCS    = \
    200200        $(VBOX_PATH_VMM_SRC)/include \
    201201        $(VBOX_VMM_TESTCASE_OUT_DIR)
    202  tstAsmStructsRC_SOURCES = tstAsmStructs.cpp
    203  tstAsmStructs.cpp_DEPS += $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsRC.h
     202tstAsmStructsRC_SOURCES = tstAsmStructs.cpp
     203tstAsmStructs.cpp_DEPS += $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructsRC.h
    204204endif # VBOX_WITH_RAW_MODE
    205205
    … …  
    209209#
    210210if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    211  tstGlobalConfigHardened_TEMPLATE = VBoxR3HardenedTstExe
    212  tstGlobalConfigHardened_NAME     = tstGlobalConfig
    213  tstGlobalConfigHardened_DEFS     = PROGRAM_NAME_STR=\"tstGlobalConfig\"
    214  tstGlobalConfigHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
    215  tstGlobalConfig_TEMPLATE = VBoxR3HardenedTstDll
    216 else
    217  tstGlobalConfig_TEMPLATE = VBOXR3TSTEXE
    218 endif
    219 tstGlobalConfig_SOURCES = tstGlobalConfig.cpp
    220 tstGlobalConfig_LIBS    = $(LIB_RUNTIME)
     211tstGlobalConfigHardened_TEMPLATE = VBoxR3HardenedTstExe
     212tstGlobalConfigHardened_NAME     = tstGlobalConfig
     213tstGlobalConfigHardened_DEFS     = PROGRAM_NAME_STR=\"tstGlobalConfig\"
     214tstGlobalConfigHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
     215tstGlobalConfig_TEMPLATE = VBoxR3HardenedTstDll
     216else
     217tstGlobalConfig_TEMPLATE = VBOXR3TSTEXE
     218endif
     219tstGlobalConfig_SOURCES  = tstGlobalConfig.cpp
     220tstGlobalConfig_LIBS     = $(LIB_RUNTIME)
    221221
    222222#
    … …  
    228228tstIEMCheckMc_LIBS      = $(LIB_RUNTIME)
    229229ifeq ($(KBUILD_TARGET),win)
    230  tstIEMCheckMc_CXXFLAGS = $(VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS) -wd4189 # local variable is initialized but not used.
    231 else
    232  tstIEMCheckMc_CXXFLAGS = $(VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS) -Wno-unused-value -Wno-unused-variable
     230tstIEMCheckMc_CXXFLAGS = $(VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS) -wd4189 # local variable is initialized but not used.
     231else
     232tstIEMCheckMc_CXXFLAGS = $(VBOX_C_CXX_FLAGS_NO_UNUSED_PARAMETERS) -Wno-unused-value -Wno-unused-variable
    233233endif
    234234
    … …  
    237237#
    238238if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    239  tstMMHyperHeapHardened_TEMPLATE = VBoxR3HardenedTstExe
    240  tstMMHyperHeapHardened_NAME     = tstMMHyperHeap
    241  tstMMHyperHeapHardened_DEFS     = PROGRAM_NAME_STR=\"tstMMHyperHeap\"
    242  tstMMHyperHeapHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
    243  tstMMHyperHeap_TEMPLATE = VBoxR3HardenedTstDll
    244 else
    245  tstMMHyperHeap_TEMPLATE = VBOXR3TSTEXE
     239tstMMHyperHeapHardened_TEMPLATE = VBoxR3HardenedTstExe
     240tstMMHyperHeapHardened_NAME     = tstMMHyperHeap
     241tstMMHyperHeapHardened_DEFS     = PROGRAM_NAME_STR=\"tstMMHyperHeap\"
     242tstMMHyperHeapHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
     243tstMMHyperHeap_TEMPLATE = VBoxR3HardenedTstDll
     244else
     245tstMMHyperHeap_TEMPLATE = VBOXR3TSTEXE
    246246endif
    247247tstMMHyperHeap_SOURCES  = tstMMHyperHeap.cpp
    … …  
    252252#
    253253if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    254  tstSSMHardened_TEMPLATE = VBoxR3HardenedTstExe
    255  tstSSMHardened_NAME     = tstSSM
    256  tstSSMHardened_DEFS     = PROGRAM_NAME_STR=\"tstSSM\"
    257  tstSSMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
    258  tstSSM_TEMPLATE        = VBoxR3HardenedTstDll
    259 else
    260  tstSSM_TEMPLATE        = VBOXR3TSTEXE
     254tstSSMHardened_TEMPLATE = VBoxR3HardenedTstExe
     255tstSSMHardened_NAME     = tstSSM
     256tstSSMHardened_DEFS     = PROGRAM_NAME_STR=\"tstSSM\"
     257tstSSMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
     258tstSSM_TEMPLATE         = VBoxR3HardenedTstDll
     259else
     260tstSSM_TEMPLATE         = VBOXR3TSTEXE
    261261endif
    262262tstSSM_INCS             = $(VBOX_PATH_VMM_SRC)/include
    … …  
    268268#
    269269if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    270  tstCFGMHardened_TEMPLATE = VBoxR3HardenedTstExe
    271  tstCFGMHardened_NAME     = tstCFGM
    272  tstCFGMHardened_DEFS     = PROGRAM_NAME_STR=\"tstCFGM\"
    273  tstCFGMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
    274  tstCFGM_TEMPLATE       = VBoxR3HardenedTstDll
    275 else
    276  tstCFGM_TEMPLATE       = VBOXR3TSTEXE
    277 endif
    278 tstCFGM_SOURCES         = tstCFGM.cpp
    279 tstCFGM_LIBS            = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     270tstCFGMHardened_TEMPLATE = VBoxR3HardenedTstExe
     271tstCFGMHardened_NAME     = tstCFGM
     272tstCFGMHardened_DEFS     = PROGRAM_NAME_STR=\"tstCFGM\"
     273tstCFGMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplateTestcase.cpp
     274tstCFGM_TEMPLATE         = VBoxR3HardenedTstDll
     275else
     276tstCFGM_TEMPLATE         = VBOXR3TSTEXE
     277endif
     278tstCFGM_SOURCES          = tstCFGM.cpp
     279tstCFGM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    280280
    281281#
    … …  
    305305#
    306306if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    307  tstVMREQHardened_TEMPLATE = VBOXR3HARDENEDEXE
    308  tstVMREQHardened_NAME     = tstVMREQ
    309  tstVMREQHardened_DEFS     = PROGRAM_NAME_STR=\"tstVMREQ\"
    310  tstVMREQHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    311  tstVMREQ_TEMPLATE      = VBOXR3
    312 else
    313  tstVMREQ_TEMPLATE      = VBOXR3EXE
    314 endif
    315 tstVMREQ_SOURCES        = tstVMREQ.cpp
    316 tstVMREQ_LIBS           = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     307tstVMREQHardened_TEMPLATE = VBOXR3HARDENEDEXE
     308tstVMREQHardened_NAME     = tstVMREQ
     309tstVMREQHardened_DEFS     = PROGRAM_NAME_STR=\"tstVMREQ\"
     310tstVMREQHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     311tstVMREQ_TEMPLATE         = VBOXR3
     312else
     313tstVMREQ_TEMPLATE         = VBOXR3EXE
     314endif
     315tstVMREQ_SOURCES          = tstVMREQ.cpp
     316tstVMREQ_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    317317
    318318#
    … …  
    320320#
    321321if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    322  tstAnimateHardened_TEMPLATE = VBOXR3HARDENEDEXE
    323  tstAnimateHardened_NAME     = tstAnimate
    324  tstAnimateHardened_DEFS     = PROGRAM_NAME_STR=\"tstAnimate\"
    325  tstAnimateHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    326  tstAnimate_TEMPLATE    = VBOXR3
    327 else
    328  tstAnimate_TEMPLATE    = VBOXR3EXE
    329 endif
    330 tstAnimate_SOURCES      = tstAnimate.cpp
    331 tstAnimate_LIBS         = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    332 
    333 tstX86-1_TEMPLATE       = VBOXR3TSTEXE
    334 tstX86-1_SOURCES        = tstX86-1.cpp tstX86-1A.asm
    335 tstX86-1_LIBS           = $(LIB_RUNTIME)
    336 tstX86-1_LDFLAGS.linux  = $(VBOX_GCC_no-pie)
     322tstAnimateHardened_TEMPLATE = VBOXR3HARDENEDEXE
     323tstAnimateHardened_NAME     = tstAnimate
     324tstAnimateHardened_DEFS     = PROGRAM_NAME_STR=\"tstAnimate\"
     325tstAnimateHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     326tstAnimate_TEMPLATE         = VBOXR3
     327else
     328tstAnimate_TEMPLATE         = VBOXR3EXE
     329endif
     330tstAnimate_SOURCES          = tstAnimate.cpp
     331tstAnimate_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     332
     333tstX86-1_TEMPLATE      = VBOXR3TSTEXE
     334tstX86-1_SOURCES       = tstX86-1.cpp tstX86-1A.asm
     335tstX86-1_LIBS          = $(LIB_RUNTIME)
     336tstX86-1_LDFLAGS.linux = $(VBOX_GCC_no-pie)
    337337
    338338tstX86-FpuSaveRestore_TEMPLATE = VBOXR3TSTEXE
    … …  
    346346 #
    347347 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    348   tstVMMHardened_TEMPLATE = VBOXR3HARDENEDEXE
    349   tstVMMHardened_NAME     = tstVMM
    350   tstVMMHardened_DEFS     = PROGRAM_NAME_STR=\"tstVMM\"
    351   tstVMMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    352   tstVMM_TEMPLATE       = VBOXR3
     348tstVMMHardened_TEMPLATE = VBOXR3HARDENEDEXE
     349tstVMMHardened_NAME     = tstVMM
     350tstVMMHardened_DEFS     = PROGRAM_NAME_STR=\"tstVMM\"
     351tstVMMHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     352tstVMM_TEMPLATE         = VBOXR3
    353353 else
    354   tstVMM_TEMPLATE       = VBOXR3EXE
    355  endif
    356  tstVMM_SOURCES         = tstVMM.cpp
    357  tstVMM_LIBS            = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    358 
    359  #
    360  # HM VMM testcase.
    361  #
    362  tstVMM-HM_TEMPLATE     = VBOXR3EXE
    363  tstVMM-HM_SOURCES      = tstVMM-HM.cpp
    364  tstVMM-HM_LIBS         = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    365 
    366  #
    367  # VMM host process fork test case (memory ++).
    368  #
    369  tstVMMFork_TEMPLATE    = VBOXR3EXE
    370  tstVMMFork_SOURCES     = tstVMMFork.cpp
    371  tstVMMFork_LIBS        = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    372 
    373  #
    374  # Raw-mode micro benchmark.
    375  #
     354tstVMM_TEMPLATE         = VBOXR3EXE
     355 endif
     356tstVMM_SOURCES          = tstVMM.cpp
     357tstVMM_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     358
     359#
     360# HM VMM testcase.
     361#
     362tstVMM-HM_TEMPLATE     = VBOXR3EXE
     363tstVMM-HM_SOURCES      = tstVMM-HM.cpp
     364tstVMM-HM_LIBS         = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     365
     366#
     367# VMM host process fork test case (memory ++).
     368#
     369tstVMMFork_TEMPLATE    = VBOXR3EXE
     370tstVMMFork_SOURCES     = tstVMMFork.cpp
     371tstVMMFork_LIBS        = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     372
     373#
     374# Raw-mode micro benchmark.
     375#
    376376 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    377   tstMicroHardened_TEMPLATE = VBOXR3HARDENEDEXE
    378   tstMicroHardened_NAME     = tstMicro
    379   tstMicroHardened_DEFS     = PROGRAM_NAME_STR=\"tstMicro\"
    380   tstMicroHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    381   tstMicro_TEMPLATE      = VBOXR3
     377tstMicroHardened_TEMPLATE = VBOXR3HARDENEDEXE
     378tstMicroHardened_NAME     = tstMicro
     379tstMicroHardened_DEFS     = PROGRAM_NAME_STR=\"tstMicro\"
     380tstMicroHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     381tstMicro_TEMPLATE         = VBOXR3
    382382 else
    383   tstMicro_TEMPLATE      = VBOXR3EXE
    384  endif
    385  tstMicro_SOURCES        = tstMicro.cpp
    386  tstMicro_LIBS           = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    387  tstMicro_DEFS           = $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
    388 
    389  tstMicroRC_TEMPLATE     = VBoxRc
    390  tstMicroRC_SOURCES      = tstMicroRC.cpp tstMicroRCA.asm
    391  tstMicroRC_DEFS         = $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
    392  tstMicroRC_INCS         = $(VBOX_PATH_VMM_SRC)/testcase
     383tstMicro_TEMPLATE         = VBOXR3EXE
     384 endif
     385tstMicro_SOURCES          = tstMicro.cpp
     386tstMicro_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     387tstMicro_DEFS             = $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
     388
     389tstMicroRC_TEMPLATE       = VBoxRc
     390tstMicroRC_SOURCES        = tstMicroRC.cpp tstMicroRCA.asm
     391tstMicroRC_DEFS           = $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
     392tstMicroRC_INCS           = $(VBOX_PATH_VMM_SRC)/testcase
    393393 ifeq ($(VBOX_LDR_FMT32),pe)
    394   tstMicroRC_LDFLAGS     = -Entry:tstMicroRC
    395  endif
    396  tstMicroRC_SYSSUFF      = .gc
    397  tstMicroRC_LIBS         = \
    398         $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
    399         $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
     394tstMicroRC_LDFLAGS        = -Entry:tstMicroRC
     395 endif
     396tstMicroRC_SYSSUFF        = .gc
     397tstMicroRC_LIBS           = \
     398        $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
     399        $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
    400400 ifeq ($(filter-out pe lx,$(VBOX_LDR_FMT32)),)
    401   tstMicroRC_LIBS        += \
    402         $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
    403         $(LIB_VMMRC)
    404  endif
    405  tstMicroRC_SOURCES.win = tstMicroRC.def
     401tstMicroRC_LIBS          += \
     402        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
     403        $(LIB_VMMRC)
     404 endif
     405tstMicroRC_SOURCES.win = tstMicroRC.def
    406406
    407407endif # VBOX_WITH_RAW_MODE
    … …  
    409409
    410410if !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS)
    411  #
    412  # Special NEM host testcase.
    413  #
     411#
     412# Special NEM host testcase.
     413#
    414414 if ("$(KBUILD_TARGET_ARCH).$(KBUILD_TARGET_ARCH)" == "darwin.amd64" && (defined(VBOX_WITH_NATIVE_NEM) || "$(USERNAME)" == "bird")) \
    415415 || ("$(KBUILD_TARGET_ARCH).$(KBUILD_TARGET_ARCH)" == "linux.amd64"  && (defined(VBOX_WITH_NATIVE_NEM) || "$(USERNAME)" == "bird")) \
    416416 || ("$(KBUILD_TARGET_ARCH).$(KBUILD_TARGET_ARCH)" == "win.amd64"    &&  defined(VBOX_WITH_NATIVE_NEM))
    417   PROGRAMS += NemRawBench-1
    418   NemRawBench-1_TEMPLATE = VBoxR3Static
    419   NemRawBench-1_SOURCES = NemRawBench-1.cpp
    420   NemRawBench-1_BLD_TYPE = release
    421   NemRawBench-1_INCS.win = \
    422         $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
    423         $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
    424   NemRawBench-1_CXXFLAGS.darwin = \
    425         -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform//Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks
    426   #NemRawBench-1_LDFLAGS.darwin =  \
    427   #     -F/System/Library/Frameworks \
    428   #     -framework Hypervisor
    429   NemRawBench-1_LDFLAGS.darwin = \
    430         /System/Library/Frameworks/Hypervisor.framework/Hypervisor
     417PROGRAMS += NemRawBench-1
     418NemRawBench-1_TEMPLATE = VBoxR3Static
     419NemRawBench-1_SOURCES = NemRawBench-1.cpp
     420NemRawBench-1_BLD_TYPE = release
     421NemRawBench-1_INCS.win = \
     422        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/um \
     423        $(KBUILD_DEVTOOLS)/win.x86/sdk/v10.0.17134.0/include/10.0.17134.0/shared
     424NemRawBench-1_CXXFLAGS.darwin = \
     425        -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform//Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks
     426#NemRawBench-1_LDFLAGS.darwin =  \
     427#       -F/System/Library/Frameworks \
     428#       -framework Hypervisor
     429NemRawBench-1_LDFLAGS.darwin = \
     430        /System/Library/Frameworks/Hypervisor.framework/Hypervisor
    431431 endif
    432432endif
    … …  
    434434
    435435ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
    436  #
    437  # PDM asynchronous completation test.
    438  #
     436#
     437# PDM asynchronous completation test.
     438#
    439439 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    440   tstPDMAsyncCompletionHardened_TEMPLATE = VBOXR3HARDENEDEXE
    441   tstPDMAsyncCompletionHardened_NAME     = tstPDMAsyncCompletion
    442   tstPDMAsyncCompletionHardened_DEFS     = PROGRAM_NAME_STR=\"tstPDMAsyncCompletion\"
    443   tstPDMAsyncCompletionHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    444   tstPDMAsyncCompletion_TEMPLATE        = VBOXR3
     440tstPDMAsyncCompletionHardened_TEMPLATE = VBOXR3HARDENEDEXE
     441tstPDMAsyncCompletionHardened_NAME     = tstPDMAsyncCompletion
     442tstPDMAsyncCompletionHardened_DEFS     = PROGRAM_NAME_STR=\"tstPDMAsyncCompletion\"
     443tstPDMAsyncCompletionHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     444tstPDMAsyncCompletion_TEMPLATE         = VBOXR3
    445445 else
    446   tstPDMAsyncCompletion_TEMPLATE        = VBOXR3EXE
    447  endif
    448  tstPDMAsyncCompletion_INCS             = $(VBOX_PATH_VMM_SRC)/include
    449  tstPDMAsyncCompletion_SOURCES          = tstPDMAsyncCompletion.cpp
    450  tstPDMAsyncCompletion_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    451 
    452  #
    453  # PDM asynchronous completation stress test.
    454  #
     446tstPDMAsyncCompletion_TEMPLATE         = VBOXR3EXE
     447 endif
     448tstPDMAsyncCompletion_INCS             = $(VBOX_PATH_VMM_SRC)/include
     449tstPDMAsyncCompletion_SOURCES          = tstPDMAsyncCompletion.cpp
     450tstPDMAsyncCompletion_LIBS             = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     451
     452#
     453# PDM asynchronous completation stress test.
     454#
    455455 if defined(VBOX_WITH_HARDENING) && "$(KBUILD_TARGET)" == "win"
    456   tstPDMAsyncCompletionStressHardened_TEMPLATE = VBOXR3HARDENEDEXE
    457   tstPDMAsyncCompletionStressHardened_NAME     = tstPDMAsyncCompletionStress
    458   tstPDMAsyncCompletionStressHardened_DEFS     = PROGRAM_NAME_STR=\"tstPDMAsyncCompletionStress\"
    459   tstPDMAsyncCompletionStressHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
    460   tstPDMAsyncCompletionStress_TEMPLATE  = VBOXR3
     456tstPDMAsyncCompletionStressHardened_TEMPLATE = VBOXR3HARDENEDEXE
     457tstPDMAsyncCompletionStressHardened_NAME     = tstPDMAsyncCompletionStress
     458tstPDMAsyncCompletionStressHardened_DEFS     = PROGRAM_NAME_STR=\"tstPDMAsyncCompletionStress\"
     459tstPDMAsyncCompletionStressHardened_SOURCES  = ../../HostDrivers/Support/SUPR3HardenedMainTemplate.cpp
     460tstPDMAsyncCompletionStress_TEMPLATE   = VBOXR3
    461461 else
    462   tstPDMAsyncCompletionStress_TEMPLATE  = VBOXR3EXE
    463  endif
    464  tstPDMAsyncCompletionStress_INCS       = $(VBOX_PATH_VMM_SRC)/include
    465  tstPDMAsyncCompletionStress_SOURCES    = tstPDMAsyncCompletionStress.cpp
    466  tstPDMAsyncCompletionStress_LIBS       = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
     462tstPDMAsyncCompletionStress_TEMPLATE   = VBOXR3EXE
     463 endif
     464tstPDMAsyncCompletionStress_INCS       = $(VBOX_PATH_VMM_SRC)/include
     465tstPDMAsyncCompletionStress_SOURCES    = tstPDMAsyncCompletionStress.cpp
     466tstPDMAsyncCompletionStress_LIBS       = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
    467467endif
    468468
    … …  
    482482     || defined(VBOX_WITH_DTRACE_R0) \
    483483     || defined(VBOX_WITH_DTRACE_RC))
    484  tstVMStructDTrace_TEMPLATE= VBOXR3AUTOTST
    485  tstVMStructDTrace_DEFS    = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
     484tstVMStructDTrace_TEMPLATE = VBOXR3AUTOTST
     485tstVMStructDTrace_DEFS     = IN_VMM_R3 IN_DIS $(VMM_COMMON_DEFS)
    486486 ifdef VBOX_WITH_RAW_MODE
    487   tstVMStructDTrace_DEFS  += VBOX_WITH_RAW_MODE
    488  endif
    489  tstVMStructDTrace_INCS    = \
    490         $(VBOX_PATH_VMM_SRC)/include \
    491         $(VBOX_PATH_VMM_SRC)/PATM \
    492         $(VBOX_VMM_TESTCASE_OUT_DIR)
    493  tstVMStructDTrace_SOURCES = tstVMStructDTrace.cpp
     487tstVMStructDTrace_DEFS    += VBOX_WITH_RAW_MODE
     488 endif
     489tstVMStructDTrace_INCS     = \
     490        $(VBOX_PATH_VMM_SRC)/include \
     491        $(VBOX_PATH_VMM_SRC)/PATM \
     492        $(VBOX_VMM_TESTCASE_OUT_DIR)
     493tstVMStructDTrace_SOURCES = tstVMStructDTrace.cpp
    494494 ifdef VBOX_WITH_R0_LOGGING
    495   tstVMStructDTrace_DEFS  += VBOX_WITH_R0_LOGGING
     495tstVMStructDTrace_DEFS    += VBOX_WITH_R0_LOGGING
    496496 endif
    497497 ifdef VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    498   tstVMStructDTrace_DEFS  += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
    499  endif
    500 
    501 
    502  VMMLibDTraceStructTest_INST = $(VBOX_INST_DTRACE_TST)$(KBUILD_TARGET_ARCH)/
    503  VMMLibDTraceStructTest_SOURCES = \
     498tstVMStructDTrace_DEFS    += VBOX_WITH_VMMR0_DISABLE_LAPIC_NMI
     499 endif
     500
     501
     502VMMLibDTraceStructTest_INST = $(VBOX_INST_DTRACE_TST)$(KBUILD_TARGET_ARCH)/
     503VMMLibDTraceStructTest_SOURCES = \
    504504        $(tstVMStructDTrace_0_OUTDIR)/vbox-vm-struct-test.d
    505505
    506  $$(tstVMStructDTrace_0_OUTDIR)/vbox-vm-struct-test.d: \
     506$$(tstVMStructDTrace_0_OUTDIR)/vbox-vm-struct-test.d: \
    507507                $$(tstVMStructDTrace_1_STAGE_TARGET) | $$(dir $$@)
    508508        $(QUIET)$(RM) -f $@

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

    r69654 r75173  
    1 
    21# $Id$
    32## @file
    … …  
    2524#
    2625ifdef VBOX_WITH_HARDENING
    27  PROGRAMS += VBoxVMMPreloadHardened
    28  DLLS     += VBoxVMMPreload
     26PROGRAMS += VBoxVMMPreloadHardened
     27DLLS     += VBoxVMMPreload
    2928else
    30  PROGRAMS += VBoxVMMPreload
     29PROGRAMS += VBoxVMMPreload
    3130endif
    3231
    … …  
    4746VBoxVMMPreload_LIBS = $(LIB_RUNTIME)
    4847ifdef VBOX_WITH_HARDENING
    49  VBoxVMMPreload_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxVMMPreload.dylib
     48VBoxVMMPreload_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxVMMPreload.dylib
    5049endif
    5150
Note: See TracChangeset for help on using the changeset viewer.

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