Changeset 60585 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

Timestamp:

Apr 20, 2016 9:48:09 AM (9 years ago)

Author:

vboxsync

Message:

bs3kit: updates

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -157 +157 @@
        ../../../Runtime/common/asm/ASMSerializeInstruction-rdtscp.asm \
 
-#
-# We generate a list of files with 16-bit far functions for which we generate
-# near jump stubs.
-#
-#$(PATH_OUT_OBJ)/bs3kit-common-16-near-to-far.kmk.ts \
-#+| $(PATH_OUT_OBJ)/bs3kit-common-16-near-to-far.kmk: $(VBOX_PATH_BS3KIT_SRC)/bs3kit.h
-#       $(SED) \
-#               -n -e '/no-near-stub/d' \
-#               -e 's/^ *BS3_DECL(.*)  *\([a-zA-Z][a-zA-Z0-9_]*\)(.*[;,][^;]*$/\1/p' \
-#               --output $@ \
-#               bs3kit.h
-#       .$(CP_CHANGED) --changed -f -- $@ $(PATH_OUT_OBJ)/bs3kit-common-16-near-to-far.kmk
-#include $(PATH)
-
-
 # The 16-bit BS3Kit library.
 LIBRARIES += bs3kit-common-16
@@ -199 +184 @@
         bs3-wc16-I4D.asm \
        bs3-c16-Trap16Generic.asm \
+       bs3-c16-TrapRmV86Generic.asm \
+       bs3-c16-Trap16RmV86Data.asm \
+       bs3-c16-TrapRmV86Data.c \
         bs3-c16-CreateHybridFarRet.asm
 bs3kit-common-16_bs3-cmn-UInt64Div.c_CFLAGS = -oh -d0 # -d1+ vs -d0 saves 0x6a3-0x577 = 0x12C (300)!
-bs3kit-common-16_VBOX_NEAR_TO_FAR_CMN_FUNCTIONS := \
-        $(sort $(subst bs3-cmn-,Bs3,$(basename $(filter-out \
-                %Data.c \
-                bs3-rm-% \
-                bs3-cmn-hexdigits.c \
-        ,$(filter %.c,$(bs3kit-common-16_SOURCES)))))) \
-       Bs3PrintfV \
-       Bs3StrPrintfV \
-       Bs3TestPrintfV \
-       Bs3TestFailedF \
-       Bs3TestFailedV \
-       Bs3TestSkippedF \
-       Bs3TestSkippedV \
-       Bs3TestSubF \
-       Bs3TestSubV \
-       Bs3Trap16InitEx \
-
-bs3kit-common-16_VBOX_NEAR_TO_FAR_MODE_FUNCTIONS := \
-        Bs3TrapInit \
-
-bs3kit-common-16_VBOX_FAR_TO_NEAR_CMN_FUNCTIONS := \
-        ASMMemFirstMismatchingU8:8 \
-        ASMMemFirstNonZero:6 \
-
-$(call BS3KIT_FN_GEN_CMN_NEARSTUBS,bs3kit-common-16,$(bs3kit-common-16_VBOX_NEAR_TO_FAR_CMN_FUNCTIONS))
-$(call BS3KIT_FN_GEN_MODE_NEARSTUBS,bs3kit-common-16,$(bs3kit-common-16_VBOX_NEAR_TO_FAR_MODE_FUNCTIONS))
-$(call BS3KIT_FN_GEN_CMN_FARSTUBS,bs3kit-common-16,$(bs3kit-common-16_VBOX_FAR_TO_NEAR_CMN_FUNCTIONS))
+
+$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,ASMMemFirstMismatchingU8,8)
+$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,ASMMemFirstNonZero,6)
+-include $(PATH_SUB_CURRENT)/bs3kit-autostubs.kmk # manually generated from headers, see bottom of this file.
 
 # The 32-bit BS3Kit library.
@@ -488 +453 @@
 bs3kit-mangling-code-undef.h: $(PATH_SUB_CURRENT)/bs3kit-mangling-code-define.h
         $(SED) \
-                -e 's/#define \([a-zA-Z_][a-zA-Z0-9_]*\) .*$(DOLLAR)/#undef \1/' \
-        -e 's/Function needing mangling\./Undefining function mangling - automatically generated by the $@ makefile rule./' \
+                -e 's/#\( *\)define \([a-zA-Z_][a-zA-Z0-9_]*\) .*$(DOLLAR)/#\1undef \2/' \
+        -e 's/Function needing mangling.*$(DOLLAR)/Undefining function mangling - automatically generated by the $@ makefile rule./' \
         --output $(dir $<)bs3kit-mangling-code-undef.h \
                 $<
 
