[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r22086 - in /fsf/trunk/libc: ./ elf/ misc/sys/ nptl/ ports/ ports/sysdeps/unix/sysv/linux/tile/nptl/ sysdeps/gnu/netinet/ sy...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r22086 - in /fsf/trunk/libc: ./ elf/ misc/sys/ nptl/ ports/ ports/sysdeps/unix/sysv/linux/tile/nptl/ sysdeps/gnu/netinet/ sy...
- From: eglibc@xxxxxxxxxx
- Date: Sat, 29 Dec 2012 00:01:53 -0000
Author: eglibc
Date: Sat Dec 29 00:01:52 2012
New Revision: 22086
Log:
Import glibc-mainline for 2012-12-29
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/elf/elf.h
fsf/trunk/libc/misc/sys/cdefs.h
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/pthread_rwlock_tryrdlock.c
fsf/trunk/libc/nptl/pthread_rwlock_trywrlock.c
fsf/trunk/libc/ports/ChangeLog.tile
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h
fsf/trunk/libc/sysdeps/gnu/netinet/tcp.h
fsf/trunk/libc/sysdeps/ieee754/dbl-64/atnat.h
fsf/trunk/libc/sysdeps/ieee754/dbl-64/atnat2.h
fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpa.c
fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpa2.h
fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpatan.c
fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpatan.h
fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpexp.h
fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpsqrt.h
fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_tan.c
fsf/trunk/libc/sysdeps/ieee754/dbl-64/ulog.h
fsf/trunk/libc/sysdeps/ieee754/dbl-64/utan.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Dec 29 00:01:52 2012
@@ -1,3 +1,37 @@
+2012-12-28 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
+
+ * sysdeps/ieee754/dbl-64/mpatan.c (__mpatan): Remove
+ __ATAN_TWOM.
+ * sysdeps/ieee754/dbl-64/mpatan.h: Likewise.
+
+ * sysdeps/ieee754/dbl-64/atnat.h: Replaced constants with
+ their values.
+ * sysdeps/ieee754/dbl-64/atnat2.h: Likewise.
+ * sysdeps/ieee754/dbl-64/s_tan.c (tan): Likewise.
+ * sysdeps/ieee754/dbl-64/ulog.h: Likewise.
+ * sysdeps/ieee754/dbl-64/utan.h: Likewise.
+
+2012-12-28 Andreas Jaeger <aj@xxxxxxx>
+
+ * elf/elf.h (NT_S390_TDB, NT_FILE, NT_SIGINFO): Define. New
+ values are from Linux 3.7.
+
+ * sysdeps/gnu/netinet/tcp.h (TCPI_OPT_SYN_DATA)
+ (TCPI_OPT_ECN_SEEN): Define. Sync with Linux 3.7.
+
+2012-12-28 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
+
+ * misc/sys/cdefs.h (__glibc_likely): Wrap __builtin_expect for
+ TRUE case.
+
+ * sysdeps/ieee754/dbl-64/mpa.c (norm): Define R as RADIXI.
+ (norm): Likewise.
+ * sysdeps/ieee754/dbl-64/mpa2.h: Remove all static const
+ variables with preprocessor constants.
+ * sysdeps/ieee754/dbl-64/mpatan.h: Likewise.
+ * sysdeps/ieee754/dbl-64/mpexp.h: Likewise.
+ * sysdeps/ieee754/dbl-64/mpsqrt.h: Likewise.
+
2012-12-27 Bruno Haible <bruno@xxxxxxxxx>
[BZ #14317]
Modified: fsf/trunk/libc/elf/elf.h
==============================================================================
--- fsf/trunk/libc/elf/elf.h (original)
+++ fsf/trunk/libc/elf/elf.h Sat Dec 29 00:01:52 2012
@@ -616,6 +616,10 @@
#define NT_LWPSTATUS 16 /* Contains copy of lwpstatus struct */
#define NT_LWPSINFO 17 /* Contains copy of lwpinfo struct */
#define NT_PRFPXREG 20 /* Contains copy of fprxregset struct */
+#define NT_SIGINFO 0x53494749 /* Contains copy of siginfo_t,
+ size might increase */
+#define NT_FILE 0x46494c45 /* Contains information about mapped
+ files */
#define NT_PRXFPREG 0x46e62b7f /* Contains copy of user_fxsr_struct */
#define NT_PPC_VMX 0x100 /* PowerPC Altivec/VMX registers */
#define NT_PPC_SPE 0x101 /* PowerPC SPE/EVR registers */
@@ -631,6 +635,7 @@
#define NT_S390_PREFIX 0x305 /* s390 prefix register */
#define NT_S390_LAST_BREAK 0x306 /* s390 breaking event address */
#define NT_S390_SYSTEM_CALL 0x307 /* s390 system call restart data */
+#define NT_S390_TDB 0x308 /* s390 transaction diagnostic block */
#define NT_ARM_VFP 0x400 /* ARM VFP/NEON registers */
#define NT_ARM_TLS 0x401 /* ARM TLS register */
#define NT_ARM_HW_BREAK 0x402 /* ARM hardware breakpoint registers */
Modified: fsf/trunk/libc/misc/sys/cdefs.h
==============================================================================
--- fsf/trunk/libc/misc/sys/cdefs.h (original)
+++ fsf/trunk/libc/misc/sys/cdefs.h Sat Dec 29 00:01:52 2012
@@ -378,8 +378,10 @@
#if __GNUC__ >= 3
# define __glibc_unlikely(cond) __builtin_expect((cond), 0)
+# define __glibc_likely(cond) __builtin_expect((cond), 1)
#else
# define __glibc_unlikely(cond) (cond)
+# define __glibc_likely(cond) (cond)
#endif
#include <bits/wordsize.h>
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Sat Dec 29 00:01:52 2012
@@ -1,3 +1,10 @@
+2012-12-28 Andi Kleen <ak@xxxxxxxxxxxxxxx>
+
+ * pthread_rwlock_tryrdlock.c (__pthread_rwlock_tryrdlock): Convert
+ to prototype.
+ * pthread_rwlock_trywrlock.c (__pthread_rwlock_trywrlock):
+ Likewise.
+
2012-12-27 David S. Miller <davem@xxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/sparc/lowlevellock.h
Modified: fsf/trunk/libc/nptl/pthread_rwlock_tryrdlock.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_rwlock_tryrdlock.c (original)
+++ fsf/trunk/libc/nptl/pthread_rwlock_tryrdlock.c Sat Dec 29 00:01:52 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -22,8 +22,7 @@
int
-__pthread_rwlock_tryrdlock (rwlock)
- pthread_rwlock_t *rwlock;
+__pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
{
int result = EBUSY;
Modified: fsf/trunk/libc/nptl/pthread_rwlock_trywrlock.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_rwlock_trywrlock.c (original)
+++ fsf/trunk/libc/nptl/pthread_rwlock_trywrlock.c Sat Dec 29 00:01:52 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -22,8 +22,7 @@
int
-__pthread_rwlock_trywrlock (rwlock)
- pthread_rwlock_t *rwlock;
+__pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
{
int result = EBUSY;
Modified: fsf/trunk/libc/ports/ChangeLog.tile
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.tile (original)
+++ fsf/trunk/libc/ports/ChangeLog.tile Sat Dec 29 00:01:52 2012
@@ -1,3 +1,8 @@
+2012-12-28 Chris Metcalf <cmetcalf@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h
+ (lll_futex_timed_wait_bitset): New macro.
+
2012-12-14 Chris Metcalf <cmetcalf@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/tile/nptl/clone.S: Fix DWARF info.
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h Sat Dec 29 00:01:52 2012
@@ -86,6 +86,19 @@
(val), (timespec)); \
})
+#define lll_futex_timed_wait_bitset(futexp, val, timespec, clockbit, private) \
+ ({ \
+ INTERNAL_SYSCALL_DECL (__err); \
+ long int __ret; \
+ int __op = FUTEX_WAIT_BITSET | clockbit; \
+ \
+ __ret = INTERNAL_SYSCALL (futex, __err, 6, (futexp), \
+ __lll_private_flag (__op, private), \
+ (val), (timespec), NULL /* Unused. */, \
+ FUTEX_BITSET_MATCH_ANY); \
+ __ret; \
+ })
+
#define lll_futex_wake(futexp, nr, private) \
({ \
INTERNAL_SYSCALL_DECL (__err); \
Modified: fsf/trunk/libc/sysdeps/gnu/netinet/tcp.h
==============================================================================
--- fsf/trunk/libc/sysdeps/gnu/netinet/tcp.h (original)
+++ fsf/trunk/libc/sysdeps/gnu/netinet/tcp.h Sat Dec 29 00:01:52 2012
@@ -173,7 +173,9 @@
# define TCPI_OPT_TIMESTAMPS 1
# define TCPI_OPT_SACK 2
# define TCPI_OPT_WSCALE 4
-# define TCPI_OPT_ECN 8
+# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init */
+# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with ECT */
+# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd */
/* Values for tcpi_state. */
enum tcp_ca_state
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/atnat.h
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/atnat.h (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/atnat.h Sat Dec 29 00:01:52 2012
@@ -1,7 +1,7 @@
/*
* IBM Accurate Mathematical Library
* Written by International Business Machines Corp.
- * Copyright (C) 2001 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2012 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -52,8 +52,6 @@
/**/ f17 = {{0x3fae1e1e, 0x1e1e1e1e} }, /* 1/17 */
/**/ f19 = {{0xbfaaf286, 0xbca1af28} }, /* -1/19 */
/* constants */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ one = {{0x3ff00000, 0x00000000} }, /* 1 */
/**/ a = {{0x3e4bb67a, 0x00000000} }, /* 1.290e-8 */
/**/ b = {{0x3fb00000, 0x00000000} }, /* 1/16 */
/**/ c = {{0x3ff00000, 0x00000000} }, /* 1 */
@@ -77,9 +75,7 @@
/**/ u9[M] ={{{0x38c1aa5b, 0x00000000} }, /* 2.658e-35 */
/**/ {{0x35c1aa4d, 0x00000000} }, /* 9.443e-50 */
/**/ {{0x32c1aa88, 0x00000000} }, /* 3.355e-64 */
-/**/ {{0x11c1aa56, 0x00000000} }},/* 3.818e-223 */
-/**/ two8 = {{0x40700000, 0x00000000} }, /* 2**8=256 */
-/**/ two52 = {{0x43300000, 0x00000000} }; /* 2**52 */
+/**/ {{0x11c1aa56, 0x00000000} }};/* 3.818e-223 */
#else
#ifdef LITTLE_ENDI
@@ -106,8 +102,6 @@
/**/ f17 = {{0x1e1e1e1e, 0x3fae1e1e} }, /* 1/17 */
/**/ f19 = {{0xbca1af28, 0xbfaaf286} }, /* -1/19 */
/* constants */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ one = {{0x00000000, 0x3ff00000} }, /* 1 */
/**/ a = {{0x00000000, 0x3e4bb67a} }, /* 1.290e-8 */
/**/ b = {{0x00000000, 0x3fb00000} }, /* 1/16 */
/**/ c = {{0x00000000, 0x3ff00000} }, /* 1 */
@@ -131,15 +125,13 @@
/**/ u9[M] ={{{0x00000000, 0x38c1aa5b} }, /* 2.658e-35 */
/**/ {{0x00000000, 0x35c1aa4d} }, /* 9.443e-50 */
/**/ {{0x00000000, 0x32c1aa88} }, /* 3.355e-64 */
-/**/ {{0x00000000, 0x11c1aa56} }},/* 3.818e-223 */
-/**/ two8 = {{0x00000000, 0x40700000} }, /* 2**8=256 */
-/**/ two52 = {{0x00000000, 0x43300000} }; /* 2**52 */
+/**/ {{0x00000000, 0x11c1aa56} }};/* 3.818e-223 */
#endif
#endif
-#define ZERO zero.d
-#define ONE one.d
+#define ZERO 0.0
+#define ONE 1.0
#define A a.d
#define B b.d
#define C c.d
@@ -160,7 +152,7 @@
#define U6 u6.d
#define U7 u7.d
#define U8 u8.d
-#define TWO8 two8.d
-#define TWO52 two52.d
+#define TWO8 0x1.0p8 /* 2^8 */
+#define TWO52 0x1.0p52 /* 2^52 */
#endif
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/atnat2.h
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/atnat2.h (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/atnat2.h Sat Dec 29 00:01:52 2012
@@ -2,7 +2,7 @@
/*
* IBM Accurate Mathematical Library
* Written by International Business Machines Corp.
- * Copyright (C) 2001 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2012 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -57,9 +57,6 @@
/**/ f17 = {{0x3fae1e1e, 0x1e1e1e1e} }, /* 1/17 */
/**/ f19 = {{0xbfaaf286, 0xbca1af28} }, /* -1/19 */
/* constants */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ mzero = {{0x80000000, 0x00000000} }, /* -0 */
-/**/ one = {{0x3ff00000, 0x00000000} }, /* 1 */
/**/ inv16 = {{0x3fb00000, 0x00000000} }, /* 1/16 */
/**/ opi = {{0x400921fb, 0x54442d18} }, /* pi */
/**/ opi1 = {{0x3ca1a626, 0x33145c07} }, /* pi-opi */
@@ -95,11 +92,8 @@
/**/ {{0x23c6eee8, 0x00000000} }, /* 2.465e-136 */
/**/ {{0x11c6ed16, 0x00000000} }},/* 4.955e-223 */
/**/ ue = {{0x38900e9d, 0x00000000} }, /* 3.02e-36 */
-/**/ two8 = {{0x40700000, 0x00000000} }, /* 2**8=256 */
-/**/ two52 = {{0x43300000, 0x00000000} }, /* 2**52 */
/**/ two500 = {{0x5f300000, 0x00000000} }, /* 2**500 */
-/**/ twom500 = {{0x20b00000, 0x00000000} }, /* 2**(-500) */
-/**/ twom1022 = {{0x00100000, 0x00000000} }; /* 2**(-1022) */
+/**/ twom500 = {{0x20b00000, 0x00000000} }; /* 2**(-500) */
#else
#ifdef LITTLE_ENDI
@@ -127,9 +121,6 @@
/**/ f17 = {{0x1e1e1e1e, 0x3fae1e1e} }, /* 1/17 */
/**/ f19 = {{0xbca1af28, 0xbfaaf286} }, /* -1/19 */
/* constants */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ mzero = {{0x00000000, 0x80000000} }, /* -0 */
-/**/ one = {{0x00000000, 0x3ff00000} }, /* 1 */
/**/ inv16 = {{0x00000000, 0x3fb00000} }, /* 1/16 */
/**/ opi = {{0x54442d18, 0x400921fb} }, /* pi */
/**/ opi1 = {{0x33145c07, 0x3ca1a626} }, /* pi-opi */
@@ -165,20 +156,17 @@
/**/ {{0x00000000, 0x23c6eee8} }, /* 2.465e-136 */
/**/ {{0x00000000, 0x11c6ed16} }},/* 4.955e-223 */
/**/ ue = {{0x00000000, 0x38900e9d} }, /* 3.02e-36 */
-/**/ two8 = {{0x00000000, 0x40700000} }, /* 2**8=256 */
-/**/ two52 = {{0x00000000, 0x43300000} }, /* 2**52 */
/**/ two500 = {{0x00000000, 0x5f300000} }, /* 2**500 */
-/**/ twom500 = {{0x00000000, 0x20b00000} }, /* 2**(-500) */
-/**/ twom1022 = {{0x00000000, 0x00100000} }; /* 2**(-1022) */
+/**/ twom500 = {{0x00000000, 0x20b00000} }; /* 2**(-500) */
#endif
#endif
-#define ZERO zero.d
-#define MZERO mzero.d
-#define ONE one.d
-#define TWO8 two8.d
-#define TWO52 two52.d
-#define TWOM1022 twom1022.d
+#define ZERO 0.0 /* 0 */
+#define MZERO -0.0 /* 0 with the sign bit set */
+#define ONE 1.0 /* 1 */
+#define TWO8 0x1.0p8 /* 2^8 */
+#define TWO52 0x1.0p52 /* 2^52 */
+#define TWOM1022 0x1.0p-1022 /* 2^-1022 */
#endif
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpa.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpa.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpa.c Sat Dec 29 00:01:52 2012
@@ -139,7 +139,7 @@
/* number *y, normalized case (|x| >= 2**(-1022))) */
static void norm(const mp_no *x, double *y, int p)
{
- #define R radixi.d
+ #define R RADIXI
int i;
#if 0
int k;
@@ -199,7 +199,7 @@
double a,v;
#endif
-#define R radixi.d
+#define R RADIXI
if (EX<-44 || (EX==-44 && X[1]<TWO5))
{ *y=ZERO; return; }
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpa2.h
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpa2.h (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpa2.h Sat Dec 29 00:01:52 2012
@@ -30,65 +30,21 @@
#ifndef MPA2_H
#define MPA2_H
-
-#ifdef BIG_ENDI
-static const number
-/**/ radix = {{0x41700000, 0x00000000} }, /* 2**24 */
-/**/ radixi = {{0x3e700000, 0x00000000} }, /* 2**-24 */
-/**/ cutter = {{0x44b00000, 0x00000000} }, /* 2**76 */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ one = {{0x3ff00000, 0x00000000} }, /* 1 */
-/**/ mone = {{0xbff00000, 0x00000000} }, /* -1 */
-/**/ two = {{0x40000000, 0x00000000} }, /* 2 */
-/**/ two5 = {{0x40400000, 0x00000000} }, /* 2**5 */
-/**/ two10 = {{0x40900000, 0x00000000} }, /* 2**10 */
-/**/ two18 = {{0x41100000, 0x00000000} }, /* 2**18 */
-/**/ two19 = {{0x41200000, 0x00000000} }, /* 2**19 */
-/**/ two23 = {{0x41600000, 0x00000000} }, /* 2**23 */
-/**/ two52 = {{0x43300000, 0x00000000} }, /* 2**52 */
-/**/ two57 = {{0x43800000, 0x00000000} }, /* 2**57 */
-/**/ two71 = {{0x44600000, 0x00000000} }, /* 2**71 */
-/**/ twom1032 = {{0x00000400, 0x00000000} }; /* 2**-1032 */
-
-#else
-#ifdef LITTLE_ENDI
-static const number
-/**/ radix = {{0x00000000, 0x41700000} }, /* 2**24 */
-/**/ radixi = {{0x00000000, 0x3e700000} }, /* 2**-24 */
-/**/ cutter = {{0x00000000, 0x44b00000} }, /* 2**76 */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ one = {{0x00000000, 0x3ff00000} }, /* 1 */
-/**/ mone = {{0x00000000, 0xbff00000} }, /* -1 */
-/**/ two = {{0x00000000, 0x40000000} }, /* 2 */
-/**/ two5 = {{0x00000000, 0x40400000} }, /* 2**5 */
-/**/ two10 = {{0x00000000, 0x40900000} }, /* 2**10 */
-/**/ two18 = {{0x00000000, 0x41100000} }, /* 2**18 */
-/**/ two19 = {{0x00000000, 0x41200000} }, /* 2**19 */
-/**/ two23 = {{0x00000000, 0x41600000} }, /* 2**23 */
-/**/ two52 = {{0x00000000, 0x43300000} }, /* 2**52 */
-/**/ two57 = {{0x00000000, 0x43800000} }, /* 2**57 */
-/**/ two71 = {{0x00000000, 0x44600000} }, /* 2**71 */
-/**/ twom1032 = {{0x00000000, 0x00000400} }; /* 2**-1032 */
+#define RADIX 0x1.0p24 /* 2^24 */
+#define RADIXI 0x1.0p-24 /* 2^-24 */
+#define CUTTER 0x1.0p76 /* 2^76 */
+#define ZERO 0.0 /* 0 */
+#define ONE 1.0 /* 1 */
+#define MONE -1.0 /* -1 */
+#define TWO -2.0 /* -2 */
+#define TWO5 0x1.0p5 /* 2^5 */
+#define TWO10 0x1.0p10 /* 2^10 */
+#define TWO18 0x1.0p18 /* 2^18 */
+#define TWO19 0x1.0p19 /* 2^19 */
+#define TWO23 0x1.0p23 /* 2^23 */
+#define TWO52 0x1.0p52 /* 2^52 */
+#define TWO57 0x1.0p57 /* 2^57 */
+#define TWO71 0x1.0p71 /* 2^71 */
+#define TWOM1032 0x1.0p-1032 /* 2^-1032 */
#endif
-#endif
-
-#define RADIX radix.d
-#define RADIXI radixi.d
-#define CUTTER cutter.d
-#define ZERO zero.d
-#define ONE one.d
-#define MONE mone.d
-#define TWO two.d
-#define TWO5 two5.d
-#define TWO10 two10.d
-#define TWO18 two18.d
-#define TWO19 two19.d
-#define TWO23 two23.d
-#define TWO52 two52.d
-#define TWO57 two57.d
-#define TWO71 two71.d
-#define TWOM1032 twom1032.d
-
-
-#endif
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpatan.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpatan.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpatan.c Sat Dec 29 00:01:52 2012
@@ -1,7 +1,7 @@
/*
* IBM Accurate Mathematical Library
* written by International Business Machines Corp.
- * Copyright (C) 2001, 2011 Free Software Foundation
+ * Copyright (C) 2001-2012 Free Software Foundation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -98,7 +98,7 @@
__sub(&mps,&mpt1,&mpt,p);
/* Compute Atan(x) */
- mptwoim1.d[1] = __atan_twom[m].d;
+ mptwoim1.d[1] = 1 << m;
__mul(&mptwoim1,&mpt,y,p);
return;
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpatan.h
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpatan.h (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpatan.h Sat Dec 29 00:01:52 2012
@@ -1,7 +1,7 @@
/*
* IBM Accurate Mathematical Library
* Written by International Business Machines Corp.
- * Copyright (C) 2001, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2012 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -30,8 +30,6 @@
extern const number __atan_xm[8] attribute_hidden;
extern const number __atan_twonm1[33] attribute_hidden;
extern const number __atan_twom[8] attribute_hidden;
-extern const number __atan_one attribute_hidden;
-extern const number __atan_two attribute_hidden;
extern const int __atan_np[33] attribute_hidden;
@@ -85,22 +83,6 @@
/**/ {{0x405d4000, 0x00000000} }, /* 117 */
};
- const number
- __atan_twom[8] = { /* 2**m */
-/**/ {{0x3ff00000, 0x00000000} }, /* 1.0 */
-/**/ {{0x40000000, 0x00000000} }, /* 2.0 */
-/**/ {{0x40100000, 0x00000000} }, /* 4.0 */
-/**/ {{0x40200000, 0x00000000} }, /* 8.0 */
-/**/ {{0x40300000, 0x00000000} }, /* 16.0 */
-/**/ {{0x40400000, 0x00000000} }, /* 32.0 */
-/**/ {{0x40500000, 0x00000000} }, /* 64.0 */
-/**/ {{0x40600000, 0x00000000} }, /* 128.0 */
- };
-
- const number
-/**/ __atan_one = {{0x3ff00000, 0x00000000} }, /* 1 */
-/**/ __atan_two = {{0x40000000, 0x00000000} }; /* 2 */
-
#else
#ifdef LITTLE_ENDI
@@ -152,22 +134,6 @@
/**/ {{0x00000000, 0x405d4000} }, /* 117 */
};
- const number
- __atan_twom[8] = { /* 2**m */
-/**/ {{0x00000000, 0x3ff00000} }, /* 1.0 */
-/**/ {{0x00000000, 0x40000000} }, /* 2.0 */
-/**/ {{0x00000000, 0x40100000} }, /* 4.0 */
-/**/ {{0x00000000, 0x40200000} }, /* 8.0 */
-/**/ {{0x00000000, 0x40300000} }, /* 16.0 */
-/**/ {{0x00000000, 0x40400000} }, /* 32.0 */
-/**/ {{0x00000000, 0x40500000} }, /* 64.0 */
-/**/ {{0x00000000, 0x40600000} }, /* 128.0 */
- };
-
- const number
-/**/ __atan_one = {{0x00000000, 0x3ff00000} }, /* 1 */
-/**/ __atan_two = {{0x00000000, 0x40000000} }; /* 2 */
-
#endif
#endif
@@ -178,5 +144,5 @@
#endif
#endif
-#define ONE __atan_one.d
-#define TWO __atan_two.d
+#define ONE 1.0
+#define TWO 2.0
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpexp.h
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpexp.h (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpexp.h Sat Dec 29 00:01:52 2012
@@ -28,13 +28,6 @@
#define MPEXP_H
extern const number __mpexp_twomm1[33] attribute_hidden;
-extern const number __mpexp_radix attribute_hidden;
-extern const number __mpexp_radixi attribute_hidden;
-extern const number __mpexp_zero attribute_hidden;
-extern const number __mpexp_one attribute_hidden;
-extern const number __mpexp_two attribute_hidden;
-extern const number __mpexp_half attribute_hidden;
-
#ifndef AVOID_MPEXP_H
#ifdef BIG_ENDI
@@ -75,14 +68,6 @@
/**/ {{0x3ae00000, 0x00000000} }, /* 2**-81 */
};
- const number
-/**/ __mpexp_radix = {{0x41700000, 0x00000000} }, /* 2**24 */
-/**/ __mpexp_radixi = {{0x3e700000, 0x00000000} }, /* 2**-24 */
-/**/ __mpexp_zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ __mpexp_one = {{0x3ff00000, 0x00000000} }, /* 1 */
-/**/ __mpexp_two = {{0x40000000, 0x00000000} }, /* 2 */
-/**/ __mpexp_half = {{0x3fe00000, 0x00000000} }; /* 1/2 */
-
#else
#ifdef LITTLE_ENDI
const number
@@ -121,23 +106,16 @@
/**/ {{0x00000000, 0x3b100000} }, /* 2**-78 */
/**/ {{0x00000000, 0x3ae00000} }, /* 2**-81 */
};
- const number
-/**/ __mpexp_radix = {{0x00000000, 0x41700000} }, /* 2**24 */
-/**/ __mpexp_radixi = {{0x00000000, 0x3e700000} }, /* 2**-24 */
-/**/ __mpexp_zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ __mpexp_one = {{0x00000000, 0x3ff00000} }, /* 1 */
-/**/ __mpexp_two = {{0x00000000, 0x40000000} }, /* 2 */
-/**/ __mpexp_half = {{0x00000000, 0x3fe00000} }; /* 1/2 */
#endif
#endif
#endif
-#define RADIX __mpexp_radix.d
-#define RADIXI __mpexp_radixi.d
-#define ZERO __mpexp_zero.d
-#define ONE __mpexp_one.d
-#define TWO __mpexp_two.d
-#define HALF __mpexp_half.d
+#define RADIX 0x1.0p24 /* 2^24 */
+#define RADIXI 0x1.0p-24 /* 2^-24 */
+#define ZERO 0.0 /* 0 */
+#define ONE 1.0 /* 1 */
+#define TWO 2.0 /* 2 */
+#define HALF 0x1.0p-1 /* 1/2 */
#endif
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpsqrt.h
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpsqrt.h (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/mpsqrt.h Sat Dec 29 00:01:52 2012
@@ -27,31 +27,15 @@
#ifndef MPSQRT_H
#define MPSQRT_H
-extern const number __mpsqrt_one attribute_hidden;
-extern const number __mpsqrt_halfrad attribute_hidden;
extern const int __mpsqrt_mp[33] attribute_hidden;
#ifndef AVOID_MPSQRT_H
-#ifdef BIG_ENDI
- const number
-/**/ __mpsqrt_one = {{0x3ff00000, 0x00000000} }, /* 1 */
-/**/ __mpsqrt_halfrad = {{0x41600000, 0x00000000} }; /* 2**23 */
-
-#else
-#ifdef LITTLE_ENDI
- const number
-/**/ __mpsqrt_one = {{0x00000000, 0x3ff00000} }, /* 1 */
-/**/ __mpsqrt_halfrad = {{0x00000000, 0x41600000} }; /* 2**23 */
-
-#endif
-#endif
-
const int __mpsqrt_mp[33] = {0,0,0,0,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,
4,4,4,4,4,4,4,4,4};
#endif
-#define ONE __mpsqrt_one.d
-#define HALFRAD __mpsqrt_halfrad.d
+#define ONE 1.0 /* 1 */
+#define HALFRAD 0x1.0p23 /* 2^23 */
#endif
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_tan.c
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_tan.c (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/s_tan.c Sat Dec 29 00:01:52 2012
@@ -1,7 +1,7 @@
/*
* IBM Accurate Mathematical Library
* written by International Business Machines Corp.
- * Copyright (C) 2001, 2009, 2011 Free Software Foundation
+ * Copyright (C) 2001-2012 Free Software Foundation
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -84,7 +84,7 @@
goto ret;
}
- w=(x<ZERO) ? -x : x;
+ w=(x<0.0) ? -x : x;
/* (I) The case abs(x) <= 1.259e-8 */
if (w<=g1.d) { retval = x; goto ret; }
@@ -101,7 +101,7 @@
c1 = x2*(a15.d+x2*(a17.d+x2*(a19.d+x2*(a21.d+x2*(a23.d+x2*(a25.d+
x2*a27.d))))));
EMULV(x,x,x2,xx2,t1,t2,t3,t4,t5)
- ADD2(a13.d,aa13.d,c1,zero.d,c2,cc2,t1,t2)
+ ADD2(a13.d,aa13.d,c1,0.0,c2,cc2,t1,t2)
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
ADD2(a11.d,aa11.d,c1,cc1,c2,cc2,t1,t2)
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
@@ -113,8 +113,8 @@
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
ADD2(a3.d ,aa3.d ,c1,cc1,c2,cc2,t1,t2)
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
- MUL2(x ,zero.d,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8)
- ADD2(x ,zero.d,c2,cc2,c1,cc1,t1,t2)
+ MUL2(x ,0.0,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8)
+ ADD2(x ,0.0,c2,cc2,c1,cc1,t1,t2)
if ((y=c1+(cc1-u2.d*c1)) == c1+(cc1+u2.d*c1)) { retval = y; goto ret; }
retval = tanMp(x);
goto ret;
@@ -125,11 +125,11 @@
/* First stage */
i = ((int) (mfftnhf.d+TWO8*w));
- z = w-xfg[i][0].d; z2 = z*z; s = (x<ZERO) ? MONE : ONE;
+ z = w-xfg[i][0].d; z2 = z*z; s = (x<0.0) ? MONE : ONE;
pz = z+z*z2*(e0.d+z2*e1.d);
fi = xfg[i][1].d; gi = xfg[i][2].d; t2 = pz*(gi+fi)/(gi-pz);
if ((y=fi+(t2-fi*u3.d))==fi+(t2+fi*u3.d)) { retval = (s*y); goto ret; }
- t3 = (t2<ZERO) ? -t2 : t2;
+ t3 = (t2<0.0) ? -t2 : t2;
t4 = fi*ua3.d+t3*ub3.d;
if ((y=fi+(t2-t4))==fi+(t2+t4)) { retval = (s*y); goto ret; }
@@ -137,16 +137,16 @@
ffi = xfg[i][3].d;
c1 = z2*(a7.d+z2*(a9.d+z2*a11.d));
EMULV(z,z,z2,zz2,t1,t2,t3,t4,t5)
- ADD2(a5.d,aa5.d,c1,zero.d,c2,cc2,t1,t2)
+ ADD2(a5.d,aa5.d,c1,0.0,c2,cc2,t1,t2)
MUL2(z2,zz2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
ADD2(a3.d,aa3.d,c1,cc1,c2,cc2,t1,t2)
MUL2(z2,zz2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
- MUL2(z ,zero.d,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8)
- ADD2(z ,zero.d,c2,cc2,c1,cc1,t1,t2)
+ MUL2(z ,0.0,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8)
+ ADD2(z ,0.0,c2,cc2,c1,cc1,t1,t2)
ADD2(fi ,ffi,c1,cc1,c2,cc2,t1,t2)
MUL2(fi ,ffi,c1,cc1,c3,cc3,t1,t2,t3,t4,t5,t6,t7,t8)
- SUB2(one.d,zero.d,c3,cc3,c1,cc1,t1,t2)
+ SUB2(1.0,0.0,c3,cc3,c1,cc1,t1,t2)
DIV2(c2,cc2,c1,cc1,c3,cc3,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
if ((y=c3+(cc3-u4.d*c3))==c3+(cc3+u4.d*c3)) { retval = (s*y); goto ret; }
@@ -165,7 +165,7 @@
da = xn*mp3.d;
a=t1-da;
da = (t1-a)-da;
- if (a<ZERO) {ya=-a; yya=-da; sy=MONE;}
+ if (a<0.0) {ya=-a; yya=-da; sy=MONE;}
else {ya= a; yya= da; sy= ONE;}
/* (IV),(V) The case 0.787 < abs(x) <= 25, abs(y) <= 1e-7 */
@@ -178,7 +178,7 @@
if (n) {
/* First stage -cot */
EADD(a,t2,b,db)
- DIV2(one.d,zero.d,b,db,c,dc,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
+ DIV2(1.0,0.0,b,db,c,dc,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
if ((y=c+(dc-u6.d*c))==c+(dc+u6.d*c)) { retval = (-y); goto ret; } }
else {
/* First stage tan */
@@ -202,7 +202,7 @@
MUL2(a,da,a,da,x2,xx2,t1,t2,t3,t4,t5,t6,t7,t8)
c1 = x2*(a15.d+x2*(a17.d+x2*(a19.d+x2*(a21.d+x2*(a23.d+x2*(a25.d+
x2*a27.d))))));
- ADD2(a13.d,aa13.d,c1,zero.d,c2,cc2,t1,t2)
+ ADD2(a13.d,aa13.d,c1,0.0,c2,cc2,t1,t2)
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
ADD2(a11.d,aa11.d,c1,cc1,c2,cc2,t1,t2)
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
@@ -219,7 +219,7 @@
if (n) {
/* Second stage -cot */
- DIV2(one.d,zero.d,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
+ DIV2(1.0,0.0,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
if ((y=c2+(cc2-u8.d*c2)) == c2+(cc2+u8.d*c2)) { retval = (-y); goto ret; } }
else {
/* Second stage tan */
@@ -240,14 +240,14 @@
/* -cot */
t2 = pz*(fi+gi)/(fi+pz);
if ((y=gi-(t2-gi*u10.d))==gi-(t2+gi*u10.d)) { retval = (-sy*y); goto ret; }
- t3 = (t2<ZERO) ? -t2 : t2;
+ t3 = (t2<0.0) ? -t2 : t2;
t4 = gi*ua10.d+t3*ub10.d;
if ((y=gi-(t2-t4))==gi-(t2+t4)) { retval = (-sy*y); goto ret; } }
else {
/* tan */
t2 = pz*(gi+fi)/(gi-pz);
if ((y=fi+(t2-fi*u9.d))==fi+(t2+fi*u9.d)) { retval = (sy*y); goto ret; }
- t3 = (t2<ZERO) ? -t2 : t2;
+ t3 = (t2<0.0) ? -t2 : t2;
t4 = fi*ua9.d+t3*ub9.d;
if ((y=fi+(t2-t4))==fi+(t2+t4)) { retval = (sy*y); goto ret; } }
@@ -256,7 +256,7 @@
EADD(z0,yya,z,zz)
MUL2(z,zz,z,zz,z2,zz2,t1,t2,t3,t4,t5,t6,t7,t8)
c1 = z2*(a7.d+z2*(a9.d+z2*a11.d));
- ADD2(a5.d,aa5.d,c1,zero.d,c2,cc2,t1,t2)
+ ADD2(a5.d,aa5.d,c1,0.0,c2,cc2,t1,t2)
MUL2(z2,zz2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
ADD2(a3.d,aa3.d,c1,cc1,c2,cc2,t1,t2)
MUL2(z2,zz2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
@@ -265,7 +265,7 @@
ADD2(fi ,ffi,c1,cc1,c2,cc2,t1,t2)
MUL2(fi ,ffi,c1,cc1,c3,cc3,t1,t2,t3,t4,t5,t6,t7,t8)
- SUB2(one.d,zero.d,c3,cc3,c1,cc1,t1,t2)
+ SUB2(1.0,0.0,c3,cc3,c1,cc1,t1,t2)
if (n) {
/* -cot */
@@ -295,7 +295,7 @@
a = t - t1;
da = ((t-a)-t1)+da;
EADD(a,da,t1,t2) a=t1; da=t2;
- if (a<ZERO) {ya=-a; yya=-da; sy=MONE;}
+ if (a<0.0) {ya=-a; yya=-da; sy=MONE;}
else {ya= a; yya= da; sy= ONE;}
/* (+++) The case 25 < abs(x) <= 1e8, abs(y) <= 1e-7 */
@@ -308,7 +308,7 @@
if (n) {
/* First stage -cot */
EADD(a,t2,b,db)
- DIV2(one.d,zero.d,b,db,c,dc,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
+ DIV2(1.0,0.0,b,db,c,dc,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
if ((y=c+(dc-u14.d*c))==c+(dc+u14.d*c)) { retval = (-y); goto ret; } }
else {
/* First stage tan */
@@ -318,7 +318,7 @@
MUL2(a,da,a,da,x2,xx2,t1,t2,t3,t4,t5,t6,t7,t8)
c1 = x2*(a15.d+x2*(a17.d+x2*(a19.d+x2*(a21.d+x2*(a23.d+x2*(a25.d+
x2*a27.d))))));
- ADD2(a13.d,aa13.d,c1,zero.d,c2,cc2,t1,t2)
+ ADD2(a13.d,aa13.d,c1,0.0,c2,cc2,t1,t2)
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
ADD2(a11.d,aa11.d,c1,cc1,c2,cc2,t1,t2)
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
@@ -335,7 +335,7 @@
if (n) {
/* Second stage -cot */
- DIV2(one.d,zero.d,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
+ DIV2(1.0,0.0,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
if ((y=c2+(cc2-u16.d*c2)) == c2+(cc2+u16.d*c2)) { retval = (-y); goto ret; } }
else {
/* Second stage tan */
@@ -355,14 +355,14 @@
/* -cot */
t2 = pz*(fi+gi)/(fi+pz);
if ((y=gi-(t2-gi*u18.d))==gi-(t2+gi*u18.d)) { retval = (-sy*y); goto ret; }
- t3 = (t2<ZERO) ? -t2 : t2;
+ t3 = (t2<0.0) ? -t2 : t2;
t4 = gi*ua18.d+t3*ub18.d;
if ((y=gi-(t2-t4))==gi-(t2+t4)) { retval = (-sy*y); goto ret; } }
else {
/* tan */
t2 = pz*(gi+fi)/(gi-pz);
if ((y=fi+(t2-fi*u17.d))==fi+(t2+fi*u17.d)) { retval = (sy*y); goto ret; }
- t3 = (t2<ZERO) ? -t2 : t2;
+ t3 = (t2<0.0) ? -t2 : t2;
t4 = fi*ua17.d+t3*ub17.d;
if ((y=fi+(t2-t4))==fi+(t2+t4)) { retval = (sy*y); goto ret; } }
@@ -371,7 +371,7 @@
EADD(z0,yya,z,zz)
MUL2(z,zz,z,zz,z2,zz2,t1,t2,t3,t4,t5,t6,t7,t8)
c1 = z2*(a7.d+z2*(a9.d+z2*a11.d));
- ADD2(a5.d,aa5.d,c1,zero.d,c2,cc2,t1,t2)
+ ADD2(a5.d,aa5.d,c1,0.0,c2,cc2,t1,t2)
MUL2(z2,zz2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
ADD2(a3.d,aa3.d,c1,cc1,c2,cc2,t1,t2)
MUL2(z2,zz2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
@@ -380,7 +380,7 @@
ADD2(fi ,ffi,c1,cc1,c2,cc2,t1,t2)
MUL2(fi ,ffi,c1,cc1,c3,cc3,t1,t2,t3,t4,t5,t6,t7,t8)
- SUB2(one.d,zero.d,c3,cc3,c1,cc1,t1,t2)
+ SUB2(1.0,0.0,c3,cc3,c1,cc1,t1,t2)
if (n) {
/* -cot */
@@ -398,7 +398,7 @@
/* Range reduction by algorithm iii */
n = (__branred(x,&a,&da)) & 0x00000001;
EADD(a,da,t1,t2) a=t1; da=t2;
- if (a<ZERO) {ya=-a; yya=-da; sy=MONE;}
+ if (a<0.0) {ya=-a; yya=-da; sy=MONE;}
else {ya= a; yya= da; sy= ONE;}
/* (+++) The case 1e8 < abs(x) < 2**1024, abs(y) <= 1e-7 */
@@ -411,7 +411,7 @@
if (n) {
/* First stage -cot */
EADD(a,t2,b,db)
- DIV2(one.d,zero.d,b,db,c,dc,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
+ DIV2(1.0,0.0,b,db,c,dc,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
if ((y=c+(dc-u22.d*c))==c+(dc+u22.d*c)) { retval = (-y); goto ret; } }
else {
/* First stage tan */
@@ -426,7 +426,7 @@
MUL2(a,da,a,da,x2,xx2,t1,t2,t3,t4,t5,t6,t7,t8)
c1 = x2*(a15.d+x2*(a17.d+x2*(a19.d+x2*(a21.d+x2*(a23.d+x2*(a25.d+
x2*a27.d))))));
- ADD2(a13.d,aa13.d,c1,zero.d,c2,cc2,t1,t2)
+ ADD2(a13.d,aa13.d,c1,0.0,c2,cc2,t1,t2)
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
ADD2(a11.d,aa11.d,c1,cc1,c2,cc2,t1,t2)
MUL2(x2,xx2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
@@ -443,7 +443,7 @@
if (n) {
/* Second stage -cot */
- DIV2(one.d,zero.d,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
+ DIV2(1.0,0.0,c1,cc1,c2,cc2,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10)
if ((y=c2+(cc2-u24.d*c2)) == c2+(cc2+u24.d*c2)) { retval = (-y); goto ret; } }
else {
/* Second stage tan */
@@ -463,14 +463,14 @@
/* -cot */
t2 = pz*(fi+gi)/(fi+pz);
if ((y=gi-(t2-gi*u26.d))==gi-(t2+gi*u26.d)) { retval = (-sy*y); goto ret; }
- t3 = (t2<ZERO) ? -t2 : t2;
+ t3 = (t2<0.0) ? -t2 : t2;
t4 = gi*ua26.d+t3*ub26.d;
if ((y=gi-(t2-t4))==gi-(t2+t4)) { retval = (-sy*y); goto ret; } }
else {
/* tan */
t2 = pz*(gi+fi)/(gi-pz);
if ((y=fi+(t2-fi*u25.d))==fi+(t2+fi*u25.d)) { retval = (sy*y); goto ret; }
- t3 = (t2<ZERO) ? -t2 : t2;
+ t3 = (t2<0.0) ? -t2 : t2;
t4 = fi*ua25.d+t3*ub25.d;
if ((y=fi+(t2-t4))==fi+(t2+t4)) { retval = (sy*y); goto ret; } }
@@ -479,7 +479,7 @@
EADD(z0,yya,z,zz)
MUL2(z,zz,z,zz,z2,zz2,t1,t2,t3,t4,t5,t6,t7,t8)
c1 = z2*(a7.d+z2*(a9.d+z2*a11.d));
- ADD2(a5.d,aa5.d,c1,zero.d,c2,cc2,t1,t2)
+ ADD2(a5.d,aa5.d,c1,0.0,c2,cc2,t1,t2)
MUL2(z2,zz2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
ADD2(a3.d,aa3.d,c1,cc1,c2,cc2,t1,t2)
MUL2(z2,zz2,c2,cc2,c1,cc1,t1,t2,t3,t4,t5,t6,t7,t8)
@@ -488,7 +488,7 @@
ADD2(fi ,ffi,c1,cc1,c2,cc2,t1,t2)
MUL2(fi ,ffi,c1,cc1,c3,cc3,t1,t2,t3,t4,t5,t6,t7,t8)
- SUB2(one.d,zero.d,c3,cc3,c1,cc1,t1,t2)
+ SUB2(1.0,0.0,c3,cc3,c1,cc1,t1,t2)
if (n) {
/* -cot */
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/ulog.h
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/ulog.h (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/ulog.h Sat Dec 29 00:01:52 2012
@@ -1,7 +1,7 @@
/*
* IBM Accurate Mathematical Library
* Written by International Business Machines Corp.
- * Copyright (C) 2001 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2012 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -80,10 +80,6 @@
/**/ d19 = {{0x3faaf286, 0xbca1af28} }, /* 1/19 */
/**/ d20 = {{0xbfa99999, 0x9999999a} }, /* -1/20 */
/* constants */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ one = {{0x3ff00000, 0x00000000} }, /* 1 */
-/**/ half = {{0x3fe00000, 0x00000000} }, /* 1/2 */
-/**/ mhalf = {{0xbfe00000, 0x00000000} }, /* -1/2 */
/**/ sqrt_2 = {{0x3ff6a09e, 0x667f3bcc} }, /* sqrt(2) */
/**/ h1 = {{0x3fd2e000, 0x00000000} }, /* 151/2**9 */
/**/ h2 = {{0x3f669000, 0x00000000} }, /* 361/2**17 */
@@ -156,10 +152,6 @@
/**/ d19 = {{0xbca1af28, 0x3faaf286} }, /* 1/19 */
/**/ d20 = {{0x9999999a, 0xbfa99999} }, /* -1/20 */
/* constants */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ one = {{0x00000000, 0x3ff00000} }, /* 1 */
-/**/ half = {{0x00000000, 0x3fe00000} }, /* 1/2 */
-/**/ mhalf = {{0x00000000, 0xbfe00000} }, /* -1/2 */
/**/ sqrt_2 = {{0x667f3bcc, 0x3ff6a09e} }, /* sqrt(2) */
/**/ h1 = {{0x00000000, 0x3fd2e000} }, /* 151/2**9 */
/**/ h2 = {{0x00000000, 0x3f669000} }, /* 361/2**17 */
@@ -181,10 +173,10 @@
#endif
#endif
-#define ZERO zero.d
-#define ONE one.d
-#define HALF half.d
-#define MHALF mhalf.d
+#define ZERO 0.0 /* 0 */
+#define ONE 1.0 /* 1 */
+#define HALF 0x1.0p-1 /* 1/2 */
+#define MHALF -0x1.0p-1 /* -1/2 */
#define SQRT_2 sqrt_2.d
#define DEL_U delu.d
#define DEL_V delv.d
Modified: fsf/trunk/libc/sysdeps/ieee754/dbl-64/utan.h
==============================================================================
--- fsf/trunk/libc/sysdeps/ieee754/dbl-64/utan.h (original)
+++ fsf/trunk/libc/sysdeps/ieee754/dbl-64/utan.h Sat Dec 29 00:01:52 2012
@@ -1,7 +1,7 @@
/*
* IBM Accurate Mathematical Library
* Written by International Business Machines Corp.
- * Copyright (C) 2001 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2012 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -81,11 +81,7 @@
/**/ e1 = {{0x3FC11112, 0xE0A6B45F} }, /* . */
/* constants */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ one = {{0x3ff00000, 0x00000000} }, /* 1 */
-/**/ mone = {{0xbff00000, 0x00000000} }, /*-1 */
/**/ mfftnhf = {{0xc02f0000, 0x00000000} }, /*-15.5 */
-/**/ two8 = {{0x40700000, 0x00000000} }, /* 256 */
/**/ g1 = {{0x3e4b096c, 0x00000000} }, /* 1.259e-8 */
/**/ g2 = {{0x3faf212d, 0x00000000} }, /* 0.0608 */
@@ -202,11 +198,7 @@
/**/ e1 = {{0xE0A6B45F, 0x3FC11112} }, /* . */
/* constants */
-/**/ zero = {{0x00000000, 0x00000000} }, /* 0 */
-/**/ one = {{0x00000000, 0x3ff00000} }, /* 1 */
-/**/ mone = {{0x00000000, 0xbff00000} }, /*-1 */
/**/ mfftnhf = {{0x00000000, 0xc02f0000} }, /*-15.5 */
-/**/ two8 = {{0x00000000, 0x40700000} }, /* 256 */
/**/ g1 = {{0x00000000, 0x3e4b096c} }, /* 1.259e-8 */
/**/ g2 = {{0x00000000, 0x3faf212d} }, /* 0.0608 */
@@ -271,9 +263,9 @@
#endif
-#define ZERO zero.d
-#define ONE one.d
-#define MONE mone.d
-#define TWO8 two8.d
-
-#endif
+#define ZERO 0.0
+#define ONE 1.0
+#define MONE -1.0
+#define TWO8 0x1.0p8 /* 2^8 */
+
+#endif
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits