Changeset 98418 in vbox for trunk/src/VBox
- Timestamp:
- Feb 1, 2023 9:29:03 PM (23 months ago)
- Location:
- trunk/src/VBox/ValidationKit
- Files:
-
- 14 edited
-
Config.kmk (modified) (5 diffs)
-
Makefile.kmk (modified) (6 diffs)
-
bootsectors/Config.kmk (modified) (17 diffs)
-
bootsectors/Makefile.kmk (modified) (2 diffs)
-
bootsectors/bs3kit/Makefile.kmk (modified) (19 diffs)
-
common/Makefile.kmk (modified) (1 diff)
-
docs/Makefile.kmk (modified) (2 diffs)
-
testboxscript/Makefile.kmk (modified) (1 diff)
-
tests/api/Makefile.kmk (modified) (1 diff)
-
utils/TestExecServ/Makefile.kmk (modified) (2 diffs)
-
utils/audio/Makefile.kmk (modified) (2 diffs)
-
utils/clipboard/Makefile.kmk (modified) (1 diff)
-
utils/cpu/Makefile.kmk (modified) (1 diff)
-
utils/misc/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/ValidationKit/Config.kmk
r98256 r98418 89 89 ifeq ($(KBUILD_TARGET),solaris) 90 90 TEMPLATE_VBoxValidationKitR3_LIBS += \ 91 kstat \92 nsl \93 contract91 kstat \ 92 nsl \ 93 contract 94 94 if1of ($(KBUILD_TARGET_ARCH), amd64 x86) 95 95 TEMPLATE_VBoxValidationKitR3_LIBS += \ … … 104 104 # Make VCC100 output work on NT3.x, NT4, W2K, XP and W2K3. 105 105 ifndef VBOX_WITH_NOCRT_STATIC 106 TEMPLATE_VBoxValidationKitR3_LIBS.win.x86 = \107 108 109 110 $(PATH_STAGE_LIB)/RuntimeR3VccTricks$(VBOX_SUFF_LIB)111 TEMPLATE_VBoxValidationKitR3_LDFLAGS.win.x86 = \112 113 -Include:_vcc100_shell32_fakes_asm \114 -Section:.bss,RW!K106 TEMPLATE_VBoxValidationKitR3_LIBS.win.x86 = \ 107 $(PATH_TOOL_$(TEMPLATE_VBoxValidationKitR3_TOOL.win.x86)_LIB)/oldnames.lib \ 108 $(PATH_TOOL_$(TEMPLATE_VBoxValidationKitR3_TOOL.win.x86)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \ 109 $(PATH_TOOL_$(TEMPLATE_VBoxValidationKitR3_TOOL.win.x86)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \ 110 $(PATH_STAGE_LIB)/RuntimeR3VccTricks$(VBOX_SUFF_LIB) 111 TEMPLATE_VBoxValidationKitR3_LDFLAGS.win.x86 = \ 112 -Include:_vcc100_shell32_fakes_cpp \ 113 -Include:_vcc100_shell32_fakes_asm \ 114 -Section:.bss,RW!K 115 115 endif 116 116 TEMPLATE_VBoxValidationKitR3_LDFLAGS.win.x86 += -NoOptIData … … 152 152 $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB) 153 153 ifndef VBOX_WITH_NOCRT_STATIC 154 TEMPLATE_VBoxValidationKitR3SupDrv_LDFLAGS.win.x86 = \155 -Include:_vcc100_ntdll_fakes_cpp \156 -Include:_vcc100_ntdll_fakes_asm154 TEMPLATE_VBoxValidationKitR3SupDrv_LDFLAGS.win.x86 = \ 155 -Include:_vcc100_ntdll_fakes_cpp \ 156 -Include:_vcc100_ntdll_fakes_asm 157 157 endif 158 158 … … 191 191 192 192 define def_vbox_validationkit_py_check 193 $(eval name:=$(basename $(notdir $(py))))194 195 pylint:$(name)-py-phony.o196 $(name).o: $(name)-py-phony.o197 $(PATH_TARGET)/pylint/$(name).o $(name)-py-phony.o:: $(py) | $(PATH_TARGET)/pylint/198 ifdef VBOX_WITH_PYLINT193 $(eval name:=$(basename $(notdir $(py)))) 194 195 pylint: $(name)-py-phony.o 196 $(name).o: $(name)-py-phony.o 197 $(PATH_TARGET)/pylint/$(name).o $(name)-py-phony.o:: $(py) | $(PATH_TARGET)/pylint/ 198 ifdef VBOX_WITH_PYLINT 199 199 $(QUIET2)$(call MSG_L1,Subjecting $(py) to pylint...) 200 200 $(QUIET)$(REDIRECT) -C "$(dir $(py))" -E LC_ALL=C -E PYTHONPATH="$(VBOX_PYTHONPATH_VALIDATIONKIT)" -- \ 201 201 $(VBOX_PYLINT) --rcfile=$(VBOX_PATH_VALIDATIONKIT_SRC)/pylintrc $$(VBOX_PYLINT_FLAGS) $$($(py)_VBOX_PYLINT_FLAGS) ./$(notdir $(py)) 202 endif202 endif 203 203 $(QUIET)$(APPEND) -t "$(PATH_TARGET)/pylint/$(name).o" 204 204 205 ifn1of ($(py),$(VBOX_VALIDATIONKIT_PYUNITTEST_EXCLUDE))206 pyunittest: $(name)-pyunittest.o207 $(PATH_TARGET)/pyunittest/$(name).o $(name)-pyunittest.o:: $(py) | $(PATH_TARGET)/pyunittest/205 ifn1of ($(py), $(VBOX_VALIDATIONKIT_PYUNITTEST_EXCLUDE)) 206 pyunittest: $(name)-pyunittest.o 207 $(PATH_TARGET)/pyunittest/$(name).o $(name)-pyunittest.o:: $(py) | $(PATH_TARGET)/pyunittest/ 208 208 $(QUIET2)$(call MSG_L1,Unittesting Python source $(py)...) 209 209 $(QUIET)$(REDIRECT) -E LC_ALL=C -E PYTHONPATH="$(VBOX_PYTHONPATH_VALIDATIONKIT)" -C $(dir $(py)) \ 210 210 -- $(VBOX_UNITTEST_PYTHON) -m unittest -v $(notdir $(basename $(py))) 211 211 $(QUIET)$(APPEND) -t "$(PATH_TARGET)/pyunittest/$(name).o" 212 VBOX_VALIDATIONKIT_PYUNITTEST_TARGETS += $(PATH_TARGET)/pyunittest/$(name).o213 214 TESTING += $(name)-pyunittest.o215 endif216 TESTING += $(name)-py-phony.o217 VBOX_VALIDATIONKIT_PYLINT_TARGETS+= $(PATH_TARGET)/pylint/$(name).o212 VBOX_VALIDATIONKIT_PYUNITTEST_TARGETS += $(PATH_TARGET)/pyunittest/$(name).o 213 214 TESTING += $(name)-pyunittest.o 215 endif 216 TESTING += $(name)-py-phony.o 217 VBOX_VALIDATIONKIT_PYLINT_TARGETS += $(PATH_TARGET)/pylint/$(name).o 218 218 endef # def_vbox_validationkit_py_check 219 219 … … 241 241 242 242 define def_vbox_validationkit_js_check 243 $(eval name:=$(basename $(notdir $(js))))244 $(name).o $(name).obj: # $(PATH_SUB_CURRENT)/$(js)243 $(eval name:=$(basename $(notdir $(js)))) 244 $(name).o $(name).obj: # $(PATH_SUB_CURRENT)/$(js) 245 245 -$(REDIRECT) -E LC_ALL=C -C $(dir $(js)) -- $$(VBOX_JSHINT) ./$(notdir $(js)) $$(VBOX_JSHINT_FLAGS) 246 jslint: $(name).o246 jslint: $(name).o 247 247 endef 248 248 249 249 ifdef VBOX_WITH_JSHINT 250 define def_vbox_validationkit_process_js_sources250 define def_vbox_validationkit_process_js_sources 251 251 $(if-expr $(words $(_SUB_MAKEFILE_STACK)) <= 0, \ 252 252 $(foreach js, $(VBOX_VALIDATIONKIT_JS_SOURCES), $(eval $(def_vbox_validationkit_js_check))),) 253 endef253 endef 254 254 endif 255 255 -
trunk/src/VBox/ValidationKit/Makefile.kmk
r98103 r98418 50 50 # 51 51 include $(PATH_SUB_CURRENT)/tests/Makefile.kmk 52 ifneq ($(KBUILD_HOST),os2) 52 ifneq ($(KBUILD_HOST),os2) # needs yasm 53 53 if1of ($(KBUILD_TARGET_ARCH), amd64 x86) # needs yasm 54 54 include $(PATH_SUB_CURRENT)/bootsectors/Makefile.kmk … … 113 113 $(VBOX_PATH_VALIDATIONKIT)/VBoxValidationKit.iso \ 114 114 $(VBOX_PATH_VALIDATIONKIT)/ \ 115 116 115 $$(foreach inst, $$(VBOX_VALIDATIONKIT_INSTALLS), \ 116 $$(filter $(PATH_STAGE)/$(INST_VALIDATIONKIT)%, $$($$(inst)_2_STAGE_TARGETS))) 117 117 $(call MSG_L1,Packing the Test Suite $@) 118 118 $(QUIET)$(RM) -f $@ … … 175 175 if1of ($(KBUILD_TARGET_ARCH), amd64 x86) 176 176 VBOX_VALIDATIONKIT_FILESPEC += \ 177 $(VBOX_PATH_VALIDATIONKIT)/bootsectors/bootsector-pae.img \178 $(VBOX_PATH_VALIDATIONKIT)/bootsectors/bootsector-shutdown.img177 $(VBOX_PATH_VALIDATIONKIT)/bootsectors/bootsector-pae.img \ 178 $(VBOX_PATH_VALIDATIONKIT)/bootsectors/bootsector-shutdown.img 179 179 endif 180 180 endif … … 220 220 endef 221 221 222 TMP_SUFF_EXE =.exe222 TMP_SUFF_EXE = .exe 223 223 $(foreach os, os2 win,$(foreach arch, x86 amd64, \ 224 224 $(eval $(def_vbox_validationkit_common_files)) \ 225 225 )) 226 TMP_SUFF_EXE =226 TMP_SUFF_EXE = 227 227 $(foreach os, darwin freebsd linux solaris,$(foreach arch, x86 amd64, \ 228 228 $(eval $(def_vbox_validationkit_common_files)) \ … … 287 287 $(VBOX_PATH_VALIDATIONKIT.win.amd64)/ntSetFreq.exe \ 288 288 $(VBOX_PATH_VALIDATIONKIT.win.amd64)/ntTimeSources.exe 289 290 291 292 293 289 # Disabled for now; does not work without WinMM.dll export verification files. 290 #ifdef VBOX_WITH_AUDIO_VALIDATIONKIT 291 # VBOX_VALIDATIONKIT_FILESPEC += \ 292 # $(VBOX_PATH_VALIDATIONKIT.win.amd64)/ntPlayToneWaveX.exe 293 #endif 294 294 endif 295 295 ifdef VBOX_WITH_VALIDATIONKIT_PACKING.win.x86 … … 322 322 VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \ 323 323 $(foreach whitelisted, $(VALKIT_UNITTESTS_WHITELIST_IPRT) $(VALKIT_UNITTESTS_WHITELIST_IPRT.$(os)), \ 324 324 $$(wildcard $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))/$(whitelisted)$(TMP_SUFF_EXE))) 325 325 # Unit tests which utilize parts of the Guest Additions. 326 326 VBOX_VALIDATIONKIT_FILESPEC_UNITTESTS += \ 327 327 $(foreach whitelisted, $(VALKIT_UNITTESTS_WHITELIST_GUEST_ADDITIONS) $(VALKIT_UNITTESTS_WHITELIST_GUEST_ADDITIONS.$(os)), \ 328 328 $$(wildcard $(VBOX_PATH_VALIDATIONKIT_UNITTESTS.$(os).$(arch))/$(whitelisted)$(TMP_SUFF_EXE))) 329 329 endef 330 330 331 TMP_SUFF_EXE =.exe331 TMP_SUFF_EXE = .exe 332 332 $(foreach os, win,$(foreach arch, x86 amd64, \ 333 333 $(eval $(def_vbox_validationkit_unittests)) \ 334 334 )) 335 TMP_SUFF_EXE =335 TMP_SUFF_EXE = 336 336 $(foreach os, darwin freebsd linux solaris,$(foreach arch, x86 amd64, \ 337 337 $(eval $(def_vbox_validationkit_unittests)) \ -
trunk/src/VBox/ValidationKit/bootsectors/Config.kmk
r98103 r98418 50 50 51 51 if 0 # Adding as few as possible new properties. 52 KBUILD_COMPILE_CATEGTORIES += C1653 PROPS_TOOLS+= C16TOOL54 PROPS_SINGLE+= C16TOOL C16OBJSUFF55 PROPS_ACCUMULATE_R += C16FLAGS C16DEFS56 PROPS_ACCUMULATE_L += C16INCS52 KBUILD_COMPILE_CATEGTORIES += C16 53 PROPS_TOOLS += C16TOOL 54 PROPS_SINGLE += C16TOOL C16OBJSUFF 55 PROPS_ACCUMULATE_R += C16FLAGS C16DEFS 56 PROPS_ACCUMULATE_L += C16INCS 57 57 endif 58 58 … … 70 70 # The 16-bit code & data segment classes. 71 71 if 1 72 BS3KIT_CLASS_CODE16 = CODE73 BS3KIT_SEGNM_DATA16 =74 BS3KIT_CLASS_DATA16 = DATA75 BS3KIT_GRPNM_DATA16 = DGROUP76 BS3KIT_CLASS_BSS16= BSS72 BS3KIT_CLASS_CODE16 = CODE 73 BS3KIT_SEGNM_DATA16 = 74 BS3KIT_CLASS_DATA16 = DATA 75 BS3KIT_GRPNM_DATA16 = DGROUP 76 BS3KIT_CLASS_BSS16 = BSS 77 77 else 78 BS3KIT_CLASS_CODE16 = BS3CLASS16CODE79 BS3KIT_SEGNM_DATA16 = BS3DATA1680 BS3KIT_CLASS_DATA16 = FAR_DATA81 BS3KIT_GRPNM_DATA16 = BS3DATA16_GROUP82 BS3KIT_CLASS_BSS16= ???78 BS3KIT_CLASS_CODE16 = BS3CLASS16CODE 79 BS3KIT_SEGNM_DATA16 = BS3DATA16 80 BS3KIT_CLASS_DATA16 = FAR_DATA 81 BS3KIT_GRPNM_DATA16 = BS3DATA16_GROUP 82 BS3KIT_CLASS_BSS16 = ??? 83 83 endif 84 84 … … 115 115 # @param 3 The far function name. 116 116 define def_Bs3KitGenNearStubSource 117 $1_SOURCES += $$($1_0_OUTDIR)/stub$2.asm118 $1_CLEAN+= $$($1_0_OUTDIR)/stub$2.asm119 $$$$($1_0_OUTDIR)/stub$2.asm: $$(VBOX_PATH_BOOTSECTORS_SRC)/Config.kmk | $$$$(dir $$$$@)117 $1_SOURCES += $$($1_0_OUTDIR)/stub$2.asm 118 $1_CLEAN += $$($1_0_OUTDIR)/stub$2.asm 119 $$$$($1_0_OUTDIR)/stub$2.asm: $$(VBOX_PATH_BOOTSECTORS_SRC)/Config.kmk | $$$$(dir $$$$@) 120 120 $(QUIET)$(APPEND) -tn $$@ \ 121 121 '%include "bs3kit.mac"' \ … … 166 166 # @param 5 The parameter size in bytes. 167 167 define def_Bs3KitGenFarStubSource 168 $1_SOURCES += $$($1_0_OUTDIR)/stub_$2$3.asm169 $1_CLEAN+= $$($1_0_OUTDIR)/stub_$2$3.asm170 $$$$($1_0_OUTDIR)/stub_$2$3.asm: $$(VBOX_PATH_BOOTSECTORS_SRC)/Config.kmk | $$$$(dir $$$$@)168 $1_SOURCES += $$($1_0_OUTDIR)/stub_$2$3.asm 169 $1_CLEAN += $$($1_0_OUTDIR)/stub_$2$3.asm 170 $$$$($1_0_OUTDIR)/stub_$2$3.asm: $$(VBOX_PATH_BOOTSECTORS_SRC)/Config.kmk | $$$$(dir $$$$@) 171 171 $(QUIET)$(APPEND) -tn $$@ \ 172 172 '%include "bs3kit.mac"' \ … … 246 246 TOOL_VBoxNasm_COMPILE_AS_DEPORD = 247 247 define TOOL_VBoxNasm_COMPILE_AS_CMDS 248 ifdef TOOL_VBoxNasm_USE_KSUBMIT248 ifdef TOOL_VBoxNasm_USE_KSUBMIT 249 249 $(QUIET)kmk_builtin_kSubmit -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasm_AS)\ 250 250 $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\ … … 253 253 -MD "$(dep)" -MP\ 254 254 $(abspath $(source)) 255 else255 else 256 256 $(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasm_AS)\ 257 257 $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\ … … 260 260 -MD "$(dep)" -MP\ 261 261 $(abspath $(source)) 262 endif262 endif 263 263 $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)" 264 264 endef … … 528 528 # 529 529 define VBoxBs3KitImgSrcHandler_16bit_c 530 local type := C530 local type := C 531 531 $(kb-src-one 2) 532 532 endef … … 534 534 C32TOOL = Bs3Ow32 535 535 define VBoxBs3KitImgSrcHandler_32bit_c 536 local type := C32536 local type := C32 537 537 $(kb-src-one 2) 538 538 endef 539 539 540 540 define VBoxBs3KitImgSrcHandler_64bit_c 541 local type := C64541 local type := C64 542 542 $(kb-src-one 2) 543 543 endef … … 605 605 TEMPLATE_VBoxBS3KitImg_ASFLAGS = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels 606 606 TEMPLATE_VBoxBS3KitImg_ASDEFS = ASM_FORMAT_OMF RT_NOINC_SEGMENTS __NASM__ ARCH_BITS=16 RT_ARCH_X86 ASM_MODEL_FAR_CODE \ 607 608 607 BS3CLASS16CODE=$(BS3KIT_CLASS_CODE16) BS3KIT_CLASS_DATA16=$(BS3KIT_CLASS_DATA16) \ 608 BS3KIT_GRPNM_DATA16=$(BS3KIT_GRPNM_DATA16) BS3KIT_CLASS_BSS16=$(BS3KIT_CLASS_BSS16) 609 609 TEMPLATE_VBoxBS3KitImg_DEFS = IN_BS3KIT 610 610 TEMPLATE_VBoxBS3KitImg_DEFS.debug = BS3_STRICT … … 654 654 debug $(BS3_OW_DBG_LDOPT) all \ 655 655 option quiet, map, statics, verbose, symfile, start=_start, farcalls \ 656 656 disable 1014, 1080 \ 657 657 \ 658 659 660 661 662 663 664 665 666 667 668 669 $(if-expr "$(BS3KIT_SEGNM_DATA16)" == "", \670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 , \688 689 690 691 692 693 694 695 ) \696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 658 output raw offset=0x10000 \ 659 order \ 660 clname BS3FLAT segaddr=0x0000 \ 661 segment BS3FLAT segaddr=0x0000 \ 662 clname $(BS3KIT_CLASS_CODE16) segaddr=0x1000 \ 663 segment BS3TEXT16 \ 664 segment BS3TEXT16_NEARSTUBS \ 665 segment BS3TEXT16_FARSTUBS \ 666 segment BS3TEXT16_END \ 667 clname BS3SYSTEM16 segaddr=0x2000 \ 668 segment BS3SYSTEM16 \ 669 $(if-expr "$(BS3KIT_SEGNM_DATA16)" == "", \ 670 clname DATA \ 671 segment BS3DATA16 segaddr=0x2900 \ 672 segment BS3DATA16_DATA \ 673 segment DATA \ 674 segment _DATA \ 675 segment BS3DATA16CONST \ 676 segment CONST \ 677 segment BS3DATA16CONST2 \ 678 segment CONST2 \ 679 segment STRINGS \ 680 segment BS3DATA16_END \ 681 clname BSS \ 682 segment BSS \ 683 segment _BSS \ 684 segment BS3DATA16_END \ 685 clname FAR_DATA \ 686 segment FAR_DATA \ 687 , \ 688 clname FAR_DATA \ 689 segment BS3DATA16 segaddr=0x2900 \ 690 segment FAR_DATA \ 691 segment BS3DATA16CONST \ 692 segment BS3DATA16CONST2 \ 693 segment BS3DATA16_DATA \ 694 segment BS3DATA16_END \ 695 ) \ 696 segment BS3DATA32 \ 697 segment BS3DATA32CONST \ 698 segment BS3DATA32CONST2 \ 699 segment BS3DATA32_DATA \ 700 segment BS3DATA32_BSS \ 701 segment BS3DATA32_END \ 702 \ 703 segment BS3DATA64 \ 704 segment BS3DATA64CONST \ 705 segment BS3DATA64_BSS \ 706 segment BS3DATA64_END \ 707 clname BS3CLASS16RMCODE \ 708 segment BS3RMCODE16_START \ 709 segment BS3RMCODE16 \ 710 segment BS3RMCODE16_END \ 711 clname BS3CLASS16X0CODE \ 712 segment BS3X0CODE16_START \ 713 segment BS3X0CODE16 \ 714 segment BS3X0CODE16_END \ 715 clname BS3CLASS16X1CODE \ 716 segment BS3X1CODE16_START \ 717 segment BS3X1CODE16 \ 718 segment BS3X1CODE16_END \ 719 clname BS3CLASS32CODE \ 720 segment BS3TEXT32_START \ 721 segment BS3TEXT32 \ 722 segment BS3TEXT32_END \ 723 clname BS3CLASSSEPARATE32AND64BITCODE \ 724 segment BS3SEPARATE32AND64BITCODE \ 725 segment BS3SEPARATE32AND64BITCODE_END \ 726 clname BS3CLASS64CODE \ 727 segment BS3TEXT64_START \ 728 segment BS3TEXT64 \ 729 segment BS3TEXT64_END 730 730 731 731 TEMPLATE_VBoxBS3KitImg_LNK_DEPS = \ 732 732 $(bs3-bootsector_1_TARGET) \ 733 733 $(VBoxBs3Linker_1_TARGET) 734 TEMPLATE_VBoxBS3KitImg_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY) \734 TEMPLATE_VBoxBS3KitImg_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY) \ 735 735 ,,$(QUIET)$(MV_EXT) -f -- "$(out)" "$(out).tmp" \ 736 736 $$(NLTAB)$(QUIET)$(VBoxBs3Linker_1_TARGET) -o $(out) $(bs3-bootsector_1_TARGET) $(out).tmp \ … … 743 743 $(PATH_OBJ)/bs3kit-common-32/bs3kit-common-32.lib \ 744 744 $(PATH_OBJ)/bs3kit-common-64/bs3kit-common-64.lib \ 745 745 \ 746 746 $(PATH_OBJ)/bs3kit-rm/bs3kit-rm.lib \ 747 747 $(PATH_OBJ)/bs3kit-pe16/bs3kit-pe16.lib \ … … 776 776 TEMPLATE_VBoxBS3KitImg32_ASFLAGS = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels 777 777 TEMPLATE_VBoxBS3KitImg32_ASDEFS = ASM_FORMAT_OMF RT_NOINC_SEGMENTS __NASM__ \ 778 779 778 BS3CLASS16CODE=$(BS3KIT_CLASS_CODE16) BS3KIT_CLASS_DATA16=$(BS3KIT_CLASS_DATA16) \ 779 BS3KIT_GRPNM_DATA16=$(BS3KIT_GRPNM_DATA16) BS3KIT_CLASS_BSS16=$(BS3KIT_CLASS_BSS16) 780 780 TEMPLATE_VBoxBS3KitImg32_DEFS = ARCH_BITS=32 IN_BS3KIT 781 781 TEMPLATE_VBoxBS3KitImg32_DEFS.debug = BS3_STRICT … … 799 799 TEMPLATE_VBoxBS3KitImg64_ASFLAGS = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels 800 800 TEMPLATE_VBoxBS3KitImg64_ASDEFS = ASM_FORMAT_OMF ASM_CALL64_MSC RT_NOINC_SEGMENTS __NASM__ \ 801 802 801 BS3CLASS16CODE=$(BS3KIT_CLASS_CODE16) BS3KIT_CLASS_DATA16=$(BS3KIT_CLASS_DATA16) \ 802 BS3KIT_GRPNM_DATA16=$(BS3KIT_GRPNM_DATA16) BS3KIT_CLASS_BSS16=$(BS3KIT_CLASS_BSS16) 803 803 TEMPLATE_VBoxBS3KitImg64_DEFS = IN_BS3KIT ARCH_BITS=64 804 804 TEMPLATE_VBoxBS3KitImg64_DEFS.debug = BS3_STRICT … … 818 818 # Note! -mx32 would be exactly what we needed here, however it causes internal compiler errors with 4.8.4 on gentoo. 819 819 TEMPLATE_VBoxBS3KitImg64_CFLAGS = -m64 -maccumulate-outgoing-args -g -Os -fno-omit-frame-pointer $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_WARN_PEDANTIC_C) \ 820 820 -msoft-float -fno-exceptions -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) 821 821 TEMPLATE_VBoxBS3KitImg64_CXXFLAGS = -m64 -maccumulate-outgoing-args -g -Os -fno-omit-frame-pointer $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_WARN_PEDANTIC_CXX) \ 822 822 -msoft-float -fno-exceptions -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) 823 823 endif 824 824 TEMPLATE_VBoxBS3KitImg64_LDTOOL = VBoxBsUnusedLd … … 835 835 TEMPLATE_VBoxBS3KitBS_ASFLAGS = -f bin --mapfile 836 836 TEMPLATE_VBoxBS3KitBS_ASDEFS = ASM_FORMAT_BIN RT_NOINC_SEGMENTS ARCH_BITS=16 __YASM__ \ 837 838 837 BS3CLASS16CODE=$(BS3KIT_CLASS_CODE16) BS3KIT_CLASS_DATA16=$(BS3KIT_CLASS_DATA16) \ 838 BS3KIT_GRPNM_DATA16=$(BS3KIT_GRPNM_DATA16) BS3KIT_CLASS_BSS16=$(BS3KIT_CLASS_BSS16) 839 839 TEMPLATE_VBoxBS3KitBS_INCS = $(VBOX_PATH_BS3KIT_SRC) . 840 840 TEMPLATE_VBoxBS3KitBS_LDTOOL = VBoxBsCpLd … … 856 856 debug $(BS3_OW_DBG_LDOPT) all \ 857 857 option quiet, map, statics, verbose, symfile \ 858 859 860 861 862 863 864 865 866 867 clname BS3SYSTEM16\868 869 870 871 segment _NULL\872 segment _AFTERNULL\873 874 $(if-expr "$(BS3KIT_SEGNM_DATA16)" == "", \875 876 877 878 879 880 ,\881 882 883 ) \884 segment _DATA\885 segment XIB\886 segment XI\887 segment XIE\888 segment YIB\889 segment YI\890 segment YIE\891 segment STRINGS\892 $(if-expr "$(BS3KIT_SEGNM_DATA16)" == "", \893 894 ,) \895 segment DATA\896 897 898 899 900 901 902 903 904 $(if-expr "$(BS3KIT_SEGNM_DATA16)" != "", \905 segment BS3DATA16\906 907 908 909 910 911 ,\912 913 )\914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 858 disable 1080 \ 859 order \ 860 clname $(BS3KIT_CLASS_CODE16) \ 861 segment BEGTEXT \ 862 segment BS3TEXT16 \ 863 segment _TEXT \ 864 segment BS3TEXT16_NEARSTUBS \ 865 segment BS3TEXT16_FARSTUBS \ 866 segment BS3TEXT16_END \ 867 clname BS3SYSTEM16 \ 868 segment BS3SYSTEM16 \ 869 \ 870 clname BEGDATA \ 871 segment _NULL \ 872 segment _AFTERNULL \ 873 clname DATA \ 874 $(if-expr "$(BS3KIT_SEGNM_DATA16)" == "", \ 875 segment BS3DATA16 \ 876 segment BS3DATA16CONST \ 877 segment CONST \ 878 segment BS3DATA16CONST2 \ 879 segment CONST2 \ 880 , \ 881 segment CONST \ 882 segment CONST2 \ 883 ) \ 884 segment _DATA \ 885 segment XIB \ 886 segment XI \ 887 segment XIE \ 888 segment YIB \ 889 segment YI \ 890 segment YIE \ 891 segment STRINGS \ 892 $(if-expr "$(BS3KIT_SEGNM_DATA16)" == "", \ 893 segment BS3DATA16_DATA \ 894 ,) \ 895 segment DATA \ 896 clname BSS \ 897 segment _BSS \ 898 segment BSS \ 899 segment BS3DATA16_END \ 900 clname STACK \ 901 segment STACK \ 902 \ 903 clname FAR_DATA \ 904 $(if-expr "$(BS3KIT_SEGNM_DATA16)" != "", \ 905 segment BS3DATA16 \ 906 segment BS3DATA16_DATA \ 907 segment BS3DATA16CONST \ 908 segment BS3DATA16CONST2 \ 909 segment FAR_DATA \ 910 segment BS3DATA16_END \ 911 , \ 912 segment FAR_DATA \ 913 ) \ 914 segment BS3DATA32 \ 915 segment BS3DATA32CONST \ 916 segment BS3DATA32CONST2 \ 917 segment BS3DATA32_DATA \ 918 segment BS3DATA32_BSS \ 919 segment BS3DATA32_END \ 920 \ 921 segment BS3DATA64 \ 922 segment BS3DATA64CONST \ 923 segment BS3DATA64_BSS \ 924 segment BS3DATA64_END \ 925 clname BS3CLASS16RMCODE \ 926 segment BS3RMCODE16_START \ 927 segment BS3RMCODE16 \ 928 segment BS3RMCODE16_END \ 929 clname BS3CLASS16X0CODE \ 930 segment BS3X0CODE16_START \ 931 segment BS3X0CODE16 \ 932 segment BS3X0CODE16_END \ 933 clname BS3CLASS16X1CODE \ 934 segment BS3X1CODE16_START \ 935 segment BS3X1CODE16 \ 936 segment BS3X1CODE16_END \ 937 clname BS3CLASS32CODE \ 938 segment BS3TEXT32 \ 939 segment BS3TEXT32_END \ 940 clname BS3CLASSSEPARATE32AND64BITCODE \ 941 segment BS3SEPARATE32AND64BITCODE \ 942 segment BS3SEPARATE32AND64BITCODE_END \ 943 clname BS3CLASS64CODE \ 944 segment BS3TEXT64 \ 945 segment BS3TEXT64_END 946 946 # clname BS3FLAT segaddr=0x0000 \ 947 947 # segment BS3FLAT segaddr=0x0000 -
trunk/src/VBox/ValidationKit/bootsectors/Makefile.kmk
r98103 r98418 167 167 168 168 ifeq ($(USERNAME),birdxx) 169 if1of ($(KBUILD_HOST).$(KBUILD_HOST_ARCH), win.amd64)170 #171 # Generated instruction tests (work in progress).172 #173 174 VBOX_PATH_VBINSTST = $(PATH_ROOT)/src/VBox/VMM/testcase/Instructions175 VBOX_VBINSTST_GEN= $(VBOX_PATH_VBINSTST)/InstructionTestGen.py176 VBOX_BOOTSECTOR2_VBINSTST_AMD64_GEN= $(VBOX_BLD_PYTHON) $(VBOX_VBINSTST_GEN) \177 178 VBOX_BOOTSECTOR2_VBINSTST_AMD64_FILES = $(shell $(VBOX_BOOTSECTOR2_VBINSTST_AMD64_GEN) --makefile-mode)179 180 #$$(bootsectors_0_OUTDIR)/VBInsTst.ts + $$(VBOX_BOOTSECTOR2_VBINSTST_AMD64_FILES): $(VBOX_VBINSTST_GEN) | $$(dir $$@)181 # $(VBOX_BOOTSECTOR2_VBINSTST_AMD64_GEN)182 # $(APPEND) -t $@183 #184 #bootsectors_SOURCES += $(bootsectors_0_OUTDIR)/bootsector2-vbinstst-1.img185 #bootsectors_CLEAN += $(VBOX_BOOTSECTOR2_VBINSTST_AMD64_FILES)186 #187 #$$(bootsectors_0_OUTDIR)/bootsector2-vbinstst-1.img: \188 # $(PATH_SUB_CURRENT)/bootsector2-vbinstst-64-1.asm \189 # $$(bootsectors_0_OUTDIR)/VBInsTst-64.asm190 # $(TOOL_$(VBOX_ASTOOL)_AS) -f bin -D ASM_FORMAT_BIN -I $(dir $@) -I $(PATH_ROOT)/include -I $(VBOX_PATH_VBINSTST) -o $@ -L nasm -l [email protected] $<191 192 MISCBINS += bootsector2-vbinstst-kernel193 bootsector2-vbinstst-kernel_TEMPLATE = VBoxBsTestImg194 bootsector2-vbinstst-kernel_SOURCES = \195 bootsector2-vbinstst-kernel.asm196 197 198 MISCBINS += bootsector2-vbinstst-64-1199 bootsector2-vbinstst-64-1_TEMPLATE = VBoxBsTestImg200 bootsector2-vbinstst-64-1_DEFS = \201 BS2_BIG_IMAGE_LM64 \202 BS2_BIG_IMAGE_GEN_SOURCE_FILE=bs2-vbinstst-64-1.asm \203 BS2_BIG_IMAGE_GEN_TEST_NAME=\"bs2-vbinstst-64-1\"204 bootsector2-vbinstst-64-1_INCS = $(bootsector2-vbinstst-64-1_0_OUTDIR)/205 bootsector2-vbinstst-64-1_SOURCES = \206 bootsector2-vbinstst-kernel.asm \207 bootsector2-vbinstst-big-template.asm208 bootsector2-vbinstst-64-1_INTERMEDIATES = \209 $(bootsector2-vbinstst-64-1_0_OUTDIR)/bs2-vbinstst-64-1.asm210 bootsector2-vbinstst-64-1_CLEAN = \211 $(bootsector2-vbinstst-64-1_0_OUTDIR)/bs2-vbinstst-64-1.asm212 213 $$(bootsector2-vbinstst-64-1_0_OUTDIR)/bs2-vbinstst-64-1.asm: $(VBOX_VBINSTST_GEN) | $$(dir $$@)169 if1of ($(KBUILD_HOST).$(KBUILD_HOST_ARCH), win.amd64) 170 # 171 # Generated instruction tests (work in progress). 172 # 173 174 VBOX_PATH_VBINSTST = $(PATH_ROOT)/src/VBox/VMM/testcase/Instructions 175 VBOX_VBINSTST_GEN = $(VBOX_PATH_VBINSTST)/InstructionTestGen.py 176 VBOX_BOOTSECTOR2_VBINSTST_AMD64_GEN = $(VBOX_BLD_PYTHON) $(VBOX_VBINSTST_GEN) \ 177 --split 3 --target bs2-r0-64 --output-base $(bootsectors_0_OUTDIR)/VBInsTst-64 --test-size tiny 178 VBOX_BOOTSECTOR2_VBINSTST_AMD64_FILES = $(shell $(VBOX_BOOTSECTOR2_VBINSTST_AMD64_GEN) --makefile-mode) 179 180 #$$(bootsectors_0_OUTDIR)/VBInsTst.ts + $$(VBOX_BOOTSECTOR2_VBINSTST_AMD64_FILES): $(VBOX_VBINSTST_GEN) | $$(dir $$@) 181 # $(VBOX_BOOTSECTOR2_VBINSTST_AMD64_GEN) 182 # $(APPEND) -t $@ 183 # 184 #bootsectors_SOURCES += $(bootsectors_0_OUTDIR)/bootsector2-vbinstst-1.img 185 #bootsectors_CLEAN += $(VBOX_BOOTSECTOR2_VBINSTST_AMD64_FILES) 186 # 187 #$$(bootsectors_0_OUTDIR)/bootsector2-vbinstst-1.img: \ 188 # $(PATH_SUB_CURRENT)/bootsector2-vbinstst-64-1.asm \ 189 # $$(bootsectors_0_OUTDIR)/VBInsTst-64.asm 190 # $(TOOL_$(VBOX_ASTOOL)_AS) -f bin -D ASM_FORMAT_BIN -I $(dir $@) -I $(PATH_ROOT)/include -I $(VBOX_PATH_VBINSTST) -o $@ -L nasm -l [email protected] $< 191 192 MISCBINS += bootsector2-vbinstst-kernel 193 bootsector2-vbinstst-kernel_TEMPLATE = VBoxBsTestImg 194 bootsector2-vbinstst-kernel_SOURCES = \ 195 bootsector2-vbinstst-kernel.asm 196 197 198 MISCBINS += bootsector2-vbinstst-64-1 199 bootsector2-vbinstst-64-1_TEMPLATE = VBoxBsTestImg 200 bootsector2-vbinstst-64-1_DEFS = \ 201 BS2_BIG_IMAGE_LM64 \ 202 BS2_BIG_IMAGE_GEN_SOURCE_FILE=bs2-vbinstst-64-1.asm \ 203 BS2_BIG_IMAGE_GEN_TEST_NAME=\"bs2-vbinstst-64-1\" 204 bootsector2-vbinstst-64-1_INCS = $(bootsector2-vbinstst-64-1_0_OUTDIR)/ 205 bootsector2-vbinstst-64-1_SOURCES = \ 206 bootsector2-vbinstst-kernel.asm \ 207 bootsector2-vbinstst-big-template.asm 208 bootsector2-vbinstst-64-1_INTERMEDIATES = \ 209 $(bootsector2-vbinstst-64-1_0_OUTDIR)/bs2-vbinstst-64-1.asm 210 bootsector2-vbinstst-64-1_CLEAN = \ 211 $(bootsector2-vbinstst-64-1_0_OUTDIR)/bs2-vbinstst-64-1.asm 212 213 $$(bootsector2-vbinstst-64-1_0_OUTDIR)/bs2-vbinstst-64-1.asm: $(VBOX_VBINSTST_GEN) | $$(dir $$@) 214 214 $(REDIRECT) -0 /dev/null -- $(VBOX_BLD_PYTHON) $(VBOX_VBINSTST_GEN) --target bs2-r0-64-big --output-base $(basename $@) --test-size medium 215 215 216 MISCBINS += bootsector2-vbinstst-32-1217 bootsector2-vbinstst-32-1_TEMPLATE = VBoxBsTestImg218 bootsector2-vbinstst-32-1_DEFS = \219 BS2_BIG_IMAGE_PP32 \220 BS2_BIG_IMAGE_GEN_SOURCE_FILE=bs2-vbinstst-32-1.asm \221 BS2_BIG_IMAGE_GEN_TEST_NAME=\"bs2-vbinstst-32-1\"222 bootsector2-vbinstst-32-1_INCS = $(bootsector2-vbinstst-32-1_0_OUTDIR)/223 bootsector2-vbinstst-32-1_SOURCES = \224 bootsector2-vbinstst-kernel.asm \225 bootsector2-vbinstst-big-template.asm226 bootsector2-vbinstst-32-1_INTERMEDIATES = \227 $(bootsector2-vbinstst-32-1_0_OUTDIR)/bs2-vbinstst-32-1.asm228 bootsector2-vbinstst-32-1_CLEAN = \229 $(bootsector2-vbinstst-32-1_0_OUTDIR)/bs2-vbinstst-32-1.asm230 231 $$(bootsector2-vbinstst-32-1_0_OUTDIR)/bs2-vbinstst-32-1.asm: $(VBOX_VBINSTST_GEN) | $$(dir $$@)216 MISCBINS += bootsector2-vbinstst-32-1 217 bootsector2-vbinstst-32-1_TEMPLATE = VBoxBsTestImg 218 bootsector2-vbinstst-32-1_DEFS = \ 219 BS2_BIG_IMAGE_PP32 \ 220 BS2_BIG_IMAGE_GEN_SOURCE_FILE=bs2-vbinstst-32-1.asm \ 221 BS2_BIG_IMAGE_GEN_TEST_NAME=\"bs2-vbinstst-32-1\" 222 bootsector2-vbinstst-32-1_INCS = $(bootsector2-vbinstst-32-1_0_OUTDIR)/ 223 bootsector2-vbinstst-32-1_SOURCES = \ 224 bootsector2-vbinstst-kernel.asm \ 225 bootsector2-vbinstst-big-template.asm 226 bootsector2-vbinstst-32-1_INTERMEDIATES = \ 227 $(bootsector2-vbinstst-32-1_0_OUTDIR)/bs2-vbinstst-32-1.asm 228 bootsector2-vbinstst-32-1_CLEAN = \ 229 $(bootsector2-vbinstst-32-1_0_OUTDIR)/bs2-vbinstst-32-1.asm 230 231 $$(bootsector2-vbinstst-32-1_0_OUTDIR)/bs2-vbinstst-32-1.asm: $(VBOX_VBINSTST_GEN) | $$(dir $$@) 232 232 $(REDIRECT) -0 /dev/null -- $(VBOX_BLD_PYTHON) $(VBOX_VBINSTST_GEN) --target bs2-r0-32-big --output-base $(basename $@) --test-size medium 233 233 … … 237 237 238 238 ifdef VBOX_WITH_BS3KIT 239 #240 # Bs3kit241 #242 243 #244 # APIC245 #246 MISCBINS += bs3-apic-1247 bs3-apic-1_TEMPLATE = VBoxBS3KitImg248 bs3-apic-1_SOURCES= \249 bs3kit/bs3-first-rm.asm \250 bs3-apic-1.c \251 bs3-apic-1-32.c32252 253 254 # CPU basics #2 (first being bootsector2-cpu-basic-1).255 MISCBINS += bs3-cpu-basic-2256 bs3-cpu-basic-2_TEMPLATE = VBoxBS3KitImg257 bs3-cpu-basic-2_INCS= .258 bs3-cpu-basic-2_DEFS =BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-basic-2-template.c259 bs3-cpu-basic-2_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-cpu-basic-2-template.c260 bs3-cpu-basic-2_SOURCES = \261 bs3kit/bs3-first-rm.asm \262 bs3-cpu-basic-2.c \263 bs3-cpu-basic-2-x0.c \264 bs3-cpu-basic-2-32.c32 \265 bs3-cpu-basic-2-pf.c32 \266 bs3-cpu-basic-2-asm.asm \267 268 269 270 bs3-cpu-basic-2-template.o:: \271 $$(bs3-cpu-basic-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate-x0.o16 \272 $$(bs3-cpu-basic-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \273 $$(bs3-cpu-basic-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \274 $$(bs3-cpu-basic-2_0_OUTDIR)/bs3-cpu-basic-2-asm.o16275 276 #277 # CPU weird stuff #1.278 #279 MISCBINS += bs3-cpu-weird-1280 bs3-cpu-weird-1_TEMPLATE = VBoxBS3KitImg281 bs3-cpu-weird-1_INCS= .282 bs3-cpu-weird-1_SOURCES = \283 bs3kit/bs3-first-rm.asm \284 bs3-cpu-weird-1.c \285 bs3-cpu-weird-1-x0.c \286 bs3-cpu-weird-1-asm.asm287 288 #289 # 64-bit CPU state #1.290 #291 MISCBINS += bs3-cpu-state64-1292 bs3-cpu-state64-1_TEMPLATE = VBoxBS3KitImg293 bs3-cpu-state64-1_INCS= .294 bs3-cpu-state64-1_SOURCES = \295 bs3kit/bs3-first-init-all-lm64.asm \296 bs3-cpu-state64-1.c64 \297 bs3-cpu-state64-1-asm.asm298 299 #300 # FPU state corruption checker.301 #302 MISCBINS += bs3-fpustate-1303 bs3-fpustate-1_TEMPLATE = VBoxBS3KitImg304 bs3-fpustate-1_INCS= .305 bs3-fpustate-1_DEFS =BS3_CMN_INSTANTIATE_FILE1=bs3-fpustate-1-template.c306 bs3-fpustate-1_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-fpustate-1-template.c307 bs3-fpustate-1_SOURCES = \308 bs3kit/bs3-first-rm.asm \309 bs3-fpustate-1.c \310 311 312 313 bs3-fpustate-1-asm.asm314 bs3-fpustate-1-template.o:: \315 $$(bs3-fpustate-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o16 \316 $$(bs3-fpustate-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \317 $$(bs3-fpustate-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \318 $$(bs3-fpustate-1_0_OUTDIR)/bs3-fpustate-1-asm.o16319 320 #321 # CPU instruction decoding experiments.322 #323 MISCBINS += bs3-cpu-decoding-1324 bs3-cpu-decoding-1_TEMPLATE = VBoxBS3KitImg325 bs3-cpu-decoding-1_INCS= .326 bs3-cpu-decoding-1_DEFS =BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-decoding-1-template.c327 bs3-cpu-decoding-1_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-cpu-decoding-1-template.c328 bs3-cpu-decoding-1_SOURCES = \329 bs3kit/bs3-first-init-all-pp32.asm \330 bs3-cpu-decoding-1.c32 \331 bs3-cpu-decoding-1-asm.asm332 # bs3kit/bs3-cmn-instantiate.c16 \333 # bs3kit/bs3-cmn-instantiate.c32 \334 # bs3kit/bs3-cmn-instantiate.c64335 bs3-cpu-decoding-1-template.o:: \336 $$(bs3-cpu-decoding-1_0_OUTDIR)/bs3-cpu-decoding-1-asm.o16337 # $$(bs3-cpu-decoding-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o16 \338 # $$(bs3-cpu-decoding-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \339 # $$(bs3-cpu-decoding-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \340 341 342 #343 # CPU instructions #2 (first being bootsector2-cpu-instr-1).344 #345 MISCBINS += bs3-cpu-instr-2346 bs3-cpu-instr-2_TEMPLATE = VBoxBS3KitImg347 bs3-cpu-instr-2_INCS= .348 bs3-cpu-instr-2_DEFS =BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-instr-2-template.c349 bs3-cpu-instr-2_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-cpu-instr-2-template.c350 bs3-cpu-instr-2_SOURCES = \351 bs3kit/bs3-first-rm.asm \352 bs3-cpu-instr-2.c \353 bs3-cpu-instr-2-asm.asm \354 355 356 357 bs3-cpu-instr-2-template.o:: \358 $$(bs3-cpu-instr-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate-x0.o16 \359 $$(bs3-cpu-instr-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \360 $$(bs3-cpu-instr-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \361 $$(bs3-cpu-instr-2_0_OUTDIR)/bs3-cpu-instr-2-asm.o16362 363 #364 # CPU instructions #3 - SSE, ++.365 #366 MISCBINS += bs3-cpu-instr-3367 bs3-cpu-instr-3_TEMPLATE = VBoxBS3KitImg368 bs3-cpu-instr-3_INCS= .369 bs3-cpu-instr-3_SOURCES = \370 bs3kit/bs3-first-init-all-pe32.asm \371 bs3-cpu-instr-3.c32 \372 bs3-cpu-instr-3-asm.asm373 bs3-cpu-instr-3-template.o:: \374 $$(bs3-cpu-instr-3_0_OUTDIR)/bs3-cpu-instr-3-asm.o16375 376 #377 # CPU generated instruction tests #1378 #379 MISCBINS += bs3-cpu-generated-1380 bs3-cpu-generated-1_TEMPLATE = VBoxBS3KitImg381 bs3-cpu-generated-1_INCS = .382 bs3-cpu-generated-1_DEFS = BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-generated-1-template.c383 bs3-cpu-generated-1_SOURCES = \384 bs3kit/bs3-first-rm.asm \385 bs3-cpu-generated-1.c \386 bs3-cpu-generated-1-asm.asm \387 388 389 390 $(bs3-cpu-generated-1_0_OUTDIR)/bs3-cpu-generated-1-data.c16391 bs3-cpu-generated-1_CLEAN = $(bs3-cpu-generated-1_0_OUTDIR)/bs3-cpu-generated-1-data.c16392 393 bs3-cpu-generated-1-template.o:: \394 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate-x0.o16 \395 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \396 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \397 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3-cpu-generated-1-asm.o16398 399 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3-cpu-generated-1-data.c16: \400 $(PATH_SUB_CURRENT)/bs3-cpu-generated-1-data.py \401 $(PATH_SUB_CURRENT)/../../VMM/VMMAll/IEMAllInstructionsPython.py \402 $(PATH_SUB_CURRENT)/../../VMM/VMMAll/IEMAllInstructions*.cpp.h \403 239 # 240 # Bs3kit 241 # 242 243 # 244 # APIC 245 # 246 MISCBINS += bs3-apic-1 247 bs3-apic-1_TEMPLATE = VBoxBS3KitImg 248 bs3-apic-1_SOURCES = \ 249 bs3kit/bs3-first-rm.asm \ 250 bs3-apic-1.c \ 251 bs3-apic-1-32.c32 252 253 254 # CPU basics #2 (first being bootsector2-cpu-basic-1). 255 MISCBINS += bs3-cpu-basic-2 256 bs3-cpu-basic-2_TEMPLATE = VBoxBS3KitImg 257 bs3-cpu-basic-2_INCS = . 258 bs3-cpu-basic-2_DEFS = BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-basic-2-template.c 259 bs3-cpu-basic-2_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-cpu-basic-2-template.c 260 bs3-cpu-basic-2_SOURCES = \ 261 bs3kit/bs3-first-rm.asm \ 262 bs3-cpu-basic-2.c \ 263 bs3-cpu-basic-2-x0.c \ 264 bs3-cpu-basic-2-32.c32 \ 265 bs3-cpu-basic-2-pf.c32 \ 266 bs3-cpu-basic-2-asm.asm \ 267 bs3kit/bs3-cmn-instantiate-x0.c16 \ 268 bs3kit/bs3-cmn-instantiate.c32 \ 269 bs3kit/bs3-cmn-instantiate.c64 270 bs3-cpu-basic-2-template.o:: \ 271 $$(bs3-cpu-basic-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate-x0.o16 \ 272 $$(bs3-cpu-basic-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \ 273 $$(bs3-cpu-basic-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \ 274 $$(bs3-cpu-basic-2_0_OUTDIR)/bs3-cpu-basic-2-asm.o16 275 276 # 277 # CPU weird stuff #1. 278 # 279 MISCBINS += bs3-cpu-weird-1 280 bs3-cpu-weird-1_TEMPLATE = VBoxBS3KitImg 281 bs3-cpu-weird-1_INCS = . 282 bs3-cpu-weird-1_SOURCES = \ 283 bs3kit/bs3-first-rm.asm \ 284 bs3-cpu-weird-1.c \ 285 bs3-cpu-weird-1-x0.c \ 286 bs3-cpu-weird-1-asm.asm 287 288 # 289 # 64-bit CPU state #1. 290 # 291 MISCBINS += bs3-cpu-state64-1 292 bs3-cpu-state64-1_TEMPLATE = VBoxBS3KitImg 293 bs3-cpu-state64-1_INCS = . 294 bs3-cpu-state64-1_SOURCES = \ 295 bs3kit/bs3-first-init-all-lm64.asm \ 296 bs3-cpu-state64-1.c64 \ 297 bs3-cpu-state64-1-asm.asm 298 299 # 300 # FPU state corruption checker. 301 # 302 MISCBINS += bs3-fpustate-1 303 bs3-fpustate-1_TEMPLATE = VBoxBS3KitImg 304 bs3-fpustate-1_INCS = . 305 bs3-fpustate-1_DEFS = BS3_CMN_INSTANTIATE_FILE1=bs3-fpustate-1-template.c 306 bs3-fpustate-1_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-fpustate-1-template.c 307 bs3-fpustate-1_SOURCES = \ 308 bs3kit/bs3-first-rm.asm \ 309 bs3-fpustate-1.c \ 310 bs3kit/bs3-cmn-instantiate.c16 \ 311 bs3kit/bs3-cmn-instantiate.c32 \ 312 bs3kit/bs3-cmn-instantiate.c64 \ 313 bs3-fpustate-1-asm.asm 314 bs3-fpustate-1-template.o:: \ 315 $$(bs3-fpustate-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o16 \ 316 $$(bs3-fpustate-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \ 317 $$(bs3-fpustate-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \ 318 $$(bs3-fpustate-1_0_OUTDIR)/bs3-fpustate-1-asm.o16 319 320 # 321 # CPU instruction decoding experiments. 322 # 323 MISCBINS += bs3-cpu-decoding-1 324 bs3-cpu-decoding-1_TEMPLATE = VBoxBS3KitImg 325 bs3-cpu-decoding-1_INCS = . 326 bs3-cpu-decoding-1_DEFS = BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-decoding-1-template.c 327 bs3-cpu-decoding-1_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-cpu-decoding-1-template.c 328 bs3-cpu-decoding-1_SOURCES = \ 329 bs3kit/bs3-first-init-all-pp32.asm \ 330 bs3-cpu-decoding-1.c32 \ 331 bs3-cpu-decoding-1-asm.asm 332 # bs3kit/bs3-cmn-instantiate.c16 \ 333 # bs3kit/bs3-cmn-instantiate.c32 \ 334 # bs3kit/bs3-cmn-instantiate.c64 335 bs3-cpu-decoding-1-template.o:: \ 336 $$(bs3-cpu-decoding-1_0_OUTDIR)/bs3-cpu-decoding-1-asm.o16 337 # $$(bs3-cpu-decoding-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o16 \ 338 # $$(bs3-cpu-decoding-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \ 339 # $$(bs3-cpu-decoding-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \ 340 341 342 # 343 # CPU instructions #2 (first being bootsector2-cpu-instr-1). 344 # 345 MISCBINS += bs3-cpu-instr-2 346 bs3-cpu-instr-2_TEMPLATE = VBoxBS3KitImg 347 bs3-cpu-instr-2_INCS = . 348 bs3-cpu-instr-2_DEFS = BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-instr-2-template.c 349 bs3-cpu-instr-2_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-cpu-instr-2-template.c 350 bs3-cpu-instr-2_SOURCES = \ 351 bs3kit/bs3-first-rm.asm \ 352 bs3-cpu-instr-2.c \ 353 bs3-cpu-instr-2-asm.asm \ 354 bs3kit/bs3-cmn-instantiate-x0.c16 \ 355 bs3kit/bs3-cmn-instantiate.c32 \ 356 bs3kit/bs3-cmn-instantiate.c64 357 bs3-cpu-instr-2-template.o:: \ 358 $$(bs3-cpu-instr-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate-x0.o16 \ 359 $$(bs3-cpu-instr-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \ 360 $$(bs3-cpu-instr-2_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \ 361 $$(bs3-cpu-instr-2_0_OUTDIR)/bs3-cpu-instr-2-asm.o16 362 363 # 364 # CPU instructions #3 - SSE, ++. 365 # 366 MISCBINS += bs3-cpu-instr-3 367 bs3-cpu-instr-3_TEMPLATE = VBoxBS3KitImg 368 bs3-cpu-instr-3_INCS = . 369 bs3-cpu-instr-3_SOURCES = \ 370 bs3kit/bs3-first-init-all-pe32.asm \ 371 bs3-cpu-instr-3.c32 \ 372 bs3-cpu-instr-3-asm.asm 373 bs3-cpu-instr-3-template.o:: \ 374 $$(bs3-cpu-instr-3_0_OUTDIR)/bs3-cpu-instr-3-asm.o16 375 376 # 377 # CPU generated instruction tests #1 378 # 379 MISCBINS += bs3-cpu-generated-1 380 bs3-cpu-generated-1_TEMPLATE = VBoxBS3KitImg 381 bs3-cpu-generated-1_INCS = . 382 bs3-cpu-generated-1_DEFS = BS3_CMN_INSTANTIATE_FILE1=bs3-cpu-generated-1-template.c 383 bs3-cpu-generated-1_SOURCES = \ 384 bs3kit/bs3-first-rm.asm \ 385 bs3-cpu-generated-1.c \ 386 bs3-cpu-generated-1-asm.asm \ 387 bs3kit/bs3-cmn-instantiate-x0.c16 \ 388 bs3kit/bs3-cmn-instantiate.c32 \ 389 bs3kit/bs3-cmn-instantiate.c64 \ 390 $(bs3-cpu-generated-1_0_OUTDIR)/bs3-cpu-generated-1-data.c16 391 bs3-cpu-generated-1_CLEAN = $(bs3-cpu-generated-1_0_OUTDIR)/bs3-cpu-generated-1-data.c16 392 393 bs3-cpu-generated-1-template.o:: \ 394 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate-x0.o16 \ 395 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o32 \ 396 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3kit/bs3-cmn-instantiate.o64 \ 397 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3-cpu-generated-1-asm.o16 398 399 $$(bs3-cpu-generated-1_0_OUTDIR)/bs3-cpu-generated-1-data.c16: \ 400 $(PATH_SUB_CURRENT)/bs3-cpu-generated-1-data.py \ 401 $(PATH_SUB_CURRENT)/../../VMM/VMMAll/IEMAllInstructionsPython.py \ 402 $(PATH_SUB_CURRENT)/../../VMM/VMMAll/IEMAllInstructions*.cpp.h \ 403 | $$(dir $$@) 404 404 $(REDIRECT) -0 /dev/null -- $(VBOX_BLD_PYTHON) $< $@ 405 405 406 #407 # Memory allocation.408 #409 MISCBINS += bs3-memalloc-1410 bs3-memalloc-1_TEMPLATE = VBoxBS3KitImg411 bs3-memalloc-1_INCS= .412 bs3-memalloc-1_SOURCES = \413 bs3kit/bs3-first-init-all-lm64.asm \414 bs3-memalloc-1.c64415 416 417 #418 # Timer Interrupts419 #420 MISCBINS += bs3-timers-1421 bs3-timers-1_TEMPLATE = VBoxBS3KitImg422 bs3-timers-1_INCS= .423 bs3-timers-1_DEFS =BS3_CMN_INSTANTIATE_FILE1=bs3-timers-1-template.c424 bs3-timers-1_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-timers-1-template.c425 bs3-timers-1_SOURCES = \426 bs3kit/bs3-first-rm.asm \427 bs3-timers-1.c \428 bs3-timers-1-x0.c429 430 #431 # Timing432 #433 MISCBINS += bs3-timing-1434 bs3-timing-1_TEMPLATE = VBoxBS3KitImg435 bs3-timing-1_INCS= .436 bs3-timing-1_DEFS =BS3_CMN_INSTANTIATE_FILE1=bs3-timing-1-template.c437 bs3-timing-1_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-timing-1-template.c438 bs3-timing-1_SOURCES = \439 bs3kit/bs3-first-rm.asm \440 bs3-timing-1.c \441 bs3-timing-1-32.c32442 443 #444 # Lock contention and interruption.445 #446 MISCBINS += bs3-locking-1447 bs3-locking-1_TEMPLATE = VBoxBS3KitImg448 bs3-locking-1_INCS= .449 bs3-locking-1_SOURCES = \450 bs3kit/bs3-first-rm.asm \451 bs3-locking-1.c406 # 407 # Memory allocation. 408 # 409 MISCBINS += bs3-memalloc-1 410 bs3-memalloc-1_TEMPLATE = VBoxBS3KitImg 411 bs3-memalloc-1_INCS = . 412 bs3-memalloc-1_SOURCES = \ 413 bs3kit/bs3-first-init-all-lm64.asm \ 414 bs3-memalloc-1.c64 415 416 417 # 418 # Timer Interrupts 419 # 420 MISCBINS += bs3-timers-1 421 bs3-timers-1_TEMPLATE = VBoxBS3KitImg 422 bs3-timers-1_INCS = . 423 bs3-timers-1_DEFS = BS3_CMN_INSTANTIATE_FILE1=bs3-timers-1-template.c 424 bs3-timers-1_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-timers-1-template.c 425 bs3-timers-1_SOURCES = \ 426 bs3kit/bs3-first-rm.asm \ 427 bs3-timers-1.c \ 428 bs3-timers-1-x0.c 429 430 # 431 # Timing 432 # 433 MISCBINS += bs3-timing-1 434 bs3-timing-1_TEMPLATE = VBoxBS3KitImg 435 bs3-timing-1_INCS = . 436 bs3-timing-1_DEFS = BS3_CMN_INSTANTIATE_FILE1=bs3-timing-1-template.c 437 bs3-timing-1_DEFS += BS3_MODE_INSTANTIATE_FILE1=bs3-timing-1-template.c 438 bs3-timing-1_SOURCES = \ 439 bs3kit/bs3-first-rm.asm \ 440 bs3-timing-1.c \ 441 bs3-timing-1-32.c32 442 443 # 444 # Lock contention and interruption. 445 # 446 MISCBINS += bs3-locking-1 447 bs3-locking-1_TEMPLATE = VBoxBS3KitImg 448 bs3-locking-1_INCS = . 449 bs3-locking-1_SOURCES = \ 450 bs3kit/bs3-first-rm.asm \ 451 bs3-locking-1.c 452 452 453 453 endif # VBOX_WITH_BS3KIT -
trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk
r98107 r98418 49 49 BLDPROGS += VBoxBs3ObjConverter 50 50 VBoxBs3ObjConverter_TEMPLATE = VBoxBldProg 51 VBoxBs3ObjConverter_DEFS = 51 VBoxBs3ObjConverter_DEFS = BS3KIT_BS3CLASS16CODE=$(BS3KIT_BS3CLASS16CODE) IN_RT_R3 52 52 VBoxBs3ObjConverter_SOURCES = \ 53 53 $(VBOX_PATH_BS3KIT_SRC)/VBoxBs3ObjConverter.cpp \ 54 54 $(PATH_ROOT)/src/VBox/Runtime/common/sort/shellsort.cpp 55 55 56 56 … … 81 81 bs3-cmn-PrintStr.c \ 82 82 bs3-cmn-PrintStrN.asm \ 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 83 bs3-cmn-StrFormatV.c \ 84 bs3-cmn-StrPrintf.c \ 85 bs3-cmn-StrLen.c \ 86 bs3-cmn-StrNLen.c \ 87 bs3-cmn-StrCpy.c \ 88 bs3-cmn-MemChr.asm \ 89 bs3-cmn-MemCmp.asm \ 90 bs3-cmn-MemCpy.c \ 91 bs3-cmn-MemPCpy.c \ 92 bs3-cmn-MemMove.c \ 93 bs3-cmn-MemSet.asm \ 94 bs3-cmn-MemZero.asm \ 95 bs3-cmn-MemAlloc.c \ 96 bs3-cmn-MemAllocZ.c \ 97 bs3-cmn-MemFree.c \ 98 bs3-cmn-MemGuardedTestPage.c \ 99 bs3-cmn-MemPrintInfo.c \ 100 bs3-cmn-PagingData.c \ 101 bs3-cmn-PagingInitRootForPP.c \ 102 bs3-cmn-PagingInitRootForPAE.c \ 103 bs3-cmn-PagingInitRootForLM.c \ 104 bs3-cmn-PagingAlias.c \ 105 bs3-cmn-PagingProtect.c \ 106 bs3-cmn-PagingQueryAddressInfo.c \ 107 bs3-cmn-PagingSetupCanonicalTraps.c \ 108 bs3-cmn-pic-data.c \ 109 bs3-cmn-PicMaskAll.c \ 110 bs3-cmn-PicUpdateMask.c \ 111 bs3-cmn-PicSetup.c \ 112 bs3-cmn-pit.c \ 113 bs3-cmn-PitIrqHandler.c \ 114 bs3-cmn-RegCtxRestore.asm \ 115 bs3-cmn-RegCtxConvertToRingX.c \ 116 bs3-cmn-RegCtxConvertV86ToRm.c \ 117 bs3-cmn-RegCtxPrint.c \ 118 bs3-cmn-RegCtxGetRspSsAsCurPtr.c \ 119 bs3-cmn-RegCtxSave.asm \ 120 bs3-cmn-RegCtxSaveEx.asm \ 121 bs3-cmn-RegCtxSaveForMode.c \ 122 bs3-cmn-RegCtxSetGrpSegFromCurPtr.c \ 123 bs3-cmn-RegCtxSetGrpSegFromFlat.c \ 124 bs3-cmn-RegCtxSetRipCsFromCurPtr.c \ 125 bs3-cmn-RegCtxSetRipCsFromFlat.c \ 126 bs3-cmn-RegCtxSetRipCsFromLnkPtr.c \ 127 bs3-cmn-RegCtxSetGpr.c \ 128 bs3-cmn-RegGetCr0.asm \ 129 bs3-cmn-RegGetCr2.asm \ 130 bs3-cmn-RegGetCr3.asm \ 131 bs3-cmn-RegGetCr4.asm \ 132 bs3-cmn-RegSetCr0.asm \ 133 bs3-cmn-RegSetCr2.asm \ 134 bs3-cmn-RegSetCr3.asm \ 135 bs3-cmn-RegSetCr4.asm \ 136 bs3-cmn-RegGetDr0.asm \ 137 bs3-cmn-RegGetDr1.asm \ 138 bs3-cmn-RegGetDr2.asm \ 139 bs3-cmn-RegGetDr3.asm \ 140 bs3-cmn-RegGetDr6.asm \ 141 bs3-cmn-RegGetDr7.asm \ 142 bs3-cmn-RegGetDrX.asm \ 143 bs3-cmn-RegSetDr0.asm \ 144 bs3-cmn-RegSetDr1.asm \ 145 bs3-cmn-RegSetDr2.asm \ 146 bs3-cmn-RegSetDr3.asm \ 147 bs3-cmn-RegSetDr6.asm \ 148 bs3-cmn-RegSetDr7.asm \ 149 bs3-cmn-RegSetDrX.asm \ 150 bs3-cmn-RegGetTr.asm \ 151 bs3-cmn-RegSetTr.asm \ 152 bs3-cmn-RegGetLdtr.asm \ 153 bs3-cmn-RegSetLdtr.asm \ 154 bs3-cmn-RegGetXcr0.asm \ 155 bs3-cmn-RegSetXcr0.asm \ 156 bs3-cmn-ExtCtxInit.c \ 157 bs3-cmn-ExtCtxSave.asm \ 158 bs3-cmn-ExtCtxSaveEx.asm \ 159 bs3-cmn-ExtCtxRestore.asm \ 160 bs3-cmn-ExtCtxRestoreEx.asm \ 161 bs3-cmn-ExtCtxGetSize.c \ 162 bs3-cmn-ExtCtxAlloc.c \ 163 bs3-cmn-ExtCtxFree.c \ 164 bs3-cmn-ExtCtxCopy.c \ 165 bs3-cmn-ExtCtxGetFcw.c \ 166 bs3-cmn-ExtCtxSetFcw.c \ 167 bs3-cmn-ExtCtxGetFsw.c \ 168 bs3-cmn-ExtCtxSetFsw.c \ 169 bs3-cmn-ExtCtxGetAbridgedFtw.c \ 170 bs3-cmn-ExtCtxSetAbridgedFtw.c \ 171 bs3-cmn-ExtCtxGetMxCsr.c \ 172 bs3-cmn-ExtCtxSetMxCsr.c \ 173 bs3-cmn-ExtCtxGetMxCsrMask.c \ 174 bs3-cmn-ExtCtxSetMxCsrMask.c \ 175 bs3-cmn-ExtCtxGetMm.c \ 176 bs3-cmn-ExtCtxSetMm.c \ 177 bs3-cmn-ExtCtxGetXmm.c \ 178 bs3-cmn-ExtCtxSetXmm.c \ 179 bs3-cmn-ExtCtxGetYmm.c \ 180 bs3-cmn-ExtCtxSetYmm.c \ 181 bs3-cmn-SelFar32ToFlat32.c \ 182 bs3-cmn-SelFar32ToFlat32NoClobber.asm \ 183 bs3-cmn-SelProtFar32ToFlat32.c \ 184 bs3-cmn-SelProtModeCodeToRealMode.asm \ 185 bs3-cmn-SelRealModeCodeToProtMode.asm \ 186 bs3-cmn-SelFlatCodeToRealMode.asm \ 187 bs3-cmn-SelFlatCodeToProtFar16.asm \ 188 bs3-cmn-SelRealModeDataToProtFar16.asm \ 189 bs3-cmn-SelProtFar16DataToRealMode.asm \ 190 bs3-cmn-SelRealModeDataToFlat.asm \ 191 bs3-cmn-SelProtFar16DataToFlat.asm \ 192 bs3-cmn-SelFlatDataToProtFar16.asm \ 193 bs3-cmn-SelFlatDataToRealMode.asm \ 194 bs3-cmn-SelLnkPtrToCurPtr.c \ 195 bs3-cmn-SelLnkPtrToFlat.c \ 196 bs3-cmn-SelSetup16BitData.c \ 197 bs3-cmn-SelSetup16BitCode.c \ 198 bs3-cmn-SelSetup32BitCode.c \ 199 bs3-cmn-SelSetupGate.c \ 200 bs3-cmn-SelSetupGate64.c \ 201 bs3-cmn-SlabInit.c \ 202 bs3-cmn-SlabAlloc.c \ 203 bs3-cmn-SlabAllocEx.c \ 204 bs3-cmn-SlabFree.c \ 205 bs3-cmn-SlabListInit.c \ 206 bs3-cmn-SlabListAdd.c \ 207 bs3-cmn-SlabListAlloc.c \ 208 bs3-cmn-SlabListAllocEx.c \ 209 bs3-cmn-SlabListFree.c \ 210 bs3-cmn-SwitchHlpConvRealModeRetfPopBpDecBpAndReturn.asm \ 211 bs3-cmn-SwitchHlpConvProtModeRetfPopBpDecBpAndReturn.asm \ 212 bs3-cmn-SwitchToRing0.asm \ 213 bs3-cmn-SwitchToRing1.asm \ 214 bs3-cmn-SwitchToRing2.asm \ 215 bs3-cmn-SwitchToRing3.asm \ 216 bs3-cmn-SwitchToRingX.asm \ 217 bs3-cmn-SwitchTo16Bit.asm \ 218 bs3-cmn-SwitchTo16BitV86.asm \ 219 bs3-cmn-SwitchTo32Bit.asm \ 220 bs3-cmn-SwitchTo64Bit.asm \ 221 bs3-cmn-Syscall.asm \ 222 bs3-cmn-TestData.c \ 223 bs3-cmn-TestInit.c \ 224 bs3-cmn-TestFailed.c \ 225 225 bs3-cmn-TestNow.asm \ 226 227 228 229 230 226 bs3-cmn-TestSkipped.c \ 227 bs3-cmn-TestSub.c \ 228 bs3-cmn-TestSubDone.c \ 229 bs3-cmn-TestSubErrorCount.c \ 230 bs3-cmn-TestTerm.c \ 231 231 bs3-cmn-TestSendCmdWithStr.asm \ 232 232 bs3-cmn-TestSendCmdWithU32.asm \ … … 261 261 bs3-cmn-TrapSetJmpAndRestoreWithExtCtxAndRm.c \ 262 262 bs3-cmn-TrapUnsetJmp.c \ 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 ../../../Runtime/common/asm/ASMMultU64ByU32DivByU32.asm \ 263 bs3-cmn-UtilSetFullGdtr.asm \ 264 bs3-cmn-UtilSetFullIdtr.asm \ 265 bs3-cmn-TestDoModesByOneHlp.asm \ 266 ../../../Runtime/common/asm/ASMBitFirstClear.asm \ 267 ../../../Runtime/common/asm/ASMBitFirstSet.asm \ 268 ../../../Runtime/common/asm/ASMBitNextClear.asm \ 269 ../../../Runtime/common/asm/ASMBitNextSet.asm \ 270 ../../../Runtime/common/asm/ASMBitFirstSetU16.asm \ 271 ../../../Runtime/common/asm/ASMBitFirstSetU32.asm \ 272 ../../../Runtime/common/asm/ASMBitFirstSetU64.asm \ 273 ../../../Runtime/common/asm/ASMBitLastSetU16.asm \ 274 ../../../Runtime/common/asm/ASMBitLastSetU32.asm \ 275 ../../../Runtime/common/asm/ASMBitLastSetU64.asm \ 276 ../../../Runtime/common/asm/ASMMemFirstMismatchingU8.asm \ 277 ../../../Runtime/common/asm/ASMSerializeInstruction-cpuid.asm \ 278 ../../../Runtime/common/asm/ASMSerializeInstruction-iret.asm \ 279 ../../../Runtime/common/asm/ASMSerializeInstruction-rdtscp.asm \ 280 ../../../Runtime/common/asm/ASMCpuIdExSlow.asm \ 281 ../../../Runtime/common/asm/ASMCpuId.asm \ 282 ../../../Runtime/common/asm/ASMCpuId_Idx_ECX.asm \ 283 ../../../Runtime/common/asm/ASMWrMsr.asm \ 284 ../../../Runtime/common/asm/ASMGetXcr0.asm \ 285 ../../../Runtime/common/asm/ASMSetXcr0.asm \ 286 ../../../Runtime/common/asm/ASMSetFlags.asm \ 287 ../../../Runtime/common/asm/ASMGetFlags.asm \ 288 ../../../Runtime/common/asm/ASMMultU64ByU32DivByU32.asm 289 289 290 290 # The 16-bit BS3Kit library. … … 314 314 bs3-wc16-U4D.asm \ 315 315 bs3-wc16-I4D.asm \ 316 317 318 319 316 bs3-c16-SwitchFromV86To16BitAndCallC.asm \ 317 bs3-c16-Trap16Generic.asm \ 318 bs3-c16-TrapRmV86Generic.asm \ 319 bs3-c16-TrapRmV86Data.c \ 320 320 bs3-c16-CreateHybridFarRet.asm 321 321 bs3kit-common-16_bs3-cmn-UInt64Div.c_CFLAGS = -oh -d0 # -d1+ vs -d0 saves 0x6a3-0x577 = 0x12C (300)! … … 337 337 bs3kit-common-32_ASDEFS = RT_ASMDEFS_INC_FIRST_FILE 338 338 bs3kit-common-32_SOURCES = $(VBOX_BS3KIT_COMMON_SOURCES) \ 339 340 339 bs3-cmn-PagingMapRamAbove4GForLM.c \ 340 bs3-cmn-SwitchHlpConvFlatRetToRetfProtMode.asm \ 341 341 bs3-cmn-UInt64Div.c \ 342 342 bs3-wc32-U8D.asm \ … … 346 346 bs3-wc32-U8LS.asm \ 347 347 bs3-wc32-U8M.asm \ 348 348 bs3-c32-Trap32Generic.asm 349 349 350 350 # The 64-bit BS3Kit library. … … 355 355 bs3kit-common-64_ASDEFS = RT_ASMDEFS_INC_FIRST_FILE 356 356 bs3kit-common-64_SOURCES = $(VBOX_BS3KIT_COMMON_SOURCES) \ 357 358 359 360 361 362 363 ../../../Runtime/common/asm/ASMSetGDTR.asm \ 357 bs3-cmn-PagingMapRamAbove4GForLM.c \ 358 bs3-cmn-SwitchHlpConvFlatRetToRetfProtMode.asm \ 359 bs3-c64-Trap64Generic.asm \ 360 ../../../Runtime/common/asm/ASMGetIDTR.asm \ 361 ../../../Runtime/common/asm/ASMSetIDTR.asm \ 362 ../../../Runtime/common/asm/ASMGetGDTR.asm \ 363 ../../../Runtime/common/asm/ASMSetGDTR.asm 364 364 365 365 … … 406 406 bs3-mode-TestDoModesByMax.c \ 407 407 bs3-mode-TestDoModesHlp.asm \ 408 bs3-mode-BiosInt15hE820.asm \408 bs3-mode-BiosInt15hE820.asm 409 409 410 410 # The 16-bit real mode BS3Kit library. … … 418 418 bs3-mode-TestDoModesStub.asm \ 419 419 bs3-mode-TestDoModesByOneStub.asm \ 420 bs3-mode-TestDoModesByMaxStub.asm \420 bs3-mode-TestDoModesByMaxStub.asm 421 421 422 422 … … 430 430 bs3-mode-TestDoModesStub.asm \ 431 431 bs3-mode-TestDoModesByOneStub.asm \ 432 bs3-mode-TestDoModesByMaxStub.asm \432 bs3-mode-TestDoModesByMaxStub.asm 433 433 # bs3-mode-CpuDetect.asm 434 434 … … 441 441 bs3-mode-TestDoModesStub.asm \ 442 442 bs3-mode-TestDoModesByOneStub.asm \ 443 bs3-mode-TestDoModesByMaxStub.asm \443 bs3-mode-TestDoModesByMaxStub.asm 444 444 445 445 # The v86 BS3Kit library for 16-bit protected kernel+tss. … … 451 451 bs3-mode-TestDoModesStub.asm \ 452 452 bs3-mode-TestDoModesByOneStub.asm \ 453 bs3-mode-TestDoModesByMaxStub.asm \453 bs3-mode-TestDoModesByMaxStub.asm 454 454 455 455 # The 32-bit BS3Kit library for 32-bit protected kernel+tss. … … 469 469 bs3-mode-TestDoModesStub.asm \ 470 470 bs3-mode-TestDoModesByOneStub.asm \ 471 bs3-mode-TestDoModesByMaxStub.asm \471 bs3-mode-TestDoModesByMaxStub.asm 472 472 473 473 # The v8086 BS3Kit library for 32-bit protected kernel+tss. … … 487 487 bs3-mode-TestDoModesStub.asm \ 488 488 bs3-mode-TestDoModesByOneStub.asm \ 489 bs3-mode-TestDoModesByMaxStub.asm \489 bs3-mode-TestDoModesByMaxStub.asm 490 490 491 491 # The 32-bit BS3Kit library for 16-bit paged protected kernel+tss. … … 519 519 bs3-mode-TestDoModesStub.asm \ 520 520 bs3-mode-TestDoModesByOneStub.asm \ 521 bs3-mode-TestDoModesByMaxStub.asm \521 bs3-mode-TestDoModesByMaxStub.asm 522 522 523 523 # The v8086 BS3Kit library for 32-bit paged protected kernel+tss. … … 538 538 bs3-mode-TestDoModesStub.asm \ 539 539 bs3-mode-TestDoModesByOneStub.asm \ 540 bs3-mode-TestDoModesByMaxStub.asm \540 bs3-mode-TestDoModesByMaxStub.asm 541 541 542 542 # The 16-bit BS3Kit library for 16-bit PAE paged protected kernel+tss. … … 569 569 bs3-mode-TestDoModesStub.asm \ 570 570 bs3-mode-TestDoModesByOneStub.asm \ 571 bs3-mode-TestDoModesByMaxStub.asm \571 bs3-mode-TestDoModesByMaxStub.asm 572 572 573 573 # The v8086 BS3Kit library for 32-bit PAE paged protected kernel+tss. … … 587 587 bs3-mode-TestDoModesStub.asm \ 588 588 bs3-mode-TestDoModesByOneStub.asm \ 589 bs3-mode-TestDoModesByMaxStub.asm \589 bs3-mode-TestDoModesByMaxStub.asm 590 590 591 591 # The 32-bit long mode BS3Kit library. … … 754 754 755 755 bs3kit-update:: bs3kit-autostubs.kmk bs3kit-mangling-code-define.h bs3kit-mangling-code-undef.h 756 .NOTPARALLEL: 756 .NOTPARALLEL: bs3kit-autostubs.kmk bs3kit-mangling-code-define.h bs3kit-mangling-code-undef.h 757 757 758 758 -
trunk/src/VBox/ValidationKit/common/Makefile.kmk
r98103 r98418 69 69 VBOX_VALIDATIONKIT_PYTHON_SOURCES += \ 70 70 $(wildcard \ 71 72 73 71 $(PATH_SUB_CURRENT)/*.py \ 72 $(PATH_SUB_CURRENT)/*/*.py \ 73 ) 74 74 75 75 $(evalcall def_vbox_validationkit_process_python_sources) -
trunk/src/VBox/ValidationKit/docs/Makefile.kmk
r98103 r98418 48 48 endif 49 49 endif 50 if1of ($(KBUILD_HOST), win)50 if1of ($(KBUILD_HOST), win) 51 51 VBOX_RST2HTML := $(VBOX_BLD_PYTHON) $(VBOX_RST2HTML) 52 52 endif … … 54 54 55 55 GENERATED_FILES = \ 56 57 58 59 56 AutomaticTestingRevamp.html \ 57 VBoxValidationKitReadMe.html \ 58 VBoxAudioValidationKitReadMe.html \ 59 TestBoxImaging.html 60 60 61 61 all: $(GENERATED_FILES) -
trunk/src/VBox/ValidationKit/testboxscript/Makefile.kmk
r98103 r98418 64 64 linux/testboxscript-service.sh=>linux/testboxscript-service.sh 65 65 testboxscript_SOURCES.linux = \ 66 66 ../../Installer/linux/routines.sh=>linux/setup-installer-routines.sh \ 67 67 linux/setup-routines.sh=>linux/setup-routines.sh 68 68 69 69 testboxscript_SOURCES.solaris = \ 70 solaris/setup-routines.sh=>solaris/setup-routines.sh \70 solaris/setup-routines.sh=>solaris/setup-routines.sh 71 71 72 72 testboxscript_SOURCES.win = \ -
trunk/src/VBox/ValidationKit/tests/api/Makefile.kmk
r98078 r98418 54 54 ifndef VBOX_OSE 55 55 ValidationKitTestsApi_EXEC_SOURCES += \ 56 $(PATH_SUB_CURRENT)/tdCloud1.py \57 $(PATH_SUB_CURRENT)/tdOciConnection1.py \56 $(PATH_SUB_CURRENT)/tdCloud1.py \ 57 $(PATH_SUB_CURRENT)/tdOciConnection1.py \ 58 58 $(PATH_SUB_CURRENT)/tdOciExport1.py \ 59 $(PATH_SUB_CURRENT)/tdOciImage1.py \59 $(PATH_SUB_CURRENT)/tdOciImage1.py \ 60 60 $(PATH_SUB_CURRENT)/tdOciImport1.py \ 61 $(PATH_SUB_CURRENT)/tdOciInstance1.py \61 $(PATH_SUB_CURRENT)/tdOciInstance1.py \ 62 62 $(PATH_SUB_CURRENT)/tdOciProfile1.py 63 63 endif 64 64 ValidationKitTestsApi_SOURCES := \ 65 65 $(wildcard \ 66 67 66 $(PATH_SUB_CURRENT)/*.ova \ 67 ) 68 68 69 69 VBOX_VALIDATIONKIT_PYTHON_SOURCES += $(ValidationKitTestsApi_EXEC_SOURCES) -
trunk/src/VBox/ValidationKit/utils/TestExecServ/Makefile.kmk
r98103 r98418 42 42 TestExecService_TEMPLATE = VBoxValidationKitR3 43 43 ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING 44 TestExecService_DEFS = \45 KBUILD_TARGET="$(KBUILD_TARGET)" \46 KBUILD_TARGET_ARCH="$(KBUILD_TARGET_ARCH)"44 TestExecService_DEFS = \ 45 KBUILD_TARGET="$(KBUILD_TARGET)" \ 46 KBUILD_TARGET_ARCH="$(KBUILD_TARGET_ARCH)" 47 47 else 48 TestExecService_DEFS = \49 KBUILD_TARGET=\"$(KBUILD_TARGET)\" \50 KBUILD_TARGET_ARCH=\"$(KBUILD_TARGET_ARCH)\"48 TestExecService_DEFS = \ 49 KBUILD_TARGET=\"$(KBUILD_TARGET)\" \ 50 KBUILD_TARGET_ARCH=\"$(KBUILD_TARGET_ARCH)\" 51 51 endif 52 52 TestExecService_SOURCES = \ … … 55 55 56 56 ifn1of ($(KBUILD_TARGET), os2) 57 TestExecService_SOURCES += \57 TestExecService_SOURCES += \ 58 58 TestExecServiceSerial.cpp 59 59 endif -
trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk
r98255 r98418 64 64 endif 65 65 endif 66 if 67 68 69 66 if defined(VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST) \ 67 && defined(VBOX_WITH_ADDITIONS) \ 68 && !defined(VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER) \ 69 && (defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_BUILD)) 70 70 PROGRAMS += vkatadd 71 71 endif … … 200 200 201 201 202 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK) \202 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK) \ 203 203 && 0 ## @todo r=bird: Disabled because nobody really wants or needs to run this during build other than Andy. 204 204 ## And more importantly, it breaks the build (os2, bsd*). 205 205 206 206 PROGRAMS += tstVkatHostSelftest -
trunk/src/VBox/ValidationKit/utils/clipboard/Makefile.kmk
r98103 r98418 45 45 ClipUtil_SOURCES = ClipUtil.cpp 46 46 ifn1of ($(KBUILD_TARGET), darwin os2 win) 47 ClipUtil_LIBPATH= $(VBOX_LIBPATH_X11)48 ClipUtil_LIBS= X11 Xmu47 ClipUtil_LIBPATH = $(VBOX_LIBPATH_X11) 48 ClipUtil_LIBS = X11 Xmu 49 49 endif 50 50 -
trunk/src/VBox/ValidationKit/utils/cpu/Makefile.kmk
r98103 r98418 60 60 if1of ($(KBUILD_TARGET_ARCH), x86 amd64) 61 61 ifneq ($(KBUILD_HOST),os2) 62 PROGRAMS += cidet-app62 PROGRAMS += cidet-app 63 63 endif 64 64 cidet-app_TEMPLATE = VBoxValidationKitR3 -
trunk/src/VBox/ValidationKit/utils/misc/Makefile.kmk
r98255 r98418 42 42 # 43 43 PROGRAMS += LoadGenerator 44 if1of ($(KBUILD_TARGET_ARCH), amd64)44 if1of ($(KBUILD_TARGET_ARCH), amd64) 45 45 ifdef VBOX_WITH_R0_MODULES 46 46 ifdef VBOX_WITH_VBOXR0_AS_DLL 47 DLLS+= loadgeneratorR047 DLLS += loadgeneratorR0 48 48 else 49 SYSMODS += loadgeneratorR049 SYSMODS += loadgeneratorR0 50 50 endif 51 loadgeneratorR0_TEMPLATE := VBoxValidationKitR052 loadgeneratorR0_SOURCES:= loadgeneratorR0.cpp51 loadgeneratorR0_TEMPLATE := VBoxValidationKitR0 52 loadgeneratorR0_SOURCES := loadgeneratorR0.cpp 53 53 endif 54 LoadGenerator_TEMPLATE := VBoxValidationKitR3SupDrv55 LoadGenerator_DEFS:= WITH_IPI_LOAD_GEN54 LoadGenerator_TEMPLATE := VBoxValidationKitR3SupDrv 55 LoadGenerator_DEFS := WITH_IPI_LOAD_GEN 56 56 else 57 LoadGenerator_TEMPLATE := VBoxValidationKitR357 LoadGenerator_TEMPLATE := VBoxValidationKitR3 58 58 endif 59 59 LoadGenerator_SOURCES := loadgenerator.cpp
Note:
See TracChangeset
for help on using the changeset viewer.
