Make _decdptr work properly for either DPTR on DS390

[fw/sdcc] / device / lib / _fs2ulong.c

diff --git a/device/lib/_fs2ulong.c b/device/lib/_fs2ulong.c
index 48730bca68cbc6ecc495087074f13b59ee963c79..bdff3c7621d82261493d0a26f3b7778c3d198a81 100644 (file)
--- a/device/lib/_fs2ulong.c
+++ b/device/lib/_fs2ulong.c
@@ -6,52 +6,17 @@
 ** I would appreciate receiving any updates/patches/changes that anyone
 ** makes, and am willing to be the repository for said changes (am I
 ** making a big mistake?).
-
-Warning! Only single-precision is actually implemented.  This file
-won't really be much use until double-precision is supported.
-
-However, once that is done, this file might eventually become a
-replacement for libgcc1.c.  It might also make possible
-cross-compilation for an IEEE target machine from a non-IEEE
-host such as a VAX.
-
-If you'd like to work on completing this, please talk to rms@gnu.ai.mit.edu.
-
-
 **
 ** Pat Wood
 ** Pipeline Associates, Inc.
 ** pipeline!phw@motown.com or
 ** sun!pipeline!phw or
 ** uunet!motown!pipeline!phw
-**
-** 05/01/91 -- V1.0 -- first release to gcc mailing lists
-** 05/04/91 -- V1.1 -- added float and double prototypes and return values
-**                  -- fixed problems with adding and subtracting zero
-**                  -- fixed rounding in truncdfsf2
-**                  -- fixed SWAP define and tested on 386
 */
 
-/*
-** The following are routines that replace the libgcc soft floating point
-** routines that are called automatically when -msoft-float is selected.
-** The support single and double precision IEEE format, with provisions
-** for byte-swapped machines (tested on 386).  Some of the double-precision
-** routines work at full precision, but most of the hard ones simply punt
-** and call the single precision routines, producing a loss of accuracy.
-** long long support is not assumed or included.
-** Overall accuracy is close to IEEE (actually 68882) for single-precision
-** arithmetic.  I think there may still be a 1 in 1000 chance of a bit
-** being rounded the wrong way during a multiply.  I'm not fussy enough to
-** bother with it, but if anyone is, knock yourself out.
-**
-** Efficiency has only been addressed where it was obvious that something
-** would make a big difference.  Anyone who wants to do this right for
-** best speed should go in and rewrite in assembler.
-**
-** I have tested this only on a 68030 workstation and 386/ix integrated
-** in with -msoft-float.
-*/
+/* (c)2000: hacked a little by johan.knol@iduna.nl for sdcc */
+
+#include <_float.h>
 
 /* the following deal with IEEE single-precision numbers */
 #define EXCESS         126
@@ -63,36 +28,35 @@ If you'd like to work on completing this, please talk to rms@gnu.ai.mit.edu.
 #define PACK(s,e,m)    ((s) | ((e) << 23) | (m))
 
 union float_long
-  {
-    float f;
-    long l;
-  };
+{
+  float f;
+  long l;
+};
 
-/* convert double to int */
+/* convert float to unsigned long */
 unsigned long 
 __fs2ulong (float a1)
 {
   volatile union float_long fl1;
   volatile int exp;
   volatile long l;
-
+  
   fl1.f = a1;
-
-  if (!fl1.l)
+  
+  if (!fl1.l || SIGN(fl1.l))
     return (0);
 
+  if (a1>=ULONG_MAX)
+    return ULONG_MAX;
+
   exp = EXP (fl1.l) - EXCESS - 24;
   l = MANT (fl1.l);
+  
+  l >>= -exp;
+
+  return l;
+}
 
-  if (exp > 0)
-    return (0x7F | SIGN(fl1.l)); /* largest integer */
 
-  /* shift down until exp = 0 or l = 0 */
-  if (exp < 0 && exp > -25 && l)
-    l >>= -exp;
-  else
-    return (0);
 
-  return (SIGN(fl1.l) ? -l : l);
-}