Changeset 58799 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Nov 20, 2015 2:16:17 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: Early printf.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (5 diffs)
• bs3-cmn-PrintF.c (added)
• bs3-cmn-hexdigits.c (added)
• bs3-first-rm.asm (modified) (1 diff)
• bs3-shutdown.c (modified) (1 diff)
• bs3kit.h (modified) (2 diffs)

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

@@ -117 +117 @@
 
 #
-# VCC elf cross compiling 64-bit gcc (mac): sudo port install x86_64-elf-gcc
+# Visual C++ tool variant that runs the object converter afterwards.
 #
 TOOL_Bs3Vcc64 := Visual C++ 64-bit
@@ -153 +153 @@
 define TOOL_Bs3Vcc64_COMPILE_CXX_CMDS
 $(TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_COMPILE_CXX_CMDS)
+        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET)  "$(obj)"
+endef
+
+#
+# 32-bit OpenWatcom C/C++ tool variant that runs the object converter afterwards
+# to rename intrinsic functions so they don't clash with the 16-bit compiler.
+#
+TOOL_Bs3Ow32 := Visual C++ 64-bit
+TOOL_Bs3Ow32_CC  = $(TOOL_OPENWATCOM_CC)
+TOOL_Bs3Ow32_CXX = $(TOOL_OPENWATCOM_CXX)
+TOOL_Bs3Ow32_COBJSUFF                 = $(TOOL_OPENWATCOM_COBJSUFF)
+TOOL_Bs3Ow32_CFLAGS                   = $(TOOL_OPENWATCOM_CFLAGS)
+TOOL_Bs3Ow32_CFLAGS.debug             = $(TOOL_OPENWATCOM_CFLAGS.debug)
+TOOL_Bs3Ow32_CFLAGS.dbgopt            = $(TOOL_OPENWATCOM_CFLAGS.dbgopt)
+TOOL_Bs3Ow32_CFLAGS.profile           = $(TOOL_OPENWATCOM_CFLAGS.profile)
+TOOL_Bs3Ow32_CFLAGS.release           = $(TOOL_OPENWATCOM_CFLAGS.release)
+TOOL_Bs3Ow32_CINCS                    = $(TOOL_OPENWATCOM_CINCS)
+TOOL_Bs3Ow32_CDEFS                    =
+TOOL_Bs3Ow32_COMPILE_C_DEPEND         = $(TOOL_OPENWATCOM_COMPILE_C_DEPEND) $(VBoxBs3ObjConverter_1_TARGET)
+TOOL_Bs3Ow32_COMPILE_C_DEPORD         = $(TOOL_OPENWATCOM_COMPILE_C_DEPORD)
+TOOL_Bs3Ow32_COMPILE_C_OUTPUT         = $(TOOL_OPENWATCOM_COMPILE_C_OUTPUT)
+TOOL_Bs3Ow32_COMPILE_C_OUTPUT_MAYBE   = $(TOOL_OPENWATCOM_COMPILE_C_OUTPUT_MAYBE)
+define TOOL_Bs3Ow32_COMPILE_C_CMDS
+$(TOOL_OPENWATCOM_COMPILE_C_CMDS)
+#       $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
+endef
+
+TOOL_Bs3Ow32_CXXOBJSUFF               = $(TOOL_OPENWATCOM_CXXOBJSUFF)
+TOOL_Bs3Ow32_CXXFLAGS                 = $(TOOL_OPENWATCOM_CXXFLAGS)
+TOOL_Bs3Ow32_CXXFLAGS.debug           = $(TOOL_OPENWATCOM_CXXFLAGS.debug)
+TOOL_Bs3Ow32_CXXFLAGS.dbgopt          = $(TOOL_OPENWATCOM_CXXFLAGS.dbgopt)
+TOOL_Bs3Ow32_CXXFLAGS.profile         = $(TOOL_OPENWATCOM_CXXFLAGS.profile)
+TOOL_Bs3Ow32_CXXFLAGS.release         = $(TOOL_OPENWATCOM_CXXFLAGS.release)
+TOOL_Bs3Ow32_CXXINCS                  = $(TOOL_OPENWATCOM_CXXINCS)
+TOOL_Bs3Ow32_CXXDEFS                  =
+TOOL_Bs3Ow32_COMPILE_CXX_DEPEND       = $(TOOL_OPENWATCOM_COMPILE_CXX_DEPEND) $(VBoxBs3ObjConverter_1_TARGET)
+TOOL_Bs3Ow32_COMPILE_CXX_DEPORD       = $(TOOL_OPENWATCOM_COMPILE_CXX_DEPORD)
+TOOL_Bs3Ow32_COMPILE_CXX_OUTPUT       = $(TOOL_OPENWATCOM_COMPILE_CXX_OUTPUT)
+TOOL_Bs3Ow32_COMPILE_CXX_OUTPUT_MAYBE = $(TOOL_OPENWATCOM_COMPILE_CXX_OUTPUT_MAYBE)
+define TOOL_Bs3Ow32_COMPILE_CXX_CMDS
+$(TOOL_OPENWATCOM_COMPILE_CXX_CMDS)
         $(QUIET)$(VBoxBs3ObjConverter_1_TARGET)  "$(obj)"
 endef
