Changeset 58749 in vbox for trunk/include/iprt/asm-watcom-x86-32.h

Timestamp:

Nov 18, 2015 7:46:11 PM (9 years ago)

Author:

vboxsync

Message:

iprt/asm*.h: Watcom & RT_MANGLER, include #pragma aux before function prototypes so we can #undef the mangled symbol.

File:

• trunk/include/iprt/asm-watcom-x86-32.h (modified) (51 diffs)

trunk/include/iprt/asm-watcom-x86-32.h

@@ -35 +35 @@
 
 /*
- * Turns out we cannot use 'ds' for segment stuff here because the compiler
- * seems to insists on loading the DGROUP segment into 'ds' before calling
- * stuff when using -ecc.  Using 'es' instead as this seems to work fine.
+ * Note! The #undef that preceds the #pragma aux statements is for undoing
+ *       the mangling, because the symbol in #pragma aux [symbol] statements
+ *       doesn't get subjected to preprocessing.  This is also why we include
+ *       the watcom header at the top rather than at the bottom of the
+ *       asm-amd64-x86.h file.
  */
 
+#undef       ASMCompilerBarrier
 #if 0 /* overkill version. */
 # pragma aux ASMCompilerBarrier = \
@@ -52 +55 @@
 #endif
 
+#undef      ASMNopPause
 #pragma aux ASMNopPause = \
     ".686p" \
@@ -59 +63 @@
     modify exact [] nomemory;
 
+#undef      ASMAtomicXchgU8
 #pragma aux ASMAtomicXchgU8 = \
     "xchg [ecx], al" \
@@ -65 +70 @@
     modify exact [al];
 
+#undef      ASMAtomicXchgU16
 #pragma aux ASMAtomicXchgU16 = \
     "xchg [ecx], ax" \
@@ -71 +77 @@
     modify exact [ax];
 
+#undef      ASMAtomicXchgU32
 #pragma aux ASMAtomicXchgU32 = \
     "xchg [ecx], eax" \
@@ -77 +84 @@
     modify exact [eax];
 
+#undef      ASMAtomicXchgU64
 #pragma aux ASMAtomicXchgU64 = \
     ".586" \
@@ -86 +94 @@
     modify exact [edx ecx ebx eax];
 
+#undef      ASMAtomicCmpXchgU8
 #pragma aux ASMAtomicCmpXchgU8 = \
     ".486" \
@@ -94 +103 @@
     modify exact [al];
 
+#undef      ASMAtomicCmpXchgU16
 #pragma aux ASMAtomicCmpXchgU16 = \
     ".486" \
@@ -102 +112 @@
     modify exact [ax];
 
+#undef      ASMAtomicCmpXchgU32
 #pragma aux ASMAtomicCmpXchgU32 = \
     ".486" \
@@ -110 +121 @@
     modify exact [eax];
 
+#undef      ASMAtomicCmpXchgU64
 #pragma aux ASMAtomicCmpXchgU64 = \
     ".586" \
@@ -118 +130 @@
     modify exact [eax edx];
 
+#undef      ASMAtomicCmpXchgExU32
 #pragma aux ASMAtomicCmpXchgExU32 = \
     ".586" \
@@ -127 +140 @@
     modify exact [eax];
 
+#undef      ASMAtomicCmpXchgExU64
 #pragma aux ASMAtomicCmpXchgExU64 = \
     ".586" \
@@ -137 +151 @@
     modify exact [eax edx];
 
+#undef      ASMSerializeInstruction
 #pragma aux ASMSerializeInstruction = \
     ".586" \
@@ -144 +159 @@
     modify exact [eax ebx ecx edx];
 
+#undef      ASMAtomicReadU64
 #pragma aux ASMAtomicReadU64 = \
     ".586" \
@@ -155 +171 @@
     modify exact [eax ebx ecx edx];
 
+#undef      ASMAtomicUoReadU64
 #pragma aux ASMAtomicUoReadU64 = \
     ".586" \
@@ -166 +183 @@
     modify exact [eax ebx ecx edx];
 
+#undef      ASMAtomicAddU16
 #pragma aux ASMAtomicAddU16 = \
     ".486" \
@@ -173 +191 @@
     modify exact [ax];
 
+#undef      ASMAtomicAddU32
 #pragma aux ASMAtomicAddU32 = \
     ".486" \
@@ -180 +199 @@
     modify exact [eax];
 
+#undef      ASMAtomicIncU16
 #pragma aux ASMAtomicIncU16 = \
     ".486" \
@@ -189 +209 @@
     modify exact [ax];
 
+#undef      ASMAtomicIncU32
 #pragma aux ASMAtomicIncU32 = \
     ".486" \
