Changeset 60578 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Timestamp:

Apr 19, 2016 3:26:34 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: made it easier to move 16-bit templated C code to other segments.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (2 diffs)
• bs3-cmn-instantiate-x0.c16 (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-instantiate.c16 ) (2 diffs)
• bs3-cmn-instantiate-x1.c16 (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-instantiate.c16 ) (2 diffs)
• bs3-mode-SwitchToLM64.asm (modified) (1 diff)
• bs3-mode-TestDoModes.c (modified) (1 diff)
• bs3-rm-InitAll.c (modified) (1 diff)
• bs3-rm-InitGdt.c (modified) (1 diff)
• bs3-rm-InitMemory.c (modified) (1 diff)
• bs3kit-mangling-code.h (modified) (1 diff)
• bs3kit.h (modified) (6 diffs)

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

@@ -201 +201 @@
         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_FUNCTIONS := \
+bs3kit-common-16_VBOX_NEAR_TO_FAR_CMN_FUNCTIONS := \
         $(sort $(subst bs3-cmn-,Bs3,$(basename $(filter-out \
                 %Data.c \
@@ -221 +221 @@
         Bs3TrapInit \
 
-$(call BS3KIT_FN_GEN_NEARSTUBS,bs3kit-common-16,$(bs3kit-common-16_VBOX_NEAR_TO_FAR_FUNCTIONS))
+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))
 
 # The 32-bit BS3Kit library.

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-instantiate-x0.c16

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * BS3Kit - 16-bit common C template instantiator.
+ * BS3Kit - 16-bit common C template instantiator, using the BS3X0TEXT16 segment.
  */
 
@@ -25 +25 @@
  */
 
-
+#define BS3_USE_X0_TEXT_SEG 1
 #include "bs3-cmn-instantiate-common.h"
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-instantiate-x1.c16

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * BS3Kit - 16-bit common C template instantiator.
+ * BS3Kit - 16-bit common C template instantiator, using the BS3X1TEXT16 segment.
  */
 
@@ -25 +25 @@
  */
 
-
+#define BS3_USE_X1_TEXT_SEG 1
 #include "bs3-cmn-instantiate-common.h"
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-SwitchToLM64.asm

@@ -41 +41 @@
 ; @remarks  Does not require 20h of parameter scratch space in 64-bit mode.
 ;
-BS3_GLOBAL_NAME_EX TMPL_NM(Bs3SwitchToLM16_Safe), function, 0
+BS3_GLOBAL_NAME_EX TMPL_NM(Bs3SwitchToLM64_Safe), function, 0
 BS3_PROC_BEGIN_MODE Bs3SwitchToLM64, BS3_PBC_NEAR
 %ifdef TMPL_LM64

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-TestDoModes.c

@@ -25 +25 @@
  */
 
-/** @todo get this mess into the RM segment! */
-
 
 /*********************************************************************************************************************************
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#if defined(__WATCOMC__) && TMPL_MODE == BS3_MODE_RM
-/* In real mode we move this blob of code to the RMTEXT16 segment to save space. */
-# define BS3_USE_RM_TEXT_SEG 1
+#if TMPL_MODE == BS3_MODE_RM
+# define BS3_USE_RM_TEXT_SEG 1 /* Real mode version in RMTEXT16 segment to save space. */
 # include "bs3kit-template-header.h"
 # include "bs3-cmn-test.h"
-# pragma code_seg("BS3RMTEXT16", "BS3CLASS16RMCODE")
 #else
 # include "bs3kit-template-header.h"

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitAll.c

@@ -34 +34 @@
 #include <iprt/asm-amd64-x86.h>
 
-//#ifdef __WATCOMC__
-//# pragma code_seg("BS3RMTEXT16", "BS3CLASS16RMCODE")
-//#endif
-
 
 BS3_DECL(void) Bs3InitAll_rm(void)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitGdt.c

@@ -32 +32 @@
 #include <iprt/asm.h>
 
-#ifdef __WATCOMC__
-# pragma code_seg("BS3RMTEXT16", "BS3CLASS16RMCODE")
-#endif
-
 
 /*********************************************************************************************************************************

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitMemory.c

@@ -32 +32 @@
 #include "bs3-cmn-memory.h"
 #include <iprt/asm.h>
-
-#ifdef __WATCOMC__
-# pragma code_seg("BS3RMTEXT16", "BS3CLASS16RMCODE")
-#endif
 
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code.h

@@ -30 +30 @@
  */
 #undef BS3_CMN_MANGLER
-#if ARCH_BITS != 16 || !defined(BS3_USE_RM_TEXT_SEG)
+#if ARCH_BITS != 16 || !defined(BS3_USE_ALT_16BIT_TEXT_SEG)
 # define BS3_CMN_MANGLER(a_Function)            BS3_CMN_NM(a_Function)
 #else

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

@@ -49 +49 @@
 #endif
 
+/** @def BS3_USE_ALT_16BIT_TEXT_SEG
+ * Combines the BS3_USE_RM_TEXT_SEG,  BS3_USE_X0_TEXT_SEG, and
+ * BS3_USE_X1_TEXT_SEG indicators into a single one. */
+#if defined(BS3_USE_RM_TEXT_SEG) || defined(BS3_USE_X0_TEXT_SEG) || defined(BS3_USE_X1_TEXT_SEG)
+# define BS3_USE_ALT_16BIT_TEXT_SEG
+#else
+# undef  BS3_USE_ALT_16BIT_TEXT_SEG
+#endif
+
 /*
  * We may want to reuse some IPRT code in the common name space, so we
@@ -55 +64 @@
  * declarations before we can define it. Thus the duplciate effort.)
  */
-#if ARCH_BITS != 16 || !defined(BS3_USE_RM_TEXT_SEG)
+#if ARCH_BITS != 16 || !defined(BS3_USE_ALT_16BIT_TEXT_SEG)
 # define RT_MANGLER(a_Name) RT_CONCAT3(a_Name,_c,ARCH_BITS)
 #else
 # define RT_MANGLER(a_Name) RT_CONCAT(a_Name,_f16)
+# undef RTCALL
+# define RTCALL __cdecl __far
 #endif
 #include <iprt/mangling.h>
@@ -509 +520 @@
  *
  * @param a_Type        The return type. */
-#if ARCH_BITS != 16 || !defined(BS3_USE_RM_TEXT_SEG)
+#if ARCH_BITS != 16 || !defined(BS3_USE_ALT_16BIT_TEXT_SEG)
 # define BS3_DECL(a_Type)  BS3_DECL_NEAR(a_Type)
 #else
@@ -576 +587 @@
  * Constructs a common function name, far or near as defined by the source.
  *
- * Which to use in 16-bit mode is defined by BS3_USE_RM_TEXT_SEG.  In 32-bit and
- * 64-bit mode there are no far symbols, only near ones.
+ * Which to use in 16-bit mode is defined by BS3_USE_ALT_16BIT_TEXT_SEG.  In
+ * 32-bit and 64-bit mode there are no far symbols, only near ones.
  *
  * Example: BS3_CMN_FN_NM(Bs3Shutdown)
@@ -583 +594 @@
  * @param   a_Name      The name of the function.
  */
-#if ARCH_BITS != 16 || !defined(BS3_USE_RM_TEXT_SEG)
+#if ARCH_BITS != 16 || !defined(BS3_USE_ALT_16BIT_TEXT_SEG)
 # define BS3_CMN_FN_NM(a_Name)  BS3_CMN_NM(a_Name)
 #else
@@ -2687 +2698 @@
 #include "bs3kit-mangling-code.h"
 
-
-#endif
-
+/*
+ * Change 16-bit text segment if requested.
+ */
+#if defined(BS3_USE_ALT_16BIT_TEXT_SEG) && ARCH_BITS == 16 && !defined(BS3_DONT_CHANGE_TEXT_SEG)
+# if (defined(BS3_USE_RM_TEXT_SEG) + defined(BS3_USE_X0_TEXT_SEG) + defined(BS3_USE_X1_TEXT_SEG)) != 1
+#  error "Cannot set more than one alternative 16-bit text segment!"
+# elif defined(BS3_USE_RM_TEXT_SEG)
+#  pragma code_seg("BS3RMTEXT16", "BS3CLASS16RMCODE")
+# elif defined(BS3_USE_X0_TEXT_SEG)
+#  pragma code_seg("BS3X0TEXT16", "BS3CLASS16X0CODE")
+# elif defined(BS3_USE_X1_TEXT_SEG)
+#  pragma code_seg("BS3X1TEXT16", "BS3CLASS16X1CODE")
+# else
+#  error "Huh? Which alternative text segment did you want again?"
+# endif
+#endif
+
+#endif
+