On Sun, 2018-07-15 at 08:06 -0700, Steve Kargl wrote:
> Apparently, the recents additions to libm were not
> subject to any code review.  The following patch 
> does two things.  First, it works around
> 
> https://bugs.llvm.org/show_bug.cgi?id=8532
> 
> Second, it removes the pollution of libm with the
> polevll.c functions.  Those functions are used 
> only in ld80/e_powl.c, and those functions should
> be inlined.
> 
> Index: Makefile
> ===================================================================
> --- Makefile  (revision 336304)
> +++ Makefile  (working copy)
> @@ -56,7 +56,6 @@
>       imprecise.c \
>       k_cos.c k_cosf.c k_exp.c k_expf.c k_rem_pio2.c k_sin.c k_sinf.c \
>       k_tan.c k_tanf.c \
> -     polevll.c \
>       s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_carg.c s_cargf.c s_cargl.c \
>       s_cbrt.c s_cbrtf.c s_ceil.c s_ceilf.c s_clog.c s_clogf.c \
>       s_copysign.c s_copysignf.c s_cos.c s_cosf.c \
> Index: ld80/e_powl.c
> ===================================================================
> --- ld80/e_powl.c     (revision 336304)
> +++ ld80/e_powl.c     (working copy)
> @@ -77,6 +77,7 @@
>  #include 
>  
>  #include "math_private.h"
> +#include "polevll.c"
>  
>  /* Table size */
>  #define NXT 32
> Index: src/math_private.h
> ===================================================================
> --- src/math_private.h        (revision 336304)
> +++ src/math_private.h        (working copy)
> @@ -828,7 +828,4 @@
>  long double __kernel_cosl(long double, long double);
>  long double __kernel_tanl(long double, long double, int);
>  
> -long double __p1evll(long double, void *, int);
> -long double __polevll(long double, void *, int);
> -
>  #endif /* !_MATH_PRIVATE_H_ */
> Index: src/polevll.c
> ===================================================================
> --- src/polevll.c     (revision 336304)
> +++ src/polevll.c     (working copy)
> @@ -69,7 +69,7 @@
>   * Polynomial evaluator:
>   *  P[0] x^n  +  P[1] x^(n-1)  +  ...  +  P[n]
>   */
> -long double
> +static inline long double
>  __polevll(long double x, void *PP, int n)
>  {
>       long double y;
> @@ -88,7 +88,7 @@
>   * Polynomial evaluator:
>   *  x^n  +  P[0] x^(n-1)  +  P[1] x^(n-2)  +  ...  +  P[n]
>   */
> -long double
> +static inline long double
>  __p1evll(long double x, void *PP, int n)
>  {
>       long double y;
> Index: src/s_cpow.c
> ===================================================================
> --- src/s_cpow.c      (revision 336304)
> +++ src/s_cpow.c      (working copy)
> @@ -60,7 +60,7 @@
>       y = cimag (z);
>       absa = cabs (a);
>       if (absa == 0.0) {
> -             return (0.0 + 0.0 * I);
> +             return (CMPLX(0.0, 0.0));
>       }
>       arga = carg (a);
>       r = pow (absa, x);
> @@ -69,6 +69,6 @@
>               r = r * exp (-y * arga);
>               theta = theta + y * log (absa);
>       }
> -     w = r * cos (theta) + (r * sin (theta)) * I;
> +     w = CMPLX(r * cos (theta),  r * sin (theta));
>       return (w);
>  }
> Index: src/s_cpowf.c
> ===================================================================
> --- src/s_cpowf.c     (revision 336304)
> +++ src/s_cpowf.c     (working copy)
> @@ -59,7 +59,7 @@
>       y = cimagf(z);
>       absa = cabsf (a);
>       if (absa == 0.0f) {
> -             return (0.0f + 0.0f * I);
> +             return (CMPLXF(0.0f, 0.0f));
>       }
>       arga = cargf (a);
>       r = powf (absa, x);
> @@ -68,6 +68,6 @@
>               r = r * expf (-y * arga);
>               theta = theta + y * logf (absa);
>       }
> -     w = r * cosf (theta) + (r * sinf (theta)) * I;
> +     w = CMPLXF(r * cosf (theta), r * sinf (theta));
>       return (w);
>  }
> Index: src/s_cpowl.c
> ===================================================================
> --- src/s_cpowl.c     (revision 336304)
> +++ src/s_cpowl.c     (working copy)
> @@ -59,7 +59,7 @@
>       y = cimagl(z);
>       absa = cabsl(a);
>       if (absa == 0.0L) {
> -             return (0.0L + 0.0L * I);
> +             return (CMPLXL(0.0L, 0.0L));
>       }
>       arga = cargl(a);
>       r = powl(absa, x);
> @@ -68,6 +68,6 @@
>               r = r * expl(-y * arga);
>               theta = theta + y * logl(absa);
>       }
> -     w = r * cosl(theta) + (r * sinl(theta)) * I;
> +     w = CMPLXL(r * cosl(theta), r * sinl(theta));
>       return (w);
>  }
> 

If a file contains inline function definitions and is intended only to
be included into another file and not compiled separately, shouldn't
its name be spelled polevll.h ?

-- Ian
_______________________________________________
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"

Reply via email to