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

Timestamp:

Oct 21, 2024 12:28:40 PM (4 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165395

Message:

IPRT: Sort out export/import trouble with 'inline-assembly' functions implemented in C++ on windows by introducing a RT_DECL_ASM() macro that combines RTDECL with DECLASM. [build fix] jiraref:VBP-1171

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• Config.kmk (modified) (4 diffs)
• bs3kit/asmdefs-first.mac (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -651 +651 @@
         BS3CLASS16CODE=$(BS3KIT_CLASS_CODE16) BS3KIT_CLASS_DATA16=$(BS3KIT_CLASS_DATA16) \
         BS3KIT_GRPNM_DATA16=$(BS3KIT_GRPNM_DATA16) BS3KIT_CLASS_BSS16=$(BS3KIT_CLASS_BSS16)
-TEMPLATE_VBoxBS3KitImg_DEFS         = IN_BS3KIT IPRT_NO_CRT
+TEMPLATE_VBoxBS3KitImg_DEFS         = IN_BS3KIT IPRT_NO_CRT IN_RT_R0 IN_RT_STATIC
 TEMPLATE_VBoxBS3KitImg_DEFS.debug   = BS3_STRICT
 
@@ -821 +821 @@
 TEMPLATE_VBoxBS3KitImgBig = Template for building BS3Kit test images with high 32-bit & 64-bit code
 TEMPLATE_VBoxBS3KitImgBig_EXTENDS     = VBoxBS3KitImg
-TEMPLATE_VBoxBS3KitImgBig_DEFS        = $(TEMPLATE_VBoxBS3KitImg_DEFS) BS3_BIG_IMAGE  BS3_TEXT32_ABOVE_1M BS3_TEXT64_ABOVE_1M
+TEMPLATE_VBoxBS3KitImgBig_DEFS        = $(TEMPLATE_VBoxBS3KitImg_DEFS) BS3_BIG_IMAGE BS3_TEXT32_ABOVE_1M BS3_TEXT64_ABOVE_1M
 #TEMPLATE_VBoxBS3KitImgBig_LDFLAGS     = \
 #       $(subst BS3CLASS32CODE, BS3CLASS32CODE segaddr=0xa000$(SP), $(TEMPLATE_VBoxBS3KitImg_LDFLAGS))
@@ -930 +930 @@
         BS3CLASS16CODE=$(BS3KIT_CLASS_CODE16) BS3KIT_CLASS_DATA16=$(BS3KIT_CLASS_DATA16) \
         BS3KIT_GRPNM_DATA16=$(BS3KIT_GRPNM_DATA16) BS3KIT_CLASS_BSS16=$(BS3KIT_CLASS_BSS16)
-TEMPLATE_VBoxBS3KitImg32_DEFS         = ARCH_BITS=32 IN_BS3KIT IPRT_NO_CRT
+TEMPLATE_VBoxBS3KitImg32_DEFS         = ARCH_BITS=32 IN_BS3KIT IPRT_NO_CRT IN_RT_R0 IN_RT_STATIC
 TEMPLATE_VBoxBS3KitImg32_DEFS.debug   = BS3_STRICT
 TEMPLATE_VBoxBS3KitImg32_ARTOOL       = Bs3Ow16
@@ -953 +953 @@
         BS3CLASS16CODE=$(BS3KIT_CLASS_CODE16) BS3KIT_CLASS_DATA16=$(BS3KIT_CLASS_DATA16) \
         BS3KIT_GRPNM_DATA16=$(BS3KIT_GRPNM_DATA16) BS3KIT_CLASS_BSS16=$(BS3KIT_CLASS_BSS16)
-TEMPLATE_VBoxBS3KitImg64_DEFS         = IN_BS3KIT ARCH_BITS=64 IPRT_NO_CRT
+TEMPLATE_VBoxBS3KitImg64_DEFS         = IN_BS3KIT ARCH_BITS=64 IPRT_NO_CRT IN_RT_R0 IN_RT_STATIC
 TEMPLATE_VBoxBS3KitImg64_DEFS.debug   = BS3_STRICT
 TEMPLATE_VBoxBS3KitImg64_ARTOOL       = Bs3Ow16

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/asmdefs-first.mac

@@ -50 +50 @@
 ;
 %define BEGINCODE               TMPL_BEGIN_TEXT
+%define BEGINPROC               BS3_BEGINPROC_WRAPPER
 %define BEGINPROC_EXPORTED      BS3_BEGINPROC_EXPORTED_WRAPPER
 %define ENDPROC                 BS3_PROC_END_CMN
 %undef  NAME
 %define NAME(a)                 BS3_CMN_NM(a)
+
+%macro BS3_BEGINPROC_WRAPPER          1-2 0 ; %2 is ignored as we don't do endbr32/64
+BS3_PROC_BEGIN_CMN %1, BS3_PBC_NEAR
+%endmacro
 
 %macro BS3_BEGINPROC_EXPORTED_WRAPPER 1-2 0 ; %2 is ignored as we don't do endbr32/64