X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7240919a3009128f1b777158346aac6444e85022..a3fc8840a3c1586b17c9d211e959571fba365af6:/src/floatfns.c diff --git a/src/floatfns.c b/src/floatfns.c index 8bfb8814b6..562ec045c1 100644 --- a/src/floatfns.c +++ b/src/floatfns.c @@ -15,7 +15,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ /* ANSI C requires only these float functions: @@ -24,7 +25,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ Define HAVE_INVERSE_HYPERBOLIC if you have acosh, asinh, and atanh. Define HAVE_CBRT if you have cbrt. - Define HAVE_RINT if you have rint. + Define HAVE_RINT if you have a working rint. If you don't define these, then the appropriate routines will be simulated. Define HAVE_MATHERR if on a system supporting the SysV matherr callback. @@ -37,7 +38,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ (What systems actually do this? Please let us know.) Define FLOAT_CHECK_DOMAIN if the float library doesn't handle errors by - either setting errno, or signalling SIGFPE/SIGILL. Otherwise, domain and + either setting errno, or signaling SIGFPE/SIGILL. Otherwise, domain and range checking will happen before calling the float routines. This has no effect if HAVE_MATHERR is defined (since matherr will be called when a domain error occurs.) @@ -49,15 +50,20 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "lisp.h" #include "syssignal.h" -Lisp_Object Qarith_error; - #ifdef LISP_FLOAT_TYPE -#ifdef MSDOS -/* These are redefined (correctly, but differently) in values.h. */ -#undef INTBITS -#undef LONGBITS -#undef SHORTBITS +#if STDC_HEADERS +#include +#endif + +/* If IEEE_FLOATING_POINT isn't defined, default it from FLT_*. */ +#ifndef IEEE_FLOATING_POINT +#if (FLT_RADIX == 2 && FLT_MANT_DIG == 24 \ + && FLT_MIN_EXP == -125 && FLT_MAX_EXP == 128) +#define IEEE_FLOATING_POINT 1 +#else +#define IEEE_FLOATING_POINT 0 +#endif #endif /* Work around a problem that happens because math.h on hpux 7 @@ -73,9 +79,9 @@ Lisp_Object Qarith_error; #include /* This declaration is omitted on some systems, like Ultrix. */ -#if !defined (HPUX) && defined (HAVE_LOGB) +#if !defined (HPUX) && defined (HAVE_LOGB) && !defined (logb) extern double logb (); -#endif /* not HPUX and HAVE_LOGB */ +#endif /* not HPUX and HAVE_LOGB and no logb macro */ #if defined(DOMAIN) && defined(SING) && defined(OVERFLOW) /* If those are defined, then this is probably a `matherr' machine. */ @@ -117,10 +123,6 @@ extern int errno; #define sinh(x) ((exp(x)-exp(-x))*0.5) #endif /* VMS */ -#ifndef HAVE_RINT -#define rint(x) (floor((x)+0.5)) -#endif - static SIGTYPE float_error (); /* Nonzero while executing in floating point. @@ -129,7 +131,9 @@ static SIGTYPE float_error (); static int in_float; /* If an argument is out of range for a mathematical function, - here is the actual argument value to use in the error message. */ + here is the actual argument value to use in the error message. + These variables are used only across the floating point library call + so there is no need to staticpro them. */ static Lisp_Object float_error_arg, float_error_arg2; @@ -180,17 +184,19 @@ static char *float_error_fn_name; #define FLOAT_TO_INT(x, i, name, num) \ do \ { \ - if ((x) >= (1 << (VALBITS-1)) || (x) <= - (1 << (VALBITS-1)) - 1) \ + if ((x) >= (((EMACS_INT) 1) << (VALBITS-1)) || \ + (x) <= - (((EMACS_INT) 1) << (VALBITS-1)) - 1) \ range_error (name, num); \ - XSET (i, Lisp_Int, (int)(x)); \ + XSETINT (i, (EMACS_INT)(x)); \ } \ while (0) #define FLOAT_TO_INT2(x, i, name, num1, num2) \ do \ { \ - if ((x) >= (1 << (VALBITS-1)) || (x) <= - (1 << (VALBITS-1)) - 1) \ + if ((x) >= (((EMACS_INT) 1) << (VALBITS-1)) || \ + (x) <= - (((EMACS_INT) 1) << (VALBITS-1)) - 1) \ range_error2 (name, num1, num2); \ - XSET (i, Lisp_Int, (int)(x)); \ + XSETINT (i, (EMACS_INT)(x)); \ } \ while (0) @@ -215,7 +221,7 @@ extract_float (num) { CHECK_NUMBER_OR_FLOAT (num, 0); - if (XTYPE (num) == Lisp_Float) + if (FLOATP (num)) return XFLOAT (num)->data; return (double) XINT (num); } @@ -320,13 +326,13 @@ DEFUN ("bessel-j1", Fbessel_j1, Sbessel_j1, 1, 1, 0, DEFUN ("bessel-jn", Fbessel_jn, Sbessel_jn, 2, 2, 0, "Return the order N bessel function output jn of ARG.\n\ The first arg (the order) is truncated to an integer.") - (arg1, arg2) - register Lisp_Object arg1, arg2; + (n, arg) + register Lisp_Object n, arg; { - int i1 = extract_float (arg1); - double f2 = extract_float (arg2); + int i1 = extract_float (n); + double f2 = extract_float (arg); - IN_FLOAT (f2 = jn (i1, f2), "bessel-jn", arg1); + IN_FLOAT (f2 = jn (i1, f2), "bessel-jn", n); return make_float (f2); } @@ -353,13 +359,13 @@ DEFUN ("bessel-y1", Fbessel_y1, Sbessel_y1, 1, 1, 0, DEFUN ("bessel-yn", Fbessel_yn, Sbessel_yn, 2, 2, 0, "Return the order N bessel function output yn of ARG.\n\ The first arg (the order) is truncated to an integer.") - (arg1, arg2) - register Lisp_Object arg1, arg2; + (n, arg) + register Lisp_Object n, arg; { - int i1 = extract_float (arg1); - double f2 = extract_float (arg2); + int i1 = extract_float (n); + double f2 = extract_float (arg); - IN_FLOAT (f2 = yn (i1, f2), "bessel-yn", arg1); + IN_FLOAT (f2 = yn (i1, f2), "bessel-yn", n); return make_float (f2); } @@ -434,7 +440,7 @@ DEFUN ("exp", Fexp, Sexp, 1, 1, 0, } DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, - "Return the exponential X ** Y.") + "Return the exponential ARG1 ** ARG2.") (arg1, arg2) register Lisp_Object arg1, arg2; { @@ -442,10 +448,10 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, CHECK_NUMBER_OR_FLOAT (arg1, 0); CHECK_NUMBER_OR_FLOAT (arg2, 0); - if (XTYPE (arg1) == Lisp_Int /* common lisp spec */ - && XTYPE (arg2) == Lisp_Int) /* don't promote, if both are ints */ + if (INTEGERP (arg1) /* common lisp spec */ + && INTEGERP (arg2)) /* don't promote, if both are ints */ { /* this can be improved by pre-calculating */ - int acc, x, y; /* some binary powers of x then accumulating */ + EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ Lisp_Object val; x = XINT (arg1); @@ -471,11 +477,11 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0, y = (unsigned)y >> 1; } } - XSET (val, Lisp_Int, acc); + XSETINT (val, acc); return val; } - f1 = (XTYPE (arg1) == Lisp_Float) ? XFLOAT (arg1)->data : XINT (arg1); - f2 = (XTYPE (arg2) == Lisp_Float) ? XFLOAT (arg2)->data : XINT (arg2); + f1 = FLOATP (arg1) ? XFLOAT (arg1)->data : XINT (arg1); + f2 = FLOATP (arg2) ? XFLOAT (arg2)->data : XINT (arg2); /* Really should check for overflow, too */ if (f1 == 0.0 && f2 == 0.0) f1 = 1.0; @@ -643,10 +649,10 @@ DEFUN ("abs", Fabs, Sabs, 1, 1, 0, { CHECK_NUMBER_OR_FLOAT (arg, 0); - if (XTYPE (arg) == Lisp_Float) + if (FLOATP (arg)) IN_FLOAT (arg = make_float (fabs (XFLOAT (arg)->data)), "abs", arg); else if (XINT (arg) < 0) - XSETINT (arg, - XFASTINT (arg)); + XSETINT (arg, - XINT (arg)); return arg; } @@ -658,7 +664,7 @@ DEFUN ("float", Ffloat, Sfloat, 1, 1, 0, { CHECK_NUMBER_OR_FLOAT (arg, 0); - if (XTYPE (arg) == Lisp_Int) + if (INTEGERP (arg)) return make_float ((double) XINT (arg)); else /* give 'em the same float back */ return arg; @@ -671,7 +677,7 @@ This is the same as the exponent of a float.") Lisp_Object arg; { Lisp_Object val; - int value; + EMACS_INT value; double f = extract_float (arg); if (f == 0.0) @@ -682,8 +688,9 @@ This is the same as the exponent of a float.") IN_FLOAT (value = logb (f), "logb", arg); #else #ifdef HAVE_FREXP - IN_FLOAT (frexp (f, &value), "logb", arg); - value--; + int ivalue; + IN_FLOAT (frexp (f, &ivalue), "logb", arg); + value = ivalue - 1; #else int i; double d; @@ -707,60 +714,42 @@ This is the same as the exponent of a float.") #endif #endif } - XSET (val, Lisp_Int, value); + XSETINT (val, value); return val; } -/* the rounding functions */ - -DEFUN ("ceiling", Fceiling, Sceiling, 1, 1, 0, - "Return the smallest integer no less than ARG. (Round toward +inf.)") - (arg) - register Lisp_Object arg; -{ - CHECK_NUMBER_OR_FLOAT (arg, 0); - - if (XTYPE (arg) == Lisp_Float) - { - double d; - - IN_FLOAT (d = ceil (XFLOAT (arg)->data), "ceiling", arg); - FLOAT_TO_INT (d, arg, "ceiling", arg); - } - - return arg; -} - #endif /* LISP_FLOAT_TYPE */ -DEFUN ("floor", Ffloor, Sfloor, 1, 2, 0, - "Return the largest integer no greater than ARG. (Round towards -inf.)\n\ -With optional DIVISOR, return the largest integer no greater than ARG/DIVISOR.") - (arg, divisor) +/* the rounding functions */ + +static Lisp_Object +rounding_driver (arg, divisor, double_round, int_round2, name) register Lisp_Object arg, divisor; + double (*double_round) (); + EMACS_INT (*int_round2) (); + char *name; { CHECK_NUMBER_OR_FLOAT (arg, 0); if (! NILP (divisor)) { - int i1, i2; + EMACS_INT i1, i2; CHECK_NUMBER_OR_FLOAT (divisor, 1); #ifdef LISP_FLOAT_TYPE - if (XTYPE (arg) == Lisp_Float || XTYPE (divisor) == Lisp_Float) + if (FLOATP (arg) || FLOATP (divisor)) { double f1, f2; - f1 = XTYPE (arg) == Lisp_Float ? XFLOAT (arg)->data : XINT (arg); - f2 = (XTYPE (divisor) == Lisp_Float - ? XFLOAT (divisor)->data : XINT (divisor)); - if (f2 == 0) + f1 = FLOATP (arg) ? XFLOAT (arg)->data : XINT (arg); + f2 = (FLOATP (divisor) ? XFLOAT (divisor)->data : XINT (divisor)); + if (! IEEE_FLOATING_POINT && f2 == 0) Fsignal (Qarith_error, Qnil); - IN_FLOAT2 (f1 = floor (f1 / f2), "floor", arg, divisor); - FLOAT_TO_INT2 (f1, arg, "floor", arg, divisor); + IN_FLOAT2 (f1 = (*double_round) (f1 / f2), name, arg, divisor); + FLOAT_TO_INT2 (f1, arg, name, arg, divisor); return arg; } #endif @@ -771,66 +760,147 @@ With optional DIVISOR, return the largest integer no greater than ARG/DIVISOR.") if (i2 == 0) Fsignal (Qarith_error, Qnil); - /* With C's /, the result is implementation-defined if either operand - is negative, so use only nonnegative operands. */ - i1 = (i2 < 0 - ? (i1 <= 0 ? -i1 / -i2 : -1 - ((i1 - 1) / -i2)) - : (i1 < 0 ? -1 - ((-1 - i1) / i2) : i1 / i2)); - - XSET (arg, Lisp_Int, i1); + XSETINT (arg, (*int_round2) (i1, i2)); return arg; } #ifdef LISP_FLOAT_TYPE - if (XTYPE (arg) == Lisp_Float) + if (FLOATP (arg)) { double d; - IN_FLOAT (d = floor (XFLOAT (arg)->data), "floor", arg); - FLOAT_TO_INT (d, arg, "floor", arg); + + IN_FLOAT (d = (*double_round) (XFLOAT (arg)->data), name, arg); + FLOAT_TO_INT (d, arg, name, arg); } #endif return arg; } -#ifdef LISP_FLOAT_TYPE +/* With C's /, the result is implementation-defined if either operand + is negative, so take care with negative operands in the following + integer functions. */ -DEFUN ("round", Fround, Sround, 1, 1, 0, - "Return the nearest integer to ARG.") - (arg) - register Lisp_Object arg; +static EMACS_INT +ceiling2 (i1, i2) + EMACS_INT i1, i2; { - CHECK_NUMBER_OR_FLOAT (arg, 0); + return (i2 < 0 + ? (i1 < 0 ? ((-1 - i1) / -i2) + 1 : - (i1 / -i2)) + : (i1 <= 0 ? - (-i1 / i2) : ((i1 - 1) / i2) + 1)); +} - if (XTYPE (arg) == Lisp_Float) - { - double d; +static EMACS_INT +floor2 (i1, i2) + EMACS_INT i1, i2; +{ + return (i2 < 0 + ? (i1 <= 0 ? -i1 / -i2 : -1 - ((i1 - 1) / -i2)) + : (i1 < 0 ? -1 - ((-1 - i1) / i2) : i1 / i2)); +} - /* Screw the prevailing rounding mode. */ - IN_FLOAT (d = rint (XFLOAT (arg)->data), "round", arg); - FLOAT_TO_INT (d, arg, "round", arg); - } +static EMACS_INT +truncate2 (i1, i2) + EMACS_INT i1, i2; +{ + return (i2 < 0 + ? (i1 < 0 ? -i1 / -i2 : - (i1 / -i2)) + : (i1 < 0 ? - (-i1 / i2) : i1 / i2)); +} - return arg; +static EMACS_INT +round2 (i1, i2) + EMACS_INT i1, i2; +{ + /* The C language's division operator gives us one remainder R, but + we want the remainder R1 on the other side of 0 if R1 is closer + to 0 than R is; because we want to round to even, we also want R1 + if R and R1 are the same distance from 0 and if C's quotient is + odd. */ + EMACS_INT q = i1 / i2; + EMACS_INT r = i1 % i2; + EMACS_INT abs_r = r < 0 ? -r : r; + EMACS_INT abs_r1 = (i2 < 0 ? -i2 : i2) - abs_r; + return q + (abs_r + (q & 1) <= abs_r1 ? 0 : (i2 ^ r) < 0 ? -1 : 1); +} + +/* The code uses emacs_rint, so that it works to undefine HAVE_RINT + if `rint' exists but does not work right. */ +#ifdef HAVE_RINT +#define emacs_rint rint +#else +static double +emacs_rint (d) + double d; +{ + return floor (d + 0.5); +} +#endif + +static double +double_identity (d) + double d; +{ + return d; } -DEFUN ("truncate", Ftruncate, Struncate, 1, 1, 0, +DEFUN ("ceiling", Fceiling, Sceiling, 1, 2, 0, + "Return the smallest integer no less than ARG. (Round toward +inf.)\n\ +With optional DIVISOR, return the smallest integer no less than ARG/DIVISOR.") + (arg, divisor) + Lisp_Object arg, divisor; +{ + return rounding_driver (arg, divisor, ceil, ceiling2, "ceiling"); +} + +DEFUN ("floor", Ffloor, Sfloor, 1, 2, 0, + "Return the largest integer no greater than ARG. (Round towards -inf.)\n\ +With optional DIVISOR, return the largest integer no greater than ARG/DIVISOR.") + (arg, divisor) + Lisp_Object arg, divisor; +{ + return rounding_driver (arg, divisor, floor, floor2, "floor"); +} + +DEFUN ("round", Fround, Sround, 1, 2, 0, + "Return the nearest integer to ARG.\n\ +With optional DIVISOR, return the nearest integer to ARG/DIVISOR.") + (arg, divisor) + Lisp_Object arg, divisor; +{ + return rounding_driver (arg, divisor, emacs_rint, round2, "round"); +} + +DEFUN ("truncate", Ftruncate, Struncate, 1, 2, 0, "Truncate a floating point number to an int.\n\ -Rounds the value toward zero.") - (arg) - register Lisp_Object arg; +Rounds ARG toward zero.\n\ +With optional DIVISOR, truncate ARG/DIVISOR.") + (arg, divisor) + Lisp_Object arg, divisor; { - CHECK_NUMBER_OR_FLOAT (arg, 0); + return rounding_driver (arg, divisor, double_identity, truncate2, + "truncate"); +} - if (XTYPE (arg) == Lisp_Float) - { - double d; +#ifdef LISP_FLOAT_TYPE - d = XFLOAT (arg)->data; - FLOAT_TO_INT (d, arg, "truncate", arg); - } +Lisp_Object +fmod_float (x, y) + register Lisp_Object x, y; +{ + double f1, f2; - return arg; + f1 = FLOATP (x) ? XFLOAT (x)->data : XINT (x); + f2 = FLOATP (y) ? XFLOAT (y)->data : XINT (y); + + if (! IEEE_FLOATING_POINT && f2 == 0) + Fsignal (Qarith_error, Qnil); + + /* If the "remainder" comes out with the wrong sign, fix it. */ + IN_FLOAT2 ((f1 = fmod (f1, f2), + f1 = (f2 < 0 ? f1 > 0 : f1 < 0) ? f1 + f2 : f1), + "mod", x, y); + return make_float (f1); } /* It's not clear these are worth adding. */ @@ -863,12 +933,12 @@ DEFUN ("fround", Ffround, Sfround, 1, 1, 0, register Lisp_Object arg; { double d = extract_float (arg); - IN_FLOAT (d = rint (d), "fround", arg); + IN_FLOAT (d = emacs_rint (d), "fround", arg); return make_float (d); } DEFUN ("ftruncate", Fftruncate, Sftruncate, 1, 1, 0, - "Truncate a floating point number to an integral float value.\n\ + "Truncate a floating point number to an integral float value.\n\ Rounds the value toward zero.") (arg) register Lisp_Object arg; @@ -889,7 +959,7 @@ float_error (signo) if (! in_float) fatal_error_signal (signo); -#ifdef BSD +#ifdef BSD_SYSTEM #ifdef BSD4_1 sigrelse (SIGILL); #else /* not BSD4_1 */ @@ -898,7 +968,7 @@ float_error (signo) #else /* Must reestablish handler each time it is called. */ signal (SIGILL, float_error); -#endif /* BSD */ +#endif /* BSD_SYSTEM */ in_float = 0; @@ -995,9 +1065,9 @@ syms_of_floatfns () defsubr (&Sabs); defsubr (&Sfloat); defsubr (&Slogb); +#endif /* LISP_FLOAT_TYPE */ defsubr (&Sceiling); + defsubr (&Sfloor); defsubr (&Sround); defsubr (&Struncate); -#endif /* LISP_FLOAT_TYPE */ - defsubr (&Sfloor); }