Changeset 58750 in vbox

Timestamp:

Nov 18, 2015 8:31:38 PM (9 years ago)

Author:

vboxsync

Message:

iprt/asmdefs.mac,bs3kit: Added RT_ASMDEFS_INC_FIRST_FILE so I can redefine macros used by IPRT assembly code and use it in bs3kit.

Location:

trunk

Files:

• include/iprt/asmdefs.mac (modified) (1 diff)
• src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk (modified) (4 diffs)
• src/VBox/ValidationKit/bootsectors/bs3kit/asmdefs-first.mac (added)
• src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h (modified) (4 diffs)
• src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.mac (modified) (1 diff)

trunk/include/iprt/asmdefs.mac

@@ -23 +23 @@
 ; terms and conditions of either the GPL or the CDDL or both.
 ;
+
+; Special hack for bs3kit.
+%ifdef RT_ASMDEFS_INC_FIRST_FILE
+ %include "asmdefs-first.mac"
+%endif
 
 %ifndef ___iprt_asmdefs_mac

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

@@ -382 +382 @@
         bs3-cmn-TestSendStrCmd.asm \
         bs3-cmn-TestIsVmmDevTestingPresent.asm \
+       ../../../Runtime/common/asm/ASMBitFirstClear.asm
 
 # The BS3Kit library.
@@ -387 +388 @@
 bs3kit-common-16_TEMPLATE = VBoxBS3KitImg
 bs3kit-common-16_DEFS     = TMPL_PE16 BS3_CMN_ONLY
+bs3kit-common-16_ASDEFS   = RT_ASMDEFS_INC_FIRST_FILE
 bs3kit-common-16_SOURCES  = $(VBOX_BS3KIT_COMMON_SOURCES) \
         bs3-system-data.asm
@@ -394 +396 @@
 bs3kit-common-32_TEMPLATE = VBoxBS3KitImg32
 bs3kit-common-32_DEFS     = TMPL_PE32 BS3_CMN_ONLY
+bs3kit-common-32_ASDEFS   = RT_ASMDEFS_INC_FIRST_FILE
 bs3kit-common-32_SOURCES  = $(VBOX_BS3KIT_COMMON_SOURCES)
 
@@ -400 +403 @@
 bs3kit-common-64-asm_TEMPLATE = VBoxBS3KitImg64
 bs3kit-common-64-asm_DEFS     = TMPL_LM64 BS3_CMN_ONLY
+bs3kit-common-64-asm_ASDEFS   = RT_ASMDEFS_INC_FIRST_FILE
 bs3kit-common-64-asm_SOURCES  = $(filter %.asm,$(VBOX_BS3KIT_COMMON_SOURCES))
 

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

@@ -36 +36 @@
 # undef  IN_RING0
 #endif
+
+/*
+ * We may want to reuse some IPRT code in the common name space, so we
+ * redefine the RT_MANGLER to work like BS3_CMN_NM.  (We cannot use
+ * BS3_CMN_NM yet, as we need to include IPRT headers with function
+ * declarations before we can define it. Thus the duplciate effort.)
+ */
+#define RT_MANGLER(a_Name) RT_CONCAT3(a_Name,_c,ARCH_BITS)
+#include <iprt/mangling.h>
 #include <iprt/x86.h>
+
+
 
 RT_C_DECLS_BEGIN
@@ -335 +346 @@
 # define BS3_DATA_NM(a_Name)  a_Name
 #endif
+
 
 /**
@@ -387 +399 @@
 
 
+
 /** @defgroup grp_bs3kit_system System structures
  * @{ */
@@ -1181 +1194 @@
 RT_C_DECLS_END
 
-#endif
-
+
+#endif
+

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

@@ -32 +32 @@
 ; If we don't do the latter we end up with an unused 'text' section.
 ;
+
+; Drop the asmdefs-first.mac header for native bs3kit files.
+%undef RT_ASMDEFS_INC_FIRST_FILE
 
 ;; Wrapper around BITS.