X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2F_fs2ulong.c;h=e792fd17174ac926c1375b6b4a40895cb63b8910;hb=bb226788dab3832b0ec0cda70874ce3fce4eebc6;hp=01f55a49cb259ad3075fcf940acc66d9e0f277a7;hpb=ea34442f1a2452c591734d551d76e46718665404;p=fw%2Fsdcc

diff --git a/device/lib/_fs2ulong.c b/device/lib/_fs2ulong.c
index 01f55a49..e792fd17 100644
--- a/device/lib/_fs2ulong.c
+++ b/device/lib/_fs2ulong.c
@@ -1,3 +1,68 @@
+/* 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
+
+// unsigned long __fs2ulong (float x)
+static void dummy(void) __naked
+{
+	__asm
+	.globl	___fs2ulong
+___fs2ulong:
+	mov	r7, #158
+	.globl	fs2ulong_begin
+fs2ulong_begin:
+	lcall	fsgetarg
+	jnb	sign_a, fs2ulong_int
+	ljmp	fs_return_zero
+
+fs2ulong_int:
+	clr	c
+	mov	a, r7
+	subb	a, exp_a
+	jnc	fs2ulong_int_ok
+	// if we get here, x >= 2^32
+	mov	a, #0xFF
+	mov	b, a
+	mov	dph, a
+	mov	dpl, a
+	ret
+
+fs2ulong_int_ok:
+	mov	r1, #0
+	lcall	fs_rshift_a
+
+fs2ulong_done:
+	mov	dpl, r1
+	mov	dph, r2
+	mov	b, r3
+	mov	a, r4
+	ret
+	__endasm;
+}
+
+#else
+
 /*
 ** libgcc support for software floating point.
 ** Copyright (C) 1991 by Pipeline Associates, Inc.  All rights reserved.
@@ -14,18 +79,8 @@
 ** uunet!motown!pipeline!phw
 */
 
-/* (c)2000: hacked a little by johan.knol@iduna.nl for sdcc */
-
-#include <limits.h>
+/* (c)2000/2001: hacked a little by johan.knol@iduna.nl for sdcc */
 
-/* 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 >> (8*sizeof(fp)-1)) & 1)
-#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))
 
 union float_long
 {
@@ -46,9 +101,6 @@ __fs2ulong (float a1)
   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);
   
@@ -57,6 +109,4 @@ __fs2ulong (float a1)
   return l;
 }
 
-
-
-
+#endif