From 6600049466b586e3decaf24bd70c06b21382cf98 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 6 May 1998 14:43:15 +0000 Subject: Update. 1998-04-16 07:42 Geoff Keating * Makeconfig [!build-static]: Link `static' binaries with libc_pic.a. Still need *FLAGS-.o because we still sometimes build .o files. * db2/Makefile: Don't build libndbm.a if !build-static. 1998-04-16 07:42 Geoff Keating * configure.in: New test for broken gcc on PowerPC. * sysdeps/powerpc/atomicity.h: Use result of test. * linuxthreads/sysdeps/powerpc/pt-machine.h: Use result of test. * math/libm-test.c: Update many of the epsilon to match actual performance. * sysdeps/libm-ieee754/e_exp.c: Reduce the number of branches. * sysdeps/libm-ieee754/e_expf.c: Likewise. * sysdeps/libm-ieee754/s_exp2.c: Likewise. * sysdeps/libm-ieee754/s_exp2f.c: Likewise. * sysdeps/libm-ieee754/e_pow.c: Correct typo. * sysdeps/powerpc/elf/libc-start.c: New file. * sysdeps/powerpc/elf/start.S: New file, use libc-start. * sysdeps/powerpc/elf/start.c: Delete. * sysdeps/unix/sysv/linux/powerpc/Dist: Remove syscall.h * sysdeps/unix/sysv/linux/powerpc/syscall.h: Delete. It was unused. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Correct previous few patches. --- sysdeps/libm-ieee754/e_exp.c | 48 ++++++----------- sysdeps/libm-ieee754/e_expf.c | 48 ++++++----------- sysdeps/libm-ieee754/s_exp2.c | 14 ++--- sysdeps/libm-ieee754/s_exp2f.c | 14 ++--- sysdeps/powerpc/atomicity.h | 18 ++++--- sysdeps/powerpc/elf/libc-start.c | 100 +++++++++++++++++++++++++++++++++++ sysdeps/powerpc/elf/start.S | 53 +++++++++++++++++++ sysdeps/unix/sysv/linux/powerpc/Dist | 1 - 8 files changed, 201 insertions(+), 95 deletions(-) create mode 100644 sysdeps/powerpc/elf/libc-start.c create mode 100644 sysdeps/powerpc/elf/start.S (limited to 'sysdeps') diff --git a/sysdeps/libm-ieee754/e_exp.c b/sysdeps/libm-ieee754/e_exp.c index 660c5bc88d..5eae12a19c 100644 --- a/sysdeps/libm-ieee754/e_exp.c +++ b/sysdeps/libm-ieee754/e_exp.c @@ -76,8 +76,8 @@ __ieee754_exp (double x) /* Check for usual case. */ if (isless (x, himark) && isgreater (x, lomark)) { - static const double TWO43 = 8796093022208.0; - static const double TWO52 = 4503599627370496.0; + static const double THREEp42 = 13194139533312.0; + static const double THREEp51 = 6755399441055744.0; /* 1/ln(2). */ static const double M_1_LN2 = 1.442695040888963387; /* ln(2), part 1 */ @@ -94,40 +94,22 @@ __ieee754_exp (double x) fesetround (FE_TONEAREST); /* Calculate n. */ - if (x >= 0) - { - n = x * M_1_LN2 + TWO52; - n -= TWO52; - } - else - { - n = x * M_1_LN2 - TWO52; - n += TWO52; - } + n = x * M_1_LN2 + THREEp51; + n -= THREEp51; x = x - n*M_LN2_0; - if (x >= 0) - { - /* Calculate t/512. */ - t = x + TWO43; - t -= TWO43; - x -= t; - - /* Compute tval = t. */ - tval = (int) (t * 512.0); - - x -= __exp_deltatable[tval]; - } - else - { - /* As above, but x is negative. */ - t = x - TWO43; - t += TWO43; - x -= t; - tval = (int) (t * 512.0); + /* Calculate t/512. */ + t = x + THREEp42; + t -= THREEp42; + x -= t; - x += __exp_deltatable[-tval]; - } + /* Compute tval = t. */ + tval = (int) (t * 512.0); + + if (t >= 0) + x -= __exp_deltatable[tval]; + else + x += __exp_deltatable[-tval]; /* Now, the variable x contains x + n*ln(2)_1. */ dely = n*M_LN2_1; diff --git a/sysdeps/libm-ieee754/e_expf.c b/sysdeps/libm-ieee754/e_expf.c index c4a7b644fd..ff6357bd1d 100644 --- a/sysdeps/libm-ieee754/e_expf.c +++ b/sysdeps/libm-ieee754/e_expf.c @@ -71,8 +71,8 @@ __ieee754_expf (float x) /* Check for usual case. */ if (isless (x, himark) && isgreater (x, lomark)) { - static const float TWO43 = 8796093022208.0; - static const float TWO23 = 8388608.0; + static const float THREEp42 = 13194139533312.0; + static const float THREEp22 = 12582912.0; /* 1/ln(2). */ #undef M_1_LN2 static const float M_1_LN2 = 1.44269502163f; @@ -90,40 +90,22 @@ __ieee754_expf (float x) fesetround (FE_TONEAREST); /* Calculate n. */ - if (x >= 0) - { - n = x * M_1_LN2 + TWO23; - n -= TWO23; - } - else - { - n = x * M_1_LN2 - TWO23; - n += TWO23; - } + n = x * M_1_LN2 + THREEp22; + n -= THREEp22; dx = x - n*M_LN2; - if (dx >= 0) - { - /* Calculate t/512. */ - t = dx + TWO43; - t -= TWO43; - dx -= t; - - /* Compute tval = t. */ - tval = (int) (t * 512.0); - - delta = - __exp_deltatable[tval]; - } - else - { - /* As above, but x is negative. */ - t = dx - TWO43; - t += TWO43; - dx -= t; - tval = (int) (t * 512.0); + /* Calculate t/512. */ + t = dx + THREEp42; + t -= THREEp42; + dx -= t; - delta = __exp_deltatable[-tval]; - } + /* Compute tval = t. */ + tval = (int) (t * 512.0); + + if (t >= 0) + delta = - __exp_deltatable[tval]; + else + delta = __exp_deltatable[-tval]; /* Compute ex2 = 2^n e^(t/512+delta[t]). */ ex2_u.d = __exp_atable[tval+177]; diff --git a/sysdeps/libm-ieee754/s_exp2.c b/sysdeps/libm-ieee754/s_exp2.c index ead1ce89eb..875d4d6f2c 100644 --- a/sysdeps/libm-ieee754/s_exp2.c +++ b/sysdeps/libm-ieee754/s_exp2.c @@ -48,7 +48,7 @@ __ieee754_exp2 (double x) /* Check for usual case. */ if (isless (x, himark) && isgreater (x, lomark)) { - static const double TWO43 = 8796093022208.0; + static const double THREEp42 = 13194139533312.0; int tval, unsafe; double rx, x22, result; union ieee754_double ex2_u, scale_u; @@ -66,16 +66,8 @@ __ieee754_exp2 (double x) x = ex + t/512 + x1. First, calculate rx = ex + t/512. */ - if (x >= 0) - { - rx = x + TWO43; - rx -= TWO43; - } - else - { - rx = x - TWO43; - rx += TWO43; - } + rx = x + THREEp42; + rx -= THREEp42; x -= rx; /* Compute x=x1. */ /* Compute tval = (ex*512 + t)+256. Now, t = (tval mod 512)-256 and ex=tval/512 [that's mod, NOT %; and diff --git a/sysdeps/libm-ieee754/s_exp2f.c b/sysdeps/libm-ieee754/s_exp2f.c index 641b7548f1..8229885453 100644 --- a/sysdeps/libm-ieee754/s_exp2f.c +++ b/sysdeps/libm-ieee754/s_exp2f.c @@ -49,7 +49,7 @@ __ieee754_exp2f (float x) /* Check for usual case. */ if (isless (x, himark) && isgreater (x, lomark)) { - static const float TWO15 = 32768.0; + static const float THREEp14 = 49152.0; int tval, unsafe; float rx, x22, result; union ieee754_float ex2_u, scale_u; @@ -67,16 +67,8 @@ __ieee754_exp2f (float x) x = ex + t/512 + x1. First, calculate rx = ex + t/256. */ - if (x >= 0) - { - rx = x + TWO15; - rx -= TWO15; - } - else - { - rx = x - TWO15; - rx += TWO15; - } + rx = x + THREEp14; + rx -= THREEp14; x -= rx; /* Compute x=x1. */ /* Compute tval = (ex*256 + t)+128. Now, t = (tval mod 256)-128 and ex=tval/256 [that's mod, NOT %; and diff --git a/sysdeps/powerpc/atomicity.h b/sysdeps/powerpc/atomicity.h index dba09658cb..5b56532779 100644 --- a/sysdeps/powerpc/atomicity.h +++ b/sysdeps/powerpc/atomicity.h @@ -1,5 +1,5 @@ /* Low-level functions for atomic operations. PowerPC version. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,7 +22,13 @@ #include -static inline int +#if BROKEN_PPC_ASM_CR0 +# define __ATOMICITY_INLINE /* nothing */ +#else +# define __ATOMICITY_INLINE inline +#endif + +static __ATOMICITY_INLINE int __attribute__ ((unused)) exchange_and_add (volatile uint32_t *mem, int val) { @@ -36,7 +42,7 @@ exchange_and_add (volatile uint32_t *mem, int val) return result; } -static inline void +static __ATOMICITY_INLINE void __attribute__ ((unused)) atomic_add (volatile uint32_t *mem, int val) { @@ -49,7 +55,7 @@ atomic_add (volatile uint32_t *mem, int val) " : "=&r"(tmp) : "r" (mem), "r"(val) : "cr0"); } -static inline int +static __ATOMICITY_INLINE int __attribute__ ((unused)) compare_and_swap (volatile long int *p, long int oldval, long int newval) { @@ -66,7 +72,7 @@ compare_and_swap (volatile long int *p, long int oldval, long int newval) return result; } -static inline long int +static __ATOMICITY_INLINE long int __attribute__ ((unused)) always_swap (volatile long int *p, long int newval) { @@ -79,7 +85,7 @@ always_swap (volatile long int *p, long int newval) return result; } -static inline int +static __ATOMICITY_INLINE int __attribute__ ((unused)) test_and_set (volatile long int *p, long int oldval, long int newval) { diff --git a/sysdeps/powerpc/elf/libc-start.c b/sysdeps/powerpc/elf/libc-start.c new file mode 100644 index 0000000000..535eab2a64 --- /dev/null +++ b/sysdeps/powerpc/elf/libc-start.c @@ -0,0 +1,100 @@ +/* Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library 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. + + The GNU C 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include + +extern void __libc_init_first (int argc, char **argv, char **envp); + +extern int _dl_starting_up; +weak_extern (_dl_starting_up) +extern int __libc_multiple_libcs; + +struct startup_info +{ + void *sda_base; + int (*main) (int, char **, char **, void *); + int (*init) (int, char **, char **, void *); + void (*fini) (void); +}; + +int +__libc_start_main (int argc, char **argv, char **envp, + void *auxvec, void (*rtld_fini) (void), + struct startup_info *stinfo, + char **stack_on_entry) +{ +#ifndef PIC + /* The next variable is only here to work around a bug in gcc <= 2.7.2.2. + If the address would be taken inside the expression the optimizer + would try to be too smart and throws it away. Grrr. */ + int *dummy_addr = &_dl_starting_up; + + __libc_multiple_libcs = dummy_addr && !_dl_starting_up; +#endif + + /* the PPC SVR4 ABI says that the top thing on the stack will + be a NULL pointer, so if not we assume that we're being called + as a statically-linked program by Linux... */ + if (*stack_on_entry != NULL) + { + /* ...in which case, we have argc as the top thing on the + stack, followed by argv (NULL-terminated), envp (likewise), + and the auxilary vector. */ + argc = *(int *) stack_on_entry; + argv = stack_on_entry + 1; + envp = argv + argc + 1; + auxvec = envp; + while (*(char **) auxvec != NULL) + ++auxvec; + ++auxvec; + rtld_fini = NULL; + } + + /* Register the destructor of the dynamic linker if there is any. */ + if (rtld_fini != NULL) + atexit (rtld_fini); + + /* Set the global _environ variable correctly. */ + __environ = envp; + + /* Call the initializer of the libc. */ +#ifdef PIC + if (_dl_debug_impcalls) + _dl_debug_message (1, "\ninitialize libc\n\n", NULL); +#endif + __libc_init_first (argc, argv, envp); + + /* Call the initializer of the program. */ +#ifdef PIC + if (_dl_debug_impcalls) + _dl_debug_message (1, "\ninitialize program: ", argv[0], "\n\n", NULL); +#endif + stinfo->init (argc, argv, __environ, auxvec); + + /* Register the destructor of the program. */ + atexit (stinfo->fini); + +#ifdef PIC + if (_dl_debug_impcalls) + _dl_debug_message (1, "\ntransferring control: ", argv[0], "\n\n", NULL); +#endif + + exit (stinfo->main (argc, argv, __environ, auxvec)); +} diff --git a/sysdeps/powerpc/elf/start.S b/sysdeps/powerpc/elf/start.S new file mode 100644 index 0000000000..94cb423629 --- /dev/null +++ b/sysdeps/powerpc/elf/start.S @@ -0,0 +1,53 @@ +/* Startup code for programs linked with GNU libc. + Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library 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. + + The GNU C 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include + + /* These are the various addresses we require. */ + .section ".rodata" + .align 2 +L(start_addresses): + .long _SDA_BASE_ + .long JUMPTARGET(main) + .long JUMPTARGET(_init) + .long JUMPTARGET(_fini) + ASM_SIZE_DIRECTIVE(L(start_addresses)) + + .section ".text" +ENTRY(_start) + /* Save the stack pointer, in case we're statically linked under Linux. */ + mr %r9,%r1 + /* Set up an initial stack frame, and clear the LR. */ + clrrwi %r1,%r1,4 + li %r0,0 + stwu %r1,-16(%r1) + mtlr %r0 + stw %r0,0(%r1) + /* Set r13 to point at the 'small data area', and put the address of + start_addresses in r8... */ + lis %r8,L(start_addresses)@ha + lwzu %r13,L(start_addresses)@l(%r8) + /* and continue in libc-start, in glibc. */ + b JUMPTARGET(__libc_start_main) +END(_start) + +/* Define a symbol for the first piece of initialized data. */ + .section ".data" +__data_start: +weak_alias (__data_start, data_start) diff --git a/sysdeps/unix/sysv/linux/powerpc/Dist b/sysdeps/unix/sysv/linux/powerpc/Dist index 0213c45f51..71eb76f0c0 100644 --- a/sysdeps/unix/sysv/linux/powerpc/Dist +++ b/sysdeps/unix/sysv/linux/powerpc/Dist @@ -3,4 +3,3 @@ clone.S kernel_stat.h kernel_termios.h init-first.h -syscall.h -- cgit v1.2.3