Changeset 3866

Timestamp:

Jun 26, 2014, 11:52:22 PM (11 years ago)

Author:

bird

Message:

Make libc/conv build with watcom (taking a little shortcut wrt assembly).

Location:

trunk/libc

Files:

• include/386/builtin.h (modified) (7 diffs)
• src/libc/conv/Makefile.kmk (modified) (2 diffs)
• src/libc/conv/lltoa.c (modified) (1 diff)

trunk/libc/include/386/builtin.h

@@ -874 +874 @@
 
 
-#ifndef __WATCOMC__ /** @todo port me later. */
 
 /* Quick routines similar to div() and friends, but inline */
 
+#ifdef __WATCOMC__
+long __ldivmod (long num, long den, long *rem);
+# pragma aux __ldivmod = \
+    "cdq" \
+    "idiv ecx" \
+    "mov [ebx], edx" \
+    parm [eax] [ecx] [ebx] value [eax]
+#else
 static __inline__ long __ldivmod (long num, long den, long *rem)
 {
+# ifdef _MSC_VER /* No intrisic idiv, but this will be /O2'ed into the gcc code. */
+  *rem = num % den;
+  return num / den;
+# else
   long q, r;
   __asm__ ("cltd; idivl %2"
@@ -886 +897 @@
   *rem = r;
   return q;
-}
-
+# endif
+}
+#endif
+
+#ifdef __WATCOMC__
+unsigned __uldivmod (unsigned long num, unsigned long den, unsigned long *rem);
+# pragma aux __uldivmod = \
+    "xor  edx, edx" \
+    "div  ecx" \
+    "mov [ebx], edx" \
+    parm [eax] [ecx] [ebx] value [eax]
+#else
 static __inline__ unsigned long __uldivmod (unsigned long num,
   unsigned long den, unsigned long *rem)
 {
+# ifdef _MSC_VER /* No intrisic div, but this will be /O2'ed into the gcc code. */
+  *rem = num % den;
+  return num / den;
+# else
   unsigned long q, r;
   __asm__ ("xorl %%edx,%%edx; divl %2"
@@ -897 +922 @@
   *rem = r;
   return q;
-}
+#endif
+}
+#endif
 
 /*
@@ -908 +935 @@
 static __inline__ long long __lldivmod (long long num, long den, long *rem)
 {
+#if !defined(__GNUC__)
+  /* Not bothering with doing this as inline for now. */
+  *rem = num % den;
+  return num / den;
+#else
   long long q;
   long r;
@@ -981 +1013 @@
   *rem = r;
   return q;
+#endif
 }
 
@@ -987 +1020 @@
     instead of two because the result is always a 32-bit integer.
 */
+#ifdef __WATCOMC__
+unsigned long long __ulldivmod (unsigned long long num, unsigned long den, unsigned long *rem);
+# pragma aux __ulldivmod = \
+    "xor  edx, edx" \
+    "div  ebx" \
+    "xchg esi, eax" \
+    "div  ebx" \
+    "mov  [ecx], edx" \
+    "mov  edx, esi" \
+    parm [esi eax] [ebx] [ecx] value [eax edx] modify exact [esi eax edx]
+#else
 static __inline__ unsigned long long __ulldivmod (unsigned long long num,
   unsigned long den, unsigned long *rem)
 {
+# ifdef _MSC_VER
+    unsigned long long q;
+    __asm {
+        mov     ecx, [den]
+        mov     eax, dword ptr [num + 4]
+        xor     edx, edx
+        DIV     ecx     ; capitalized DIV because of _STD(div).
+        mov     dword ptr [q + 4], eax
+        mov     eax, dword ptr [num]
+        DIV     ecx
+        mov     dword ptr [q], eax
+        mov     ecx, [rem]
+        mov     [ecx], edx
+    };
+    return q;
+# else
   unsigned long long q;
   unsigned long r;
@@ -1003 +1063 @@
   *rem = r;
   return q;
-}
-
-#endif /* ! __WATCOM__ */
+# endif
+}
+#endif
 
 __END_DECLS

trunk/libc/src/libc/conv/Makefile.kmk

@@ -65 +65 @@
     $(PATH_LIBC_SRC)/libc/conv/ulltoa.c \
     $(PATH_LIBC_SRC)/libc/conv/ultoa.c \
-    $(PATH_LIBC_SRC)/libc/conv/__digits.c \
+    $(PATH_LIBC_SRC)/libc/conv/__digits.c
 
-libc_libc_conv_SOURCES.x86 = \
+if defined(CFG_LIBC_USE_WATCOM) || "$(KBUILD_TARGET)" != "os2"
+ libc_libc_conv_SOURCES += \
+    $(PATH_LIBC_SRC)/libc/conv/c/biaddbb.c \
+    $(PATH_LIBC_SRC)/libc/conv/c/bidivbw.c \
+    $(PATH_LIBC_SRC)/libc/conv/c/bidivhlp.c \
+    $(PATH_LIBC_SRC)/libc/conv/c/bimulbb.c \
+    $(PATH_LIBC_SRC)/libc/conv/c/bimulbw.c \
+    $(PATH_LIBC_SRC)/libc/conv/c/bisubmbw.c
+else
+## @todo convert to nasm.
+ libc_libc_conv_SOURCES.x86 = \
     $(PATH_LIBC_SRC)/libc/conv/386/biaddbb.s \
     $(PATH_LIBC_SRC)/libc/conv/386/bidivbw.s \
@@ -73 +83 @@
     $(PATH_LIBC_SRC)/libc/conv/386/bimulbb.s \
     $(PATH_LIBC_SRC)/libc/conv/386/bimulbw.s \
-    $(PATH_LIBC_SRC)/libc/conv/386/bisubmbw.s \
+    $(PATH_LIBC_SRC)/libc/conv/386/bisubmbw.s
+endif
 
 $(PATH_LIBC_SRC)/libc/conv/bipow5.c_DEPS = $(PATH_TARGET)/bipow5.tab

trunk/libc/src/libc/conv/lltoa.c

@@ -19 +19 @@
   char digits[64];
   unsigned long long x;
+  unsigned long rem;
   int i;
-  long rem;
 
   dst = string;