@@ -200 +221 @@
 /* ASMAtomicIncU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicDecU16
 #pragma aux ASMAtomicDecU16 = \
     ".486" \
@@ -209 +231 @@
     modify exact [ax];
 
+#undef      ASMAtomicDecU32
 #pragma aux ASMAtomicDecU32 = \
     ".486" \
@@ -220 +243 @@
 /* ASMAtomicDecU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicOrU32
 #pragma aux ASMAtomicOrU32 = \
     "lock or [ecx], eax" \
@@ -227 +251 @@
 /* ASMAtomicOrU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicAndU32
 #pragma aux ASMAtomicAndU32 = \
     "lock and [ecx], eax" \
@@ -234 +259 @@
 /* ASMAtomicAndU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicUoOrU32
 #pragma aux ASMAtomicUoOrU32 = \
     "or [ecx], eax" \
@@ -241 +267 @@
 /* ASMAtomicUoOrU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicUoAndU32
 #pragma aux ASMAtomicUoAndU32 = \
     "and [ecx], eax" \
@@ -248 +275 @@
 /* ASMAtomicUoAndU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicUoIncU32
 #pragma aux ASMAtomicUoIncU32 = \
     ".486" \
@@ -256 +284 @@
     modify exact [eax];
 
+#undef      ASMAtomicUoDecU32
 #pragma aux ASMAtomicUoDecU32 = \
     ".486" \
@@ -265 +294 @@
     modify exact [eax];
 
+#undef      ASMMemZeroPage
 #pragma aux ASMMemZeroPage = \
     "mov ecx, 1024" \
@@ -272 +302 @@
     modify exact [eax ecx edi];
 
+#undef      ASMMemZero32
 #pragma aux ASMMemZero32 = \
     "shr ecx, 2" \
@@ -279 +310 @@
     modify exact [eax ecx edi];
 
+#undef      ASMMemZero32
 #pragma aux ASMMemZero32 = \
     "shr ecx, 2" \
@@ -285 +317 @@
     modify exact [ecx edi];
 
+#undef      ASMProbeReadByte
 #pragma aux ASMProbeReadByte = \
     "mov al, [ecx]" \
@@ -291 +324 @@
     modify exact [al];
 
+#undef      ASMBitSet
 #pragma aux ASMBitSet = \
     "bts [ecx], eax" \
@@ -296 +330 @@
     modify exact [];
 
+#undef      ASMAtomicBitSet
 #pragma aux ASMAtomicBitSet = \
     "lock bts [ecx], eax" \
@@ -301 +336 @@
     modify exact [];
 
+#undef      ASMBitClear
 #pragma aux ASMBitClear = \
     "btr [ecx], eax" \
@@ -306 +342 @@
     modify exact [];
 
+#undef      ASMAtomicBitClear
 #pragma aux ASMAtomicBitClear = \
     "lock btr [ecx], eax" \
@@ -311 +348 @@
     modify exact [];
 
+#undef      ASMBitToggle
 #pragma aux ASMBitToggle = \
     "btc [ecx], eax" \
@@ -316 +354 @@
     modify exact [];
 
+#undef      ASMAtomicBitToggle
 #pragma aux ASMAtomicBitToggle = \
     "lock btc [ecx], eax" \
@@ -322 +361 @@
 
 
+#undef      ASMBitTestAndSet
 #pragma aux ASMBitTestAndSet = \
     "bts [ecx], eax" \
@@ -329 +369 @@
     modify exact [eax];
 
+#undef      ASMAtomicBitTestAndSet
 #pragma aux ASMAtomicBitTestAndSet = \
     "lock bts [ecx], eax" \
@@ -336 +377 @@
     modify exact [eax];
 
+#undef      ASMBitTestAndClear
 #pragma aux ASMBitTestAndClear = \
     "btr [ecx], eax" \
@@ -343 +385 @@
     modify exact [eax];
 
+#undef      ASMAtomicBitTestAndClear
 #pragma aux ASMAtomicBitTestAndClear = \
     "lock btr [ecx], eax" \
@@ -350 +393 @@
     modify exact [eax];
 
+#undef      ASMBitTestAndToggle
 #pragma aux ASMBitTestAndToggle = \
     "btc [ecx], eax" \
@@ -357 +401 @@
     modify exact [eax];
 
+#undef      ASMAtomicBitTestAndToggle
 #pragma aux ASMAtomicBitTestAndToggle = \
     "lock btc [ecx], eax" \
@@ -365 +410 @@
 
 /** @todo this is way to much inline assembly, better off in an external function. */
+#undef      ASMBitFirstClear
 #pragma aux ASMBitFirstClear = \
     "mov edx, edi" /* save start of bitmap for later */ \
@@ -387 +433 @@
 
 /** @todo this is way to much inline assembly, better off in an external function. */
+#undef      ASMBitFirstSet
 #pragma aux ASMBitFirstSet = \
     "mov edx, edi" /* save start of bitmap for later */ \
@@ -408 +455 @@
 /* ASMBitNextSet: Too much work, do when needed. */
 
+#undef      ASMBitFirstSetU32
 #pragma aux ASMBitFirstSetU32 = \
     "bsf eax, eax" \
@@ -420 +468 @@
     modify exact [eax] nomemory;
 
+#undef      ASMBitLastSetU32
 #pragma aux ASMBitLastSetU32 = \
     "bsr eax, eax" \
@@ -432 +481 @@
     modify exact [eax] nomemory;
 
+#undef      ASMByteSwapU16
 #pragma aux ASMByteSwapU16 = \
     "ror ax, 8" \
@@ -438 +488 @@
     modify exact [ax] nomemory;
 
+#undef      ASMByteSwapU32
 #pragma aux ASMByteSwapU32 = \
     "bswap eax" \
@@ -444 +495 @@
     modify exact [eax] nomemory;
 
+#undef      ASMRotateLeftU32
 #pragma aux ASMRotateLeftU32 = \
     "rol    eax, cl" \
@@ -450 +502 @@
     modify exact [eax] nomemory;
 
+#undef      ASMRotateRightU32
 #pragma aux ASMRotateRightU32 = \
     "ror    eax, cl" \