+#
+# Rule for regenerating bs3kit-mangling-functions-define.h.
+#
+bs3kit-mangling-code-define.h: \
+                $(PATH_SUB_CURRENT)/bs3kit.h \
+                $(PATH_SUB_CURRENT)/bs3-cmn-paging.h \
+                $(PATH_SUB_CURRENT)/bs3-cmn-test.h
+        $(APPEND) -tn "$(dir $<)$@" \
+                 '/* $(DOLLAR)Id: $(DOLLAR) */' \
+                 '/** @file' \
+                 ' * BS3Kit - Function needing mangling - generated by the $@ makefile rule.' \
+                 ' */' \
+                 '' \
+                 '/*' \
+                 ' * Copyright (C) 2007-2016 Oracle Corporation' \
+                 ' *' \
+                 ' * This file is part of VirtualBox Open Source Edition (OSE), as' \
+                 ' * available from http://www.virtualbox.org. This file is free software;' \
+                 ' * you can redistribute it and/or modify it under the terms of the GNU' \
+                 ' * General Public License (GPL) as published by the Free Software' \
+                 ' * Foundation, in version 2 as it comes in the "COPYING" file of the' \
+                 ' * VirtualBox OSE distribution. VirtualBox OSE is distributed in the' \
+                 ' * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.' \
+                 ' *' \
+                 ' * The contents of this file may alternatively be used under the terms' \
+                 ' * of the Common Development and Distribution License Version 1.0' \
+                 ' * (CDDL) only, as it comes in the "COPYING.CDDL" file of the' \
+                 ' * VirtualBox OSE distribution, in which case the provisions of the' \
+                 ' * CDDL are applicable instead of those of the GPL.' \
+                 ' *' \
+                 ' * You may elect to license modified versions of this file under the' \
+                 ' * terms and conditions of either the GPL or the CDDL or both.' \
+                 ' */' \
+                 ''
+        $(SED) -n \
+                -e 's/^ *BS3_CMN_PROTO_STUB([^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/#define \1 BS3_CMN_MANGLER(\1)/p' \
+                -e 's/^ *BS3_CMN_PROTO_NOSB([^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/#define \1 BS3_CMN_MANGLER(\1)/p' \
+                -e 's/^ *BS3_CMN_PROTO_FARSTUB([^,]*,[^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/#define \1 BS3_CMN_MANGLER(\1)/p' \
+                $< | sort >> "$(dir $<)bs3kit-mangling-code-define.h"
+        $(APPEND) -n "$(dir $<)$@" '#ifndef BS3_CMN_ONLY'
+        $(SED) -n \
+                -e 's/^ *BS3_MODE_PROTO_STUB([^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/# define \1 BS3_MODE_MANGLER(\1)/p' \
+                -e 's/^ *BS3_MODE_PROTO_NOSB([^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/# define \1 BS3_MODE_MANGLER(\1)/p' \
+                -e 's/^ *BS3_MODE_PROTO_FARSTUB([^,]*,[^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/# define \1 BS3_MODE_MANGLER(\1)/p' \
+                $< | sort >> "$(dir $<)bs3kit-mangling-code-define.h"
+        $(APPEND) -n "$(dir $<)$@" '#endif /* !BS3_CMN_ONLY */'
+
+#
+# Rule for regenerating bs3kit-autostubs.kmk.
+#
+bs3kit-autostubs.kmk: \
+                $(PATH_SUB_CURRENT)/bs3kit.h \
+                $(PATH_SUB_CURRENT)/bs3-cmn-memory.h \
+                $(PATH_SUB_CURRENT)/bs3-cmn-paging.h \
+                $(PATH_SUB_CURRENT)/bs3-cmn-test.h
+        $(APPEND) -tn "$(dir $<)$@" \
+                 '# $(DOLLAR)Id: $(DOLLAR)' \
+                 '## @file' \
+                 '# BS3Kit - Automatic near/far stubs - generated by the $@ makefile rule.' \
+                 '#' \
+                 '' \
+                 '#' \
+                 '# Copyright (C) 2007-2016 Oracle Corporation' \
+                 '#' \
+                 '# This file is part of VirtualBox Open Source Edition (OSE), as' \
+                 '# available from http://www.virtualbox.org. This file is free software;' \
+                 '# you can redistribute it and/or modify it under the terms of the GNU' \
+                 '# General Public License (GPL) as published by the Free Software' \
+                 '# Foundation, in version 2 as it comes in the "COPYING" file of the' \
+                 '# VirtualBox OSE distribution. VirtualBox OSE is distributed in the' \
+                 '# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.' \
+                 '#' \
+                 '# The contents of this file may alternatively be used under the terms' \
+                 '# of the Common Development and Distribution License Version 1.0' \
+                 '# (CDDL) only, as it comes in the "COPYING.CDDL" file of the' \
+                 '# VirtualBox OSE distribution, in which case the provisions of the' \
+                 '# CDDL are applicable instead of those of the GPL.' \
+                 '#' \
+                 '# You may elect to license modified versions of this file under the' \
+                 '# terms and conditions of either the GPL or the CDDL or both.' \
+                 '#' \
+                 ''
+        $(SED) -n \
+                -e '/^ *BS3_CMN_PROTO_STUB/p' \
+                -e '/^ *BS3_CMD_PROTO_FARSTUB/p' \
+                -e '/^ *BS3_MODE_PROTO_STUB/p' \
+                -e '/^ *BS3_MODE_PROTO_FARSTUB/p' \
+                $< \
+        | sort \
+        | $(SED) -n \
+                -e 's/^ *BS3_CMN_PROTO_STUB([^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/\$(DOLLAR)(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,\1)/p' \
+                -e 's/^ *BS3_MODE_PROTO_STUB([^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/\$(DOLLAR)(call BS3KIT_FN_GEN_MODE_NEARSTUB,bs3kit-common-16,\1)/p' \
+                -e 's/^ *BS3_CMN_PROTO_FARSTUB( *\([^,]*\),[^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/\$(DOLLAR)(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,\2,\1)/p' \
+                -e 's/^ *BS3_MODE_PROTO_FARSTUB( *\([^,]*\),[^,]*, *\([a-zA-Z_][a-zA-Z0-9_]*\) *,.*$(DOLLAR)/\$(DOLLAR)(call BS3KIT_FN_GEN_MODE_FARSTUB,bs3kit-common-16,\2,\1)/p' \
+                --append "$(dir $<)$@"
+
+bs3kit-update:: bs3kit-autostubs.kmk bs3kit-mangling-code-define.h bs3kit-mangling-code-undef.h
+.NOTPARALLEL:   bs3kit-autostubs.kmk bs3kit-mangling-code-define.h bs3kit-mangling-code-undef.h
+
 
 include $(FILE_KBUILD_SUB_FOOTER)