Changeset 58749 in vbox

Timestamp:

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

Author:

vboxsync

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

104190

Message:

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

Location:

trunk/include/iprt

Files:

• asm-amd64-x86-watcom-16.h (modified) (62 diffs)
• asm-amd64-x86-watcom-32.h (modified) (72 diffs)
• asm-amd64-x86.h (modified) (2 diffs)
• asm-watcom-x86-16.h (modified) (48 diffs)
• asm-watcom-x86-32.h (modified) (51 diffs)
• asm.h (modified) (2 diffs)

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

@@ -38 +38 @@
  * 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      ASMGetIDTR
 #pragma aux ASMGetIDTR = \
     "sidt fword ptr es:[bx]" \
@@ -45 +52 @@
     modify exact [];
 
+#undef      ASMGetIdtrLimit
 #pragma aux ASMGetIdtrLimit = \
     "sub  sp, 8" \
@@ -55 +63 @@
     modify exact [bx];
 
+#undef      ASMSetIDTR
 #pragma aux ASMSetIDTR = \
     "lidt fword ptr es:[bx]" \
@@ -60 +69 @@
     modify nomemory;
 
+#undef      ASMGetGDTR
 #pragma aux ASMGetGDTR = \
     "sgdt fword ptr es:[bx]" \
@@ -65 +75 @@
     modify exact [];
 
+#undef      ASMSetGDTR
 #pragma aux ASMSetGDTR = \
     "lgdt fword ptr es:[bx]" \
@@ -70 +81 @@
     modify exact [] nomemory;
 
+#undef      ASMGetCS
 #pragma aux ASMGetCS = \
     "mov ax, cs" \
@@ -76 +88 @@
     modify exact [ax] nomemory;
 
+#undef      ASMGetDS
 #pragma aux ASMGetDS = \
     "mov ax, ds" \
@@ -82 +95 @@
     modify exact [ax] nomemory;
 
+#undef      ASMGetES
 #pragma aux ASMGetES = \
     "mov ax, es" \
@@ -88 +102 @@
     modify exact [ax] nomemory;
 
+#undef      ASMGetFS
 #pragma aux ASMGetFS = \
     "mov ax, fs" \
@@ -94 +109 @@
     modify exact [ax] nomemory;
 
+#undef      ASMGetGS
 #pragma aux ASMGetGS = \
     "mov ax, gs" \
@@ -100 +116 @@
     modify exact [ax] nomemory;
 
+#undef      ASMGetSS
 #pragma aux ASMGetSS = \
     "mov ax, ss" \
@@ -106 +123 @@
     modify exact [ax] nomemory;
 
+#undef      ASMGetTR
 #pragma aux ASMGetTR = \
     "str ax" \
@@ -112 +130 @@
     modify exact [ax] nomemory;
 
+#undef      ASMGetLDTR
 #pragma aux ASMGetLDTR = \
     "sldt ax" \
@@ -120 +139 @@
 /** @todo ASMGetSegAttr   */
 
+#undef      ASMGetFlags
 #pragma aux ASMGetFlags = \
     "pushf" \
@@ -127 +147 @@
     modify exact [ax] nomemory;
 
+#undef      ASMSetFlags
 #pragma aux ASMSetFlags = \
     "push ax" \
@@ -133 +154 @@
     modify exact [] nomemory;
 
+#undef      ASMChangeFlags
 #pragma aux ASMChangeFlags = \
     "pushf" \
@@ -144 +166 @@
     modify exact [dx] nomemory;
 
+#undef      ASMAddFlags
 #pragma aux ASMAddFlags = \
     "pushf" \
@@ -154 +177 @@
     modify exact [dx] nomemory;
 
+#undef      ASMClearFlags
 #pragma aux ASMClearFlags = \
     "pushf" \
@@ -166 +190 @@
 /* Note! Must use the 64-bit integer return value convension.
          The order of registers in the value [set] does not seem to mean anything. */
+#undef      ASMReadTSC
 #pragma aux ASMReadTSC = \
     ".586" \
@@ -199 +224 @@
             si:di
          This ordering seems to apply to parameter values too. */
+#undef      ASMGetCR0
 #pragma aux ASMGetCR0 = \
     "mov eax, cr0" \
@@ -207 +233 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMSetCR0
 #pragma aux ASMSetCR0 = \
     "shl edx, 16" \
@@ -214 +241 @@
     modify exact [dx] nomemory;
 
