Raymond Toy pushed to branch issue-486-rename-openlibm-functions at cmucl / cmucl Commits: 12f6a778 by Raymond Toy at 2026-03-04T14:51:03-08:00 Fix #488: Add log2f function from openlibm - - - - - f103e3fd by Raymond Toy at 2026-03-04T14:51:03-08:00 Merge branch 'issue-488-add-openlibm-log2f' into 'master' Fix #488: Add log2f function from openlibm Closes #488 See merge request cmucl/cmucl!364 - - - - - b96d1d0f by Raymond Toy at 2026-03-04T16:20:53-08:00 Merge branch 'master' into issue-486-rename-openlibm-functions - - - - - 66a5234a by Raymond Toy at 2026-03-04T16:24:32-08:00 Use __ieee754_log2f without it being renamed to log2f Just remove the `#define` for it from math_private.h. Add a comment in irrat.c for why we declarations for the functions. - - - - - 4 changed files: - src/lisp/Config.x86_common - src/lisp/irrat.c - + src/lisp/openlibm/e_log2f.c - src/lisp/openlibm/math_private.h Changes: ===================================== src/lisp/Config.x86_common ===================================== @@ -110,6 +110,7 @@ OPENLIBM_SRCS = \ $(OPENLIBM_DIR)/e_hypotf.c \ $(OPENLIBM_DIR)/e_log10f.c \ $(OPENLIBM_DIR)/e_logf.c \ + $(OPENLIBM_DIR)/e_log2f.c \ $(OPENLIBM_DIR)/e_powf.c \ $(OPENLIBM_DIR)/e_rem_pio2f.c \ $(OPENLIBM_DIR)/e_sinhf.c \ ===================================== src/lisp/irrat.c ===================================== @@ -56,7 +56,10 @@ extern float cr_expm1f(float); extern void cr_sincosf(float, float *, float *); #else #include "openlibm_math.h" - +/* + * Declare the openlibm functions we use. This is needed because we + * changed the names of the openlibm functions. + */ extern float openlibm_asinhf(float); extern float openlibm_atanf(float); extern float openlibm_cosf(float); @@ -78,8 +81,6 @@ extern float __ieee754_log10f(float); extern float __ieee754_sinhf(float); extern float __ieee754_hypotf(float, float); - - #endif ===================================== src/lisp/openlibm/e_log2f.c ===================================== @@ -0,0 +1,85 @@ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunPro, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +#include "cdefs-compat.h" +//__FBSDID("$FreeBSD: src/lib/msun/src/e_log2f.c,v 1.5 2011/10/15 05:23:28 das Exp $"); + +/* + * Float version of e_log2.c. See the latter for most comments. + */ + +#include <openlibm_math.h> + +#include "math_private.h" +#include "k_logf.h" + +// VBS +#define float_t float + +static const float +two25 = 3.3554432000e+07, /* 0x4c000000 */ +ivln2hi = 1.4428710938e+00, /* 0x3fb8b000 */ +ivln2lo = -1.7605285393e-04; /* 0xb9389ad4 */ + +static const float zero = 0.0; + +OLM_DLLEXPORT float +__ieee754_log2f(float x) +{ + float f,hfsq,hi,lo,r,y; + int32_t i,k,hx; + + GET_FLOAT_WORD(hx,x); + + k=0; + if (hx < 0x00800000) { /* x < 2**-126 */ + if ((hx&0x7fffffff)==0) + return -two25/zero; /* log(+-0)=-inf */ + if (hx<0) return (x-x)/zero; /* log(-#) = NaN */ + k -= 25; x *= two25; /* subnormal number, scale up x */ + GET_FLOAT_WORD(hx,x); + } + if (hx >= 0x7f800000) return x+x; + if (hx == 0x3f800000) + return zero; /* log(1) = +0 */ + k += (hx>>23)-127; + hx &= 0x007fffff; + i = (hx+(0x4afb0d))&0x800000; + SET_FLOAT_WORD(x,hx|(i^0x3f800000)); /* normalize x or x/2 */ + k += (i>>23); + y = (float)k; + f = x - (float)1.0; + hfsq = (float)0.5*f*f; + r = k_log1pf(f); + + /* + * We no longer need to avoid falling into the multi-precision + * calculations due to compiler bugs breaking Dekker's theorem. + * Keep avoiding this as an optimization. See e_log2.c for more + * details (some details are here only because the optimization + * is not yet available in double precision). + * + * Another compiler bug turned up. With gcc on i386, + * (ivln2lo + ivln2hi) would be evaluated in float precision + * despite runtime evaluations using double precision. So we + * must cast one of its terms to float_t. This makes the whole + * expression have type float_t, so return is forced to waste + * time clobbering its extra precision. + */ + if (sizeof(float_t) > sizeof(float)) + return (r - hfsq + f) * ((float_t)ivln2lo + ivln2hi) + y; + + hi = f - hfsq; + GET_FLOAT_WORD(hx,hi); + SET_FLOAT_WORD(hi,hx&0xfffff000); + lo = (f - hi) - hfsq + r; + return (lo+hi)*ivln2lo + lo*ivln2hi + hi*ivln2hi + y; +} ===================================== src/lisp/openlibm/math_private.h ===================================== @@ -334,14 +334,12 @@ extern float __ieee754_coshf(float); #define __ieee754_lgammaf_r lgammaf_r #if 0 #define __ieee754_log10f log10f -#else -extern float __ieee754_log10f(float); -#endif #define __ieee754_log2f log2f -#if 0 #define __ieee754_sinhf sinhf #define __ieee754_hypotf hypotf #else +extern float __ieee754_log10f(float); +extern float __ieee754_log2f(float); extern float __ieee754_sinhf(float); extern float __ieee754_hypotf(float, float); #endif View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/ae5589e335096b04cc9ad27... -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/ae5589e335096b04cc9ad27... You're receiving this email because of your account on gitlab.common-lisp.net.