cmucl-cvs

cmucl-cvs@common-lisp.net

2904 discussions

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-35-gef38247
by Raymond Toy 03 Dec '14

03 Dec '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via ef3824719adb38bf923d493d91942d304523ea29 (commit) via 85c9daef724604a5c84b13aa8fc88255e380d0be (commit) from df425339e0cf09ef687c491e99f6c10238f56b85 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ef3824719adb38bf923d493d91942d304523ea29 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Dec 2 18:10:52 2014 -0800 #ifdef out some debugging code for os_dlsym. diff --git a/src/lisp/Darwin-os.c b/src/lisp/Darwin-os.c index e1120ab..53d2db5 100644 --- a/src/lisp/Darwin-os.c +++ b/src/lisp/Darwin-os.c @@ -534,7 +534,7 @@ os_dlsym(const char *sym_name, lispobj lib_list) void *sym_addr = 0; int offset = sym_name[0] == '_' ? 1 : 0; -#if 1 +#if 0 if (offset == 0) { fprintf(stderr, "sym-name = %s\n", sym_name); } commit 85c9daef724604a5c84b13aa8fc88255e380d0be Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Dec 1 23:14:31 2014 -0800 Add support for ppc. Not yet working, but OPT_EXTRA value appears to be needed, especially the __LINKEDIT address, like on i386. diff --git a/src/tools/linker.sh b/src/tools/linker.sh index a0050b9..a5a99ef 100755 --- a/src/tools/linker.sh +++ b/src/tools/linker.sh @@ -99,14 +99,17 @@ case $uname_s in # when creating the executable on 10.8. (See ticket:112.) OPT_EXTRA="-segaddr __LINKEDIT 0x99000000 -rdynamic -mmacosx-version-min=10.5" + OS_LIBS= ;; powerpc) - # Nothing needed for ppc? + # See Config.ppc_darwin Like i386, __LINKEDIT is linked + # just after the dynamic space which messes things up, so + # we move it to a diffferent address. The address below + # appears to be free. + OPT_EXTRA="-segaddr __LINKEDIT 0x99000000 -mmacosx-version-min=10.4 -static-libgcc" + OS_LIBS="-lSystem -lc -lm" ;; esac - - # See Config.x86_darwin - OS_LIBS= ;; SunOS) # A quick test indicates that gcc will accept the following ----------------------------------------------------------------------- Summary of changes: src/lisp/Darwin-os.c | 2 +- src/tools/linker.sh | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-33-gdf42533
by Raymond Toy 01 Dec '14

01 Dec '14

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-32-g0ec3368
by Raymond Toy 01 Dec '14

