GitLab

at 2026-02-03T08:32:45-08:00

Define macros to handle invalid and overflow signals

Minor cleanup of GNUMakefile

First, CORE64_OBJS is no longer defined, so don't use it.  The
CORE64_OBJS that used to name the .o files for core-math are now
computed as part of OBJS.

This removal also meant that the "clean" target no longer removed the
core-math object files.  Fix this by changing the rule to remove
$(OBJS) instead of *.o.

Fix #470:  Fix unit test issues on Ubuntu CI

Merge branch 'issue-470-ubuntu-ci-failures' into 'master'

Fix #470:  Fix unit test issues on Ubuntu CI

Closes #470

See merge request cmucl/cmucl!348
Fix #469:  Reenable cr_pow

Merge branch 'issue-469-enable-cr-pow' into 'master'

Fix #469:  Reenable cr_pow

Closes #469 and #470

See merge request cmucl/cmucl!346
Merge branch 'master' into issue-468-core-math-signals

     - job: linux:install

       artifacts: true

   variables:

-    CONFIG: "x86_linux_clang"

+    # Fedora 41 must build with gcc because the clang build fails some

+    # ansi-tests.  See [#469].

+    CONFIG: "x86_linux"

   # These rules is needed so that the static analyzer job can run on a

   # schedule because this is a prerequisite of the analyzer build.  A

   # regular push or merge request does the normal stuff.

       - linux-4/lisp

   variables:

     # This must match the config used for the linux build!

-    CONFIG: "x86_linux_clang"

+    CONFIG: "x86_linux"

   needs:

     - job: ubuntu:install

       artifacts: true

   variables:

-    CONFIG: "x86_linux_clang"

+    # Build with gcc on Ubuntu 25.10.  It produces a lisp than passes

+    # the ansi-tests.  Clang seems to fail the ansi-tests WRITE.1,

+    # PRINT.1, and friends when cr_pow is used.

+    CONFIG: "x86_linux"

 ubuntu:test:

   <<: *unit_test_configuration

 shift $((OPTIND - 1))

 # Create the test directory needed by the issue.45 test.

-rm -rf test-tmp

-mkdir test-tmp

-ln -s /bin/ls test-tmp/ls-link

+#rm -rf test-tmp

+#mkdir test-tmp

+#ln -s /bin/ls test-tmp/ls-link

 # Set the timestamps on 64-bit-timestamp-2038.txt and

 # 64-bit-timestamp-2106.txt, but only for OSes where we know this

 # tests/os.lisp.

 case `uname -s` in

     Linux)

-	touch -d "1 April 2038" tests/resources/64-bit-timestamp-2038.txt

-	touch -d "1 April 2106" tests/resources/64-bit-timestamp-2106.txt

+	# -t format is [[CC]YY]MMDDhhmm[.ss]

+	touch -t 203804010000 tests/resources/64-bit-timestamp-2038.txt

+	touch -t 210604010000 tests/resources/64-bit-timestamp-2106.txt

 	;;

 esac

 	mv ,version version

 	$(CC) ${CFLAGS} $(CPPFLAGS) -DVERSION=`cat version` -c $<

-lisp: ${OBJS} ${CORE64_OBJS} version.o

+lisp: ${OBJS} version.o

 	$(CC) -g ${OS_LINK_FLAGS} -o ,lisp $^ ${OS_LIBS} -lm

 	mv -f ,lisp lisp

 	@false

 clean:

-	$(RM) Depends *.o $(CORE64_OBJS) lisp lisp.nm core lisp.a

+	$(RM) Depends $(OBJS) lisp lisp.nm core lisp.a

 	echo 'Map file for lisp version 0' > lisp.nm

 depend: Depends

  * Wrappers for the special functions

  */

+#define MAYBE_SIGNAL_INVALID(test, val)		\

+    if ((test)) {				\ 

+        return fdlibm_setexception(val, FDLIBM_INVALID);	\

+    }

+

+#define MAYBE_SIGNAL_OVERFLOW(x)	\

+    if (isinf(x)) {	\

+	return fdlibm_setexception(x, FDLIBM_OVERFLOW); \

+    }

+

 double

 lisp_sin(double x)

 {

 #ifdef FEATURE_CORE_MATH

-    /* Signals invalid if x is infinite */

-    if (isinf(x)) {

-	return fdlibm_setexception(x, FDLIBM_INVALID);

-    }

+    MAYBE_SIGNAL_INVALID(isinf(x), x)

     return cr_sin(x);

 #else    

 lisp_cos(double x)

 {

 #ifdef FEATURE_CORE_MATH

-    /* Signals invalid if x is infinite */

-    if (isinf(x)) {

-	return fdlibm_setexception(x, FDLIBM_INVALID);

-    }

+    MAYBE_SIGNAL_INVALID(isinf(x), x)

     return cr_cos(x);

 #else    

 lisp_tan(double x)

 {

 #ifdef FEATURE_CORE_MATH

-    /* Signals invalid if x is infinite */

-    if (isinf(x)) {

-	return fdlibm_setexception(x, FDLIBM_INVALID);

-    }

+    MAYBE_SIGNAL_INVALID(isinf(x), x)

     return cr_tan(x);

 #else    

 lisp_sinh(double x)

 {

 #ifdef FEATURE_CORE_MATH

-    /* Signal overflow if x is infinite */

-    if (isinf(x)) {

-	return fdlibm_setexception(x, FDLIBM_OVERFLOW);

-    }

+    MAYBE_SIGNAL_OVERFLOW(x)

     return cr_sinh(x);

 #else    

 lisp_asinh(double x)

 {

 #ifdef FEATURE_CORE_MATH

-    /* Signal overflow if x is infinite */

-    if (isinf(x)) {

-	return fdlibm_setexception(x, FDLIBM_OVERFLOW);

-    }

+    MAYBE_SIGNAL_OVERFLOW(x)

     return cr_asinh(x);

 #else    

 lisp_acosh(double x)

 {

 #ifdef FEATURE_CORE_MATH

-    /* Signals invalid if x is not in the domain x >= 1 */

-    if (x < 1) {

-	return fdlibm_setexception(x, FDLIBM_INVALID);

-    }

-    /* Signal overflow if x is infinite */

-    if (isinf(x)) {

-	return fdlibm_setexception(x, FDLIBM_OVERFLOW);

-    }

+    MAYBE_SIGNAL_INVALID(x < 1, x)

+

+    MAYBE_SIGNAL_OVERFLOW(x)

     return cr_acosh(x);

 #else    

 double

 lisp_pow(double x, double y)

 {

+#ifdef FEATURE_CORE_MATH

     /*

-     * cr_pow seems causes ansi-tests to fail in test WRITE.1 among

-     * others.  Somewhere an invalid operation is occurring.  Thus

-     * just use fdlibm for now until we can figure out what's causing

-     * the failure.

+     * cr_pow when compiled with older versions of gcc or clang can

+     * cause failures in the ansi-tests [#469].  Ubuntu 25.10 and Fedora 41

+     * (gcc only) are known to have compilers that work well enough

+     * that the ansi-tests pass.

      */

+    return cr_pow(x, y);

+#else    

     return __ieee754_pow(x, y);

+#endif

 }

 double

 (define-test issue.45

   (:tag :issues)

   ;; This depends on run-tests to setup the test directory correctly!

-  (let* ((test-dir #p"test-tmp/")

+  (let* ((test-dir #p"tests/test-run-prog/")

 	 (test-dir-name (namestring test-dir)))

     (flet ((do-test (program)

 	     (with-output-to-string (s)

+#! /bin/sh

+exec /bin/ls "$@"

Raymond Toy pushed to branch issue-468-core-math-signals at cmucl / cmucl

Commits:

6 changed files:

Changes: