Changeset 106559 in vbox for trunk

Timestamp:

Oct 21, 2024 12:08:33 PM (6 months ago)

Author:

vboxsync

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

165393

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. jiraref:VBP-1171

Location:

trunk

Files:

• include/iprt/asm-math.h (modified) (1 diff)
• include/iprt/asm-mem.h (modified) (2 diffs)
• include/iprt/asm.h (modified) (4 diffs)
• include/iprt/cdefs.h (modified) (3 diffs)
• src/VBox/Runtime/common/asm/ASMBitFirstClear-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/common/asm/ASMBitFirstSet-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/common/asm/ASMBitNextClear-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/common/asm/ASMBitNextSet-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/common/asm/ASMMemFill32-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/common/asm/ASMMemFirstMismatchingU8-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/common/asm/ASMMemFirstNonZero-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/common/asm/ASMMemZero32-generic.cpp (modified) (1 diff)
• src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32-generic.cpp (modified) (1 diff)

trunk/include/iprt/asm-math.h

@@ -397 +397 @@
  */
 #if RT_INLINE_ASM_EXTERNAL || !defined(__GNUC__) || (!defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86))
-DECLASM(uint64_t) ASMMultU64ByU32DivByU32(uint64_t u64A, uint32_t u32B, uint32_t u32C);
+RT_DECL_ASM(uint64_t) ASMMultU64ByU32DivByU32(uint64_t u64A, uint32_t u32B, uint32_t u32C);
 #else
 DECLINLINE(uint64_t) ASMMultU64ByU32DivByU32(uint64_t u64A, uint32_t u32B, uint32_t u32C)

trunk/include/iprt/asm-mem.h

@@ -184 +184 @@
  */
 #if !defined(RDESKTOP) && (!defined(RT_OS_LINUX) || !defined(__KERNEL__))
-DECLASM(void RT_FAR *) ASMMemFirstNonZero(void const RT_FAR *pv, size_t cb) RT_NOTHROW_PROTO;
+RT_DECL_ASM(void RT_FAR *) ASMMemFirstNonZero(void const RT_FAR *pv, size_t cb) RT_NOTHROW_PROTO;
 #else
 DECLINLINE(void RT_FAR *) ASMMemFirstNonZero(void const RT_FAR *pv, size_t cb) RT_NOTHROW_DEF
@@ -233 +233 @@
 #if    (!defined(RT_OS_LINUX) || !defined(__KERNEL__)) \
     && (!defined(RT_OS_FREEBSD) || !defined(_KERNEL))
-DECLASM(void *) ASMMemFirstMismatchingU8(void const RT_FAR *pv, size_t cb, uint8_t u8) RT_NOTHROW_PROTO;
+RT_DECL_ASM(void *) ASMMemFirstMismatchingU8(void const RT_FAR *pv, size_t cb, uint8_t u8) RT_NOTHROW_PROTO;
 #else
 DECLINLINE(void *) ASMMemFirstMismatchingU8(void const RT_FAR *pv, size_t cb, uint8_t u8) RT_NOTHROW_DEF

trunk/include/iprt/asm.h

@@ -7804 +7804 @@
  */
 #if RT_INLINE_ASM_EXTERNAL || (!defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86))
-DECLASM(int32_t) ASMBitFirstClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_PROTO;
+RT_DECL_ASM(int32_t) ASMBitFirstClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_PROTO;
 #else
 DECLINLINE(int32_t) ASMBitFirstClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_DEF
@@ -7891 +7891 @@
  */
 #if RT_INLINE_ASM_EXTERNAL || (!defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86))
-DECLASM(int) ASMBitNextClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_PROTO;
+RT_DECL_ASM(int) ASMBitNextClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_PROTO;
 #else
 DECLINLINE(int) ASMBitNextClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_DEF
@@ -7961 +7961 @@
  */
 #if RT_INLINE_ASM_EXTERNAL || (!defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86))
-DECLASM(int32_t) ASMBitFirstSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_PROTO;
+RT_DECL_ASM(int32_t) ASMBitFirstSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_PROTO;
 #else
 DECLINLINE(int32_t) ASMBitFirstSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_DEF
@@ -8047 +8047 @@
  */
 #if RT_INLINE_ASM_EXTERNAL || (!defined(RT_ARCH_AMD64) && !defined(RT_ARCH_X86))
-DECLASM(int) ASMBitNextSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_PROTO;
+RT_DECL_ASM(int) ASMBitNextSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_PROTO;
 #else
 DECLINLINE(int) ASMBitNextSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_DEF

trunk/include/iprt/cdefs.h

@@ -1708 +1708 @@
 #endif
 