01 Dec '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 0ec33685dff49b910b0c46644f983064c02ab949 (commit) via 394a28dfacbfe6d4557ed8f59152c58b17078f05 (commit) from 5f81e24180fa7721fcad38b9ae3419bd9f2a221d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0ec33685dff49b910b0c46644f983064c02ab949 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Nov 30 20:00:50 2014 -0800 Remove lisp.a when cleaning; update usags. * make clean should remove lisp.a * Use $(RM) instead of rm. * Use $(AR) instead of ar. diff --git a/src/lisp/GNUmakefile b/src/lisp/GNUmakefile index f67a20e..ad9b472 100644 --- a/src/lisp/GNUmakefile +++ b/src/lisp/GNUmakefile @@ -49,10 +49,10 @@ lisp: ${OBJS} version.o # builtin_image_flag to 1 so that the runtime knows the runtime # contains the core sections. lisp.a: version.o ${OBJS} ${EXEC_FINAL_OBJ} - ar crs lisp.a ${OBJS} version.o + $(AR) crs lisp.a ${OBJS} version.o ifneq (${EXEC_FINAL_OBJ},) - ar d lisp.a exec-init.o - ar r lisp.a ${EXEC_FINAL_OBJ} + $(AR) d lisp.a exec-init.o + $(AR) r lisp.a ${EXEC_FINAL_OBJ} endif version: @@ -63,7 +63,7 @@ internals.h internals.inc: @false clean: - rm -f Depends *.o lisp lisp.nm core + $(RM) Depends *.o lisp lisp.nm core lisp.a echo 'Map file for lisp version 0' > lisp.nm depend: Depends commit 394a28dfacbfe6d4557ed8f59152c58b17078f05 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Nov 30 19:17:16 2014 -0800 Don't bother to build clm or motifd on darwin/ppc. It's not likely we'll ever install motif on that machine. diff --git a/bin/build-utils.sh b/bin/build-utils.sh index e59fd19..18d6f60 100755 --- a/bin/build-utils.sh +++ b/bin/build-utils.sh @@ -36,6 +36,7 @@ $TARGET/lisp/lisp \ (setq *gc-verbose* nil *interactive* nil) (load "target:tools/clxcom") (load "target:clx/clx-library") +#-ppc (load "target:tools/clmcom") (load "target:tools/hemcom") @@ -61,4 +62,17 @@ fi export MAKE -${MAKE} -C $TARGET/motif/server clean && ${MAKE} -C $TARGET/motif/server +# Don't bother building motifd on ppc; we'll probably never support that again. + +SKIPMOTIF=no +case `uname -s` in + Darwin) + case `uname -p` in + powerpc) SKIPMOTIF=yes ;; + esac ;; +esac + +if [ "$SKIPMOTIF" = "no" ]; then + ${MAKE} -C $TARGET/motif/server clean && ${MAKE} -C $TARGET/motif/server +fi + ----------------------------------------------------------------------- Summary of changes: bin/build-utils.sh | 16 +++++++++++++++- src/lisp/GNUmakefile | 8 ++++---- 2 files changed, 19 insertions(+), 5 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-30-g5f81e24
by Raymond Toy 01 Dec '14

01 Dec '14

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-29-g46b8066
by Raymond Toy 30 Nov '14

30 Nov '14

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-28-g70181ee
by Raymond Toy 30 Nov '14

30 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 70181ee7553a350eedd7acb2815b98dde6ce846c (commit) from 1e4040f32e973a1debcec908e4e69147c31a67ec (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 70181ee7553a350eedd7acb2815b98dde6ce846c Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Nov 29 21:00:38 2014 -0800 Partially addresses ticket:91 by allowing the test suite to finish. The tests still fail (along with others), but the test suite will finish. * code/float-trap.lisp: * Update SET-FLOATING-POINT-MODES: * When we clear out bits in float-invalid-op-1-byte, clear out the float-invalid-op-2-byte. Not necessary for this fix, but those bits signal other invalid operations from sqrt and such. * When clearing the exceptions, clear the sticky exceptions summary bit too. * Fix SIGFPE-HANDLER: * As above, clear out the bit in float-invalid-op-2-byte and the exceptions summary bit. * Only clear out the new exception bits, as done for SSE2. * Mask out the float-invalid-op-2-byte and the summary bit before setting the new modes. * compiler/ppc/parms.lisp * Define float-exceptions-summary-byte. * code/exports.lisp: * Export FLOAT-INVALID-OP-2-BYTE diff --git a/src/code/exports.lisp b/src/code/exports.lisp index 99e0762..a6dcc0b 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -1164,6 +1164,7 @@ (:export "SIGCONTEXT-LR" "COMPATIBLE-FUNCTION-TYPES-P" "FLOAT-INVALID-OP-1-BYTE" + "FLOAT-INVALID-OP-2-BYTE" "GET-FP-OPERANDS" "FUSED-MULTIPLY-ADD" "FUSED-MULTIPLY-SUBTRACT") diff --git a/src/code/float-trap.lisp b/src/code/float-trap.lisp index a736e0d..d67a4ff 100644 --- a/src/code/float-trap.lisp +++ b/src/code/float-trap.lisp @@ -193,7 +193,8 @@ #+(and darwin ppc) (when (member :invalid current-exceptions) ;; Clear out the bits for the detected invalid operation - (setf (ldb vm:float-invalid-op-1-byte modes) 0))) + (setf (ldb vm:float-invalid-op-1-byte modes) 0) + (setf (ldb vm:float-invalid-op-2-byte modes) 0))) (when accrued-x-p (setf (ldb float-sticky-bits modes) @@ -201,12 +202,18 @@ #+(and darwin ppc) (when (member :invalid current-exceptions) ;; Clear out the bits for the detected invalid operation - (setf (ldb vm:float-invalid-op-1-byte modes) 0))) + (setf (ldb vm:float-invalid-op-1-byte modes) 0) + (setf (ldb vm:float-invalid-op-2-byte modes) 0))) + + #+(and darwin ppc) + (when (or accrued-x-p current-x-p) + (setf (ldb vm:float-exceptions-summary-byte modes) 0)) (when fast-mode-p (if fast-mode (setq modes (logior float-fast-bit modes)) (setq modes (logand (lognot float-fast-bit) modes)))) + (setf (floating-point-modes) modes)) (values)) @@ -261,7 +268,12 @@ (traps (logand (ldb float-exceptions-byte modes) (ldb float-traps-byte modes)))) #+(and darwin ppc) - (let ((new-modes modes)) + (let* ((new-modes modes) + (new-exceptions (logandc2 (ldb float-exceptions-byte new-modes) + traps))) + ;; (format t "sigfpe: modes = #B~32,'0b~%" modes) + ;; (format t "sigfpe: new-exc = #B~32,'0b~%" new-exceptions) + (setf (ldb float-exceptions-byte new-modes) new-exceptions) ;; Clear out all exceptions and save them to the context. ;; ;; XXX: Should we just clear out the bits for the traps that are @@ -273,6 +285,9 @@ ;; XXX: Should we only do that if the invalid trap is enabled? (setf (ldb float-invalid-op-1-byte new-modes) 0) (setf (ldb float-invalid-op-2-byte new-modes) 0) + ;; Clear the FP exception summary bit too. + (setf (ldb float-exceptions-summary-byte new-modes) 0) + ;; (format t "sigfpe: new modes = #B~32,'0b~%" new-modes) (setf (floating-point-modes) new-modes) (setf (sigcontext-floating-point-modes (alien:sap-alien scp (* unix:sigcontext))) @@ -371,7 +386,10 @@ ;; an exception. #+ppc (invalid-mask (if (member :invalid traps) - (dpb 0 vm:float-invalid-op-1-byte #xffffffff) + (dpb 0 + (byte 1 31) + (dpb 0 vm::float-invalid-op-2-byte + (dpb 0 vm:float-invalid-op-1-byte #xffffffff))) #xffffffff)) (orig-modes (gensym))) `(let ((,orig-modes (floating-point-modes))) @@ -387,4 +405,4 @@ ,(logand trap-mask exception-mask) #+ppc ,invalid-mask - #+mips ,(dpb 0 float-exceptions-byte #xffffffff)))))))) + #+mips ,(dpb 0 float-exceptions-byte #xffffffff)))))))) diff --git a/src/compiler/ppc/parms.lisp b/src/compiler/ppc/parms.lisp index dab5ce5..cc2c5ba 100644 --- a/src/compiler/ppc/parms.lisp +++ b/src/compiler/ppc/parms.lisp @@ -66,7 +66,8 @@ float-underflow-trap-bit float-overflow-trap-bit float-imprecise-trap-bit float-invalid-trap-bit float-divide-by-zero-trap-bit - float-invalid-op-1-byte)) + float-invalid-op-1-byte + float-invalid-op-2-byte)) #+double-double (export '(double-double-float-digits)) @@ -152,6 +153,10 @@ ;; operation such as some software request, invalid square root, or ;; invalid integer convert. (defconstant float-invalid-op-2-byte (byte 3 8)) +;; FP exception summary bit. This is set if an FP instruction causes +;; any of the FP exception bits to transition from 0 to 1 (meaning +;; that exception occurred.) +(defconstant float-exceptions-summary-byte (byte 1 31)) (defconstant float-fast-bit (ash 1 2)) ; Non-IEEE mode ); eval-when ----------------------------------------------------------------------- Summary of changes: src/code/exports.lisp | 1 + src/code/float-trap.lisp | 28 +++++++++++++++++++++++----- src/compiler/ppc/parms.lisp | 7 ++++++- 3 files changed, 30 insertions(+), 6 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-27-g1e4040f
by Raymond Toy 29 Nov '14

29 Nov '14

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-26-g1fc53cc
by Raymond Toy 28 Nov '14

28 Nov '14

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-25-g2b39eba
by Raymond Toy 28 Nov '14

28 Nov '14

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-24-g55d04a3
by Raymond Toy 27 Nov '14

27 Nov '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 55d04a31ba05d20f4e9ab6be9548d374c900b197 (commit) from 37d383ae57c2fc9597cb87eac9551af866885cd3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 55d04a31ba05d20f4e9ab6be9548d374c900b197 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Nov 26 18:35:05 2014 -0800 Fix up a few more issues with log. * src/code/irrat.lisp: * In log10, return the correct type for the result. Previously, we would return a double even if a single were desired. * Fix up a few more cases where we failed to handle log of a huge rational correctly for log base 2 and base 10. * tests/irrat.lisp: * Add some tests to check that log returns the correct type of number for the log base 2 and 10 of very large rationals. diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index 325e5bc..0804ef9 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -653,10 +653,10 @@ ;; Number fits in a double, so it's easy (float (%log10 d) float-type)) (t - ;; Number doesn't fit in a double. Do it the hard way. - ;; This should be done more accurately. - (/ (log2 number float-type) - (log2 (float 10 float-type))))))) + ;; Number doesn't fit in a double. Do it the hard way using + ;; log2. This should be done more accurately. + (float (/ (log2 number) + (log2 10)) float-type))))) (defun log (number &optional (base nil base-p)) "Return the logarithm of NUMBER in the base BASE, which defaults to e." @@ -692,10 +692,14 @@ double-float) (log2 number 1d0)) #+double-double - (((foreach integer ratio single-float double-float) + (((foreach single-float double-float) double-double-float) (dd-%log2 (float number 1w0))) #+double-double + (((foreach integer ratio) + double-double-float) + (log2 number 1w0)) + #+double-double ((double-double-float (foreach integer ratio single-float double-float double-double-float)) (dd-%log2 number)))) @@ -722,7 +726,11 @@ double-float) (log10 number 1d0)) #+double-double - (((foreach integer ratio single-float double-float) + (((foreach integer ratio) + ext:double-double-float) + (log10 number 1w0)) + #+double-double + (((foreach single-float double-float) ext:double-double-float) (dd-%log10 (float number 1w0))) #+double-double diff --git a/tests/irrat.lisp b/tests/irrat.lisp index 9538394..a6a405d 100644 --- a/tests/irrat.lisp +++ b/tests/irrat.lisp @@ -88,7 +88,12 @@ (let ((y (kernel::dd-%log2 (sqrt 0.5w0)))) (assert-true (<= (relerr y -1/2) (* 2.7 (scale-float 1d0 (- (float-digits 1w0))))) - y))) + y)) + (assert-true (typep (log (ash 1 3000) 2) 'single-float)) + (assert-true (typep (log (ash 1 3000) 2f0) 'single-float)) + (assert-true (typep (log (ash 1 3000) 2d0) 'double-float)) + (assert-true (typep (log (ash 1 3000) 2w0) 'ext:double-double-float))) + (define-test dd-log2.powers-of-2 (loop for k from -1074 below 1024 @@ -100,7 +105,11 @@ (define-test dd-log10.special-cases (let ((y (kernel::dd-%log10 (sqrt 10w0)))) (assert-true (<= (relerr y 1/2) - (* 0.25 (scale-float 1d0 (- (float-digits 1w0)))))))) + (* 0.25 (scale-float 1d0 (- (float-digits 1w0))))))) + (assert-true (typep (log (ash 1 3000) 10) 'single-float)) + (assert-true (typep (log (ash 1 3000) 10f0) 'single-float)) + (assert-true (typep (log (ash 1 3000) 10d0) 'double-float)) + (assert-true (typep (log (ash 1 3000) 10w0) 'ext:double-double-float))) (define-test dd-log10.powers-of-ten ;; It would be nice if dd-%log10 produce the exact result for powers ----------------------------------------------------------------------- Summary of changes: src/code/irrat.lisp | 20 ++++++++++++++------ tests/irrat.lisp | 13 +++++++++++-- 2 files changed, 25 insertions(+), 8 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs