Changeset 3880

Timestamp:

Jun 27, 2014, 6:01:08 PM (11 years ago)

Author:

bird

Message:

Make libc/misc build with watcom (sans assembly).

Location:

trunk/libc

Files:

• include/emx/startup.h (modified) (1 diff)
• include/sys/sysctl.h (modified) (2 diffs)
• include/unidef.h (modified) (1 diff)
• src/libc/misc/Makefile.kmk (modified) (2 diffs)
• src/libc/misc/abort.c (modified) (2 diffs)
• src/libc/misc/bsearch.c (modified) (1 diff)
• src/libc/misc/sysctl_mib.c (modified) (1 diff)
• src/libc/misc/sysctl_os2.c (modified) (2 diffs)

trunk/libc/include/emx/startup.h

@@ -68 +68 @@
 #  define _CRT_EXIT1(fun) void * __based(__segname("crtexit1")) __crtexit1__##fun##__ = (void *)fun
 # elif defined(_MSC_VER)
-#  define _CRT_INIT1(fun) __declspec(allocate("crtinit1")) void * __crtinit1__##fun##__ = (void *)fun
-#  define _CRT_EXIT1(fun) __declspec(allocate("crtexit1")) void * __crtexit1__##fun##__ = (void *)fun
+#  define _CRT_INIT1(fun) \
+    __Pragma(section("crtinit1", read)); \
+    __declspec(allocate("crtinit1")) void * __crtinit1__##fun##__ = (void *)fun
+#  define _CRT_EXIT1(fun) \
+    __Pragma(section("crtexit1", read)); \
+    __declspec(allocate("crtexit1")) void * __crtexit1__##fun##__ = (void *)fun
 # else
 #  define _CRT_INIT1(fun) void *__crtinit1__##fun##__  __attribute__((__section__("crtinit1"))) = (void *)fun

trunk/libc/include/sys/sysctl.h

@@ -214 +214 @@
         __libc_sysctl_##parent##_##name##_children
 
-#undef DATA_SET
-#define DATA_SET(set, data) __asm__ (".stabs \"___libc_" #set "__\", 25, 0, 0, _" #data)
+#undef SYSCTL_DATA_SET
+#ifdef __OS2__
+# ifdef __WATCOMC__
+#  define SYSCTL_DATA_SET(data) void * __based(__segname("SET2___libc_sysctl_set__")) __libc_sysctl_##data##__ = (void *)&data
+# else
+#  define SYSCTL_DATA_SET(data) __asm__ (".stabs \"___libc_sysctl_set__\", 25, 0, 0, _" #data)
+# endif
+
+#elif defined(__NT__) || defined(__WIN32__) || defined(__WIN64__)
+# if defined(__WATCOMC__)
+#  define SYSCTL_DATA_SET(data) void * __based(__segname("sysctl")) __libc_sysctl_##data##__ = (void *)&data
+# elif defined(_MSC_VER)
+#  define SYSCTL_DATA_SET(data) \
+    __Pragma(section("sysctl", read)); \
+    __declspec(allocate("sysctl")) void * __libc_sysctl_##data##__ = (void *)&data
+# else
+#  error "port me"
+#  define SYSCTL_DATA_SET(data) __asm__ (".stabs \"___libc_sysctl_set__\", 25, 0, 0, _" #data)
+# endif
+#endif
 
 #if __GNUC_PREREQ__(4,2)
@@ -228 +246 @@
                 &__libc_sysctl_##parent##_children, { &__libc_sysctl__##parent##_##name },                       \
                 nbr, kind, a1, a2, #name, handler, fmt, 0, descr };      \
-        DATA_SET(sysctl_set, __libc_sysctl__##parent##_##name)
+        SYSCTL_DATA_SET(__libc_sysctl__##parent##_##name)
 
 

trunk/libc/include/unidef.h

@@ -372 +372 @@
 __END_DECLS
 
-#endif /* __UNIDEF_H__ */
+#endif /* !__UNIDEF_H__ */

trunk/libc/src/libc/misc/Makefile.kmk

@@ -147 +147 @@
     $(PATH_LIBC_SRC)/libc/misc/_uflags.c \
 
+ifndef CFG_LIBC_USE_WATCOM ## port me
 libc_libc_misc_SOURCES.x86 = \
     $(PATH_LIBC_SRC)/libc/misc/386/div.s \
@@ -152 +153 @@
     $(PATH_LIBC_SRC)/libc/misc/386/setjmp.s \
     $(PATH_LIBC_SRC)/libc/misc/386/sigsetjm.s \
-    $(PATH_LIBC_SRC)/libc/misc/386/uldiv.s \
+    $(PATH_LIBC_SRC)/libc/misc/386/uldiv.s
+endif
 
 libc_libc_misc_SOURCES.os2 = \

trunk/libc/src/libc/misc/abort.c

@@ -17 +17 @@
 
     if (getenv("LIBC_BREAKPOINT_ABORT"))
-        __asm__ __volatile__("int $3");
+        __KLIBC_BREAKPOINT();
 
 
@@ -62 +62 @@
     exit(3);
 }
+

trunk/libc/src/libc/misc/bsearch.c

@@ -10 +10 @@
   const void *element;
 
-  if (width <= 0)
+  if (width == 0)
     return NULL;
   left = 1; right = num;

trunk/libc/src/libc/misc/sysctl_mib.c

@@ -56 +56 @@
 #undef security
 
+#ifdef __OS2__
 /* start the set. */
+# ifndef __WATCOMC__
 asm (".stabs  \"___libc_sysctl_set__\", 21, 0, 0, 0xffffffff\n");
-#ifdef __OS2__
+# endif
+
 /* hack to drag in sysctl_os2.c */
+extern struct sysctl_oid_list SYSCTL_NODE_CHILDREN(,os2);
+# ifdef __WATCOMC__
+#  pragma extref __libc_sysctl__os2_children;
+# else
 asm (".stabs \"___libc_sysctl__os2_children\",1,0,0,0\n"); /* (extrn) */
+# endif
 #endif
 

trunk/libc/src/libc/misc/sysctl_os2.c

@@ -62 +62 @@
          * stable number.
          */
-        unsigned cWraps = 0;
+        int cWraps = 0;
         union
         {
@@ -141 +141 @@
         char        szModel[17];
         uint32_t    uRegs[4];
-    } u;
-    if (!u.szModel[0])
-    {
+    } s_u;
+    if (!s_u.szModel[0])
+    {
+        /** @todo check if the CPU support CPUID. */
+#ifdef __WATCOMC__
+extern void getmodel(uint32_t *paValues);
+# pragma aux getmodel = \
+    "xor eax, eax" \
+    "xor ecx, ecx" \
+    "cpuid" \
+    "mov [esi + 0], ebx" \
+    "mov [esi + 4], edx" \
+    "mov [esi + 8], ecx" \
+    parm [esi] modify exact [eax ebx ecx edx]
+        getmodel(s_u.uRegs);
+#else
         int i;
         asm ("cpuid\n"
              : "=a" (i),
-               "=b" (u.uRegs[0]),
-               "=c" (u.uRegs[2]),
-               "=d" (u.uRegs[1])
+               "=b" (s_u.uRegs[0]),
+               "=c" (s_u.uRegs[2]),
+               "=d" (s_u.uRegs[1])
              : "a" (0)
              );
+#endif
     }
 
-    return (sysctl_handle_string(oidp, u.szModel, sizeof(u.szModel), req));
+    return (sysctl_handle_string(oidp, s_u.szModel, sizeof(s_u.szModel), req));
 }