+/** @def DECL_EXTERN_C
+ * Prepends an 'extern "C"' in C++ code.
+ * @param   a_RetTypeExpr   The return type, calling convention, function
+ *                          attributes, and whatnot expression of the function
+ *                          declaration.
+ */
+#ifdef __cplusplus
+# define DECL_EXTERN_C(a_RetTypeExpr)   extern "C" a_RetTypeExpr
+#else
+# define DECL_EXTERN_C(a_RetTypeExpr)   a_RetTypeExpr
+#endif
+
 /** @def DECLASM
  * How to declare an internal assembly function.
@@ -1735 +1747 @@
 # define RT_ASM_DECL_PRAGMA_WATCOM_386(a_RetType)   a_RetType
 #else
-# define RT_ASM_DECL_PRAGMA_WATCOM(a_RetType)       DECLASM(a_RetType)
-# define RT_ASM_DECL_PRAGMA_WATCOM_386(a_RetType)   DECLASM(a_RetType)
+# define RT_ASM_DECL_PRAGMA_WATCOM(a_RetType)       RT_DECL_ASM(a_RetType)
+# define RT_ASM_DECL_PRAGMA_WATCOM_386(a_RetType)   RT_DECL_ASM(a_RetType)
 #endif
 
@@ -2111 +2123 @@
 #else
 # define RTDECL(a_RetType)      DECL_IMPORT_NOTHROW(a_RetType) RTCALL
+#endif
+
+/** @def RT_DECL_ASM(a_RetType)
+ * Runtime Library assembly export or import declaration.
+ * Functions declared using this macro exists in all contexts.
+ * @param   a_RetType   The return type of the function declaration.
+ * @remarks This is only used inside IPRT.
+ * @note    This is compatible with DECLASM, just add hidden/import/export 
+ *          attributes to the function.
+ */
+#if defined(IN_RT_R3) || defined(IN_RT_RC) || defined(IN_RT_R0)
+# ifdef IN_RT_STATIC
+#  define RT_DECL_ASM(a_RetType) DECL_EXTERN_C(DECL_HIDDEN_NOTHROW(a_RetType RTCALL))
+# else
+#  define RT_DECL_ASM(a_RetType) DECL_EXTERN_C(DECL_EXPORT_NOTHROW(a_RetType RTCALL))
+# endif
+#else
+# define RT_DECL_ASM(a_RetType)  DECL_EXTERN_C(DECL_IMPORT_NOTHROW(a_RetType RTCALL))
 #endif
 

trunk/src/VBox/Runtime/common/asm/ASMBitFirstClear-generic.cpp

@@ -45 +45 @@
 
 
-RTDECL(int32_t) ASMBitFirstClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_DEF
+RT_DECL_ASM(int32_t) ASMBitFirstClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_DEF
 {
     const volatile size_t RT_FAR *pu = (const volatile size_t RT_FAR *)pvBitmap;

trunk/src/VBox/Runtime/common/asm/ASMBitFirstSet-generic.cpp

@@ -45 +45 @@
 
 
-RTDECL(int32_t) ASMBitFirstSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_DEF
+RT_DECL_ASM(int32_t) ASMBitFirstSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits) RT_NOTHROW_DEF
 {
     const volatile size_t RT_FAR *pu = (const volatile size_t RT_FAR *)pvBitmap;

trunk/src/VBox/Runtime/common/asm/ASMBitNextClear-generic.cpp

@@ -45 +45 @@
 
 
-RTDECL(int) ASMBitNextClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_DEF
+RT_DECL_ASM(int) ASMBitNextClear(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_DEF
 {
     const volatile uint32_t RT_FAR *pau32Bitmap = (const volatile uint32_t RT_FAR *)pvBitmap;

trunk/src/VBox/Runtime/common/asm/ASMBitNextSet-generic.cpp

@@ -45 +45 @@
 
 
-RTDECL(int) ASMBitNextSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_DEF
+RT_DECL_ASM(int) ASMBitNextSet(const volatile void RT_FAR *pvBitmap, uint32_t cBits, uint32_t iBitPrev) RT_NOTHROW_DEF
 {
     const volatile uint32_t RT_FAR *pau32Bitmap = (const volatile uint32_t RT_FAR *)pvBitmap;

trunk/src/VBox/Runtime/common/asm/ASMMemFill32-generic.cpp

@@ -46 +46 @@
 
 
-RTDECL(void) ASMMemFill32(volatile void RT_FAR *pv, size_t cb, uint32_t u32) RT_NOTHROW_DEF
+RT_DECL_ASM(void) ASMMemFill32(volatile void RT_FAR *pv, size_t cb, uint32_t u32) RT_NOTHROW_DEF
 {
     Assert(!(cb & 3));

trunk/src/VBox/Runtime/common/asm/ASMMemFirstMismatchingU8-generic.cpp

@@ -43 +43 @@
 
 
-RTDECL(void *) ASMMemFirstMismatchingU8(void const RT_FAR *pv, size_t cb, uint8_t u8) RT_NOTHROW_DEF
+RT_DECL_ASM(void *) ASMMemFirstMismatchingU8(void const RT_FAR *pv, size_t cb, uint8_t u8) RT_NOTHROW_DEF
 {
     uint8_t const *pb = (uint8_t const RT_FAR *)pv;

trunk/src/VBox/Runtime/common/asm/ASMMemFirstNonZero-generic.cpp

@@ -43 +43 @@
 
 
-RTDECL(void RT_FAR *) ASMMemFirstNonZero(void const RT_FAR *pv, size_t cb) RT_NOTHROW_DEF
+RT_DECL_ASM(void RT_FAR *) ASMMemFirstNonZero(void const RT_FAR *pv, size_t cb) RT_NOTHROW_DEF
 {
     uint8_t const *pb = (uint8_t const RT_FAR *)pv;

trunk/src/VBox/Runtime/common/asm/ASMMemZero32-generic.cpp

@@ -45 +45 @@
 
 
-RTDECL(void) ASMMemZero32(volatile void RT_FAR *pv, size_t cb) RT_NOTHROW_DEF
+RT_DECL_ASM(void) ASMMemZero32(volatile void RT_FAR *pv, size_t cb) RT_NOTHROW_DEF
 {
     memset((void *)pv, 0, cb);

trunk/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32-generic.cpp

@@ -44 +44 @@
 
 
-RTDECL(uint64_t) ASMMultU64ByU32DivByU32(uint64_t u64A, uint32_t u32B, uint32_t u32C)
+RT_DECL_ASM(uint64_t) ASMMultU64ByU32DivByU32(uint64_t u64A, uint32_t u32B, uint32_t u32C)
 {
     RTUINT64U   u;