@@ -296 +337 @@
 TEMPLATE_VBoxBS3KitImg32_DEFS         = ARCH_BITS=32 IN_BS3KIT
 TEMPLATE_VBoxBS3KitImg32_ARTOOL       = OPENWATCOM
-TEMPLATE_VBoxBS3KitImg32_CTOOL        = OPENWATCOM
-TEMPLATE_VBoxBS3KitImg32_CXXTOOL      = OPENWATCOM
+TEMPLATE_VBoxBS3KitImg32_CTOOL        = Bs3Ow32
+TEMPLATE_VBoxBS3KitImg32_CXXTOOL      = Bs3Ow32
 TEMPLATE_VBoxBS3KitImg32_CFLAGS       = \
         -nt=BS3TEXT32 -nd=BS3DATA32 -nc=BS3CODE32 -ecc -q -wx -zl -mf $(BS3_OW_DBG_OPT) -d1 -s -oa -ob -of -oi -ol -or -os
@@ -363 +404 @@
         bs3-cmn-Panic.asm \
         bs3-cmn-PrintChr.asm \
+        bs3-cmn-PrintF.c \
         bs3-cmn-PrintU32.asm \
         bs3-cmn-PrintX32.asm \
@@ -403 +445 @@
 bs3kit-common-16_SOURCES  = $(VBOX_BS3KIT_COMMON_SOURCES) \
         bs3-system-data.asm \
-        bs3-rm-InitMemory.c
+        bs3-rm-InitMemory.c \
+        bs3-cmn-hexdigits.c
 
 # The 32-bit BS3Kit library.

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-first-rm.asm

@@ -141 +141 @@
 extern BS3_CMN_NM(Bs3Shutdown)
 extern NAME(Main_rm)
+extern _Bs3PrintF_c32
 
 BS3_BEGIN_SYSTEM16

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-shutdown.c

@@ -22 +22 @@
 Bs3PrintX32(UINT32_C(0xfdb97531));
 Bs3PrintStr("\r\n");
+
+Bs3PrintF("Bs3PrintF: RX32=%RX32\n", UINT32_C(0xfdb97531));
 
 pvTmp2 = Bs3MemAlloc(BS3MEMKIND_REAL, _4K);

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -642 +642 @@
 
 
+/** Lower case hex digits. */
+extern char const BS3_DATA_NM(g_achBs3HexDigits)[16+1];
+/** Upper case hex digits. */
+extern char const BS3_DATA_NM(g_achBs3HexDigitsUpper)[16+1];
+
+
 #ifdef __WATCOMC__
 /**
@@ -931 +937 @@
 
 /**
+ * Converts a 64-bit unsigned integer to a string.
+ *
+ * @returns The length for the formatted string.
+ * @param   pszDst      The destination buffer.  Caller is responsible for
+ *                      ensuring sufficient space.
+ * @param   uValue      The 64-bit value.
+ * @param   uBase       The base to format the number in: 2, 8,10 or 16.
+ */
+BS3_DECL(size_t) Bs3FormatU64_c16(char BS3_FAR *pszDst, uint64_t uValue, unsigned uBase);
+BS3_DECL(size_t) Bs3FormatU64_c32(char BS3_FAR *pszDst, uint64_t uValue, unsigned uBase); /**< @copydoc Bs3FormatU64_c16 */
+BS3_DECL(size_t) Bs3FormatU64_c64(char BS3_FAR *pszDst, uint64_t uValue, unsigned uBase); /**< @copydoc Bs3FormatU64_c16 */
+#define Bs3FormatU64 BS3_CMN_NM(Bs3FormatU64) /**< Selects #Bs3FormatU64_c16, #Bs3FormatU64_c32 or #Bs3FormatU64_c64. */
+
+/**
  * Formats and prints a string to the screen.
  *