Changeset 75132 in vbox for trunk/include/iprt

Timestamp:

Oct 28, 2018 5:44:49 PM (6 years ago)

Author:

vboxsync

Message:

iprt/asm.h,cdefs.h: More watcom adjustments.

Location:

trunk/include/iprt

Files:

• asm-amd64-x86.h (modified) (1 diff)
• asm.h (modified) (7 diffs)
• cdefs.h (modified) (1 diff)

trunk/include/iprt/asm-amd64-x86.h

@@ -88 +88 @@
  * Undefine all symbols we have Watcom C/C++ #pragma aux'es for.
  */
-#undef RT_ASM_DECL_PRAGMA_WATCOM
 #if defined(__WATCOMC__) && ARCH_BITS == 16
 # include "asm-amd64-x86-watcom-16.h"
-# define RT_ASM_DECL_PRAGMA_WATCOM(type) type
 #elif defined(__WATCOMC__) && ARCH_BITS == 32
 # include "asm-amd64-x86-watcom-32.h"
-# define RT_ASM_DECL_PRAGMA_WATCOM(type) type
-#else
-# define RT_ASM_DECL_PRAGMA_WATCOM(type) DECLASM(type)
 #endif
 

trunk/include/iprt/asm.h

@@ -89 +89 @@
  * Undefine all symbols we have Watcom C/C++ #pragma aux'es for.
  */
-#undef RT_ASM_DECL_PRAGMA_WATCOM
 #if defined(__WATCOMC__) && ARCH_BITS == 16 && defined(RT_ARCH_X86)
 # include "asm-watcom-x86-16.h"
-# define RT_ASM_DECL_PRAGMA_WATCOM(type) type
 #elif defined(__WATCOMC__) && ARCH_BITS == 32 && defined(RT_ARCH_X86)
 # include "asm-watcom-x86-32.h"
-# define RT_ASM_DECL_PRAGMA_WATCOM(type) type
-#else
-# define RT_ASM_DECL_PRAGMA_WATCOM(type) DECLASM(type)
-#endif
-
+#endif
 
 
@@ -5223 +5217 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-RT_ASM_DECL_PRAGMA_WATCOM(unsigned) ASMBitFirstSetU32(uint32_t u32);
+RT_ASM_DECL_PRAGMA_WATCOM_386(unsigned) ASMBitFirstSetU32(uint32_t u32);
 #else
 DECLINLINE(unsigned) ASMBitFirstSetU32(uint32_t u32)
@@ -5289 +5283 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-RT_ASM_DECL_PRAGMA_WATCOM(unsigned) ASMBitFirstSetU64(uint64_t u64);
+RT_ASM_DECL_PRAGMA_WATCOM_386(unsigned) ASMBitFirstSetU64(uint64_t u64);
 #else
 DECLINLINE(unsigned) ASMBitFirstSetU64(uint64_t u64)
@@ -5344 +5338 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-RT_ASM_DECL_PRAGMA_WATCOM(unsigned) ASMBitFirstSetU16(uint16_t u16);
+RT_ASM_DECL_PRAGMA_WATCOM_386(unsigned) ASMBitFirstSetU16(uint16_t u16);
 #else
 DECLINLINE(unsigned) ASMBitFirstSetU16(uint16_t u16)
@@ -5363 +5357 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-RT_ASM_DECL_PRAGMA_WATCOM(unsigned) ASMBitLastSetU32(uint32_t u32);
+RT_ASM_DECL_PRAGMA_WATCOM_386(unsigned) ASMBitLastSetU32(uint32_t u32);
 #else
 DECLINLINE(unsigned) ASMBitLastSetU32(uint32_t u32)
@@ -5429 +5423 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-RT_ASM_DECL_PRAGMA_WATCOM(unsigned) ASMBitLastSetU64(uint64_t u64);
+RT_ASM_DECL_PRAGMA_WATCOM_386(unsigned) ASMBitLastSetU64(uint64_t u64);
 #else
 DECLINLINE(unsigned) ASMBitLastSetU64(uint64_t u64)
@@ -5482 +5476 @@
  */
 #if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN
-RT_ASM_DECL_PRAGMA_WATCOM(unsigned) ASMBitLastSetU16(uint16_t u16);
+RT_ASM_DECL_PRAGMA_WATCOM_386(unsigned) ASMBitLastSetU16(uint16_t u16);
 #else
 DECLINLINE(unsigned) ASMBitLastSetU16(uint16_t u16)

trunk/include/iprt/cdefs.h

@@ -1312 +1312 @@
  */
 #define DECLASMTYPE(type)       type RTCALL
+
+/** @def RT_ASM_DECL_PRAGMA_WATCOM
+ * How to declare a assembly method prototype with watcom \#pragma aux definition.  */
+/** @def RT_ASM_DECL_PRAGMA_WATCOM_386
+ * Same as RT_ASM_DECL_PRAGMA_WATCOM, but there is no 16-bit version when
+ * 8086, 80186 or 80286 is selected as the target CPU. */
+#if defined(__WATCOMC__) && ARCH_BITS == 16 && defined(RT_ARCH_X86)
+# define RT_ASM_DECL_PRAGMA_WATCOM(type) type
+# if defined(__SW_0) || defined(__SW_1) || defined(__SW_2)
+#  define RT_ASM_DECL_PRAGMA_WATCOM_386(type)   DECLASM(type)
+# else
+#  define RT_ASM_DECL_PRAGMA_WATCOM_386(type)   type
+# endif
+#elif defined(__WATCOMC__) && ARCH_BITS == 32 && defined(RT_ARCH_X86)
+# define RT_ASM_DECL_PRAGMA_WATCOM(type)        type
+# define RT_ASM_DECL_PRAGMA_WATCOM_386(type)    type
+#else
+# define RT_ASM_DECL_PRAGMA_WATCOM(type)        DECLASM(type)
+# define RT_ASM_DECL_PRAGMA_WATCOM_386(type)    DECLASM(type)
+#endif
 
 /** @def DECL_NO_RETURN