* [PATCH] Optional long double fixes
@ 2006-01-20 16:03 Jakub Jelinek
0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2006-01-20 16:03 UTC (permalink / raw)
To: Roland McGrath; +Cc: Glibc hackers
Hi!
Found during playing with the ppc64 patch.
1) There is nothing IEEE quad specific in s_nexttowardfd.c,
that routine uses solely float and double types (and thus ppc64
can use it too).
2) The Implies changes are needed to actually use the sparc assembly
optimized s_* routines, otherwise make picks ldbl-opt ones.
3) The 2006-01-18 math_ldbl_opt.h change broke libm.a.
2006-01-20 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/sparc/sparc32/fpu/Implies: New file.
* sysdeps/unix/sysv/linux/sparc/sparc32/Implies: Removed.
* sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c: Moved to...
* sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c: ... here. New file.
* sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h (long_double_symbol_1): For
C define again using _weak_alias, for assembler use weak_alias.
--- libc/sysdeps/unix/sysv/linux/sparc/sparc32/fpu/Implies.jj 2006-01-19 11:21:32.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sparc/sparc32/fpu/Implies 2006-01-19 11:14:33.000000000 +0100
@@ -0,0 +1,5 @@
+# Override ldbl-opt with sparc specific routines.
+sparc/sparc32/fpu
+# These supply the ABI compatibility for when long double was double.
+ieee754/ldbl-64-128
+ieee754/ldbl-opt
--- libc/sysdeps/unix/sysv/linux/sparc/sparc32/Implies.jj 2006-01-14 13:09:03.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sparc/sparc32/Implies 2006-01-19 11:21:28.000000000 +0100
@@ -1,3 +0,0 @@
-# These supply the ABI compatibility for when long double was double.
-ieee754/ldbl-64-128
-ieee754/ldbl-opt
--- libc/sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c.jj 2006-01-14 13:08:47.000000000 +0100
+++ libc/sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c 2006-01-19 13:09:07.000000000 +0100
@@ -1,77 +0,0 @@
-/* Single precision version of nexttoward.c.
- Conversion to IEEE single float by Jakub Jelinek, jj@ultra.linux.cz. */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/* IEEE functions
- * __nexttowardfd(x,y)
- * return the next machine floating-point number of x in the
- * direction toward y.
- * This is for machines which use different binary type for double and
- * long double conditionally, y is long double equal to double.
- * Special cases:
- */
-
-#include <math_ldbl_opt.h>
-
-float __nldbl_nexttowardf(float x, double y);
-
-float __nldbl_nexttowardf(float x, double y)
-{
- int32_t hx,hy,ix,iy;
- u_int32_t ly;
-
- GET_FLOAT_WORD(hx,x);
- EXTRACT_WORDS(hy,ly,y);
- ix = hx&0x7fffffff; /* |x| */
- iy = hy&0x7fffffff; /* |y| */
-
- if((ix>0x7f800000) || /* x is nan */
- ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0)) /* y is nan */
- return x+y;
- if((double) x==y) return y; /* x=y, return y */
- if(ix==0) { /* x == 0 */
- float x2;
- SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
- x2 = x*x;
- if(x2==x) return x2; else return x; /* raise underflow flag */
- }
- if(hx>=0) { /* x > 0 */
- if(hy<0||(ix>>23)>(iy>>20)-0x380
- || ((ix>>23)==(iy>>20)-0x380
- && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff))) /* x > y, x -= ulp */
- hx -= 1;
- else /* x < y, x += ulp */
- hx += 1;
- } else { /* x < 0 */
- if(hy>=0||(ix>>23)>(iy>>20)-0x380
- || ((ix>>23)==(iy>>20)-0x380
- && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff))) /* x < y, x -= ulp */
- hx -= 1;
- else /* x > y, x += ulp */
- hx += 1;
- }
- hy = hx&0x7f800000;
- if(hy>=0x7f800000) return x+x; /* overflow */
- if(hy<0x00800000) { /* underflow */
- float x2 = x*x;
- if(x2!=x) { /* raise underflow flag */
- SET_FLOAT_WORD(x2,hx);
- return x2;
- }
- }
- SET_FLOAT_WORD(x,hx);
- return x;
-}
-
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
-compat_symbol (libm, __nldbl_nexttowardf, nexttowardf, GLIBC_2_1);
-#endif
--- libc/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h.jj 2006-01-19 08:58:03.000000000 +0100
+++ libc/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h 2006-01-19 13:49:17.000000000 +0100
@@ -24,10 +24,15 @@
# define ldbl_hidden_def(local, name) libc_hidden_def (name)
# define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
# define ldbl_weak_alias(name, aliasname) weak_alias (name, aliasname)
+# ifndef __ASSEMBLER__
/* Note that weak_alias cannot be used - it is defined to nothing
- in most of the files. */
-# define long_double_symbol_1(lib, local, symbol, version) \
+ in most of the C files. */
+# define long_double_symbol_1(lib, local, symbol, version) \
+ _weak_alias (local, symbol)
+# else
+# define long_double_symbol_1(lib, local, symbol, version) \
weak_alias (local, symbol)
+# endif
#else
# define ldbl_hidden_def(local, name) libc_hidden_def (name)
# define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
--- libc/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c.jj 2006-01-19 13:08:59.000000000 +0100
+++ libc/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c 2006-01-14 13:08:47.000000000 +0100
@@ -0,0 +1,77 @@
+/* Single precision version of nexttoward.c.
+ Conversion to IEEE single float by Jakub Jelinek, jj@ultra.linux.cz. */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+/* IEEE functions
+ * __nexttowardfd(x,y)
+ * return the next machine floating-point number of x in the
+ * direction toward y.
+ * This is for machines which use different binary type for double and
+ * long double conditionally, y is long double equal to double.
+ * Special cases:
+ */
+
+#include <math_ldbl_opt.h>
+
+float __nldbl_nexttowardf(float x, double y);
+
+float __nldbl_nexttowardf(float x, double y)
+{
+ int32_t hx,hy,ix,iy;
+ u_int32_t ly;
+
+ GET_FLOAT_WORD(hx,x);
+ EXTRACT_WORDS(hy,ly,y);
+ ix = hx&0x7fffffff; /* |x| */
+ iy = hy&0x7fffffff; /* |y| */
+
+ if((ix>0x7f800000) || /* x is nan */
+ ((iy>=0x7ff00000)&&((iy-0x7ff00000)|ly)!=0)) /* y is nan */
+ return x+y;
+ if((double) x==y) return y; /* x=y, return y */
+ if(ix==0) { /* x == 0 */
+ float x2;
+ SET_FLOAT_WORD(x,(u_int32_t)(hy&0x80000000)|1);/* return +-minsub*/
+ x2 = x*x;
+ if(x2==x) return x2; else return x; /* raise underflow flag */
+ }
+ if(hx>=0) { /* x > 0 */
+ if(hy<0||(ix>>23)>(iy>>20)-0x380
+ || ((ix>>23)==(iy>>20)-0x380
+ && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff))) /* x > y, x -= ulp */
+ hx -= 1;
+ else /* x < y, x += ulp */
+ hx += 1;
+ } else { /* x < 0 */
+ if(hy>=0||(ix>>23)>(iy>>20)-0x380
+ || ((ix>>23)==(iy>>20)-0x380
+ && (ix&0x7fffff)>(((hy<<3)|(ly>>29))&0x7fffff))) /* x < y, x -= ulp */
+ hx -= 1;
+ else /* x > y, x += ulp */
+ hx += 1;
+ }
+ hy = hx&0x7f800000;
+ if(hy>=0x7f800000) return x+x; /* overflow */
+ if(hy<0x00800000) { /* underflow */
+ float x2 = x*x;
+ if(x2!=x) { /* raise underflow flag */
+ SET_FLOAT_WORD(x2,hx);
+ return x2;
+ }
+ }
+ SET_FLOAT_WORD(x,hx);
+ return x;
+}
+
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __nldbl_nexttowardf, nexttowardf, GLIBC_2_1);
+#endif
Jakub
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-01-20 16:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-20 16:03 [PATCH] Optional long double fixes Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).