[Git][cmucl/cmucl][issue-425-correctly-rounded-math-functions] 3 commits: Define CORE64_SRCS instead of CORE64_OBJS

28 Jan 2026


      Raymond Toy pushed to branch issue-425-correctly-rounded-math-functions at cmucl / cmucl


Commits:
6f100c06 by Raymond Toy at 2026-01-28T08:21:07-08:00
Define CORE64_SRCS instead of CORE64_OBJS

Define the list of sources for core-math routines.  The rules in
GNUMakefile handle converting the list of sources into a list of
object files.  Then we can clean up the makefile a bit to reduce
unneeded complexity.

- - - - -
08f23a38 by Raymond Toy at 2026-01-28T08:22:47-08:00
Use fdlibm_scalbn even when core-math is used.

Core-math doesn't have a scalbn function, but fdlibm does so use that.
We could use libm's scalbn, but that doesn't signal errors on overflow
like we want.

- - - - -
34837462 by Raymond Toy at 2026-01-28T08:28:42-08:00
Disable some tests for core-math

This is so we can pass CI.  We'll need to come back and look at these
again after we decide what we want to do with these failures for
core-math which pass when using fdlibm.

- - - - -


4 changed files:

- src/lisp/Config.x86_common
- src/lisp/GNUmakefile
- src/lisp/irrat.c
- tests/fdlibm.lisp


Changes:

=====================================
src/lisp/Config.x86_common
=====================================
@@ -42,29 +42,29 @@ endif
 ifdef FEATURE_CORE_MATH
 CORE_MATH_64=core-math/src/binary64
 
-CORE64_OBJS=\
-	$(CORE_MATH_64)/sin/sin.o \
-	$(CORE_MATH_64)/cos/cos.o \
-	$(CORE_MATH_64)/tan/tan.o \
-	$(CORE_MATH_64)/atan2/atan2.o \
-	$(CORE_MATH_64)/asin/asin.o \
-	$(CORE_MATH_64)/acos/acos.o \
-	$(CORE_MATH_64)/atan/atan.o \
-	$(CORE_MATH_64)/sinh/sinh.o \
-	$(CORE_MATH_64)/cosh/cosh.o \
-	$(CORE_MATH_64)/tanh/tanh.o \
-	$(CORE_MATH_64)/asinh/asinh.o \
-	$(CORE_MATH_64)/acosh/acosh.o \
-	$(CORE_MATH_64)/atanh/atanh.o \
-	$(CORE_MATH_64)/exp/exp.o \
-	$(CORE_MATH_64)/log/log.o \
-	$(CORE_MATH_64)/log10/log10.o \
-	$(CORE_MATH_64)/log2/log2.o \
-	$(CORE_MATH_64)/pow/pow.o \
-	$(CORE_MATH_64)/hypot/hypot.o \
-	$(CORE_MATH_64)/log1p/log1p.o \
-	$(CORE_MATH_64)/expm1/expm1.o \
-	$(CORE_MATH_64)/sincos/sincos.o
+CORE64_SRCS=\
+	$(CORE_MATH_64)/sin/sin.c \
+	$(CORE_MATH_64)/cos/cos.c \
+	$(CORE_MATH_64)/tan/tan.c \
+	$(CORE_MATH_64)/atan2/atan2.c \
+	$(CORE_MATH_64)/asin/asin.c \
+	$(CORE_MATH_64)/acos/acos.c \
+	$(CORE_MATH_64)/atan/atan.c \
+	$(CORE_MATH_64)/sinh/sinh.c \
+	$(CORE_MATH_64)/cosh/cosh.c \
+	$(CORE_MATH_64)/tanh/tanh.c \
+	$(CORE_MATH_64)/asinh/asinh.c \
+	$(CORE_MATH_64)/acosh/acosh.c \
+	$(CORE_MATH_64)/atanh/atanh.c \
+	$(CORE_MATH_64)/exp/exp.c \
+	$(CORE_MATH_64)/log/log.c \
+	$(CORE_MATH_64)/log10/log10.c \
+	$(CORE_MATH_64)/log2/log2.c \
+	$(CORE_MATH_64)/pow/pow.c \
+	$(CORE_MATH_64)/hypot/hypot.c \
+	$(CORE_MATH_64)/log1p/log1p.c \
+	$(CORE_MATH_64)/expm1/expm1.c \
+	$(CORE_MATH_64)/sincos/sincos.c
 endif
 
 ifeq ($(filter 2% 3%, $(shell $(CC) -dumpversion)),)


=====================================
src/lisp/GNUmakefile
=====================================
@@ -36,7 +36,7 @@ SRCS = lisp.c coreparse.c alloc.c monitor.c print.c interr.c \
 	dynbind.c breakpoint.c regnames.c backtrace.c save.c purify.c \
 	runprog.c time.c case-mapping.c exec-init.c \
 	irrat.c \
-	${CORE64_OBJS:.o=.c} \
+	${CORE64_SRCS} \
 	${FDLIBM} ${ARCH_SRC} ${ASSEM_SRC} ${OS_SRC} ${GC_SRC}
 
 
@@ -61,8 +61,8 @@ lisp: ${OBJS} ${CORE64_OBJS} version.o
 
 # Create a library out of all the object files so we can build an
 # executable.  However, we need to remove exec-init.o from the library
-lisp.a:	version.o ${OBJS} ${CORE64_OBJS} ${EXEC_FINAL_OBJ}
-	$(AR) crs lisp.a ${OBJS} ${CORE64_OBJS} version.o
+lisp.a:	version.o ${OBJS} ${EXEC_FINAL_OBJ}
+	$(AR) crs lisp.a ${OBJS} version.o
 ifneq (${EXEC_FINAL_OBJ},)
 	$(AR) d lisp.a exec-init.o
 endif


=====================================
src/lisp/irrat.c
=====================================
@@ -7,6 +7,8 @@
 
 #include "lisp.h"
 #include "internals.h"
+#include "fdlibm.h"
+
 #ifdef FEATURE_CORE_MATH
 #include <math.h>
 extern double cr_sin(double);
@@ -29,8 +31,6 @@ extern double cr_pow(double, double);
 extern double cr_hypot(double, double);
 extern double cr_log1p(double);
 extern double cr_expm1(double);
-#else
-#include "fdlibm.h"
 #endif
 
 
@@ -241,9 +241,5 @@ lisp_expm1(double x)
 double
 lisp_scalbn(double x, int n)
 {
-#ifdef FEATURE_CORE_MATH
-    return scalbn(x, n);
-#else    
     return fdlibm_scalbn(x, n);
-#endif
 }


=====================================
tests/fdlibm.lisp
=====================================
@@ -171,6 +171,7 @@
   (ext:with-float-traps-masked (:invalid)
     (assert-true (ext::float-nan-p (kernel:%expm1 *snan*))))
   ;; expm1(x) = -1 for x < -56*log(2), signaling inexact
+  #-core-math
   (let ((x (* -57 (log 2d0))))
     (ext:with-float-traps-enabled (:inexact)
 	(assert-error 'floating-point-inexact
@@ -217,6 +218,7 @@
   (ext:with-float-traps-masked (:overflow)
     (assert-equal ext:double-float-positive-infinity
 		  (kernel:%exp 710d0)))
+  #-core-math
   (let ((modes (ext:get-floating-point-modes)))
     (unwind-protect
 	 (progn



View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/66d306ffceda908c6d56b8a...

-- 
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/66d306ffceda908c6d56b8a...
You're receiving this email because of your account on gitlab.common-lisp.net.

    

Raymond Toy (＠rtoy)

tags

participants (1)