Changeset 1871

Timestamp:

Mar 14, 2005, 5:51:09 AM (20 years ago)

Author:

bird

Message:

kicked the old atod implementation (asserts on simple '-30' conversion).

Location:

trunk/src/emx

Files:

• CompileOne.sh (modified) (1 diff, 1 prop)
• Makefile.gmk (modified) (1 diff, 1 prop)
• include/emx/float.h (modified) (1 diff, 1 prop)
• src/lib/bsd/gdtoa/gdtoa.smak (added)
• src/lib/bsd/gdtoa/gdtoaimp.h (modified) (5 diffs, 1 prop)
• src/lib/bsd/gdtoa/glue/_hdtoa.c (modified) (2 diffs, 1 prop)
• src/lib/bsd/gdtoa/glue/_ldtoa.c (modified) (2 diffs, 1 prop)
• src/lib/bsd/gdtoa/glue/glue.c (modified) (2 diffs, 1 prop)
• src/lib/bsd/gdtoa/glue/machdep_ldisQ.c (modified) (1 diff, 1 prop)
• src/lib/bsd/gdtoa/glue/machdep_ldisd.c (modified) (1 diff, 1 prop)
• src/lib/bsd/gdtoa/glue/machdep_ldisx.c (modified) (1 diff, 1 prop)
• src/lib/bsd/gdtoa/strtod.c (modified) (1 diff, 1 prop)
• src/lib/bsd/gdtoa/strtof.c (modified) (1 diff, 1 prop)
• src/lib/conv/atod.c (deleted)
• src/lib/conv/dtoa.c (deleted)
• src/lib/conv/gcvt.c (modified) (1 diff, 1 prop)
• src/lib/conv/legacy-atod.c (added)
• src/lib/conv/legacy-dtoa.c (added)
• src/lib/conv/strtod.c (deleted)
• src/lib/conv/strtof.c (deleted)
• src/lib/conv/strtold.c (deleted)
• src/lib/fwdstub.asm (added)
• src/lib/io/_output.c (modified) (4 diffs, 1 prop)
• src/lib/libc.def (modified) (3 diffs, 1 prop)
• src/lib/libc.smak (modified) (1 diff, 1 prop)
• src/lib/libc06b4.def (added)

trunk/src/emx/CompileOne.sh

@@ -10 +10 @@
    gcc -c -O3 -o $TMP/compileO3.o -fmessage-length=0 -std=gnu99 -Wundef -Wall -Wmissing-prototypes -pedantic -Wno-long-long \
     -DIN_INNOTEK_LIBC -D_NFILES=20 -DHAVE_CONFIG_H \
-    -I$SRCDIR -I$ROOTDIR/include -I$ROOTDIR/src/include -I$OUTDIR/emx -I$ROOTDIR/src/lib/lgpl/include $1 \
+    -I$SRCDIR -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx -I$ROOTDIR/src/lib/lgpl/include $1 \
 && gcc -c -O3 -o $TMP/compileLg.o -fmessage-length=0 -std=gnu99 -Wundef -Wall -Wmissing-prototypes -pedantic -Wno-long-long \
     -DIN_INNOTEK_LIBC -D_NFILES=20 -DHAVE_CONFIG_H -DDEBUG_LOGGING -D__LIBC_STRICT \
-    -I$SRCDIR -I$ROOTDIR/include -I$ROOTDIR/src/include -I$OUTDIR/emx -I$ROOTDIR/src/lib/lgpl/include $1 \
+    -I$SRCDIR -I$ROOTDIR/include -I$ROOTDIR/src/include -I$ROOTDIR/src/lib/bsd/include -I$OUTDIR/emx -I$ROOTDIR/src/lib/lgpl/include $1 \
 && echo succesfully built $1

trunk/src/emx/Makefile.gmk

@@ -97 +97 @@
 endif
 CFLAGS.INC  += -Isrc/include
+CFLAGS.INC  += -Isrc/lib/bsd/include
 CFLAGS      = -Wall -Wundef -Wmissing-prototypes -mstack-arg-probe $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
 # The additional C compiler flags for different build modes

