- cmucl-cvs - mailman3.common-lisp.net

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-33-gdf42533
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 df425339e0cf09ef687c491e99f6c10238f56b85 (commit) from 0ec33685dff49b910b0c46644f983064c02ab949 (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 df425339e0cf09ef687c491e99f6c10238f56b85 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Nov 30 20:11:18 2014 -0800 Fix ticket:112 by specifying -mmacosx-version-min=10.5 when linking the new executable. diff --git a/src/tools/linker.sh b/src/tools/linker.sh index f97dcf4..a0050b9 100755 --- a/src/tools/linker.sh +++ b/src/tools/linker.sh @@ -94,7 +94,11 @@ case $uname_s in # up, so we move it to another address. This seems to be # free, at least on 10.5. - OPT_EXTRA="-segaddr __LINKEDIT 0x99000000 -rdynamic" + # Also specify the min version. (See Config.x86_darwin for + # the desired version.) This gets rid of a PIE warning + # when creating the executable on 10.8. (See ticket:112.) + + OPT_EXTRA="-segaddr __LINKEDIT 0x99000000 -rdynamic -mmacosx-version-min=10.5" ;; powerpc) # Nothing needed for ppc? ----------------------------------------------------------------------- Summary of changes: src/tools/linker.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- CMU Common Lisp

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

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 5f81e24180fa7721fcad38b9ae3419bd9f2a221d (commit) from 46b8066952521e9d7c43ff101677725425c851a8 (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 5f81e24180fa7721fcad38b9ae3419bd9f2a221d Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Nov 30 18:24:59 2014 -0800 Fix to handle (log 3/2 2) and (log -3/2 2). Test added. * src/code/irrat.lisp: * Fix LOG2 to handle the case of negative rational numbers. * Fix LOG of rational to a rational base. We want to convert the log of the number to a single float because log2 isn't intended to handle single-float type. * tests/irrat.lisp: * Add test for log of rational to rational base. * Add some additional tests for dd-%log2. diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index 0804ef9..b21b92f 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -632,8 +632,11 @@ ;; it, and converting it to double-float is accurate. (if (= (integer-length top) (integer-length bot)) - (/ (log1p (float (- x 1) float-type)) - (log-of-2 float-type)) + (let ((log-abs (/ (log1p (float (- (abs x) 1) float-type)) + (log-of-2 float-type)))) + (if (minusp x) + (complex log-abs (log-2-pi float-type)) + log-abs)) (multiple-value-bind (top-n top-frac) (log2-bignum top) (multiple-value-bind (bot-n bot-frac) @@ -687,10 +690,10 @@ (float (%log2 (float number 1d0)) 1f0)) (((foreach integer ratio) (foreach integer ratio single-float)) - (log2 number 1f0)) + (float (log2 number) 1f0)) (((foreach integer ratio) double-float) - (log2 number 1d0)) + (log2 number)) #+double-double (((foreach single-float double-float) double-double-float) diff --git a/tests/irrat.lisp b/tests/irrat.lisp index a6a405d..14db13e 100644 --- a/tests/irrat.lisp +++ b/tests/irrat.lisp @@ -37,6 +37,22 @@ (assert-true (typep result true-type) result true-type))))) +(define-test log2.special-cases + (let* ((y (log 3/2 2)) + (e (relerr y 0.5849625007211562d0))) + (assert-true (<= e + 2.308d-8) + e y)) + (let* ((y (log -3/2 2)) + (ry (realpart y)) + (iy (imagpart y)) + (er (relerr ry 0.5849625007211562d0)) + (ei (relerr iy (/ pi (log 2d0))))) + (assert-true (<= er 2.308d-8) + er ry) + (assert-true (<= ei 1.433d-8) + ei iy))) + ;; This tests that log base 10 returns the correct value and the ;; correct type. (define-test log10.result-types @@ -129,3 +145,10 @@ do (assert-true (<= e threshold) k e x y)))) + +(define-test log2.relationships + (loop for k from 1 below 1000 + for x = (expt 1.1w0 k) + for logx = (kernel::dd-%log2 x) + for log1/x = (kernel::dd-%log2 (/ x)) + do (assert-true (<= (abs (+ logx log1/x)) (* 1 double-float-epsilon))))) ----------------------------------------------------------------------- Summary of changes: src/code/irrat.lisp | 11 +++++++---- tests/irrat.lisp | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) hooks/post-receive -- CMU Common Lisp

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

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 46b8066952521e9d7c43ff101677725425c851a8 (commit) from 70181ee7553a350eedd7acb2815b98dde6ce846c (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 46b8066952521e9d7c43ff101677725425c851a8 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Nov 29 21:43:09 2014 -0800 See ticket:91: Forgot to export FLOAT-EXCEPTIONS-SUMMARY-BYTE. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index a6dcc0b..556a20e 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -1165,6 +1165,7 @@ "COMPATIBLE-FUNCTION-TYPES-P" "FLOAT-INVALID-OP-1-BYTE" "FLOAT-INVALID-OP-2-BYTE" + "FLOAT-EXCEPTIONS-SUMMARY-BYTE" "GET-FP-OPERANDS" "FUSED-MULTIPLY-ADD" "FUSED-MULTIPLY-SUBTRACT") diff --git a/src/compiler/ppc/parms.lisp b/src/compiler/ppc/parms.lisp index cc2c5ba..dda73eb 100644 --- a/src/compiler/ppc/parms.lisp +++ b/src/compiler/ppc/parms.lisp @@ -67,7 +67,8 @@ float-imprecise-trap-bit float-invalid-trap-bit float-divide-by-zero-trap-bit float-invalid-op-1-byte - float-invalid-op-2-byte)) + float-invalid-op-2-byte + float-exceptions-summary-byte)) #+double-double (export '(double-double-float-digits)) ----------------------------------------------------------------------- Summary of changes: src/code/exports.lisp | 1 + src/compiler/ppc/parms.lisp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMU Common Lisp

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

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 1e4040f32e973a1debcec908e4e69147c31a67ec (commit) from 1fc53cc336bf03c52a438bb237d95080f00dd203 (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 1e4040f32e973a1debcec908e4e69147c31a67ec Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Nov 29 00:12:55 2014 -0800 Add function to print a description of the value of the FPSCR (floating-point status and control register). diff --git a/src/compiler/ppc/float.lisp b/src/compiler/ppc/float.lisp index c5c944b..e928619 100644 --- a/src/compiler/ppc/float.lisp +++ b/src/compiler/ppc/float.lisp @@ -938,6 +938,63 @@ (defknown ((setf floating-point-modes)) (float-modes) float-modes) +(defun describe-floating-point-modes (&optional (modes (floating-point-modes))) + "Print a description of each bit of the floating point modes in MODES." + (format t "31 FX = ~B FP exception summary~%" + (ldb (byte 1 31) modes)) + (format t "30 FEX = ~B FP enabled exception summary~%" + (ldb (byte 1 30) modes)) + (format t "29 VX = ~B FP invalid operation exception summary~%" + (ldb (byte 1 29) modes)) + (format t "28 OX = ~B FP overflow exception (sticky)~%" + (ldb (byte 1 28) modes)) + (format t "27 UX = ~B FP underflow exception (sticky)~%" + (ldb (byte 1 27) modes)) + (format t "26 ZX = ~B FP zero divide exception (sticky)~%" + (ldb (byte 1 26) modes)) + (format t "25 XX = ~B FP inexact exception (sticky)~%" + (ldb (byte 1 25) modes)) + (format t "24 VXSNAN = ~B FP invalid operation with SNaN (sticky)~%" + (ldb (byte 1 24) modes)) + (format t "23 VXISI = ~B FP invalid operation for inf - inf (sticky)~%" + (ldb (byte 1 23) modes)) + (format t "22 VXIDI = ~B FP invalid operation for inf + inf (sticky)~%" + (ldb (byte 1 22) modes)) + (format t "21 VXZDZ = ~B FP invalid operation for 0/0 (sticky)~%" + (ldb (byte 1 21) modes)) + (format t "20 VXIMZ = ~B FP invalid operation for inf * 0 (sticky)~%" + (ldb (byte 1 20) modes)) + (format t "19 VXVC = ~B FP invalid operation for invalid compare (sticky)~%" + (ldb (byte 1 19) modes)) + (format t "18 FR = ~B FP fraction rounded~%" + (ldb (byte 1 18) modes)) + (format t "17 FI = ~B FP fraction inexact~%" + (ldb (byte 1 17) modes)) + (format t "12 FPRF = ~5,'0B FP result flags~%" + (ldb (byte 5 12) modes)) + (format t "11 Reserved~%") + (format t "10 VXSOFT = ~B FP invalid operation for software request (sticky)~%" + (ldb (byte 1 10) modes)) + (format t " 9 VXSQRT = ~B FP invalid operation for sqrt (sticky)~%" + (ldb (byte 1 9) modes)) + (format t " 8 VXCVI = ~B FP invalid operation for integer convert (sticky)~%" + (ldb (byte 1 8) modes)) + (format t " 7 VE = ~B FP invalid operation exception enable~%" + (ldb (byte 1 7) modes)) + (format t " 6 OE = ~B FP overflow exception enable~%" + (ldb (byte 1 6) modes)) + (format t " 5 UE = ~B FP underflow exception enable~%" + (ldb (byte 1 5) modes)) + (format t " 4 ZE = ~B FP zero divide exception enable~%" + (ldb (byte 1 4) modes)) + (format t " 3 XE = ~B FP inexact operation enable~%" + (ldb (byte 1 3) modes)) + (format t " 2 NI = ~B FP non-IEEE mode enable~%" + (ldb (byte 1 2) modes)) + (format t " 0 RN = ~2,'0B FP rounding control + (00 = nearest, 01 = zero, 10 = +inf, 11 = -inf~%" + (ldb (byte 2 0) modes))) + (define-vop (floating-point-modes) (:results (res :scs (unsigned-reg))) (:result-types unsigned-num) ----------------------------------------------------------------------- Summary of changes: src/compiler/ppc/float.lisp | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) hooks/post-receive -- CMU Common Lisp

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

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 1fc53cc336bf03c52a438bb237d95080f00dd203 (commit) from 2b39eba64aa3f2b122bcc275e6597f9cb2a5f7f4 (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 1fc53cc336bf03c52a438bb237d95080f00dd203 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Nov 28 10:40:20 2014 -0800 Signal an error for an invalid :allocation value for a slot. Fixes ticket:95, along with changeset:[2b39eb] diff --git a/src/pcl/std-class.lisp b/src/pcl/std-class.lisp index 1d4049d..3f247f2 100644 --- a/src/pcl/std-class.lisp +++ b/src/pcl/std-class.lisp @@ -435,7 +435,12 @@ slot-name) else do (loop for (option value . more) on slot by #'cddr - if (and (member option '(:allocation :type :initform + if (and (eq option :allocation) + (not (member value '(:class :instance)))) do + (simple-program-error + "~@<Slot ~S: :allocation value must be :class or :instance, not ~S~@:>" + slot-name value) + else if (and (member option '(:type :initform :documentation)) (not (eq unsupplied (getf more option unsupplied)))) do ----------------------------------------------------------------------- Summary of changes: src/pcl/std-class.lisp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) hooks/post-receive -- CMU Common Lisp

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

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 2b39eba64aa3f2b122bcc275e6597f9cb2a5f7f4 (commit) from 55d04a31ba05d20f4e9ab6be9548d374c900b197 (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 2b39eba64aa3f2b122bcc275e6597f9cb2a5f7f4 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Nov 28 10:21:52 2014 -0800 Correct the tests for the generic function lambda lists. The check for invalid gf lambda lists happens during macroexpansion, so update the tests to catch this during macroexpansion. This fixes three of the issues in ticket:95. diff --git a/tests/pcl/defgeneric.lisp b/tests/pcl/defgeneric.lisp index 05f01c7..2cf9e07 100644 --- a/tests/pcl/defgeneric.lisp +++ b/tests/pcl/defgeneric.lisp @@ -32,13 +32,12 @@ (in-package "PCL-TESTS") +;; These errors are signaled during macroexpansion of the defgeneric +;; form so catch the errors during macroexpansion. (defmacro define-gf-lambda-list-test (name lambda-list) - `(deftest ,name - (multiple-value-bind (r c) - (ignore-errors - (defgeneric g ,lambda-list)) - (values (null r) (typep c 'error))) - t t)) + `(define-test ,name + (assert-error 'program-error + (macroexpand '(defgeneric g ,lambda-list))))) (define-gf-lambda-list-test defgeneric-lambda-list.0 (a &optional (b 1))) (define-gf-lambda-list-test defgeneric-lambda-list.1 (a &key (b 1))) ----------------------------------------------------------------------- Summary of changes: tests/pcl/defgeneric.lisp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) hooks/post-receive -- CMU Common Lisp

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

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

26 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 37d383ae57c2fc9597cb87eac9551af866885cd3 (commit) from 0a522bd0c8c38f6ee76f0cc2122d9984c4e269aa (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 37d383ae57c2fc9597cb87eac9551af866885cd3 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Nov 26 14:04:29 2014 -0800 Fix some issues with log2 and log10 of big rationals. * src/code/irrat.lisp: * Add log10 function to handle the computation of the base 10 log of big rationals that might not fit in a double-float. * Fix some issues where CL:LOG wasn't handling logs of big rationals. (A regression). * tests/trac.lisp: * Update trac.8 test to include logs base 10. diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index 568fa46..325e5bc 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -645,6 +645,19 @@ (log2-bignum x) (+ n frac)))))) +;; Handle the case where number could be so large that it doesn't fit +;; in a double-float. +(defun log10 (number &optional (float-type 1d0)) + (let ((d (ignore-errors (float number 1d0)))) + (cond (d + ;; 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))))))) + (defun log (number &optional (base nil base-p)) "Return the logarithm of NUMBER in the base BASE, which defaults to e." (if base-p @@ -667,12 +680,17 @@ ((double-float (foreach integer ratio single-float double-float)) (%log2 number)) - (((foreach integer ratio single-float) + ((single-float double-float) + (%log2 (float number 1d0))) + ((single-float (foreach integer ratio single-float)) (float (%log2 (float number 1d0)) 1f0)) - (((foreach integer ratio single-float) + (((foreach integer ratio) + (foreach integer ratio single-float)) + (log2 number 1f0)) + (((foreach integer ratio) double-float) - (%log2 (float number 1d0))) + (log2 number 1d0)) #+double-double (((foreach integer ratio single-float double-float) double-double-float) @@ -690,14 +708,19 @@ ;; log base 2 and 10 for non-negative arguments. (number-dispatch ((number real) (base real)) ((double-float - (foreach rational single-float double-float)) + (foreach integer ratio single-float double-float)) (%log10 number)) - (((foreach integer ratio single-float) + ((single-float double-float) + (%log10 (float number 1d0))) + ((single-float (foreach integer ratio single-float)) (float (%log10 (float number 1d0)) 1f0)) - (((foreach integer ratio single-float) + (((foreach integer ratio) + (foreach integer ratio single-float)) + (log10 number 1f0)) + (((foreach integer ratio) double-float) - (%log10 (float number 1d0))) + (log10 number 1d0)) #+double-double (((foreach integer ratio single-float double-float) ext:double-double-float) diff --git a/tests/trac.lisp b/tests/trac.lisp index 2bf420d..198a24d 100644 --- a/tests/trac.lisp +++ b/tests/trac.lisp @@ -22,7 +22,7 @@ (:tag :trac) (assert-false (let (failures) - (dolist (base (list nil 2 2.0 2d0 + (dolist (base (list nil 2 2.0 2d0 10 10.0 10d0 (ash 1 99) (ash 1 3000) 8/7 (/ (ash 1 3000) 7))) (dolist (number (list 100 100.0 100d0 ----------------------------------------------------------------------- Summary of changes: src/code/irrat.lisp | 37 ++++++++++++++++++++++++++++++------- tests/trac.lisp | 2 +- 2 files changed, 31 insertions(+), 8 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0