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

[git] CMU Common Lisp branch master updated. snapshot-2013-12-a-44-ga00d8a9
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 a00d8a9a746933ad02f39fb22149a11299ea6a9b (commit) from ca2bf8c29d22aaf44caf31f1d7b6ba77ab418be5 (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 a00d8a9a746933ad02f39fb22149a11299ea6a9b Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Jan 3 10:13:12 2014 -0800 Produce correct results on branch cuts for atanh. For (atanh x), where x is a real number on the branch cuts for atanh, make the code return the correct value based on the definition of atanh. This is inconsistent with the description in the CLHS because the values on the branch cut are now continuous with different quadrants. The formula is clear, however, for the values on the branch cut. * src/code/irrat.lisp * src/code/irrat-dd.lisp * Use the correct branch cut values for atanh. * tests/trig.lisp * Update tests accordingly, with additional comments. diff --git a/src/code/irrat-dd.lisp b/src/code/irrat-dd.lisp index dbe9159..29627b5 100644 --- a/src/code/irrat-dd.lisp +++ b/src/code/irrat-dd.lisp @@ -1663,59 +1663,62 @@ Z may be any number, but the result is always a complex." (defun dd-complex-atanh (z) _N"Compute atanh z = (log(1+z) - log(1-z))/2" (declare (number z)) - (let* ( ;; Constants - (theta (/ (sqrt most-positive-double-float) 4.0w0)) - (rho (/ 4.0w0 (sqrt most-positive-double-float))) - (half-pi dd-pi/2) - (rp (float (realpart z) 1.0w0)) - (beta (float-sign rp 1.0w0)) - (x (* beta rp)) - (y (* beta (- (float (imagpart z) 1.0w0)))) - (eta 0.0w0) - (nu 0.0w0)) - ;; Shouldn't need this declare. - (declare (double-double-float x y)) - (locally - (declare (optimize (speed 3) - (inhibit-warnings 3))) - (cond ((or (> x theta) - (> (abs y) theta)) - ;; To avoid overflow... - (setf nu (float-sign y half-pi)) - ;; eta is real part of 1/(x + iy). This is x/(x^2+y^2), - ;; which can cause overflow. Arrange this computation so - ;; that it won't overflow. - (setf eta (let* ((x-bigger (> x (abs y))) - (r (if x-bigger (/ y x) (/ x y))) - (d (+ 1.0d0 (* r r)))) - (if x-bigger - (/ (/ x) d) - (/ (/ r y) d))))) - ((= x 1.0w0) - ;; Should this be changed so that if y is zero, eta is set - ;; to +infinity instead of approx 176? In any case - ;; tanh(176) is 1.0d0 within working precision. - (let ((t1 (+ 4w0 (square y))) - (t2 (+ (abs y) rho))) - (setf eta (dd-%log (/ (sqrt (sqrt t1)) - (sqrt t2)))) - (setf nu (* 0.5d0 - (float-sign y - (+ half-pi (dd-%atan (* 0.5d0 t2)))))))) - (t - (let ((t1 (+ (abs y) rho))) - ;; Normal case using log1p(x) = log(1 + x) - (setf eta (* 0.25d0 - (dd-%log1p (/ (* 4.0d0 x) - (+ (square (- 1.0d0 x)) - (square t1)))))) - (setf nu (* 0.5d0 - (dd-%atan2 (* 2.0d0 y) - (- (* (- 1.0d0 x) - (+ 1.0d0 x)) - (square t1)))))))) - (complex (* beta eta) - (- (* beta nu)))))) + (if (realp z) + ;; See complex-atanh for why we do this. + (dd-complex-atanh (complex z (- (* 0.0 z)))) + (let* ( ;; Constants + (theta (/ (sqrt most-positive-double-float) 4.0w0)) + (rho (/ 4.0w0 (sqrt most-positive-double-float))) + (half-pi dd-pi/2) + (rp (float (realpart z) 1.0w0)) + (beta (float-sign rp 1.0w0)) + (x (* beta rp)) + (y (* beta (- (float (imagpart z) 1.0w0)))) + (eta 0.0w0) + (nu 0.0w0)) + ;; Shouldn't need this declare. + (declare (double-double-float x y)) + (locally + (declare (optimize (speed 3) + (inhibit-warnings 3))) + (cond ((or (> x theta) + (> (abs y) theta)) + ;; To avoid overflow... + (setf nu (float-sign y half-pi)) + ;; eta is real part of 1/(x + iy). This is x/(x^2+y^2), + ;; which can cause overflow. Arrange this computation so + ;; that it won't overflow. + (setf eta (let* ((x-bigger (> x (abs y))) + (r (if x-bigger (/ y x) (/ x y))) + (d (+ 1.0d0 (* r r)))) + (if x-bigger + (/ (/ x) d) + (/ (/ r y) d))))) + ((= x 1.0w0) + ;; Should this be changed so that if y is zero, eta is set + ;; to +infinity instead of approx 176? In any case + ;; tanh(176) is 1.0d0 within working precision. + (let ((t1 (+ 4w0 (square y))) + (t2 (+ (abs y) rho))) + (setf eta (dd-%log (/ (sqrt (sqrt t1)) + (sqrt t2)))) + (setf nu (* 0.5d0 + (float-sign y + (+ half-pi (dd-%atan (* 0.5d0 t2)))))))) + (t + (let ((t1 (+ (abs y) rho))) + ;; Normal case using log1p(x) = log(1 + x) + (setf eta (* 0.25d0 + (dd-%log1p (/ (* 4.0d0 x) + (+ (square (- 1.0d0 x)) + (square t1)))))) + (setf nu (* 0.5d0 + (dd-%atan2 (* 2.0d0 y) + (- (* (- 1.0d0 x) + (+ 1.0d0 x)) + (square t1)))))))) + (complex (* beta eta) + (- (* beta nu))))))) (defun dd-complex-tanh (z) _N"Compute tanh z = sinh z / cosh z" diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index e4e744d..bcd40c3 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -1740,60 +1740,78 @@ Z may be any number, but the result is always a complex." #+double-double (when (typep z '(or double-double-float (complex double-double-float))) (return-from complex-atanh (dd-complex-atanh z))) - - (let* ( ;; Constants - (theta (/ (sqrt most-positive-double-float) 4.0d0)) - (rho (/ 4.0d0 (sqrt most-positive-double-float))) - (half-pi (/ pi 2.0d0)) - (rp (float (realpart z) 1.0d0)) - (beta (float-sign rp 1.0d0)) - (x (* beta rp)) - (y (* beta (- (float (imagpart z) 1.0d0)))) - (eta 0.0d0) - (nu 0.0d0)) - ;; Shouldn't need this declare. - (declare (double-float x y)) - (locally - (declare (optimize (speed 3))) - (cond ((or (> x theta) - (> (abs y) theta)) - ;; To avoid overflow... - (setf nu (float-sign y half-pi)) - ;; eta is real part of 1/(x + iy). This is x/(x^2+y^2), - ;; which can cause overflow. Arrange this computation so - ;; that it won't overflow. - (setf eta (let* ((x-bigger (> x (abs y))) - (r (if x-bigger (/ y x) (/ x y))) - (d (+ 1.0d0 (* r r)))) - (if x-bigger - (/ (/ x) d) - (/ (/ r y) d))))) - ((= x 1.0d0) - ;; Should this be changed so that if y is zero, eta is set - ;; to +infinity instead of approx 176? In any case - ;; tanh(176) is 1.0d0 within working precision. - (let ((t1 (+ 4d0 (square y))) - (t2 (+ (abs y) rho))) - (setf eta (log (/ (sqrt (sqrt t1)) - (sqrt t2)))) - (setf nu (* 0.5d0 - (float-sign y - (+ half-pi (atan (* 0.5d0 t2)))))))) - (t - (let ((t1 (+ (abs y) rho))) - ;; Normal case using log1p(x) = log(1 + x) - (setf eta (* 0.25d0 - (%log1p (/ (* 4.0d0 x) - (+ (square (- 1.0d0 x)) - (square t1)))))) - (setf nu (* 0.5d0 - (atan (* 2.0d0 y) - (- (* (- 1.0d0 x) - (+ 1.0d0 x)) - (square t1)))))))) - (coerce-to-complex-type (* beta eta) - (- (* beta nu)) - z)))) + + ;; When z is purely real and x > 1, we have + ;; + ;; atanh(z) = 1/2*(log(1+z) - log(1-z)) + ;; = 1/2*(log(1+x) - (log(x-1)+i*pi)) + ;; = 1/2*(log(1+x) - log(x-1) - i*pi) + ;; = 1/2(log(1+x)-log(x-1)) - i*pi/2 + ;; + ;; Thus, the imaginary part is negative. Thus, for z > 1, atanh is + ;; continuous with quadrant IV. To preserve the identity atanh(-z) + ;; = -atanh(z), we must have atanh be continuous with Quadrant II + ;; for z < -1. (The identity is obviously true from the + ;; definition.) + ;; + ;; NOTE: this differs from what the CLHS says for the continuity. + ;; Instead of the text in the CLHS, we choose to use the definition + ;; to derive the correct values. + (if (realp z) + (complex-atanh (complex (float z) (- (* 0 (float z))))) + (let* ( ;; Constants + (theta (/ (sqrt most-positive-double-float) 4.0d0)) + (rho (/ 4.0d0 (sqrt most-positive-double-float))) + (half-pi (/ pi 2.0d0)) + (rp (float (realpart z) 1.0d0)) + (beta (float-sign rp 1.0d0)) + (x (* beta rp)) + (y (* beta (- (float (imagpart z) 1.0d0)))) + (eta 0.0d0) + (nu 0.0d0)) + ;; Shouldn't need this declare. + (declare (double-float x y)) + (locally + (declare (optimize (speed 3))) + (cond ((or (> x theta) + (> (abs y) theta)) + ;; To avoid overflow... + (setf nu (float-sign y half-pi)) + ;; eta is real part of 1/(x + iy). This is x/(x^2+y^2), + ;; which can cause overflow. Arrange this computation so + ;; that it won't overflow. + (setf eta (let* ((x-bigger (> x (abs y))) + (r (if x-bigger (/ y x) (/ x y))) + (d (+ 1.0d0 (* r r)))) + (if x-bigger + (/ (/ x) d) + (/ (/ r y) d))))) + ((= x 1.0d0) + ;; Should this be changed so that if y is zero, eta is set + ;; to +infinity instead of approx 176? In any case + ;; tanh(176) is 1.0d0 within working precision. + (let ((t1 (+ 4d0 (square y))) + (t2 (+ (abs y) rho))) + (setf eta (log (/ (sqrt (sqrt t1)) + (sqrt t2)))) + (setf nu (* 0.5d0 + (float-sign y + (+ half-pi (atan (* 0.5d0 t2)))))))) + (t + (let ((t1 (+ (abs y) rho))) + ;; Normal case using log1p(x) = log(1 + x) + (setf eta (* 0.25d0 + (%log1p (/ (* 4.0d0 x) + (+ (square (- 1.0d0 x)) + (square t1)))))) + (setf nu (* 0.5d0 + (atan (* 2.0d0 y) + (- (* (- 1.0d0 x) + (+ 1.0d0 x)) + (square t1)))))))) + (coerce-to-complex-type (* beta eta) + (- (* beta nu)) + z))))) (defun complex-tanh (z) "Compute tanh z = sinh z / cosh z" diff --git a/tests/trig.lisp b/tests/trig.lisp index df76231..695c50d 100644 --- a/tests/trig.lisp +++ b/tests/trig.lisp @@ -770,24 +770,24 @@ (get-signs (atanh-def #c(-2d0 1d-20))) (assert-true (check-signs #'atanh -2d0 tr ti)) (assert-true (check-signs #'atanh -2w0 tr ti)) - (assert-true (check-signs #'atanh #c(-2d0 +0d0) tr ti)) - (assert-true (check-signs #'atanh #c(-2w0 +0w0) tr ti))) + (assert-true (check-signs #'atanh #c(-2d0 0d0) tr ti)) + (assert-true (check-signs #'atanh #c(-2w0 0w0) tr ti))) ;; Test the other side of the branch cut for x < -1. (multiple-value-bind (tr ti) (get-signs (atanh-def #c(-2d0 -1d-20))) (assert-true (check-signs #'atanh #c(-2d0 -0d0) tr ti)) (assert-true (check-signs #'atanh #c(-2w0 -0w0) tr ti))) - ;; Test for x > 1, which is continuous with Quadrant I, using the - ;; value at #c(+2d0 1d-10) as the reference + ;; Test for x > 1, which is continuous with Quadrant IV, using the + ;; value at #c(+2d0 -1d-10) as the reference (multiple-value-bind (tr ti) - (get-signs (atanh-def #c(2d0 1d-20))) + (get-signs (atanh-def #c(2d0 -1d-10))) (assert-true (check-signs #'atanh 2d0 tr ti)) (assert-true (check-signs #'atanh 2w0 tr ti)) - (assert-true (check-signs #'atanh #c(2d0 0) tr ti)) - (assert-true (check-signs #'atanh #c(2w0 0) tr ti))) + (assert-true (check-signs #'atanh #c(2d0 -0d0) tr ti)) + (assert-true (check-signs #'atanh #c(2w0 -0w0) tr ti))) ;; Test the other side of the branch cut for x > 1. (multiple-value-bind (tr ti) - (get-signs (atanh-def #c(2d0 -1d-20))) - (assert-true (check-signs #'atanh #c(2d0 -0d0) tr ti)) - (assert-true (check-signs #'atanh #c(2w0 -0w0) tr ti)))) + (get-signs (atanh-def #c(2d0 +1d-20))) + (assert-true (check-signs #'atanh #c(2d0 0d0) tr ti)) + (assert-true (check-signs #'atanh #c(2w0 0w0) tr ti)))) ----------------------------------------------------------------------- Summary of changes: src/code/irrat-dd.lisp | 109 +++++++++++++++++++++-------------------- src/code/irrat.lisp | 126 +++++++++++++++++++++++++++--------------------- tests/trig.lisp | 20 ++++---- 3 files changed, 138 insertions(+), 117 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-05-3-g7889e98
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 7889e989541ed40a753b2a884f7fbcf25e0a951d (commit) from e5a2fa14f92ca98db53d5241378c5850434998aa (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 7889e989541ed40a753b2a884f7fbcf25e0a951d Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue May 14 20:30:16 2013 -0700 Wrap exports in eval-when for x86 as was done for sparc and add CHAR-BYTES to x86-x86 cross-compile script. Only the change for CHAR-BYTES is needed for cross-compiling from x86 to x86, but I think the other changes will be needed if you do a cross-compile from some other arch to x86. diff --git a/src/compiler/x86/c-callback.lisp b/src/compiler/x86/c-callback.lisp index cccc874..1eb5856 100644 --- a/src/compiler/x86/c-callback.lisp +++ b/src/compiler/x86/c-callback.lisp @@ -15,8 +15,10 @@ (intl:textdomain "cmucl-x86-vm") ;;; Support for callbacks to Lisp. +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(make-callback-trampoline callback-accessor-form compatible-function-types-p)) +) (defun callback-accessor-form (type sp offset) `(alien:deref (sap-alien diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp index 6a643af..bd69453 100644 --- a/src/compiler/x86/parms.lisp +++ b/src/compiler/x86/parms.lisp @@ -74,6 +74,7 @@ ;;;; Machine Architecture parameters: +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(word-bits byte-bits char-bits word-shift word-bytes char-bytes fixnum-tag-bits fixnum-tag-mask positive-fixnum-bits float-sign-shift @@ -96,6 +97,7 @@ float-underflow-trap-bit float-overflow-trap-bit float-imprecise-trap-bit float-invalid-trap-bit float-divide-by-zero-trap-bit)) +) #+double-double (export '(double-double-float-digits)) @@ -224,11 +226,13 @@ ;;;; Description of the target address space. +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(target-read-only-space-start target-static-space-start target-dynamic-space-start target-foreign-linkage-space-start target-foreign-linkage-entry-size)) +) ;;; Where to put the different spaces. ;;; @@ -253,6 +257,7 @@ ;;;; Other random constants. +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(halt-trap pending-interrupt-trap error-trap cerror-trap breakpoint-trap function-end-breakpoint-trap single-step-breakpoint-trap @@ -261,6 +266,7 @@ object-not-list-trap object-not-instance-trap trace-table-normal trace-table-call-site trace-table-function-prologue trace-table-function-epilogue)) +) (defenum (:suffix -trap :start 8) halt @@ -288,7 +294,9 @@ ;;;; Static symbols. +(eval-when (:compile-toplevel :load-toplevel :execute) (export '(static-symbols static-functions)) +) ;;; These symbols are loaded into static space directly after NIL so ;;; that the system can compute their address by adding a constant diff --git a/src/tools/cross-scripts/cross-x86-x86.lisp b/src/tools/cross-scripts/cross-x86-x86.lisp index fa4e31c..3f579f3 100644 --- a/src/tools/cross-scripts/cross-x86-x86.lisp +++ b/src/tools/cross-scripts/cross-x86-x86.lisp @@ -141,6 +141,7 @@ syms)))) (frob OLD-VM:BYTE-BITS OLD-VM:WORD-BITS OLD-VM:CHAR-BITS + OLD-VM:CHAR-BYTES #+long-float OLD-VM:SIMPLE-ARRAY-LONG-FLOAT-TYPE OLD-VM:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE OLD-VM:SIMPLE-ARRAY-SINGLE-FLOAT-TYPE ----------------------------------------------------------------------- Summary of changes: src/compiler/x86/c-callback.lisp | 2 ++ src/compiler/x86/parms.lisp | 8 ++++++++ src/tools/cross-scripts/cross-x86-x86.lisp | 1 + 3 files changed, 11 insertions(+) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-05-9-gb3b0725
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 b3b0725a647a3c59440cd6ffa8baa33f616c4479 (commit) from 9be6530c85baf6d45ab60a94867ba1e3ff3d66b0 (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 b3b0725a647a3c59440cd6ffa8baa33f616c4479 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon May 20 22:15:29 2013 -0700 Regenerated from current sources. diff --git a/src/i18n/locale/cmucl.pot b/src/i18n/locale/cmucl.pot index 11ba637..4b2964a 100644 --- a/src/i18n/locale/cmucl.pot +++ b/src/i18n/locale/cmucl.pot @@ -18343,7 +18343,9 @@ msgid "Redefining ~(~A~) ~S to be a constant." msgstr "" #: src/compiler/ir1util.lisp -msgid "Return the TLF-NUMBER and FORM-NUMBER encoded as fixnum." +msgid "" +"Return the TLF-NUMBER and FORM-NUMBER encoded as fixnum, if\n" +" possible. Otherwise, return Nil." msgstr "" #: src/compiler/ir1util.lisp ----------------------------------------------------------------------- Summary of changes: src/i18n/locale/cmucl.pot | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-06-81-g0a2163e
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 0a2163ec1c2ed6cd9711dab63f92c42e246e0b81 (commit) from ae3e2030908db293f7deeebb2ef079dcd1024bc5 (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 0a2163ec1c2ed6cd9711dab63f92c42e246e0b81 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Aug 2 20:59:50 2014 -0700 Update netbsd config. Untested. * Add the appropriate gcc options to enable sse2 instructions. * Remove the fdlibm routines since they're in GNUMakefile now. diff --git a/src/lisp/Config.x86_netbsd b/src/lisp/Config.x86_netbsd index 2074013..beb93c2 100644 --- a/src/lisp/Config.x86_netbsd +++ b/src/lisp/Config.x86_netbsd @@ -1,6 +1,8 @@ # -*- Mode: makefile -*- include Config.x86_common +CPPFLAGS += -march=pentium4 -mfpmath=sse + UNDEFSYMPATTERN = -Xlinker -u -Xlinker & OS_SRC += NetBSD-os.c elf.c OS_LINK_FLAGS = -dynamic -export-dynamic @@ -8,22 +10,3 @@ OS_LIBS = EXEC_FINAL_OBJ = exec-final.o -OS_SRC += k_sin.c k_cos.c k_tan.c s_sin.c s_cos.c s_tan.c sincos.c - -k_sin.o : k_sin.c - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< -k_cos.o : k_cos.c - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< -k_tan.o : k_tan.c - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< - -s_sin.o : s_sin.c - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< -s_cos.o : s_cos.c - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< -s_tan.o : s_tan.c - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< - -sincos.o : sincos.c - $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< - ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.x86_netbsd | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp annotated tag snapshot-2014-01 created. snapshot-2014-01
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 annotated tag, snapshot-2014-01 has been created at d45720c2c896beada8be3dec56a2e1f95e1dd78d (tag) tagging 7bb20e4cfe7f12567dcbffa0a584f9d01fad5e64 (commit) replaces snapshot-2013-12-a tagged by Raymond Toy on Sat Jan 4 10:12:01 2014 -0800 - Log ----------------------------------------------------------------- Snapshot 2014-01 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (Darwin) iEYEABECAAYFAlLITvgACgkQJ5IjUmgZO7IAtgCgyNzKZvbTBi+9onW1g89S/1cv SP4AoIPOqjKJXUOaGcNYJU/Wl+QnTkmI =bO3U -----END PGP SIGNATURE----- Raymond Toy (49): Optimizations to many vops to allow a descriptor for the second arg. Simplify dd-%%sin, dd-%%cos, and dd-%%tan. Add RT. Implement trig functions in Lisp Implement sincos using the new Lisp trig routines. This can now be Add test for sincos(-0d0). Small cleanups. Correct bug in tan. Need -ffloat-store when compiling e_rem/k_rem. Merge branch 'master' into rtoy-lisp-trig Convert to using lisp-unit. Remove RT. Add some comments and remove unneeded package qualifiers. Need to build e_rem_pio2.c on sparc now. Move ieee754_rem_pio2 to os-common.c. Remove the version in from Add more tests for exceptional values for cos and tan. Add a few Make all top-level disassembly functions accept base, case, and radix Regenerated. Merge branch 'master' into rtoy-simp-dd-trig Update for ppc to get pot files generated correctly. Merge branch 'master' into rtoy-simp-dd-trig For dd-%%sin, return x if x is small enough. (Makes sin(-0w0) be Add tests for double-double trig functions. Add dd-%sincos and use it as needed instead of calling sin and cos Add tests for dd-%sincos. Increase accuracy of tan near multiples of pi/4. Add tests for branch cuts. Document the value of atan better. The CLHS is confusing. Move src/tests/trig.lisp to tests/trig.lisp. Add some selected tests from trac bug reports. Fix trac.50 to use princ-to-string. Add more tests from trac. Add test file needed by a trac test. Use the formulas from the CLHS in the docstrings. More documentation. Fix typo. Fix test trac.69: Move the setting of the logical pathname Regenerated. Simple test script to run all of the tests in the tests directory. Float printer tests from reading the logs for print.lisp. Add tests for the branch cuts for asinh and acosh, and some fixes. Add tests for the branch cut for atanh. Not clear that this is Fix ticket:90 Produce correct results on branch cuts for atanh. Make interactive use of tests a little easier. Update according to commit logs. Regenerate. Don't run trac.15 on x87. We expect this to fail there and won't fix Fix typo in cis deftransform for double-doubles. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-05-8-g9be6530
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 9be6530c85baf6d45ab60a94867ba1e3ff3d66b0 (commit) from d879838d33c578bcecf282b8b95628b6d9bbc476 (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 9be6530c85baf6d45ab60a94867ba1e3ff3d66b0 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon May 20 19:24:53 2013 -0700 Fix ticket:82: If the form numbers are too large to be encoded, don't try to set the source location information. We try to print a warning in such cases. diff --git a/src/compiler/ir1util.lisp b/src/compiler/ir1util.lisp index c39f17e..1995360 100644 --- a/src/compiler/ir1util.lisp +++ b/src/compiler/ir1util.lisp @@ -447,9 +447,11 @@ form) (defun encode-form-numbers (tlf-number form-number) - "Return the TLF-NUMBER and FORM-NUMBER encoded as fixnum." - (declare (type (unsigned-byte 14) tlf-number form-number)) - (logior tlf-number (ash form-number 14))) + "Return the TLF-NUMBER and FORM-NUMBER encoded as fixnum, if + possible. Otherwise, return Nil." + (when (and (typep tlf-number '(unsigned-byte 14)) + (typep form-number '(unsigned-byte 14))) + (logior tlf-number (ash form-number 14)))) (defun decode-form-numbers (fixnum) "Return the tlf-number and form-number from an encoded FIXNUM." @@ -460,7 +462,7 @@ "Return a source-location for the call site." nil) -(define-compiler-macro source-location () +(define-compiler-macro source-location (&whole whole) (let ((file-info (let ((rest (source-info-current-file *source-info*))) (cond (rest (car rest)) ;; MAKE-LISP-SOURCE-INFO doesn't set current-file @@ -468,18 +470,24 @@ (form-numbers (encode-form-numbers (source-path-tlf-number *current-path*) (source-path-form-number *current-path*)))) - (etypecase (file-info-name file-info) - (pathname - `(quote ,(make-file-source-location - :form-numbers form-numbers - :pathname (namestring-for-debug-source file-info)))) - ((member :stream) - `(quote ,(make-stream-source-location :form-numbers form-numbers - :user-info *user-source-info*))) - ((member :lisp) - `(quote ,(make-lisp-source-location - :form-numbers form-numbers - :form (aref (file-info-forms file-info) 0))))))) + (cond (form-numbers + (etypecase (file-info-name file-info) + (pathname + `(quote ,(make-file-source-location + :form-numbers form-numbers + :pathname (namestring-for-debug-source file-info)))) + ((member :stream) + `(quote ,(make-stream-source-location :form-numbers form-numbers + :user-info *user-source-info*))) + ((member :lisp) + `(quote ,(make-lisp-source-location + :form-numbers form-numbers + :form (aref (file-info-forms file-info) 0)))))) + (t + (warn "Dropping source-location because form numbers are too large: ~S ~S" + (source-path-tlf-number *current-path*) + (source-path-form-number *current-path*)) + whole)))) ;;; MAKE-LEXENV -- Interface diff --git a/src/general-info/release-20e.txt b/src/general-info/release-20e.txt index 858f585..f36f6d0 100644 --- a/src/general-info/release-20e.txt +++ b/src/general-info/release-20e.txt @@ -82,6 +82,7 @@ New in this release: * Ticket #80 fixed. * Ticket #81 fixed. * Ticket #83 fixed. + * Ticket #82 fixed. * Other changes: * -8 option for build-all.sh is deprecated since we don't ----------------------------------------------------------------------- Summary of changes: src/compiler/ir1util.lisp | 40 +++++++++++++++++++++++--------------- src/general-info/release-20e.txt | 1 + 2 files changed, 25 insertions(+), 16 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-06-31-g3b8bd83
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 3b8bd8385a96685faeb26da60d9394feafb79907 (commit) from 5f031f16b552b5798732191e4e5d0a04607373bf (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 3b8bd8385a96685faeb26da60d9394feafb79907 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Jul 31 16:52:39 2014 -0700 Fix ticket ##104: Source location for define-condition This is the patch from the ticket except that the boot file name has been changed to conform to the usual naming rules. To test it, try (c::info :source-location :class 'error). This should return something like #S(C::FILE-SOURCE-LOCATION :FORM-NUMBERS 52 :PATHNAME "target:code/error.lisp") Notes: * compiler/globaldb.lisp: New info-type source-location/class. As class names can theoretically also be variable names it seemed reasonable to introduce this instead of using the existing source-location/defvar. * code/error.lisp (%compiler-define-condition): Take source-location as argument and store it in the infodb. (define-condition): Pass source-location along. * bootfiles/20e/boot-2014-06-1.lisp: New bootfile needed because error.lisp is compiled before globaldb.lisp. diff --git a/src/bootfiles/20e/boot-2014-06-1.lisp b/src/bootfiles/20e/boot-2014-06-1.lisp new file mode 100644 index 0000000..8b1dca5 --- /dev/null +++ b/src/bootfiles/20e/boot-2014-06-1.lisp @@ -0,0 +1,4 @@ +;; Define source-location/class info type so that code/error.lisp can +;; be compiled. +(in-package c) +(define-info-type source-location class (or form-numbers null) nil) diff --git a/src/code/error.lisp b/src/code/error.lisp index 3fc7f81..ee44212 100644 --- a/src/code/error.lisp +++ b/src/code/error.lisp @@ -597,7 +597,7 @@ ;;;; DEFINE-CONDITION (eval-when (compile load eval) -(defun %compiler-define-condition (name direct-supers layout) +(defun %compiler-define-condition (name direct-supers layout source-location) (multiple-value-bind (class old-layout) (insured-find-class name #'condition-class-p #'make-condition-class) @@ -625,7 +625,9 @@ ;; Initialize CPL slot. (setf (condition-class-cpl class) (remove-if-not #'condition-class-p - (std-compute-class-precedence-list class)))) + (std-compute-class-precedence-list class))) + + (setf (info :source-location :class name) source-location)) (undefined-value)) ); eval-when (compile load eval) @@ -872,7 +874,8 @@ `(progn (eval-when (compile load eval) - (%compiler-define-condition ',name ',parent-types ',layout)) + (%compiler-define-condition ',name ',parent-types ',layout + (c::source-location))) (declaim (ftype (function (t) t) ,@(all-readers))) (declaim (ftype (function (t t) t) ,@(all-writers))) diff --git a/src/compiler/globaldb.lisp b/src/compiler/globaldb.lisp index ae7b565..8d182c8 100644 --- a/src/compiler/globaldb.lisp +++ b/src/compiler/globaldb.lisp @@ -1174,6 +1174,10 @@ ;;; location for defstruct and deftype. (define-info-class source-location) (define-info-type source-location defvar (or form-numbers null) nil) +;; This is used for define-condition. It could also be used for +;; defclass but PCL classes already have a "definition-source" slot and we +;; store it there. +(define-info-type source-location class (or form-numbers null) nil) ;; The textdomain for the documentation (define-info-type function textdomain (or string null) nil) ----------------------------------------------------------------------- Summary of changes: src/bootfiles/20e/boot-2014-06-1.lisp | 4 ++++ src/code/error.lisp | 9 ++++++--- src/compiler/globaldb.lisp | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/bootfiles/20e/boot-2014-06-1.lisp hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-01-5-g7b313ca
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 7b313ca19a6452137c86f9da65430b946be419a5 (commit) from c4aaa9099d992a0b2cec538a503f87a4e86e0663 (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 7b313ca19a6452137c86f9da65430b946be419a5 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Jan 6 22:31:00 2014 -0800 Fix complex multiply vop. Under some conditions (see trac.65 in tests/trac.lisp) r is packed into the same location as either x or y, and we were overwriting x (or y) with the result before we had finished with the values in x (or y). With this, trac.65 passes on sparc now. diff --git a/src/compiler/sparc/float.lisp b/src/compiler/sparc/float.lisp index e5d654d..013f184 100644 --- a/src/compiler/sparc/float.lisp +++ b/src/compiler/sparc/float.lisp @@ -2134,7 +2134,7 @@ ;; Multiply two complex numbers (macrolet - ((frob (size fmul fadd fsub cost) + ((frob (size fmul fadd fsub mov cost) (let ((vop-name (symbolicate "*/COMPLEX-" size "-FLOAT")) (complex-reg (symbolicate "COMPLEX-" size "-REG")) (real-reg (symbolicate size "-REG")) @@ -2158,30 +2158,20 @@ (yi (,imag-part y)) (rr (,real-part r)) (ri (,imag-part r))) - (cond ((location= r x) - (inst ,fmul p1 xr yr) - (inst ,fmul p2 xr yi) - (inst ,fmul rr xi yi) - (inst ,fsub rr p1 xr) - (inst ,fmul p1 xi yr) - (inst ,fadd ri p2 p1)) - ((location= r y) - (inst ,fmul p1 yr xr) - (inst ,fmul p2 yr xi) - (inst ,fmul rr yi xi) - (inst ,fsub rr p1 rr) - (inst ,fmul p1 yi xr) - (inst ,fadd ri p2 p1)) - (t - (inst ,fmul rr yr xr) - (inst ,fmul ri xi yi) - (inst ,fsub rr rr ri) - (inst ,fmul p1 xr yi) - (inst ,fmul ri xi yr) - (inst ,fadd ri ri p1))))))))) - - (frob single fmuls fadds fsubs 6) - (frob double fmuld faddd fsubd 6)) + ;; Be careful because r might be packed into the same + ;; location as either x or y. We have to be careful + ;; not to modify either x or y until all uses of x or + ;; y. + (inst ,fmul p1 yr xr) ; p1 = xr*yr + (inst ,fmul p2 xi yi) ; p2 = xi*yi + (inst ,fsub p2 p1 p2) ; p2 = xr*yr - xi*yi + (inst ,fmul p1 xr yi) ; p1 = xr*yi + (inst ,fmul ri xi yr) ; ri = xi*yr + (inst ,fadd ri ri p1) ; ri = xi*yr + xr*yi + (,@mov rr p2))))))) + + (frob single fmuls fadds fsubs (inst fmovs) 6) + (frob double fmuld faddd fsubd (move-double-reg) 6)) ;; Multiply a complex by a float. The case of float * complex is ;; handled by a deftransform to convert it to the complex*float case. ----------------------------------------------------------------------- Summary of changes: src/compiler/sparc/float.lisp | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-03-3-g179e05d
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 179e05df049f705f95eea224d1248ba5e979ce18 (commit) from f15327ba2aba87dea3c67204ca0f1100c1a605d9 (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 179e05df049f705f95eea224d1248ba5e979ce18 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Mar 8 13:32:08 2014 -0800 Return the correct values for (log -0w0) and (log 0w0). Previously we returned something like #c(-715 pi) and -715. * src/code/irrat-dd.lisp: * Handle -0w0 and 0w0 specially in dd-%log. * tests/trac.lisp: * Add a test for this in trac.lisp. diff --git a/src/code/irrat-dd.lisp b/src/code/irrat-dd.lisp index 29627b5..438339f 100644 --- a/src/code/irrat-dd.lisp +++ b/src/code/irrat-dd.lisp @@ -368,10 +368,17 @@ (optimize (speed 3) (space 0) (inhibit-warnings 3))) ;; Separate mantissa from exponent - (multiple-value-bind (x e) + (multiple-value-bind (x e sign) (decode-float x) (declare (type double-double-float x) (type double-float-exponent e)) + (when (zerop x) + ;; Handle log(+/-0). Return -inf or -inf + i*pi, but signal a + ;; division by zero. + (return-from dd-%log + (if (minusp sign) + (complex (/ (- x)) dd-pi) + (/ (- x))))) (let ((z 0w0) (y 0w0)) (declare (type double-double-float z y)) diff --git a/tests/trac.lisp b/tests/trac.lisp index f8b4258..9a02189 100644 --- a/tests/trac.lisp +++ b/tests/trac.lisp @@ -342,7 +342,10 @@ (ext:with-float-traps-masked (:divide-by-zero) (log -0d0))) (assert-equal (complex ext:single-float-negative-infinity (float pi 1f0)) - (ext:with-float-traps-masked (:divide-by-zero) (log -0f0))))) + (ext:with-float-traps-masked (:divide-by-zero) (log -0f0))) + (assert-equal + (complex ext:double-double-float-negative-infinity kernel:dd-pi) + (ext:with-float-traps-masked (:divide-by-zero) (log -0w0))))) (define-test trac.93 (:tag :trac) ----------------------------------------------------------------------- Summary of changes: src/code/irrat-dd.lisp | 9 ++++++++- tests/trac.lisp | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. begin-x87-removal-17-g7fe70d3
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

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 7fe70d3a8856058f4bb4b10602d7eadf18444791 (commit) from 656761bda082e6c08492f34af80861ac285d6426 (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 7fe70d3a8856058f4bb4b10602d7eadf18444791 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Apr 15 21:53:14 2014 -0700 Regenerated. diff --git a/src/i18n/locale/cmucl-x86-vm.pot b/src/i18n/locale/cmucl-x86-vm.pot index 3423da4..8996bd9 100644 --- a/src/i18n/locale/cmucl-x86-vm.pot +++ b/src/i18n/locale/cmucl-x86-vm.pot @@ -77,24 +77,6 @@ msgstr "" msgid "Thread safe push of val onto the list in the vector element." msgstr "" -#: src/code/commandline.lisp -msgid "" -"Specifies what kind of floating-point support should be used on x86\n" -" systems. If 'x87', Lisp will use the x87 floating-point unit; if\n" -" 'sse2', Lisp uses SSE2 floating-point unit. The default is\n" -" 'auto',which causes Lisp to check to see if SSE2 is available. If\n" -" so, then SSE2 is used. If the SSE2 core file cannot be found,Lisp\n" -" will fallback to the x87 core, which can run on any machine." -msgstr "" - -#: src/code/commandline.lisp -msgid "mode" -msgstr "" - -#: src/code/commandline.lisp -msgid "a symbol or function" -msgstr "" - #: src/code/load.lisp msgid "Top-Level Form" msgstr "" ----------------------------------------------------------------------- Summary of changes: src/i18n/locale/cmucl-x86-vm.pot | 18 ------------------ 1 file changed, 18 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0