trunk/src/emx/include/emx/float.h

@@ -26 +26 @@
 #define DTOA_GCVT       3
 
-const char * __atod (long double *p_result, const char *string,
-                     int min_exp, int max_exp, int bias,
-                     int mant_dig, int decimal_dig,
-                     int max_10_exp, int min_den_10_exp);
+const char * __legacy_atod (long double *p_result, const char *string,
+                            int min_exp, int max_exp, int bias,
+                            int mant_dig, int decimal_dig,
+                            int max_10_exp, int min_den_10_exp);
 
-char *__dtoa (char *buffer, int *p_exp, long double x, int ndigits,
-              int fmt, int dig);
+char *__legacy_dtoa (char *buffer, int *p_exp, long double x, int ndigits,
+                     int fmt, int dig);
 
 void __remove_zeros (char *digits, int keep);

trunk/src/emx/src/lib/bsd/gdtoa/gdtoaimp.h

@@ -178 +178 @@
 #ifndef GDTOAIMP_H_INCLUDED
 #define GDTOAIMP_H_INCLUDED
+#ifdef __EMX__
+#include "namespace.h"
+#endif
 #include "gdtoa.h"
 
@@ -191 +194 @@
 
 #include "namespace.h"
+#ifdef __EMX__
+#include <386/builtin.h>
+#include <sys/fmutex.h>
+#else /* !__EMX__ */
 #include <pthread.h>
+#endif /* !__EMX__ */
 #include "un-namespace.h"
 
@@ -470 +478 @@
 
 #define MULTIPLE_THREADS
+#ifdef __EMX__
+extern _fmutex __libc_gdtoa_locks[2];
+#define ACQUIRE_DTOA_LOCK(n)    do {                            \
+    if (__libc_gdtoa_locks[n].fs == _FMS_UNINIT)                     \
+        _fmutex_checked_create2(&__libc_gdtoa_locks[n], 0, "gdtoa lock no." #n); \
+    _fmutex_checked_request(&__libc_gdtoa_locks[n], 0);              \
+} while(0)
+#define FREE_DTOA_LOCK(n)       do {                            \
+    _fmutex_checked_release(&__libc_gdtoa_locks[n]);                 \
+} while(0)
+#else /* !__EMX__ */
 extern pthread_mutex_t __gdtoa_locks[2];
 #define ACQUIRE_DTOA_LOCK(n)    do {                            \
@@ -479 +498 @@
                 _pthread_mutex_unlock(&__gdtoa_locks[n]);       \
 } while(0)
+#endif /* !__EMX__ */
 
 #define Kmax 15
@@ -631 +651 @@
  extern int strtodg ANSI((CONST char*, char**, FPI*, Long*, ULong*));
 
+#ifdef __EMX__
+ extern char*   g_ddfmt  ANSI((char*, double*, int, unsigned));
+ extern char*   g_dfmt   ANSI((char*, double*, int, unsigned));
+ extern char*   g_ffmt   ANSI((char*, float*,  int, unsigned));
+ extern char*   g_Qfmt   ANSI((char*, void*,   int, unsigned));
+ extern char*   g_xfmt   ANSI((char*, void*,   int, unsigned));
+ extern char*   g_xLfmt  ANSI((char*, void*,   int, unsigned));
+#endif /* __EMX__ */
+
  extern int strtoId ANSI((CONST char *, char **, double *, double *));
  extern int strtoIdd ANSI((CONST char *, char **, double *, double *));

trunk/src/emx/src/lib/bsd/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__
+#include "namespace.h"
+#endif
 #include <float.h>
 #include <inttypes.h>
@@ -34 +37 @@
 #include <stdlib.h>
 #include "fpmath.h"
+#ifdef __EMX__
+#include "../gdtoaimp.h"
+#else
 #include "gdtoaimp.h"
+#endif
 
 /* Strings values used by dtoa() */

trunk/src/emx/src/lib/bsd/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__
+#include "namespace.h"
+#endif
 #include <float.h>
 #include <inttypes.h>
@@ -34 +37 @@
 #include <stdlib.h>
 #include "fpmath.h"