+#undef      ASMGetCR2
 #pragma aux ASMGetCR2 = \
     "mov eax, cr2" \
@@ -222 +250 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMSetCR2
 #pragma aux ASMSetCR2 = \
     "shl edx, 16" \
@@ -229 +258 @@
     modify exact [dx] nomemory;
 
+#undef      ASMGetCR3
 #pragma aux ASMGetCR3 = \
     "mov eax, cr3" \
@@ -237 +267 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMSetCR3
 #pragma aux ASMSetCR3 = \
     "shl edx, 16" \
@@ -244 +275 @@
     modify exact [dx] nomemory;
 
+#undef      ASMReloadCR3
 #pragma aux ASMReloadCR3 = \
     "mov eax, cr3" \
@@ -250 +282 @@
     modify exact [ax] nomemory;
 
+#undef      ASMGetCR4
 #pragma aux ASMGetCR4 = \
     "mov eax, cr4" \
@@ -258 +291 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMSetCR4
 #pragma aux ASMSetCR4 = \
     "shl edx, 16" \
@@ -268 +302 @@
 /* ASMSetCR8: Don't bother for 16-bit. */
 
+#undef      ASMIntEnable
 #pragma aux ASMIntEnable = \
     "sti" \
@@ -273 +308 @@
     modify exact [] nomemory;
 
+#undef      ASMIntDisable
 #pragma aux ASMIntDisable = \
     "cli" \
@@ -278 +314 @@
     modify exact [] nomemory;
 
+#undef      ASMIntDisableFlags
 #pragma aux ASMIntDisableFlags = \
     "pushf" \
@@ -286 +323 @@
     modify exact [] nomemory;
 
+#undef      ASMHalt
 #pragma aux ASMHalt = \
     "hlt" \
@@ -291 +329 @@
     modify exact [] nomemory;
 
+#undef      ASMRdMsr
 #pragma aux ASMRdMsr = \
     ".586" \
@@ -309 +348 @@
 /* ASMWrMsrEx: Implemented externally, lazy bird. */
 
+#undef      ASMRdMsr_Low
 #pragma aux ASMRdMsr_Low = \
     ".586" \
@@ -320 +360 @@
     modify exact [ax bx cx dx] nomemory;
 
+#undef      ASMRdMsr_High
 #pragma aux ASMRdMsr_High = \
     ".586" \
@@ -332 +373 @@
 
 
+#undef      ASMGetDR0
 #pragma aux ASMGetDR0 = \
     "mov eax, dr0" \
@@ -340 +382 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMGetDR1
 #pragma aux ASMGetDR1 = \
     "mov eax, dr1" \
@@ -348 +391 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMGetDR2
 #pragma aux ASMGetDR2 = \
     "mov eax, dr2" \
@@ -356 +400 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMGetDR3
 #pragma aux ASMGetDR3 = \
     "mov eax, dr3" \
@@ -364 +409 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMGetDR6
 #pragma aux ASMGetDR6 = \
     "mov eax, dr6" \
@@ -372 +418 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMGetAndClearDR6
 #pragma aux ASMGetAndClearDR6 = \
     "mov edx, 0ffff0ff0h" \
@@ -382 +429 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMGetDR7
 #pragma aux ASMGetDR7 = \
     "mov eax, dr7" \
@@ -390 +438 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMSetDR0
 #pragma aux ASMSetDR0 = \
     "shl edx, 16" \
@@ -397 +446 @@
     modify exact [dx] nomemory;
 
+#undef      ASMSetDR1
 #pragma aux ASMSetDR1 = \
     "shl edx, 16" \
@@ -404 +454 @@
     modify exact [dx] nomemory;
 
+#undef      ASMSetDR2
 #pragma aux ASMSetDR2 = \
     "shl edx, 16" \
@@ -411 +462 @@
     modify exact [dx] nomemory;
 
+#undef      ASMSetDR3
 #pragma aux ASMSetDR3 = \
     "shl edx, 16" \
@@ -418 +470 @@
     modify exact [dx] nomemory;
 
+#undef      ASMSetDR6
 #pragma aux ASMSetDR6 = \
     "shl edx, 16" \
@@ -425 +478 @@
     modify exact [dx] nomemory;
 
+#undef      ASMSetDR7
 #pragma aux ASMSetDR7 = \
     "shl edx, 16" \
@@ -433 +487 @@
 
 /* Yeah, could've used outp here, but this keeps the main file simpler. */
+#undef      ASMOutU8
 #pragma aux ASMOutU8 = \
     "out dx, al" \
@@ -438 +493 @@
     modify exact [] nomemory;
 
+#undef      ASMInU8
 #pragma aux ASMInU8 = \
     "in al, dx" \
@@ -444 +500 @@
     modify exact [] nomemory;
 
+#undef      ASMOutU16
+#undef      ASMOutU16
 #pragma aux ASMOutU16 = \
     "out dx, ax" \
@@ -449 +507 @@
     modify exact [] nomemory;
 
+#undef      ASMInU16
 #pragma aux ASMInU16 = \
     "in ax, dx" \
@@ -455 +514 @@
     modify exact [] nomemory;
 
+#undef      ASMOutU32
 #pragma aux ASMOutU32 = \
     "shl ecx, 16" \
@@ -463 +523 @@
     modify exact [] nomemory;
 
+#undef      ASMInU32
 #pragma aux ASMInU32 = \
     "in eax, dx" \
@@ -471 +532 @@
     modify exact [] nomemory;
 
+#undef      ASMOutStrU8
 #pragma aux ASMOutStrU8 = \
     "mov ds, bx" \
@@ -477 +539 @@
     modify exact [si cx ds] nomemory;
 
+#undef      ASMInStrU8
 #pragma aux ASMInStrU8 = \
     "rep insb" \
@@ -482 +545 @@
     modify exact [di cx];
 
+#undef      ASMOutStrU16
 #pragma aux ASMOutStrU16 = \
     "mov ds, bx" \
@@ -488 +552 @@
     modify exact [si cx ds] nomemory;
 
+#undef      ASMInStrU16
 #pragma aux ASMInStrU16 = \
     "rep insw" \
@@ -493 +558 @@
     modify exact [di cx];
 
+#undef      ASMOutStrU32
 #pragma aux ASMOutStrU32 = \
     "mov ds, bx" \
@@ -499 +565 @@
     modify exact [si cx ds] nomemory;
 
+#undef      ASMInStrU32
 #pragma aux ASMInStrU32 = \
     "rep insd" \
@@ -506 +573 @@
 /* ASMInvalidatePage: When needed. */
 
+#undef      ASMWriteBackAndInvalidateCaches
 #pragma aux ASMWriteBackAndInvalidateCaches = \
     ".486" \
@@ -512 +580 @@
     modify exact [] nomemory;
 
+#undef      ASMInvalidateInternalCaches
 #pragma aux ASMInvalidateInternalCaches = \
     ".486" \

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

@@ -34 +34 @@
 #endif
 
-
+/*
+ * 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      ASMGetIDTR
 #pragma aux ASMGetIDTR = \
     "sidt fword ptr [ecx]" \
@@ -40 +48 @@
     modify exact [];
 
+#undef      ASMGetIdtrLimit
 #pragma aux ASMGetIdtrLimit = \
     "sub  esp, 8" \
@@ -49 +58 @@
     modify exact [ecx];
 
+#undef      ASMSetIDTR
 #pragma aux ASMSetIDTR = \
     "lidt fword ptr [ecx]" \
@@ -54 +64 @@
     modify nomemory;
 
+#undef      ASMGetGDTR
 #pragma aux ASMGetGDTR = \
     "sgdt fword ptr [ecx]" \
@@ -59 +70 @@
     modify exact [];
 
+#undef      ASMSetGDTR
 #pragma aux ASMSetGDTR = \
     "lgdt fword ptr [ecx]" \
@@ -64 +76 @@
     modify exact [] nomemory;
 
+#undef      ASMGetCS
 #pragma aux ASMGetCS = \
     "mov ax, cs" \
@@ -70 +83 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetDS
 #pragma aux ASMGetDS = \
     "mov ax, ds" \
@@ -76 +90 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetES
 #pragma aux ASMGetES = \
     "mov ax, es" \
@@ -82 +97 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetFS
 #pragma aux ASMGetFS = \
     "mov ax, fs" \
@@ -88 +104 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetGS
 #pragma aux ASMGetGS = \
     "mov ax, gs" \
@@ -94 +111 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetSS
 #pragma aux ASMGetSS = \
     "mov ax, ss" \
@@ -100 +118 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetTR
 #pragma aux ASMGetTR = \
     "str ax" \
@@ -106 +125 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetLDTR
 #pragma aux ASMGetLDTR = \
     "sldt ax" \
@@ -114 +134 @@
 /** @todo ASMGetSegAttr   */
 
+#undef      ASMGetFlags
 #pragma aux ASMGetFlags = \
     "pushfd" \
@@ -121 +142 @@
     modify exact [eax] nomemory;
 
+#undef      ASMSetFlags
 #pragma aux ASMSetFlags = \
     "push eax" \
@@ -127 +149 @@
     modify exact [] nomemory;
 
+#undef      ASMChangeFlags
 #pragma aux ASMChangeFlags = \
     "pushfd" \
@@ -138 +161 @@
     modify exact [edx] nomemory;
 
+#undef      ASMAddFlags
 #pragma aux ASMAddFlags = \
     "pushfd" \
@@ -148 +172 @@
     modify exact [edx] nomemory;
 
+#undef      ASMClearFlags
 #pragma aux ASMClearFlags = \
     "pushfd" \
@@ -160 +185 @@
 /* Note! Must use the 64-bit integer return value convension.
          The order of registers in the value [set] does not seem to mean anything. */
+#undef      ASMReadTSC
 #pragma aux ASMReadTSC = \
     ".586" \
@@ -167 +193 @@
     modify exact [edx eax] nomemory;
 
+#undef      ASMReadTscWithAux
 #pragma aux ASMReadTscWithAux = \
     0x0f 0x01 0xf9 \
@@ -177 +204 @@
 /* ASMCpuIdExSlow: Always implemented externally. */
 
+#undef      ASMCpuId_ECX_EDX
 #pragma aux ASMCpuId_ECX_EDX = \
     "cpuid" \
@@ -184 +212 @@
     modify exact [eax ebx ecx edx];
 
+#undef      ASMCpuId_EAX
 #pragma aux ASMCpuId_EAX = \
     "cpuid" \
@@ -190 +219 @@
     modify exact [eax ebx ecx edx];
 
+#undef      ASMCpuId_EBX
 #pragma aux ASMCpuId_EBX = \
     "cpuid" \
@@ -196 +226 @@
     modify exact [eax ebx ecx edx];
 
+#undef      ASMCpuId_ECX
 #pragma aux ASMCpuId_ECX = \
     "cpuid" \
@@ -202 +233 @@
     modify exact [eax ebx ecx edx];
 
+#undef      ASMCpuId_EDX
 #pragma aux ASMCpuId_EDX = \
     "cpuid" \
@@ -211 +243 @@
 /* ASMGetApicId: Implemented externally, lazy bird. */
 
+#undef      ASMGetCR0
 #pragma aux ASMGetCR0 = \
     "mov eax, cr0" \
@@ -217 +250 @@
     modify exact [eax] nomemory;
 
+#undef      ASMSetCR0
 #pragma aux ASMSetCR0 = \
     "mov cr0, eax" \
@@ -222 +256 @@
     modify exact [] nomemory;
 
+#undef      ASMGetCR2
 #pragma aux ASMGetCR2 = \
     "mov eax, cr2" \
@@ -228 +263 @@
     modify exact [eax] nomemory;
 
+#undef      ASMSetCR2
 #pragma aux ASMSetCR2 = \
     "mov cr2, eax" \
@@ -233 +269 @@
     modify exact [] nomemory;
 
+#undef      ASMGetCR3
 #pragma aux ASMGetCR3 = \
     "mov eax, cr3" \
@@ -239 +276 @@
     modify exact [eax] nomemory;
 
+#undef      ASMSetCR3
 #pragma aux ASMSetCR3 = \
     "mov cr3, eax" \
@@ -244 +282 @@
     modify exact [] nomemory;
 
+#undef      ASMReloadCR3
 #pragma aux ASMReloadCR3 = \
     "mov eax, cr3" \
@@ -250 +289 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetCR4
 #pragma aux ASMGetCR4 = \
     "mov eax, cr4" \
@@ -256 +296 @@
     modify exact [eax] nomemory;
 
+#undef      ASMSetCR4
 #pragma aux ASMSetCR4 = \
     "mov cr4, eax" \
@@ -264 +305 @@
 /* ASMSetCR8: Don't bother for 32-bit. */
 
+#undef      ASMIntEnable
 #pragma aux ASMIntEnable = \
     "sti" \
@@ -269 +311 @@
     modify exact [] nomemory;
 
+#undef      ASMIntDisable
 #pragma aux ASMIntDisable = \
     "cli" \
@@ -274 +317 @@
     modify exact [] nomemory;
 
+#undef      ASMIntDisableFlags
 #pragma aux ASMIntDisableFlags = \
     "pushfd" \
@@ -282 +326 @@
     modify exact [] nomemory;
 
+#undef      ASMHalt
 #pragma aux ASMHalt = \
     "hlt" \
@@ -287 +332 @@
     modify exact [] nomemory;
 
+#undef      ASMRdMsr
 #pragma aux ASMRdMsr = \
     ".586" \
@@ -294 +340 @@
     modify exact [eax edx] nomemory;
 
+#undef      ASMWrMsr
 #pragma aux ASMWrMsr = \
     ".586" \
@@ -300 +347 @@
     modify exact [] nomemory;
 
+#undef      ASMRdMsrEx
 #pragma aux ASMRdMsrEx = \
     ".586" \
@@ -307 +355 @@
     modify exact [eax edx] nomemory;
 
+#undef      ASMWrMsrEx
 #pragma aux ASMWrMsrEx = \
     ".586" \
@@ -313 +362 @@
     modify exact [] nomemory;
 
+#undef      ASMRdMsr_Low
 #pragma aux ASMRdMsr_Low = \
     ".586" \
@@ -320 +370 @@
     modify exact [eax edx] nomemory;
 
+#undef      ASMRdMsr_High
 #pragma aux ASMRdMsr_High = \
     ".586" \
@@ -328 +379 @@
 
 
+#undef      ASMGetDR0
 #pragma aux ASMGetDR0 = \
     "mov eax, dr0" \
@@ -334 +386 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetDR1
 #pragma aux ASMGetDR1 = \
     "mov eax, dr1" \
@@ -340 +393 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetDR2
 #pragma aux ASMGetDR2 = \
     "mov eax, dr2" \
@@ -346 +400 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetDR3
 #pragma aux ASMGetDR3 = \
     "mov eax, dr3" \
@@ -352 +407 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetDR6
 #pragma aux ASMGetDR6 = \
     "mov eax, dr6" \
@@ -358 +414 @@
     modify exact [eax] nomemory;
 
+#undef      ASMGetAndClearDR6
 #pragma aux ASMGetAndClearDR6 = \
     "mov edx, 0ffff0ff0h" \
@@ -366 +423 @@
     modify exact [eax edx] nomemory;
 
+#undef      ASMGetDR7
 #pragma aux ASMGetDR7 = \
     "mov eax, dr7" \
@@ -372 +430 @@
     modify exact [eax] nomemory;
 
+#undef      ASMSetDR0
 #pragma aux ASMSetDR0 = \
     "mov dr0, eax" \
@@ -377 +436 @@
     modify exact [] nomemory;
 
+#undef      ASMSetDR1
 #pragma aux ASMSetDR1 = \
     "mov dr1, eax" \
@@ -382 +442 @@
     modify exact [] nomemory;
 
+#undef      ASMSetDR2
 #pragma aux ASMSetDR2 = \
     "mov dr2, eax" \
@@ -387 +448 @@
     modify exact [] nomemory;
 
+#undef      ASMSetDR3
 #pragma aux ASMSetDR3 = \
     "mov dr3, eax" \
@@ -392 +454 @@
     modify exact [] nomemory;
 
+#undef      ASMSetDR6
 #pragma aux ASMSetDR6 = \
     "mov dr6, eax" \
@@ -397 +460 @@
     modify exact [] nomemory;
 
+#undef      ASMSetDR7
 #pragma aux ASMSetDR7 = \
     "mov dr7, eax" \
@@ -403 +467 @@
 
 /* Yeah, could've used outp here, but this keeps the main file simpler. */
+#undef      ASMOutU8
 #pragma aux ASMOutU8 = \
     "out dx, al" \
@@ -408 +473 @@
     modify exact [] nomemory;
 
+#undef      ASMInU8
 #pragma aux ASMInU8 = \
     "in al, dx" \
@@ -414 +480 @@
     modify exact [] nomemory;
 
+#undef      ASMOutU16
 #pragma aux ASMOutU16 = \
     "out dx, ax" \
@@ -419 +486 @@
     modify exact [] nomemory;
 
+#undef      ASMInU16
 #pragma aux ASMInU16 = \
     "in ax, dx" \
@@ -425 +493 @@
     modify exact [] nomemory;
 
+#undef      ASMOutU32
 #pragma aux ASMOutU32 = \
     "out dx, eax" \
@@ -430 +499 @@
     modify exact [] nomemory;
 
+#undef      ASMInU32
 #pragma aux ASMInU32 = \
     "in eax, dx" \
@@ -436 +506 @@
     modify exact [] nomemory;
 
+#undef      ASMOutStrU8
 #pragma aux ASMOutStrU8 = \
     "rep outsb" \
@@ -441 +512 @@
     modify exact [esi ecx] nomemory;
 
+#undef      ASMInStrU8
 #pragma aux ASMInStrU8 = \
     "rep insb" \
@@ -446 +518 @@
     modify exact [edi ecx];
 
+#undef      ASMOutStrU16
 #pragma aux ASMOutStrU16 = \
     "rep outsw" \
@@ -451 +524 @@
     modify exact [esi ecx] nomemory;
 
+#undef      ASMInStrU16
 #pragma aux ASMInStrU16 = \
     "rep insw" \
@@ -456 +530 @@
     modify exact [edi ecx];
 
+#undef      ASMOutStrU32
 #pragma aux ASMOutStrU32 = \
     "rep outsd" \
@@ -461 +536 @@
     modify exact [esi ecx] nomemory;
 
+#undef      ASMInStrU32
 #pragma aux ASMInStrU32 = \
     "rep insd" \
@@ -466 +542 @@
     modify exact [edi ecx];
 
+#undef      ASMInvalidatePage
 #pragma aux ASMInvalidatePage = \
     "invlpg [eax]" \
@@ -471 +548 @@
     modify exact [];
 
+#undef      ASMWriteBackAndInvalidateCaches
 #pragma aux ASMWriteBackAndInvalidateCaches = \
     ".486" \
@@ -477 +555 @@
     modify exact [] nomemory;
 
+#undef      ASMInvalidateInternalCaches
 #pragma aux ASMInvalidateInternalCaches = \
     ".486" \

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

@@ -78 +78 @@
 
 
+/*
+ * Include #pragma aux definitions for Watcom C/C++.
+ */
+#if defined(__WATCOMC__) && ARCH_BITS == 16
+# include "asm-amd64-x86-watcom-16.h"
+#elif defined(__WATCOMC__) && ARCH_BITS == 32
+# include "asm-amd64-x86-watcom-32.h"
+#endif
+
 
 /** @defgroup grp_rt_asm_amd64_x86  AMD64 and x86 Specific ASM Routines
@@ -3322 +3331 @@
 #endif /* !_MSC_VER) || !RT_ARCH_AMD64 */
 
-/*
- * Include #pragma aux definitions for Watcom C/C++.
- */
-#if defined(__WATCOMC__) && ARCH_BITS == 16
-# include "asm-amd64-x86-watcom-16.h"
-#elif defined(__WATCOMC__) && ARCH_BITS == 32
-# include "asm-amd64-x86-watcom-32.h"
-#endif
-
 /** @} */
 #endif

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

@@ -38 +38 @@
  * 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 +59 @@
 #endif
 
+#undef      ASMNopPause
 #pragma aux ASMNopPause = \
     ".686p" \
@@ -59 +67 @@
     modify exact [] nomemory;
 
+#undef      ASMAtomicXchgU8
 #pragma aux ASMAtomicXchgU8 = \
     "xchg es:[bx], al" \
@@ -65 +74 @@
     modify exact [al];
 
+#undef      ASMAtomicXchgU16
 #pragma aux ASMAtomicXchgU16 = \
     "xchg es:[bx], ax" \
@@ -71 +81 @@
     modify exact [ax];
 
+#undef      ASMAtomicXchgU32
 #pragma aux ASMAtomicXchgU32 = \
     "shl  ecx, 16" \
@@ -81 +92 @@
     modify exact [ax cx];
 
+#undef      ASMAtomicXchgU64
 #pragma aux ASMAtomicXchgU64 = \
     ".586" \
@@ -101 +113 @@
     modify exact [dx cx bx ax];
 
+#undef      ASMAtomicCmpXchgU8
 #pragma aux ASMAtomicCmpXchgU8 = \
     ".486" \
@@ -109 +122 @@
     modify exact [al];
 
+#undef      ASMAtomicCmpXchgU16
 #pragma aux ASMAtomicCmpXchgU16 = \
     ".486" \
