Changeset 59310 in vbox

Timestamp:

Jan 12, 2016 12:55:58 AM (9 years ago)

Author:

vboxsync

Message:

iprt/*.h: 16-bit watcom / DOS adjustments.

Location:

trunk/include/iprt

Files:

• asm-amd64-x86-watcom-16.h (modified) (39 diffs)
• asm-amd64-x86.h (modified) (3 diffs)
• cdefs.h (modified) (1 diff)
• types.h (modified) (5 diffs)

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

@@ -48 +48 @@
 #undef      ASMGetIDTR
 #pragma aux ASMGetIDTR = \
+    ".286p" \
     "sidt fword ptr es:[bx]" \
     parm [es bx] \
@@ -54 +55 @@
 #undef      ASMGetIdtrLimit
 #pragma aux ASMGetIdtrLimit = \
+    ".286p" \
     "sub  sp, 8" \
     "mov  bx, sp" \
@@ -65 +67 @@
 #undef      ASMSetIDTR
 #pragma aux ASMSetIDTR = \
+    ".286p" \
     "lidt fword ptr es:[bx]" \
     parm [es bx] nomemory \
@@ -71 +74 @@
 #undef      ASMGetGDTR
 #pragma aux ASMGetGDTR = \
+    ".286p" \
     "sgdt fword ptr es:[bx]" \
     parm [es bx] \
@@ -77 +81 @@
 #undef      ASMSetGDTR
 #pragma aux ASMSetGDTR = \
+    ".286p" \
     "lgdt fword ptr es:[bx]" \
     parm [es bx] nomemory \
@@ -104 +109 @@
 #undef      ASMGetFS
 #pragma aux ASMGetFS = \
+    ".386" \
     "mov ax, fs" \
     parm [] nomemory \
@@ -111 +117 @@
 #undef      ASMGetGS
 #pragma aux ASMGetGS = \
+    ".386" \
     "mov ax, gs" \
     parm [] nomemory \
@@ -125 +132 @@
 #undef      ASMGetTR
 #pragma aux ASMGetTR = \
+    ".286" \
     "str ax" \
     parm [] nomemory \
@@ -132 +140 @@
 #undef      ASMGetLDTR
 #pragma aux ASMGetLDTR = \
+    ".286" \
     "sldt ax" \
     parm [] nomemory \
@@ -226 +235 @@
 #undef      ASMGetCR0
 #pragma aux ASMGetCR0 = \
+    ".386" \
     "mov eax, cr0" \
     "mov edx, eax" \
@@ -235 +245 @@
 #undef      ASMSetCR0
 #pragma aux ASMSetCR0 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -243 +254 @@
 #undef      ASMGetCR2
 #pragma aux ASMGetCR2 = \
+    ".386" \
     "mov eax, cr2" \
     "mov edx, eax" \
@@ -252 +264 @@
 #undef      ASMSetCR2
 #pragma aux ASMSetCR2 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -260 +273 @@
 #undef      ASMGetCR3
 #pragma aux ASMGetCR3 = \
+    ".386" \
     "mov eax, cr3" \
     "mov edx, eax" \
@@ -269 +283 @@
 #undef      ASMSetCR3
 #pragma aux ASMSetCR3 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -277 +292 @@
 #undef      ASMReloadCR3
 #pragma aux ASMReloadCR3 = \
+    ".386" \
     "mov eax, cr3" \
     "mov cr3, eax" \
@@ -284 +300 @@
 #undef      ASMGetCR4
 #pragma aux ASMGetCR4 = \
+    ".386" \
     "mov eax, cr4" \
     "mov edx, eax" \
@@ -293 +310 @@
 #undef      ASMSetCR4
 #pragma aux ASMSetCR4 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -375 +393 @@
 #undef      ASMGetDR0
 #pragma aux ASMGetDR0 = \
+    ".386" \
     "mov eax, dr0" \
     "mov edx, eax" \
@@ -384 +403 @@
 #undef      ASMGetDR1
 #pragma aux ASMGetDR1 = \
+    ".386" \
     "mov eax, dr1" \
     "mov edx, eax" \
@@ -393 +413 @@
 #undef      ASMGetDR2
 #pragma aux ASMGetDR2 = \
+    ".386" \
     "mov eax, dr2" \
     "mov edx, eax" \
@@ -402 +423 @@
 #undef      ASMGetDR3
 #pragma aux ASMGetDR3 = \
+    ".386" \
     "mov eax, dr3" \
     "mov edx, eax" \
@@ -411 +433 @@
 #undef      ASMGetDR6
 #pragma aux ASMGetDR6 = \
+    ".386" \
     "mov eax, dr6" \
     "mov edx, eax" \
@@ -420 +443 @@
 #undef      ASMGetAndClearDR6
 #pragma aux ASMGetAndClearDR6 = \
+    ".386" \
     "mov edx, 0ffff0ff0h" \
     "mov eax, dr6" \
@@ -431 +455 @@
 #undef      ASMGetDR7
 #pragma aux ASMGetDR7 = \
+    ".386" \
     "mov eax, dr7" \
     "mov edx, eax" \
@@ -440 +465 @@
 #undef      ASMSetDR0
 #pragma aux ASMSetDR0 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -448 +474 @@
 #undef      ASMSetDR1
 #pragma aux ASMSetDR1 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -456 +483 @@
 #undef      ASMSetDR2
 #pragma aux ASMSetDR2 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -464 +492 @@
 #undef      ASMSetDR3
 #pragma aux ASMSetDR3 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -472 +501 @@
 #undef      ASMSetDR6
 #pragma aux ASMSetDR6 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -480 +510 @@
 #undef      ASMSetDR7
 #pragma aux ASMSetDR7 = \
+    ".386" \
     "shl edx, 16" \
     "mov dx, ax" \
@@ -516 +547 @@
 #undef      ASMOutU32
 #pragma aux ASMOutU32 = \
+    ".386" \
     "shl ecx, 16" \
     "mov cx, ax" \
@@ -525 +557 @@
 #undef      ASMInU32
 #pragma aux ASMInU32 = \
+    ".386" \
     "in eax, dx" \
     "mov ecx, eax" \
@@ -534 +567 @@
 #undef      ASMOutStrU8
 #pragma aux ASMOutStrU8 = \
+    ".186" \
     "mov ds, bx" \
     "rep outsb" \
@@ -541 +575 @@
 #undef      ASMInStrU8
 #pragma aux ASMInStrU8 = \
+    ".186" \
     "rep insb" \
     parm [dx] [es di] [cx] \
@@ -547 +582 @@
 #undef      ASMOutStrU16
 #pragma aux ASMOutStrU16 = \
+    ".186" \
     "mov ds, bx" \
     "rep outsw" \
@@ -554 +590 @@
 #undef      ASMInStrU16
 #pragma aux ASMInStrU16 = \
+    ".186" \
     "rep insw" \
     parm [dx] [es di] [cx] \
@@ -560 +597 @@
 #undef      ASMOutStrU32
 #pragma aux ASMOutStrU32 = \
+    ".386" \
     "mov ds, bx" \
     "rep outsd" \
@@ -567 +605 @@
 #undef      ASMInStrU32
 #pragma aux ASMInStrU32 = \
+    ".386" \
     "rep insd" \
     parm [dx] [es di] [cx] \

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

@@ -1270 +1270 @@
  * @returns true if CPUID is supported.
  */