+#ifdef __EMX__
+#include "../gdtoaimp.h"
+#else
 #include "gdtoaimp.h"
+#endif
 
 /*

trunk/src/emx/src/lib/bsd/gdtoa/glue/glue.c

@@ -6 +6 @@
  */
 
+#ifdef __EMX__
+
+#include <386/builtin.h>
+#include <sys/fmutex.h>
+_fmutex __libc_gdtoa_locks[2] = {0};
+
+#else
+
 #include <pthread.h>
 
@@ -12 +20 @@
         PTHREAD_MUTEX_INITIALIZER
 };
+#endif

trunk/src/emx/src/lib/bsd/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__
+#include "../gdtoaimp.h"
+#else
 #include "gdtoaimp.h"
+#endif
 
 long double

trunk/src/emx/src/lib/bsd/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__
+#include "../gdtoaimp.h"
+#else
 #include "gdtoaimp.h"
+#endif
 
 long double

trunk/src/emx/src/lib/bsd/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__
+#include "../gdtoaimp.h"
+#else
 #include "gdtoaimp.h"
+#endif
 
 long double
-strtold(const char * __restrict s, char ** __restrict sp)
+_STD(strtold)(const char * __restrict s, char ** __restrict sp)
 {
         long double result;

trunk/src/emx/src/lib/bsd/gdtoa/strtod.c

@@ -59 +59 @@
 
  double
+#ifdef __EMX__
+_STD(strtod)
+#else
 strtod
+#endif
 #ifdef KR_headers
         (s00, se) CONST char *s00; char **se;

trunk/src/emx/src/lib/bsd/gdtoa/strtof.c

@@ -37 +37 @@
 
 #include "gdtoaimp.h"
+#include <stdlib.h>
 
  float
 #ifdef KR_headers
-strtof(s, sp) CONST char *s; char **sp;
+_STD(strtof)(s, sp) CONST char *s; char **sp;
 #else
-strtof(CONST char *s, char **sp)
+_STD(strtof)(CONST char *s, char **sp)
 #endif
 {

trunk/src/emx/src/lib/conv/gcvt.c

@@ -70 +70 @@
   /* Compute a string of digits and an exponent for the number. */
 
-  str = __dtoa (digstr, &xp, x, digits, DTOA_GCVT, DBL_DIG);
+  str = __legacy_dtoa (digstr, &xp, x, digits, DTOA_GCVT, DBL_DIG);
   __remove_zeros (str, 1);
 

trunk/src/emx/src/lib/io/_output.c

@@ -546 +546 @@
       int xp;
 
-      p = __dtoa (digits, &xp, x, v->prec, DTOA_PRINTF_F, v->dig);
+      p = __legacy_dtoa (digits, &xp, x, v->prec, DTOA_PRINTF_F, v->dig);
       return cvt_fixed_digits (v, p, xp, is_neg, FALSE);
     }
@@ -570 +570 @@
       int xp;
 
-      p = __dtoa (digits, &xp, x, v->prec, DTOA_PRINTF_E, v->dig);
+      p = __legacy_dtoa (digits, &xp, x, v->prec, DTOA_PRINTF_E, v->dig);
       return cvt_exp_digits (v, p, xp, is_neg, xp_char, FALSE);
     }
@@ -587 +587 @@
     v->prec = 1;
 
-  /* 0.0 is treated specially as __dtoa() etc. cannot handle that
+  /* 0.0 is treated specially as __legacy_dtoa() etc. cannot handle that
      case. */
 
@@ -598 +598 @@
       int xp;
 
-      p = __dtoa (digits, &xp, x, v->prec, DTOA_PRINTF_G, v->dig);
+      p = __legacy_dtoa (digits, &xp, x, v->prec, DTOA_PRINTF_G, v->dig);
 
       /* If the exponent (of "%e" format) is less than -4 or greater

trunk/src/emx/src/lib/libc.def

@@ -179 +179 @@
     "___argz_replace" @193
     "___argz_stringify" @194
-    "___atod" @195
+    "___legacy_atod" @195
     "___big_delete" @196
     "___big_insert" @197
@@ -219 +219 @@
     "___dbpanic" @233
     "___delpair" @234
-    "___dtoa" @235
+    "___legacy_dtoa" @235
     "___dup" @236
     "___dup2" @237
@@ -1401 +1401 @@
     "___textdomain" @1411
     "__nl_locale_name" @1412
+    ;; gdtoa
+    "___Balloc_D2A" @1413
+    "___Bfree_D2A" @1414
+    "___ULtoQ_D2A" @1415
+    "___ULtod_D2A" @1416
+    "___ULtodd_D2A" @1417
+    "___ULtof_D2A" @1418
+    "___ULtox_D2A" @1419
+    "___ULtoxL_D2A" @1420
+    "___any_on_D2A" @1421
+    "___b2d_D2A" @1422
+    "___bigtens_D2A" @1423
+    "___cmp_D2A" @1424
+    "___copybits_D2A" @1425
+    "___d2b_D2A" @1426
+    "___decrement_D2A" @1427
+    "___diff_D2A" @1428
+    "___freedtoa" @1429
+    "___g_Qfmt" @1430
+    "___g_ddfmt" @1431
+    "___g_dfmt" @1432
+    "___gdtoa" @1433
+    "___gethex_D2A" @1434
+    "___g_ffmt" @1435
+    "___g__fmt_D2A" @1436
+    "___g_xLfmt" @1437
+    "___g_xfmt" @1438
+    "___hdtoa" @1439
+    "___hexdig_D2A" @1440
+    "___hexdig_init_D2A" @1441
+    "___hexnan_D2A" @1442
+    "___hi0bits_D2A" @1443
+    "___hldtoa" @1444
+    "___i2b_D2A" @1445
+    "___increment_D2A" @1446
+    "___ldtoa" @1447
+    "___lo0bits_D2A" @1448
+    "___lshift_D2A" @1449
+    "___match_D2A" @1450
+    "___mult_D2A" @1451
+    "___multadd_D2A" @1452
+    "___nrv_alloc_D2A" @1453
+    "___pow5mult_D2A" @1454
+    "___quorem_D2A" @1455
+    "___ratio_D2A" @1456
+    "___rshift_D2A" @1457
+    "___rv_alloc_D2A" @1458
+    "___s2b_D2A" @1459
+    "___set_ones_D2A" @1460
+    "___strcp_D2A" @1461
+    "___strtoIQ" @1462
+    "___strtoId" @1463
+    "___strtoIdd" @1464
+    "___strtoIf" @1465
+    "___strtoIg_D2A" @1466
+    "___strtoIx" @1467
+    "___strtoIxL" @1468
+    "___strtodI" @1469
+    "___strtodg" @1470
+    "___strtopQ" @1471
+    "___strtopd" @1472
+    "___strtopdd" @1473
+    "___strtopf" @1474
+    "___strtopx" @1475
+    "___strtopxL" @1476
+    "___strtorQ" @1477
+    "___strtord" @1478
+    "___strtordd" @1479
+    "___strtorf" @1480
+    "___strtorx" @1481
+    "___strtorxL" @1482
+    "___sum_D2A" @1483
+    "___tens_D2A" @1484
+    "___tinytens_D2A" @1485
+    "___trailz_D2A" @1486
+    "___ulp_D2A" @1487
+    "___dtoa" @1488

trunk/src/emx/src/lib/libc.smak

@@ -391 +391 @@
 libc.TDEP.$(CPU) :=
 libc.TDEP :=
+
+
+#
+# Forwarder DLLs for backward compatibility.
+#                       
+$.omf/fwdstub.obj: src/lib/fwdstub.asm
+        $(call DO.COMPILE.asm)
+        
+$.omf/libc06b4.dll: src/lib/libc06b4.def $.omf/fwdstub.obj $.omf/libc_dll.lib
+        gcc -Zomf -o $@ -nostdlib -Zdll $^
+$(INS)lib/libc06b4.dll: $.omf/libc06b4.dll
+        $(call CP,$<,$@)
+INS.FILES += $(INS)lib/libc06b4.dll
+libc-dll: $.omf/libc06b4.dll