@@ -117 +131 @@
     modify exact [ax];
 
+#undef      ASMAtomicCmpXchgU32
 #pragma aux ASMAtomicCmpXchgU32 = \
     ".486" \
@@ -134 +149 @@
 /* ASMAtomicCmpXchgExU64: External assembly implementation, too few registers for parameters.  */
 
+#undef      ASMSerializeInstruction
 #pragma aux ASMSerializeInstruction = \
     ".586" \
@@ -141 +157 @@
     modify exact [ax bx cx dx];
 
+#undef      ASMAtomicReadU64
 #pragma aux ASMAtomicReadU64 = \
     ".586" \
@@ -157 +174 @@
     modify exact [dx cx bx ax];
 
+#undef      ASMAtomicUoReadU64
 #pragma aux ASMAtomicUoReadU64 = \
     ".586" \
@@ -173 +191 @@
     modify exact [dx cx bx ax];
 
+#undef      ASMAtomicAddU16
 #pragma aux ASMAtomicAddU16 = \
     ".486" \
@@ -180 +199 @@
     modify exact [ax];
 
+#undef      ASMAtomicAddU32
 #pragma aux ASMAtomicAddU32 = \
     ".486" \
@@ -191 +211 @@
     modify exact [ax dx];
 
+#undef      ASMAtomicIncU16
 #pragma aux ASMAtomicIncU16 = \
     ".486" \
@@ -200 +221 @@
     modify exact [ax];
 
+#undef      ASMAtomicIncU32
 #pragma aux ASMAtomicIncU32 = \
     ".486" \
@@ -213 +235 @@
 /* ASMAtomicIncU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicDecU16
 #pragma aux ASMAtomicDecU16 = \
     ".486" \
@@ -222 +245 @@
     modify exact [ax];
 
+#undef      ASMAtomicDecU32
 #pragma aux ASMAtomicDecU32 = \
     ".486" \
@@ -235 +259 @@
 /* ASMAtomicDecU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicOrU32
 #pragma aux ASMAtomicOrU32 = \
     "shl edx, 16" \
@@ -244 +269 @@
 /* ASMAtomicOrU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicAndU32
 #pragma aux ASMAtomicAndU32 = \
     "shl edx, 16" \
@@ -253 +279 @@
 /* ASMAtomicAndU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicUoOrU32
 #pragma aux ASMAtomicUoOrU32 = \
     "shl edx, 16" \
@@ -262 +289 @@
 /* ASMAtomicUoOrU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicUoAndU32
 #pragma aux ASMAtomicUoAndU32 = \
     "shl edx, 16" \
@@ -271 +299 @@
 /* ASMAtomicUoAndU64: Should be done by C inline or in external file. */
 
+#undef      ASMAtomicUoIncU32
 #pragma aux ASMAtomicUoIncU32 = \
     ".486" \
@@ -282 +311 @@
     modify exact [ax dx];
 
+#undef      ASMAtomicUoDecU32
 #pragma aux ASMAtomicUoDecU32 = \
     ".486" \
@@ -293 +323 @@
     modify exact [ax dx];
 
+#undef      ASMMemZeroPage
 #pragma aux ASMMemZeroPage = \
     "mov ecx, 1024" \
@@ -300 +331 @@
     modify exact [ax cx di];
 
+#undef      ASMMemZero32
 #pragma aux ASMMemZero32 = \
     "and ecx, 0ffffh" /* probably not necessary, lazy bird should check... */ \
@@ -308 +340 @@
     modify exact [ax cx di];
 
+#undef      ASMMemZero32
 #pragma aux ASMMemZero32 = \
     "and ecx, 0ffffh" /* probably not necessary, lazy bird should check... */ \
@@ -318 +351 @@
     modify exact [ax cx di];
 
+#undef      ASMProbeReadByte
 #pragma aux ASMProbeReadByte = \
     "mov al, es:[bx]" \
@@ -324 +358 @@
     modify exact [al];
 
+#undef      ASMBitSet
 #pragma aux ASMBitSet = \
     "shl edx, 16" \
@@ -331 +366 @@
     modify exact [dx];
 
+#undef      ASMAtomicBitSet
 #pragma aux ASMAtomicBitSet = \
     "shl edx, 16" \
@@ -338 +374 @@
     modify exact [dx];
 
+#undef      ASMBitClear
 #pragma aux ASMBitClear = \
     "shl edx, 16" \
@@ -345 +382 @@
     modify exact [dx];
 
