mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-19 01:11:05 +00:00
Sun Jan 14 17:51:09 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* misc/efgcvt_r.c (ecvt_r): Handle negative values. * stdlib/stdlib.h: Replace __CONSTVALUE by attribute. * stdlib/abs.c, stdlib/div.c, stdlib/labs.c, stdlib/ldiv.c, sysdeps/generic/hypot.c: Remove obsolete __CONSTVALUE. * stdio-common/printf_fp.c (__printf_fp): Fix parameter declaration. * sysdeps/generic/putenv.c (putenv): Fix second argument of setenv. * sysdeps/ieee754/hypot.c: New file, extracted out of cabs.c. * sysdeps/ieee754/cabs.c: Don't define hypot here. * sysdeps/ieee754/ieee754.h (union ieee854_long_double): Fix definition of ieee_nan alternative. * sysdeps/m68k/__longjmp.c, sysdeps/m68k/setjmp.c: Add register prefix spec. * sysdeps/m68k/ffs.c (ffs): Fix register constraint. * sysdeps/m68k/fpu/__math.h: Include <errno.h>. Replace obsolete __CONSTVALUE by attribute. (floor): Round to negative infinity. (rint, expm1) [__NO_MATH_INLINES]: Don't define, to avoid type clash when compiling source. (pow): Handle x == 0 and x < 0. (ceil, __isinf, __isnan): Fix register constraints. (__isinfl, __isnanl): Added. * sysdeps/m68k/fpu/acos.c, sysdeps/m68k/fpu/atan2.c, sysdeps/m68k/fpu/fmod.c, sysdeps/m68k/fpu/ldexp.c, sysdeps/m68k/fpu/pow.c: Remove obsolete __CONSTVALUE. * sysdeps/m68k/bsd-_setjmp.S, sysdeps/m68k/bsd-setjmp.S: Fix assembler syntax. * sysdeps/unix/bsd/bsd4.4/fchdir.S (fchdir): Take only one argument. * sysdeps/unix/bsd/clock.c (timeval_to_clock_t): Fix timeval to clock_t conversion. (clock): Don't multiply by CLOCKS_PER_SEC. * sysdeps/unix/bsd/poll.c (poll): Fix msec to timeval conversion. * sysdeps/unix/bsd/sun/m68k/brk.S (brk): Compare with address of __end. * sysdeps/unix/bsd/sun/m68k/vfork.S: Fix assembler syntax. * sysdeps/unix/bsd/ualarm.c (ualarm): Fix timeval calculation. * sysdeps/unix/bsd/vax/vfork.S: Remove duplicate label.
This commit is contained in:
Roland McGrath
parent
2b30df1785
commit
69c85398db
@ -29,22 +29,21 @@ __longjmp (__jmp_buf env, int val)
|
||||
|
||||
#if defined(__HAVE_68881__) || defined(__HAVE_FPU__)
|
||||
/* Restore the floating-point registers. */
|
||||
asm volatile("fmovem%.x %0, fp0-fp7" :
|
||||
/* No outputs. */ : "g" (env[0].__fpregs[0]) :
|
||||
"fp0", "fp1", "fp2", "fp3", "fp4", "fp5", "fp6", "fp7");
|
||||
asm volatile("fmovem%.x %0, %/fp0-%/fp7" :
|
||||
/* No outputs. */ : "g" (env[0].__fpregs[0]));
|
||||
#endif
|
||||
|
||||
/* Put VAL in D0. */
|
||||
asm volatile("move%.l %0, d0" : /* No outputs. */ :
|
||||
asm volatile("move%.l %0, %/d0" : /* No outputs. */ :
|
||||
"g" (val == 0 ? 1 : val) : "d0");
|
||||
|
||||
asm volatile(/* Restore the data and address registers. */
|
||||
"movem%.l %0, d1-d7/a0-a7\n"
|
||||
"movem%.l %0, %/d1-%/d7/%/a0-%/a7\n"
|
||||
/* Return to setjmp's caller. */
|
||||
#ifdef __motorola__
|
||||
"jmp (a0)"
|
||||
"jmp (%/a0)"
|
||||
#else
|
||||
"jmp a0@"
|
||||
"jmp %/a0@"
|
||||
#endif
|
||||
: /* No outputs. */ : "g" (env[0].__dregs[0])
|
||||
/* We don't bother with the clobbers,
|
||||
|
||||
@ -26,17 +26,23 @@ Cambridge, MA 02139, USA. */
|
||||
#ifdef MOTOROLA_SYNTAX
|
||||
#define d0 %d0
|
||||
#define d1 %d1
|
||||
#define PUSH(reg) move.l reg, -(%esp)
|
||||
#define POP(reg) move.l (%esp)+, reg
|
||||
#define PUSH(reg) move.l reg, -(%sp)
|
||||
#define POP(reg) move.l (%sp)+, reg
|
||||
#define PUSH0 clr.l -(%sp)
|
||||
#else
|
||||
#define PUSH(reg) movel reg, sp@-
|
||||
#define POP(reg) movel sp@+, reg
|
||||
#define PUSH0 clrl sp@-
|
||||
#endif
|
||||
|
||||
ENTRY (_setjmp)
|
||||
POP (d0) /* Pop return PC. */
|
||||
POP (d1) /* Pop jmp_buf argument. */
|
||||
PUSH (#0) /* Push second argument of zero. */
|
||||
PUSH0 /* Push second argument of zero. */
|
||||
PUSH (d1) /* Push back first argument. */
|
||||
PUSH (d0) /* Push back return PC. */
|
||||
#ifdef PIC
|
||||
bra.l C_SYMBOL_NAME (__sigsetjmp@PLTPC)
|
||||
#else
|
||||
jmp C_SYMBOL_NAME (__sigsetjmp)
|
||||
#endif
|
||||
|
||||
@ -26,8 +26,8 @@ Cambridge, MA 02139, USA. */
|
||||
#ifdef MOTOROLA_SYNTAX
|
||||
#define d0 %d0
|
||||
#define d1 %d1
|
||||
#define PUSH(reg) move.l reg, -(%esp)
|
||||
#define POP(reg) move.l (%esp)+, reg
|
||||
#define PUSH(reg) move.l reg, -(%sp)
|
||||
#define POP(reg) move.l (%sp)+, reg
|
||||
#else
|
||||
#define PUSH(reg) movel reg, sp@-
|
||||
#define POP(reg) movel sp@+, reg
|
||||
@ -36,7 +36,11 @@ Cambridge, MA 02139, USA. */
|
||||
ENTRY (setjmp)
|
||||
POP (d0) /* Pop return PC. */
|
||||
POP (d1) /* Pop jmp_buf argument. */
|
||||
PUSH (#1) /* Push second argument of one. */
|
||||
pea 1 /* Push second argument of one. */
|
||||
PUSH (d1) /* Push back first argument. */
|
||||
PUSH (d0) /* Push back return PC. */
|
||||
#ifdef PIC
|
||||
bra.l C_SYMBOL_NAME (__sigsetjmp@PLTPC)
|
||||
#else
|
||||
jmp C_SYMBOL_NAME (__sigsetjmp)
|
||||
#endif
|
||||
|
||||
@ -30,7 +30,7 @@ DEFUN(ffs, (x), int x)
|
||||
{
|
||||
int cnt;
|
||||
|
||||
asm("bfffo %1{#0:#0},%0" : "=d" (cnt) : "rm" (x & -x));
|
||||
asm("bfffo %1{#0:#0},%0" : "=d" (cnt) : "dm" (x & -x));
|
||||
|
||||
return 32 - cnt;
|
||||
}
|
||||
|
||||
@ -19,6 +19,8 @@ Cambridge, MA 02139, USA. */
|
||||
#ifdef __GNUC__
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#define __need_Emath
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef __NO_MATH_INLINES
|
||||
/* This is used when defining the functions themselves. Define them with
|
||||
@ -28,12 +30,14 @@ Cambridge, MA 02139, USA. */
|
||||
#define __m81_inline static __inline
|
||||
#else
|
||||
#define __m81_u(x) x
|
||||
#define __m81_inline exter __inline
|
||||
#define __m81_inline extern __inline
|
||||
#define __MATH_INLINES 1
|
||||
#endif
|
||||
|
||||
#define __inline_mathop2(func, op) \
|
||||
__m81_inline __CONSTVALUE double \
|
||||
__m81_inline double \
|
||||
__m81_u(func)(double __mathop_x) __attribute__((__const__)); \
|
||||
__m81_inline double \
|
||||
__m81_u(func)(double __mathop_x) \
|
||||
{ \
|
||||
double __result; \
|
||||
@ -55,20 +59,23 @@ __inline_mathop2(exp, etox)
|
||||
__inline_mathop2(fabs, abs)
|
||||
__inline_mathop(log10)
|
||||
__inline_mathop2(log, logn)
|
||||
__inline_mathop2(floor, intrz)
|
||||
__inline_mathop(sqrt)
|
||||
|
||||
__inline_mathop2(__rint, int)
|
||||
__inline_mathop2(__expm1, etoxm1)
|
||||
|
||||
#ifdef __USE_MISC
|
||||
#ifndef __NO_MATH_INLINES
|
||||
__inline_mathop2(rint, int)
|
||||
__inline_mathop2(expm1, etoxm1)
|
||||
#endif
|
||||
__inline_mathop2(log1p, lognp1)
|
||||
__inline_mathop(atanh)
|
||||
#endif
|
||||
|
||||
__m81_inline __CONSTVALUE double
|
||||
__m81_inline double
|
||||
__m81_u(__drem)(double __x, double __y) __attribute__ ((__const__));
|
||||
__m81_inline double
|
||||
__m81_u(__drem)(double __x, double __y)
|
||||
{
|
||||
double __result;
|
||||
@ -76,7 +83,9 @@ __m81_u(__drem)(double __x, double __y)
|
||||
return __result;
|
||||
}
|
||||
|
||||
__m81_inline __CONSTVALUE double
|
||||
__m81_inline double
|
||||
__m81_u(ldexp)(double __x, int __e) __attribute__ ((__const__));
|
||||
__m81_inline double
|
||||
__m81_u(ldexp)(double __x, int __e)
|
||||
{
|
||||
double __result;
|
||||
@ -85,7 +94,9 @@ __m81_u(ldexp)(double __x, int __e)
|
||||
return __result;
|
||||
}
|
||||
|
||||
__m81_inline __CONSTVALUE double
|
||||
__m81_inline double
|
||||
__m81_u(fmod)(double __x, double __y) __attribute__ ((__const__));
|
||||
__m81_inline double
|
||||
__m81_u(fmod)(double __x, double __y)
|
||||
{
|
||||
double __result;
|
||||
@ -103,11 +114,39 @@ __m81_u(frexp)(double __value, int *__expptr)
|
||||
return __mantissa;
|
||||
}
|
||||
|
||||
__m81_inline __CONSTVALUE double
|
||||
__m81_inline double
|
||||
__m81_u(floor)(double __x) __attribute__ ((__const__));
|
||||
__m81_inline double
|
||||
__m81_u(floor)(double __x)
|
||||
{
|
||||
double __result;
|
||||
unsigned long int __ctrl_reg;
|
||||
__asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg));
|
||||
/* Set rounding towards negative infinity. */
|
||||
__asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */
|
||||
: "dmi" ((__ctrl_reg & ~0x10) | 0x20));
|
||||
/* Convert X to an integer, using -Inf rounding. */
|
||||
__asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x));
|
||||
/* Restore the previous rounding mode. */
|
||||
__asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */
|
||||
: "dmi" (__ctrl_reg));
|
||||
return __result;
|
||||
}
|
||||
|
||||
__m81_inline double
|
||||
__m81_u(pow)(double __x, double __y) __attribute__ ((__const__));
|
||||
__m81_inline double
|
||||
__m81_u(pow)(double __x, double __y)
|
||||
{
|
||||
double __result;
|
||||
if (__y == 0.0 || __x == 1.0)
|
||||
if (__x == 0.0)
|
||||
{
|
||||
if (__y <= 0.0)
|
||||
__result = __infnan (EDOM);
|
||||
else
|
||||
__result = 0.0;
|
||||
}
|
||||
else if (__y == 0.0 || __x == 1.0)
|
||||
__result = 1.0;
|
||||
else if (__y == 1.0)
|
||||
__result = __x;
|
||||
@ -117,23 +156,40 @@ __m81_u(pow)(double __x, double __y)
|
||||
__asm("ftentox%.x %1, %0" : "=f" (__result) : "f" (__y));
|
||||
else if (__x == 2.0)
|
||||
__asm("ftwotox%.x %1, %0" : "=f" (__result) : "f" (__y));
|
||||
else if (__x < 0.0)
|
||||
{
|
||||
double __temp = __m81_u (__rint) (__y);
|
||||
if (__y == __temp)
|
||||
{
|
||||
int i = (int) __y;
|
||||
__result = __m81_u (exp) (__y * __m81_u (log) (-__x));
|
||||
if (i & 1)
|
||||
__result = -__result;
|
||||
}
|
||||
else
|
||||
__result = __infnan (EDOM);
|
||||
}
|
||||
else
|
||||
__result = __m81_u(exp)(__y * __m81_u(log)(__x));
|
||||
return __result;
|
||||
}
|
||||
|
||||
__m81_inline __CONSTVALUE double
|
||||
__m81_inline double
|
||||
__m81_u(ceil)(double __x) __attribute__ ((__const__));
|
||||
__m81_inline double
|
||||
__m81_u(ceil)(double __x)
|
||||
{
|
||||
double __result;
|
||||
unsigned long int __ctrl_reg;
|
||||
__asm("fmove%.l fpcr, %0" : "=g" (__ctrl_reg));
|
||||
__asm __volatile__ ("fmove%.l %!, %0" : "=dm" (__ctrl_reg));
|
||||
/* Set rounding towards positive infinity. */
|
||||
__asm("fmove%.l %0, fpcr" : /* No outputs. */ : "g" (__ctrl_reg | 0x30));
|
||||
__asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */
|
||||
: "dmi" (__ctrl_reg | 0x30));
|
||||
/* Convert X to an integer, using +Inf rounding. */
|
||||
__asm("fint%.x %1, %0" : "=f" (__result) : "f" (__x));
|
||||
__asm __volatile__ ("fint%.x %1, %0" : "=f" (__result) : "f" (__x));
|
||||
/* Restore the previous rounding mode. */
|
||||
__asm("fmove%.l %0, fpcr" : /* No outputs. */ : "g" (__ctrl_reg));
|
||||
__asm __volatile__ ("fmove%.l %0, %!" : /* No outputs. */
|
||||
: "dmi" (__ctrl_reg));
|
||||
return __result;
|
||||
}
|
||||
|
||||
@ -145,23 +201,51 @@ __m81_u(modf)(double __value, double *__iptr)
|
||||
return __value - __modf_int;
|
||||
}
|
||||
|
||||
__m81_inline __CONSTVALUE int
|
||||
__m81_inline int
|
||||
__m81_u(__isinf)(double __value) __attribute__ ((__const__));
|
||||
__m81_inline int
|
||||
__m81_u(__isinf)(double __value)
|
||||
{
|
||||
/* There is no branch-condition for infinity,
|
||||
so we must extract and examine the condition codes manually. */
|
||||
unsigned long int __fpsr;
|
||||
__asm("ftst%.x %1\n"
|
||||
"fmove%.l fpsr, %0" : "=g" (__fpsr) : "f" (__value));
|
||||
"fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value));
|
||||
return (__fpsr & (2 << (3 * 8))) ? (__value < 0 ? -1 : 1) : 0;
|
||||
}
|
||||
|
||||
__m81_inline __CONSTVALUE int
|
||||
__m81_inline int
|
||||
__m81_u(__isnan)(double __value) __attribute__ ((__const__));
|
||||
__m81_inline int
|
||||
__m81_u(__isnan)(double __value)
|
||||
{
|
||||
char __result;
|
||||
__asm("ftst%.x %1\n"
|
||||
"fsun %0" : "=g" (__result) : "f" (__value));
|
||||
"fsun %0" : "=dm" (__result) : "f" (__value));
|
||||
return __result;
|
||||
}
|
||||
|
||||
__m81_inline int
|
||||
__m81_u(__isinfl)(long double __value) __attribute__ ((__const__));
|
||||
__m81_inline int
|
||||
__m81_u(__isinfl)(long double __value)
|
||||
{
|
||||
/* There is no branch-condition for infinity,
|
||||
so we must extract and examine the condition codes manually. */
|
||||
unsigned long int __fpsr;
|
||||
__asm("ftst%.x %1\n"
|
||||
"fmove%.l %/fpsr, %0" : "=dm" (__fpsr) : "f" (__value));
|
||||
return (__fpsr & (2 << (3 * 8))) ? (__value < 0 ? -1 : 1) : 0;
|
||||
}
|
||||
|
||||
__m81_inline int
|
||||
__m81_u(__isnanl)(long double __value) __attribute__ ((__const__));
|
||||
__m81_inline int
|
||||
__m81_u(__isnanl)(long double __value)
|
||||
{
|
||||
char __result;
|
||||
__asm("ftst%.x %1\n"
|
||||
"fsun %0" : "=dm" (__result) : "f" (__value));
|
||||
return __result;
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ Cambridge, MA 02139, USA. */
|
||||
#endif
|
||||
|
||||
|
||||
__CONSTVALUE double
|
||||
double
|
||||
DEFUN(FUNC, (x), double x)
|
||||
{
|
||||
return __m81_u(FUNC)(x);
|
||||
|
||||
@ -21,7 +21,7 @@ Cambridge, MA 02139, USA. */
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
||||
__CONSTVALUE double
|
||||
double
|
||||
DEFUN(atan2, (y, x), double y AND double x)
|
||||
{
|
||||
static CONST double one = 1.0, zero = 0.0;
|
||||
|
||||
@ -20,7 +20,7 @@ Cambridge, MA 02139, USA. */
|
||||
#define __NO_MATH_INLINES
|
||||
#include <math.h>
|
||||
|
||||
__CONSTVALUE double
|
||||
double
|
||||
DEFUN(fmod, (x, y), double x AND double y)
|
||||
{
|
||||
return __fmod(x, y);
|
||||
|
||||
@ -20,7 +20,7 @@ Cambridge, MA 02139, USA. */
|
||||
#define __NO_MATH_INLINES
|
||||
#include <math.h>
|
||||
|
||||
__CONSTVALUE double
|
||||
double
|
||||
DEFUN(ldexp, (x, exp), double x AND int exp)
|
||||
{
|
||||
return __ldexp(x, exp);
|
||||
|
||||
@ -20,7 +20,7 @@ Cambridge, MA 02139, USA. */
|
||||
#define __NO_MATH_INLINES
|
||||
#include <math.h>
|
||||
|
||||
__CONSTVALUE double
|
||||
double
|
||||
DEFUN(pow, (x, y), double x AND double y)
|
||||
{
|
||||
return __pow(x, y);
|
||||
|
||||
@ -23,13 +23,15 @@ int
|
||||
__sigsetjmp (jmp_buf env, int savemask)
|
||||
{
|
||||
/* Save data registers D1 through D7. */
|
||||
asm volatile ("movem%.l d1-d7, %0" : : "m" (env[0].__jmpbuf[0].__dregs[0]));
|
||||
asm volatile ("movem%.l %/d1-%/d7, %0"
|
||||
: : "m" (env[0].__jmpbuf[0].__dregs[0]));
|
||||
|
||||
/* Save return address in place of register A0. */
|
||||
env[0].__jmpbuf[0].__aregs[0] = ((void **) &env)[-1];
|
||||
|
||||
/* Save address registers A1 through A5. */
|
||||
asm volatile ("movem%.l a1-a5, %0" : : "m" (env[0].__jmpbuf[0].__aregs[1]));
|
||||
asm volatile ("movem%.l %/a1-%/a5, %0"
|
||||
: : "m" (env[0].__jmpbuf[0].__aregs[1]));
|
||||
|
||||
/* Save caller's FP, not our own. */
|
||||
env[0].__jmpbuf[0].__fp = ((void **) &env)[-2];
|
||||
@ -39,7 +41,7 @@ __sigsetjmp (jmp_buf env, int savemask)
|
||||
|
||||
#if defined(__HAVE_68881__) || defined(__HAVE_FPU__)
|
||||
/* Save floating-point (68881) registers FP0 through FP7. */
|
||||
asm volatile ("fmovem%.x fp0-fp7, %0"
|
||||
asm volatile ("fmovem%.x %/fp0-%/fp7, %0"
|
||||
: : "m" (env[0].__jmpbuf[0].__fpregs[0]));
|
||||
#endif
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ ___curbrk:
|
||||
|
||||
.text
|
||||
ENTRY (__brk)
|
||||
movel __end, d0
|
||||
movel #__end, d0
|
||||
cmpl sp@(4), d0
|
||||
ble 0f
|
||||
movel d0, sp@(4)
|
||||
|
||||
@ -41,7 +41,7 @@ ___vfork:
|
||||
bits set) for the parent, and 0 (no bits set) for the child.
|
||||
Then AND it with D0, so the parent gets D0&-1==R0, and the child
|
||||
gets D0&0==0. */
|
||||
decl d1
|
||||
subql #1, d1
|
||||
andl d1, d0
|
||||
|
||||
/* Jump to the return PC. */
|
||||
|
||||
@ -27,7 +27,6 @@ Cambridge, MA 02139, USA. */
|
||||
replaced by a call to `execve'. Return -1 for errors, 0 to the new process,
|
||||
and the process ID of the new process to the old process. */
|
||||
.globl ___vfork
|
||||
error: jmp syscall_error
|
||||
___vfork:
|
||||
.word 0
|
||||
/* Save our return address in R2, and return to code below. */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user