+#ifdef __WATCOMC__
+DECLASM(bool) ASMHasCpuId(void);
+#else
 DECLINLINE(bool) ASMHasCpuId(void)
 {
-#ifdef RT_ARCH_AMD64
+# ifdef RT_ARCH_AMD64
     return true; /* ASSUME that all amd64 compatible CPUs have cpuid. */
-#else /* !RT_ARCH_AMD64 */
+# else /* !RT_ARCH_AMD64 */
     bool        fRet = false;
-# if RT_INLINE_ASM_GNU_STYLE
+#  if RT_INLINE_ASM_GNU_STYLE
     uint32_t    u1;
     uint32_t    u2;
@@ -1292 +1295 @@
              "popf\n\t"
              : "=m" (fRet), "=r" (u1), "=r" (u2));
-# else
+#  else
     __asm
     {
@@ -1308 +1311 @@
         popfd
     }
-# endif
+#  endif
     return fRet;
-#endif /* !RT_ARCH_AMD64 */
-}
+# endif /* !RT_ARCH_AMD64 */
+}
+#endif
 
 

trunk/include/iprt/cdefs.h

@@ -411 +411 @@
 # elif defined(_WIN32) || defined(_WIN64)
 #  define RT_OPSYS      RT_OPSYS_WINDOWS
+# elif defined(MSDOS) || defined(_MSDOS) || defined(DOS16RM) /* OW+MSC || MSC || DMC */
+#  define RT_OPSYS      RT_OPSYS_DOS
 # else
 #  error "Port Me"

trunk/include/iprt/types.h

@@ -764 +764 @@
 
 /** Signed integer which can contain both GC and HC pointers. */
-#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32)
+#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32) || (HC_ARCH_BITS == 16 || GC_ARCH_BITS == 16)
 typedef int32_t         RTINTPTR;
 #elif (HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64)
@@ -776 +776 @@
 typedef const RTINTPTR *PCRTINTPTR;
 /** The maximum value the RTINTPTR type can hold. */
-#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32)
+#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32) || (HC_ARCH_BITS == 16 || GC_ARCH_BITS == 16)
 # define RTINTPTR_MAX   INT32_MAX
 #elif (HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64)
@@ -784 +784 @@
 #endif
 /** The minimum value the RTINTPTR type can hold. */
-#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32)
+#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32) || (HC_ARCH_BITS == 16 || GC_ARCH_BITS == 16)
 # define RTINTPTR_MIN   INT32_MIN
 #elif (HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64)
@@ -793 +793 @@
 
 /** Unsigned integer which can contain both GC and HC pointers. */
-#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32)
+#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32) || (HC_ARCH_BITS == 16 || GC_ARCH_BITS == 16)
 typedef uint32_t        RTUINTPTR;
 #elif (HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64)
@@ -805 +805 @@
 typedef const RTUINTPTR *PCRTUINTPTR;
 /** The maximum value the RTUINTPTR type can hold. */
-#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32)
+#if (HC_ARCH_BITS == 32 && GC_ARCH_BITS == 32) || (HC_ARCH_BITS == 16 || GC_ARCH_BITS == 16)
 # define RTUINTPTR_MAX  UINT32_MAX
 #elif (HC_ARCH_BITS == 64 || GC_ARCH_BITS == 64)