X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2F_ulong2fs.c;h=32a8192d8488ebb9bd0ed77ea11b1d8107c6d208;hb=1bb6a9b476754a7dd750c60972bbefe75c218f68;hp=5a5078961a2ebd59a215d30fac36d450d48ef10b;hpb=9da5fdfa3ce768702c72349975421df704ec3e4c;p=fw%2Fsdcc

diff --git a/device/lib/_ulong2fs.c b/device/lib/_ulong2fs.c
index 5a507896..32a8192d 100644
--- a/device/lib/_ulong2fs.c
+++ b/device/lib/_ulong2fs.c
@@ -1,3 +1,51 @@
+/* Floating point library in optimized assembly for 8051
+ * Copyright (c) 2004, Paul Stoffregen, paul@pjrc.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+
+#define SDCC_FLOAT_LIB
+#include <float.h>
+
+
+#ifdef FLOAT_ASM_MCS51
+
+// float long __ulong2fs (float x)
+static void dummy(void) __naked
+{
+	__asm
+	.globl	___ulong2fs
+___ulong2fs:
+	mov	r4, a
+	mov	r3, b
+	mov	r2, dph
+	mov	r1, dpl
+	mov	a, #158
+	.globl	ulong2fs_doit
+ulong2fs_doit:
+	clr	sign_a
+long2fs_doit:
+	mov	exp_a, a
+	lcall	fs_normalize_a
+	ljmp	fs_round_and_return
+	__endasm;
+}
+
+#else
+
 /*
 ** libgcc support for software floating point.
 ** Copyright (C) 1991 by Pipeline Associates, Inc.  All rights reserved.
@@ -14,18 +62,7 @@
 ** uunet!motown!pipeline!phw
 */
 
-/* (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
-#define SIGNBIT		((unsigned long)0x80000000)
-#define HIDDEN		(unsigned long)(1 << 23)
-#define SIGN(fp)	((fp) & SIGNBIT)
-#define EXP(fp)		(((fp) >> 23) & (unsigned int) 0x00FF)
-#define MANT(fp)	(((fp) & (unsigned long)0x007FFFFF) | HIDDEN)
-#define PACK(s,e,m)	((s) | ((e) << 23) | (m))
+/* (c)2000/2001: hacked a little by johan.knol@iduna.nl for sdcc */
 
 union float_long
   {
@@ -33,8 +70,7 @@ union float_long
     long l;
   };
 
-float 
-__ulong2fs (unsigned long a )
+float __ulong2fs (unsigned long a )
 {
   int exp = 24 + EXCESS;
   volatile union float_long fl;
@@ -44,15 +80,31 @@ __ulong2fs (unsigned long a )
       return 0.0;
     }
 
+  while (a & NORM) 
+    {
+      // we lose accuracy here
+      a >>= 1;
+      exp++;
+    }
+  
   while (a < HIDDEN)
     {
       a <<= 1;
       exp--;
     }
 
-   a &= ~HIDDEN ;
+#if 1
+  if ((a&0x7fffff)==0x7fffff) {
+    a=0;
+    exp++;
+  }
+#endif
+
+  a &= ~HIDDEN ;
   /* pack up and go home */
   fl.l = PACK(0,(unsigned long)exp, a);
 
   return (fl.f);
 }
+
+#endif