+#undef      ASMAtomicBitClear
 #pragma aux ASMAtomicBitClear = \
     "shl edx, 16" \
@@ -352 +390 @@
     modify exact [dx];
 
+#undef      ASMBitToggle
 #pragma aux ASMBitToggle = \
     "shl edx, 16" \
@@ -359 +398 @@
     modify exact [dx];
 
+#undef      ASMAtomicBitToggle
 #pragma aux ASMAtomicBitToggle = \
     "shl edx, 16" \
@@ -365 +405 @@
     parm [es bx] [ax dx] \
     modify exact [dx];
-///
-///
+
+#undef      ASMBitTestAndSet
 #pragma aux ASMBitTestAndSet = \
     "shl edx, 16" \
@@ -376 +416 @@
     modify exact [ax dx];
 
+#undef      ASMAtomicBitTestAndSet
 #pragma aux ASMAtomicBitTestAndSet = \
     "shl edx, 16" \
@@ -385 +426 @@
     modify exact [ax dx];
 
+#undef      ASMBitTestAndClear
 #pragma aux ASMBitTestAndClear = \
     "shl edx, 16" \
@@ -394 +436 @@
     modify exact [ax dx];
 
+#undef      ASMAtomicBitTestAndClear
 #pragma aux ASMAtomicBitTestAndClear = \
     "shl edx, 16" \
@@ -403 +446 @@
     modify exact [ax dx];
 
+#undef      ASMBitTestAndToggle
 #pragma aux ASMBitTestAndToggle = \
     "shl edx, 16" \
@@ -412 +456 @@
     modify exact [ax dx];
 
+#undef      ASMAtomicBitTestAndToggle
 #pragma aux ASMAtomicBitTestAndToggle = \
     "shl edx, 16" \
@@ -422 +467 @@
 
 /** @todo this is way to much inline assembly, better off in an external function. */
+#undef      ASMBitFirstClear
 #pragma aux ASMBitFirstClear = \
     "mov bx, di" /* save start of bitmap for later */ \
@@ -449 +495 @@
 
 /** @todo this is way to much inline assembly, better off in an external function. */
+#undef      ASMBitFirstSet
 #pragma aux ASMBitFirstSet = \
     "mov bx, di" /* save start of bitmap for later */ \
@@ -475 +522 @@
 /* ASMBitNextSet: Too much work, do when needed. */
 
+#undef      ASMBitFirstSetU32
 #pragma aux ASMBitFirstSetU32 = \
     "shl edx, 16" \
@@ -489 +537 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMBitLastSetU32
 #pragma aux ASMBitLastSetU32 = \
     "shl edx, 16" \
@@ -503 +552 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMByteSwapU16
 #pragma aux ASMByteSwapU16 = \
     "ror ax, 8" \
@@ -509 +559 @@
     modify exact [ax] nomemory;
 
+#undef      ASMByteSwapU32
 #pragma aux ASMByteSwapU32 = \
     "xchg ax, dx" \
@@ -515 +566 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMRotateLeftU32
 #pragma aux ASMRotateLeftU32 = \
     "shl    edx, 16" \
@@ -525 +577 @@
     modify exact [ax dx] nomemory;
 
+#undef      ASMRotateRightU32
 #pragma aux ASMRotateRightU32 = \
     "shl    edx, 16" \

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" \

trunk/include/iprt/asm.h

@@ -82 +82 @@
 #endif
 
+/*
+ * Include #pragma aux definitions for Watcom C/C++.
+ */
+#if defined(__WATCOMC__) && ARCH_BITS == 16 && defined(RT_ARCH_X86)
+# include "asm-watcom-x86-16.h"
+#elif defined(__WATCOMC__) && ARCH_BITS == 32 && defined(RT_ARCH_X86)
+# include "asm-watcom-x86-32.h"
+#endif
+
+
 
 /** @defgroup grp_rt_asm    ASM - Assembly Routines
@@ -5109 +5119 @@
 
 
-/*
- * Include #pragma aux definitions for Watcom C/C++.
- */
-#if defined(__WATCOMC__) && ARCH_BITS == 16 && defined(RT_ARCH_X86)
-# include "asm-watcom-x86-16.h"
-#elif defined(__WATCOMC__) && ARCH_BITS == 32 && defined(RT_ARCH_X86)
-# include "asm-watcom-x86-32.h"
-#endif
-
-
 /** @} */