Changeset 3821

Timestamp:

Feb 26, 2014, 2:14:17 AM (11 years ago)

Author:

bird

Message:

More OpenWatcom changes.

Location:

trunk/libc

Files:

• include/386/builtin.h (modified) (6 diffs)
• include/sys/cdefs.h (modified) (1 diff)
• src/fbsdlibc/gdtoa/glue/_hdtoa.c (modified) (2 diffs)
• src/fbsdlibc/gdtoa/glue/_ldtoa.c (modified) (2 diffs)
• src/fbsdlibc/gdtoa/glue/glue.c (modified) (1 diff)
• src/fbsdlibc/gdtoa/glue/machdep_ldisQ.c (modified) (1 diff)
• src/fbsdlibc/gdtoa/glue/machdep_ldisd.c (modified) (1 diff)
• src/fbsdlibc/gdtoa/glue/machdep_ldisx.c (modified) (1 diff)
• src/fbsdlibc/gdtoa/strtod.c (modified) (1 diff)

trunk/libc/include/386/builtin.h

@@ -13 +13 @@
 
 
-static __inline__ signed char __cxchg (__volatile__ signed char *p,
-                                       signed char v)
-{
+#ifdef _MSC_VER
+# pragma intrinsic(_InterlockedExchange)
+# pragma intrinsic(_enable)
+# pragma intrinsic(_disable)
+#endif
+
+
 #ifdef __WATCOMC__
-  /** @todo next up */
+signed char __cxchg(__volatile__ signed char *p, signed char v);
+# pragma aux __cxchg = "xchg [edx], al" parm [edx] [al]  value [al]
+
+short       __sxchg(__volatile__ short *p, short v);
+# pragma aux __sxchg = "xchg [edx], ax" parm [edx] [ax]  value [ax]
+
+int         __lxchg(__volatile__ int *p, int v);
+# pragma aux __lxchg = "xchg [edx], eax" parm [edx] [eax]  value [eax]
+
+void        __enable(void);
+# pragma aux __enable = "sti"
+
+void        __disable(void);
+# pragma aux __disable = "cli"
+
 #else
+
+# ifdef _MSC_VER
+signed char __cxchg (__volatile__ signed char *p, signed char v);
+signed char __sxchg (__volatile__ signed char *p, signed char v);
+# else /* !_MSC_VER */
+static __inline__ signed char __cxchg (__volatile__ signed char *p, signed char v)
+{
   __asm__ __volatile__ ("xchgb %0, %1" : "=m"(*p), "=r"(v) : "1"(v));
-#endif
   return v;
 }
@@ -29 +53 @@
   return v;
 }
+# endif /* !_MSC_VER */
 
 static __inline__ int __lxchg (__volatile__ int *p, int v)
 {
+# ifdef _MSC_VER
+  return _InterlockedExchange((long *)p, v);
+# else
   __asm__ __volatile__ ("xchgl %0, %1" : "=m"(*p), "=r"(v) : "1"(v));
   return v;
+# endif
 }
 
 static __inline__ void __enable (void)
 {
+# ifdef _MSC_VER
+  _enable();
+# else
   __asm__ __volatile__ ("sti");
+# endif
 }
 
 static __inline__ void __disable (void)
 {
+# ifdef _MSC_VER
+  _enable();
+# else
   __asm__ __volatile__ ("cli");
-}
+# endif
+}
+#endif
 
 
@@ -53 +91 @@
  * @param   u       The new value.
  */
+#ifdef __WATCOMC__
+unsigned __atomic_xchg(__volatile__ unsigned *pu, unsigned u);
+# pragma aux __atomic_xchg = "xchg [edx], eax" parm [edx] [eax]  value [eax]
+#else
 static __inline__ unsigned __atomic_xchg(__volatile__ unsigned *pu, unsigned u)
 {
+# ifdef _MSC_VER
+    return _InterlockedExchange((long *)pu, u);
+# else
     __asm__ __volatile__ ("xchgl %0, %1" : "=m" (*pu), "=r" (u) : "1" (u));
     return u;
-}
+# endif
+}
+#endif
 
 /**
@@ -66 +113 @@
  * @param   u16     The new value.
  */
+#ifdef __WATCOMC__
+uint16_t __atomic_xchg_word(volatile uint16_t *pu16, uint16_t u16);
+# pragma aux __atomic_xchg_word = "xchg [edx], ax" parm [edx] [ax]  value [ax]
+#elif defined(_MSC_VER)
+uint16_t __atomic_xchg_word(volatile uint16_t *pu16, uint16_t u16);
+#else
 static inline uint16_t __atomic_xchg_word(volatile uint16_t *pu16, uint16_t u16)
 {
@@ -71 +124 @@
     return u16;
 }
+#endif
+
+#ifndef __WATCOMC__ /** @todo port me later. */
 
 /**
@@ -800 +856 @@
 }
 
+#endif /* ! __WATCOM__ */
+
 __END_DECLS
 #endif /* not _I386_BUILTIN_H */

trunk/libc/include/sys/cdefs.h

@@ -732 +732 @@
 #endif
 
+/*
+ * Smooth things out for other compilers.
+ */
+#if defined(__WATCOMC__) || defined(_MSC_VER)
+# define __volatile__   volatile
+# define __const__      const
+# define __dead2
+# define __pure2
+# define __unused
+# ifdef __cplusplus
+#  define __inline__    inline
+# elif defined(_MSC_VER)
+#  define __inline__    _inline
+# else
+#  define __inline__    _inline
+# endif
+#endif
+
+
 /* bird: include the GNU sys/cdefs.h (which fortunately have another
          blocker, _SYS_CDEFS_H). */

trunk/libc/src/fbsdlibc/gdtoa/glue/_hdtoa.c

@@ -28 +28 @@
 __FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.2 2004/01/21 04:51:50 grehan Exp $");
 
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 #include "namespace.h"
 #endif
@@ -37 +37 @@
 #include <stdlib.h>
 #include "fpmath.h"
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 #include "../gdtoaimp.h"
 #else

trunk/libc/src/fbsdlibc/gdtoa/glue/_ldtoa.c

@@ -28 +28 @@
 __FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.2 2004/01/18 07:53:49 das Exp $");
 
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 #include "namespace.h"
 #endif
@@ -37 +37 @@
 #include <stdlib.h>
 #include "fpmath.h"
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 #include "../gdtoaimp.h"
 #else

trunk/libc/src/fbsdlibc/gdtoa/glue/glue.c

@@ -6 +6 @@
  */
 
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 
 #include <386/builtin.h>

trunk/libc/src/fbsdlibc/gdtoa/glue/machdep_ldisQ.c

@@ -34 +34 @@
 __FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.2 2003/04/09 05:58:43 das Exp $");
 
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 #include "../gdtoaimp.h"
 #else

trunk/libc/src/fbsdlibc/gdtoa/glue/machdep_ldisd.c

@@ -34 +34 @@
 __FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisd.c,v 1.1 2003/03/12 20:29:58 das Exp $");
 
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 #include "../gdtoaimp.h"
 #else

trunk/libc/src/fbsdlibc/gdtoa/glue/machdep_ldisx.c

@@ -34 +34 @@
 __FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.2 2003/04/09 05:58:43 das Exp $");
 
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 #include "../gdtoaimp.h"
 #else

trunk/libc/src/fbsdlibc/gdtoa/strtod.c

@@ -59 +59 @@
 
  double
-#ifdef __EMX__
+#ifdef __IN_KLIBC__
 _STD(strtod)
 #else