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

[git] CMU Common Lisp branch master updated. begin-x87-removal-23-gfc6ec6d
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 fc6ec6d77cdde9c73bb3b6c8a2c5d1d6ced9094f (commit) from d8d6bce450fe606aa48fdbf874001134505734a1 (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 fc6ec6d77cdde9c73bb3b6c8a2c5d1d6ced9094f Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat May 3 08:57:48 2014 -0700 Ignore fasls in this directory. diff --git a/tests/pcl/.gitignore b/tests/pcl/.gitignore new file mode 100644 index 0000000..a787f9e --- /dev/null +++ b/tests/pcl/.gitignore @@ -0,0 +1,5 @@ +*.sse2f +*.ppcf +*.sparcf +*.fasl + ----------------------------------------------------------------------- Summary of changes: tests/pcl/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tests/pcl/.gitignore hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-04-25-gb9cf366
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 b9cf3661ab0675ef091588e26080756ecd0d4197 (commit) from c349b260bfbd99949e4fbc07c9b295ce0ed6118a (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 b9cf3661ab0675ef091588e26080756ecd0d4197 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat May 4 21:15:20 2013 -0700 Clean up DEPENDS * GNUmakefile * Replace $(DEPENDS) with $(CC) * Config.x86_common * Set DEPENDS_FLAG to -MM diff --git a/src/lisp/Config.x86_common b/src/lisp/Config.x86_common index 832d8d6..6f0ec95 100644 --- a/src/lisp/Config.x86_common +++ b/src/lisp/Config.x86_common @@ -62,8 +62,7 @@ ARCH_SRC = x86-arch.c OS_SRC = os-common.c e_rem_pio2.c k_rem_pio2.c NM = nm -gp -DEPEND = $(CC) -MM -E -DEPEND_FLAGS = +DEPEND_FLAGS = -MM # This no longer has aliasing problems, so no need to use # -ffloat-store and -fno-strict-aliasing anymore. diff --git a/src/lisp/GNUmakefile b/src/lisp/GNUmakefile index a3289eb..a9ab587 100644 --- a/src/lisp/GNUmakefile +++ b/src/lisp/GNUmakefile @@ -58,7 +58,7 @@ clean: depend: Depends Depends: ${SRCS} - $(DEPEND) ${DEPEND_FLAGS} ${CFLAGS} ${CPPFLAGS} $^ > ,depends + $(CC) ${DEPEND_FLAGS} ${CFLAGS} ${CPPFLAGS} $^ > ,depends mv ,depends Depends -include Depends ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.x86_common | 3 +-- src/lisp/GNUmakefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-12-a-33-ga9598e6
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 a9598e606edc4490b8b58aedb4ecdca64b6ffed9 (commit) via fe9b90a2508399c517a98d70df9002d90a3f4a46 (commit) from e48e7e828f77e7013ebf7a7e87ef8055543fc423 (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 a9598e606edc4490b8b58aedb4ecdca64b6ffed9 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Dec 22 11:10:03 2013 -0800 Add test file needed by a trac test. diff --git a/tests/resources/read-insert.lisp b/tests/resources/read-insert.lisp new file mode 100644 index 0000000..cae19a4 --- /dev/null +++ b/tests/resources/read-insert.lisp @@ -0,0 +1,11 @@ +(in-package :cl-haml) + +(defun read-haml-insert-line (stream &optional (eof-error-p nil) + (eof-value +eof+)) + (list +haml+ + (read-contents stream + (read-options stream + eof-error-p + eof-value) + eof-error-p + eof-value))) commit fe9b90a2508399c517a98d70df9002d90a3f4a46 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Dec 22 11:09:19 2013 -0800 Add more tests from trac. diff --git a/tests/trac.lisp b/tests/trac.lisp index dbe8741..2f9a4ae 100644 --- a/tests/trac.lisp +++ b/tests/trac.lisp @@ -56,11 +56,165 @@ (assert-equal " 0.100E+01" (format nil "~11,3,2,0,'*,,'EE" .9999))) +(define-test trac.15 + (:tag :trac) + (assert-true + (funcall (compile nil + (lambda (z tt betain beta) + (declare (double-float z tt betain beta) + (optimize (speed 3) (safety 0))) + (= (* (* (* z tt) betain) beta) z))) + 5.562684646268004d-309 (1+ double-float-epsilon) .5d0 2d0))) + +(define-test trac.24 + (:tag :trac) + (assert-true + (let ((y (expt 2 #c(-0.5d0 0)))) + (and (zerop (imagpart y)) + (<= (abs (- (realpart y) + (sqrt 0.5d0))) + (* 2 double-float-epsilon)))))) + +(define-test trac.25 + (:tag :trac) + (assert-true + (compile nil (lambda () + (declare (optimize (speed 0) (safety 3) (debug 3))) + (loop + (pop *random-stack*) + (return))))) + (assert-true + (compile nil (lambda () + (declare (optimize (safety 3))) + (catch (make-symbol "CMUCL-DEBUG-CATCH-TAG") + (make-string 49)))))) + +(define-test trac.29 + (:tag :trac) + (assert-true + (make-condition (find-class 'error)))) + +(define-test trac.31 + (:tag :trac) + (assert-equal '(:absolute "TMP" "Foo" "bar") + (pathname-directory "/tmp/Foo/BAR/" :case :common))) + +(define-test trac.36 + (:tag :trac) + (let ((path "/tmp/trac.36.bom.txt")) + (flet ((bug (&optional (format :utf16)) + (with-open-file (s path + :direction :output + :if-exists :supersede + :external-format format) + (format s "Hello~%")) + (with-open-file (s path + :direction :input + :external-format format) + (let ((ch (read-char s))) + (values ch (file-position s)))))) + (assert-equal (values #\H 4) + (bug :utf16)) + (assert-equal (values #\H 8) + (bug :utf32))))) + +(define-test trac.43 + (:tag :trac) + (assert-true + (let ((path "/tmp/trac.43.txt")) + (unwind-protect + (progn + (with-open-file (ostream path :direction :output + :external-format :utf-8) + (dotimes (i 1000) + (write-char (code-char #x1234) ostream))) + + (with-open-file (stream path :direction :input + :external-format :utf-8) + (let ((p0 (file-position stream)) + (ch (read-char stream))) + (unread-char ch stream) + (let ((p0* (file-position stream))) + (eql p0* p0))))))))) + (define-test trac.50 (:tag :trac) (assert-equal "#P(:DIRECTORY (:ABSOLUTE \"tmp\" \"\" \"a\" \"\" \"b\"))" (princ-to-string (make-pathname :directory '(:absolute "tmp" "" "a" "" "b"))))) +(define-test trac.58 + (:tag :trac) + (assert-false + (let ((path "/tmp/trac.58.txt") + failures) + (unwind-protect + (progn + (with-open-file (s path :direction :output :external-format :utf-16) + (dotimes (i 300) + (write-char (code-char i) s))) + + (with-open-file (s path :direction :input :external-format :utf-16) + (dotimes (i 300) + (let ((ch (read-char s nil nil))) + (unless (= i (char-code ch)) + (push (list i ch (char-code ch)) faillures))))) + failures) + (delete-file path))))) + +(define-test trac.63 + (:tag :trac) + (assert-eql + 4.999995d11 + (funcall (compile nil + (lambda (x) + (declare (type (and fixnum unsigned-byte) x) + (optimize speed (safety 0))) + (vm::with-cycle-counter + (let ((sum 0d0)) + (declare (double-float sum)) + (dotimes (k x) + (declare (type (and fixnum unsigned-byte) k)) + (incf sum k)) + sum)))) + 1000000))) + +(define-test trac.65 + (:tag :trac) + (assert-false + (let (failures) + (dolist (base '(2 2f0 2d0 2w0 #c(0 1) #c(0f0 1) #c(0d0 1) #c(0w0 1))) + (dolist (power '(2 3 1/2 -2 -3 -1/2 5)) + (dolist (power-type '(rational single-float double-float ext:double-double-float + (complex single-float) (complex double-float) + (complex ext:double-double-float))) + (let* ((pp (coerce power power-type)) + (interp (expt base pp)) + (*compile-print* nil) + (compiled (funcall (compile nil `(lambda (b) + (declare (type ,(type-of base) b)) + (expt b ,pp))) + base))) + (unless (= interp compiled) + (push (list base pp interp compiled) failures)))))) + failures))) + +(define-test trac.67 + (:tag :trac) + (assert-error 'simple-error + (funcall (compile nil + (lambda (s) + (declare (simple-string s)) + (replace s s :start2 100 :end2 105))) + (copy-seq "1234567890")))) + +(define-test trac.69 + (:tag :trac) + (setf (logical-pathname-translations "trac69") + '(("**;*.*.*" "/tmp/**/*.*"))) + (assert-error 'lisp::namestring-parse-error + (let ((*default-pathname-defaults* #p"trac69:")) + (pathname "/tmp/bar.lisp")))) + (defparameter *trac.70* (make-string 40 :initial-element #\A)) (compile 'trac.70-test @@ -68,17 +222,53 @@ (declare (simple-string workspace s)) (replace workspace s :start1 1 :end1 5 :start2 1 :end2 5))) +(define-test trac.71 + (:tag :trac) + (assert-true + (funcall (compile nil + (lambda (x) + (declare (double-float x)) + (expt x 2w0))) + 2d0))) + +(defpackage :cl-haml + (:use :cl)) + +(defparameter *path* cl:*load-pathname*) + +(define-test trac.74 + (:tag :trac) + (assert-true + (let ((path (merge-pathnames "resources/read-insert.lisp" + *path*))) + (compile-file path :external-format :utf8)))) + (define-test trac.76 (:tag :trac) (assert-equal "A1234AAAA" (subseq (trac.70-test *trac.70* "a12345") 0 9))) +(define-test trac.79 + (:tag :trac) + ;; Create a temp file full of latin1 characters. + (assert-equal + '(0 1) + (let ((path "/tmp/trac.70.txt")) + (unwind-protect + (progn + (with-open-file (s path :direction :output :if-exists :supersede + :external-format :latin1) + (dotimes (k 255) + (write-char (code-char k) s))) + (with-open-file (s path :direction :input :external-format :latin1) + (list (file-position s) + (progn + (read-char s) + (file-position s))))) + (delete-file path))))) + (define-test trac.80 (:tag :trac) ;; The following formats should not signal an error. (assert-true (ignore-errors (format nil "~ve" 21 5d-234))) (assert-true (ignore-errors (format nil "~ve" 100 5d-234)))) - - - - \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: tests/resources/read-insert.lisp | 11 +++ tests/trac.lisp | 198 +++++++++++++++++++++++++++++++++++++- 2 files changed, 205 insertions(+), 4 deletions(-) create mode 100644 tests/resources/read-insert.lisp hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. 20e-2-g40aa247
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 40aa2475c25a2715e100bbde7ba7db437a8a4326 (commit) from a7ace14123e6cbe17f041142328593287cdf6586 (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 40aa2475c25a2715e100bbde7ba7db437a8a4326 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Oct 17 20:32:52 2013 -0700 Delete assembly routines for multiplication and truncation. I think these were needed for sparc v7 and earlier which didn't have a multiply or divide instruction (multiply step, and divide step). We don't support v7 anymore so the existing vops for multiplication and division work just fine. diff --git a/src/assembly/sparc/arith.lisp b/src/assembly/sparc/arith.lisp index 2ebb72f..a49b1c1 100644 --- a/src/assembly/sparc/arith.lisp +++ b/src/assembly/sparc/arith.lisp @@ -210,192 +210,6 @@ LOW-FITS-IN-FIXNUM (move res lo)) -(macrolet - ((frob (name note cost type sc) - `(define-assembly-routine (,name - (:note ,note) - (:cost ,cost) - (:translate *) - (:policy :fast-safe) - (:arg-types ,type ,type) - (:result-types ,type)) - ((:arg x ,sc nl0-offset) - (:arg y ,sc nl1-offset) - (:res res ,sc nl0-offset) - (:temp temp ,sc nl2-offset)) - ,@(when (eq type 'tagged-num) - `((inst sra x 2))) - (cond ((backend-featurep :sparc-64) - ;; Sign extend, then multiply - (inst sra x 0) - (inst sra y 0) - (inst mulx res x y)) - ((or (backend-featurep :sparc-v8) - (backend-featurep :sparc-v9)) - (inst smul res x y)) - (t - (inst wry x) - (inst andcc temp zero-tn) - (inst nop) - (inst nop) - (dotimes (i 32) - (inst mulscc temp y)) - (inst mulscc temp zero-tn) - (inst rdy res)))))) - (frob unsigned-* "unsigned *" 40 unsigned-num unsigned-reg) - (frob signed-* "unsigned *" 41 signed-num signed-reg) - (frob fixnum-* "fixnum *" 30 tagged-num any-reg)) - - - -;;;; Division. - -#+assembler -(defun emit-divide-loop (divisor rem quo tagged) - (inst li quo 0) - (labels - ((do-loop (depth) - (cond - ((zerop depth) - (inst unimp 0)) - (t - (let ((label-1 (gen-label)) - (label-2 (gen-label))) - (inst cmp divisor rem) - (inst b :geu label-1) - (inst nop) - (inst sll divisor 1) - (do-loop (1- depth)) - (inst srl divisor 1) - (inst cmp divisor rem) - (emit-label label-1) - (inst b :gtu label-2) - (inst sll quo 1) - (inst add quo (if tagged (fixnumize 1) 1)) - (inst sub rem divisor) - (emit-label label-2)))))) - (do-loop (if tagged 30 32)))) - -(define-assembly-routine (positive-fixnum-truncate - (:note "unsigned fixnum truncate") - (:cost 45) - (:translate truncate) - (:policy :fast-safe) - (:arg-types positive-fixnum positive-fixnum) - (:result-types positive-fixnum positive-fixnum)) - ((:arg dividend any-reg nl0-offset) - (:arg divisor any-reg nl1-offset) - - (:res quo any-reg nl2-offset) - (:res rem any-reg nl0-offset)) - - (let ((error (generate-error-code nil division-by-zero-error - dividend divisor))) - (inst cmp divisor) - (inst b :eq error)) - - (move rem dividend) - (emit-divide-loop divisor rem quo t)) - - -(define-assembly-routine (fixnum-truncate - (:note "fixnum truncate") - (:cost 50) - (:policy :fast-safe) - (:translate truncate) - (:arg-types tagged-num tagged-num) - (:result-types tagged-num tagged-num)) - ((:arg dividend any-reg nl0-offset) - (:arg divisor any-reg nl1-offset) - - (:res quo any-reg nl2-offset) - (:res rem any-reg nl0-offset) - - (:temp quo-sign any-reg nl5-offset) - (:temp rem-sign any-reg nargs-offset)) - - (let ((error (generate-error-code nil division-by-zero-error - dividend divisor))) - (inst cmp divisor) - (inst b :eq error)) - - (inst xor quo-sign dividend divisor) - (inst move rem-sign dividend) - (let ((label (gen-label))) - (inst cmp dividend) - (inst ba :lt label) - (inst neg dividend) - (emit-label label)) - (let ((label (gen-label))) - (inst cmp divisor) - (inst ba :lt label) - (inst neg divisor) - (emit-label label)) - (move rem dividend) - (emit-divide-loop divisor rem quo t) - (let ((label (gen-label))) - ;; If the quo-sign is negative, we need to negate quo. - (inst cmp quo-sign) - (inst ba :lt label) - (inst neg quo) - (emit-label label)) - (let ((label (gen-label))) - ;; If the rem-sign is negative, we need to negate rem. - (inst cmp rem-sign) - (inst ba :lt label) - (inst neg rem) - (emit-label label))) - - -(define-assembly-routine (signed-truncate - (:note "(signed-byte 32) truncate") - (:cost 60) - (:policy :fast-safe) - (:translate truncate) - (:arg-types signed-num signed-num) - (:result-types signed-num signed-num)) - - ((:arg dividend signed-reg nl0-offset) - (:arg divisor signed-reg nl1-offset) - - (:res quo signed-reg nl2-offset) - (:res rem signed-reg nl0-offset) - - (:temp quo-sign signed-reg nl5-offset) - (:temp rem-sign signed-reg nargs-offset)) - - (let ((error (generate-error-code nil division-by-zero-error - dividend divisor))) - (inst cmp divisor) - (inst b :eq error)) - - (inst xor quo-sign dividend divisor) - (inst move rem-sign dividend) - (let ((label (gen-label))) - (inst cmp dividend) - (inst ba :lt label) - (inst neg dividend) - (emit-label label)) - (let ((label (gen-label))) - (inst cmp divisor) - (inst ba :lt label) - (inst neg divisor) - (emit-label label)) - (move rem dividend) - (emit-divide-loop divisor rem quo nil) - (let ((label (gen-label))) - ;; If the quo-sign is negative, we need to negate quo. - (inst cmp quo-sign) - (inst ba :lt label) - (inst neg quo) - (emit-label label)) - (let ((label (gen-label))) - ;; If the rem-sign is negative, we need to negate rem. - (inst cmp rem-sign) - (inst ba :lt label) - (inst neg rem) - (emit-label label))) - ;;;; Comparison ----------------------------------------------------------------------- Summary of changes: src/assembly/sparc/arith.lisp | 186 ----------------------------------------- 1 file changed, 186 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-05-18-gcc9d147
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 cc9d147df222fcc705e3d37b3327fd40de0a4dc9 (commit) from 6ee6333087d341cd6c716abaaaebbfbf11cb516b (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 cc9d147df222fcc705e3d37b3327fd40de0a4dc9 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon May 27 09:37:21 2013 -0700 Minor corrections for the usage message. diff --git a/bin/build.sh b/bin/build.sh index 496d641..4aa8f24 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -75,12 +75,12 @@ usage () echo ' -b d The different build directories are named ${d}-2, ${d}-3 ${d}-4' echo ' If -b is not given, a suitable name based on the OS is used.' echo ' -v v Use the given string as the version. Default is' - echo " today's date" + echo " based on git describe" echo " -u Don't build CLX, CLM, or Hemlock" echo ' -i n Make build "n" interactive, so output is sent to *standard-output*' echo ' instead of the log file. "n" should be a string consisting of' echo ' the numbers 1, 2, or 3.' - echo " -B file Use file as a boot file. Maybe be specified more than once" + echo " -B file Use file as a boot file. May be be specified more than once" echo " The file is relative to the bootfiles/<version> directory" echo ' -C [l m] Create the build directories. The args are what' echo ' you would give to create-target.sh for the lisp' ----------------------------------------------------------------------- Summary of changes: bin/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-06-89-ge334b68
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 e334b681182e7a354db0e66caa41abe1e1bbcec5 (commit) from 022325ccf101a0e9085f0189c4ec54dc96cef52d (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 e334b681182e7a354db0e66caa41abe1e1bbcec5 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Aug 3 22:16:22 2014 -0700 Fix aliasing issue noted by gcc 4.4.1 on Linux. I think the offending code in each case is trying to extract the low word if x. I think it works because on a little-endian machine, *(unsigned*)&one is 0 since the low word is stored first. On a big-endian machine, *(unsigned*)&one is the high word which, when right shifted by 29, gives 1. That is added to the address of x to get the low word of x. diff --git a/src/lisp/e_cosh.c b/src/lisp/e_cosh.c index f022ec0..28b6c3c 100644 --- a/src/lisp/e_cosh.c +++ b/src/lisp/e_cosh.c @@ -78,7 +78,11 @@ static double one = 1.0, half=0.5, huge = 1.0e300; if (ix < 0x40862E42) return half*__ieee754_exp(fabs(x)); /* |x| in [log(maxdouble), overflowthresold] */ +#if 0 lx = *( (((*(unsigned*)&one)>>29)) + (unsigned*)&x); +#else + lx = ux.i[LOWORD]; +#endif if (ix<0x408633CE || ((ix==0x408633ce)&&(lx<=(unsigned)0x8fb9f87d))) { w = __ieee754_exp(half*fabs(x)); diff --git a/src/lisp/e_sinh.c b/src/lisp/e_sinh.c index 8444741..76b3418 100644 --- a/src/lisp/e_sinh.c +++ b/src/lisp/e_sinh.c @@ -72,7 +72,11 @@ static double one = 1.0, shuge = 1.0e307; if (ix < 0x40862E42) return h*__ieee754_exp(fabs(x)); /* |x| in [log(maxdouble), overflowthresold] */ +#if 0 lx = *( (((*(unsigned*)&one)>>29)) + (unsigned*)&x); +#else + lx = ux.i[LOWORD]; +#endif if (ix<0x408633CE || ((ix==0x408633ce)&&(lx<=(unsigned)0x8fb9f87d))) { w = __ieee754_exp(0.5*fabs(x)); t = h*w; ----------------------------------------------------------------------- Summary of changes: src/lisp/e_cosh.c | 4 ++++ src/lisp/e_sinh.c | 4 ++++ 2 files changed, 8 insertions(+) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-09-4-gc042852
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 c042852462fc92df2da2259c191a909400199fb4 (commit) from 9b83625d4fc0809170354f5397afb7dab2103d42 (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 c042852462fc92df2da2259c191a909400199fb4 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Sep 11 22:29:38 2014 -0700 Support FP exceptions on NetBSD without feraiseexcept. Not quite fully working on NetBSD, but using this approach on Darwin does the right thing and all the tests pass. (Could these failures be due to NetBSD not compiling with just sse2 and thus uses x87 for the operations?) * setexception.c: * Add support for NetBSD. Instead of using feraiseexcept, try to generate the appropriate operations to generate the desired exceptions. * double-values.c: * Helper functions for setexception to return appropriate float values. These are in a different file so that the compiler can't optimize the values away when used in fdlibm_setexceptions. * GNUmakefile: * Compue double-values.c everywhere. Should be harmless since only NetBSD uses these functions. diff --git a/src/lisp/GNUmakefile b/src/lisp/GNUmakefile index c557d3b..056e9ea 100644 --- a/src/lisp/GNUmakefile +++ b/src/lisp/GNUmakefile @@ -12,7 +12,7 @@ FDLIBM = k_sin.c k_cos.c k_tan.c s_sin.c s_cos.c s_tan.c sincos.c \ e_acosh.c s_asinh.c e_atanh.c \ e_atan2.c \ e_rem_pio2.c k_rem_pio2.c \ - setexception.c + setexception.c double-values.c SRCS = lisp.c coreparse.c alloc.c monitor.c print.c interr.c \ vars.c parse.c interrupt.c search.c validate.c globals.c \ diff --git a/src/lisp/double-values.c b/src/lisp/double-values.c new file mode 100644 index 0000000..79d5921 --- /dev/null +++ b/src/lisp/double-values.c @@ -0,0 +1,40 @@ +/* + * Some helper functions to return specific double values for use by + * fdlibm_setexceptions on NetBSD. Currently, NetBSD doesn't have + * feraiseexcept so we have to do something special. See + * fdlibm_setexceptions. + */ + +#include "fdlibm.h" + +double +double_zero() +{ + return 0.0; +} + +/* + * Return most-positive-double-float + */ +double +double_huge() +{ + union { int i[2]; double d; } ux; + ux.i[HIWORD] = 0x7fefffff; + ux.i[LOWORD] = 0xffffffff; + + return ux.d; +} + +/* + * Return least-positive-double-float + */ +double +double_tiny() +{ + union { int i[2]; double d; } ux; + ux.i[HIWORD] = 0; + ux.i[LOWORD] = 1; + + return ux.d; +} diff --git a/src/lisp/setexception.c b/src/lisp/setexception.c index a77a9d8..d0f4519 100644 --- a/src/lisp/setexception.c +++ b/src/lisp/setexception.c @@ -1,4 +1,25 @@ +#if defined(__NetBSD__) +/* + * NetBSD doesn't have fenv.h. At least the version currently being + * used to build cmucl doesn't. Assume this also means we don't have + * feraiseexcept. So, to generate the desired exceptions, we have to + * create the appropriate operations to generate the desired + * exceptions. + */ +#undef HAVE_FERAISEEXCEPT + +extern double double_zero(); +extern double double_huge(); +extern double double_tiny(); + +#else +#define HAVE_FERAISEEXCEPT +#endif + +#ifdef HAVE_FERAISEEXCEPT #include <fenv.h> +#endif + #include <math.h> #include <stdio.h> @@ -50,32 +71,48 @@ fdlibm_setexception(double x, enum FDLIBM_EXCEPTION type) /* Division by zero. Use the sign of x to get the correct * signed infinity */ +#ifdef HAVE_FERAISEEXCEPT feraiseexcept(FE_DIVBYZERO); - ret = copysign(INFINITY, x); +#else + ret = copysign(1, x) / double_zero(); +#endif + break; case 1: /* Underflow. Use the sign of x to get a signed zero. */ +#ifdef HAVE_FERAISEEXCEPT feraiseexcept(FE_UNDERFLOW); ret = copysign(0.0, x); +#else + ret = double_tiny() * double_tiny();; +#endif break; case 2: /* overflow */ +#ifdef HAVE_FERAISEEXCEPT feraiseexcept(FE_OVERFLOW); ret = copysign(INFINITY, x); +#else + ret = double_huge() * copysign(double_huge(), x); +#endif break; case 3: { - /* invalid */ + /* if */ if (!isQNaN(x)) { /* * If it's not a quiet NaN, we want to signal an invalid * operation. Otherwise, we silently return a NaN. */ +#ifdef HAVE_FERAISEEXCEPT feraiseexcept(FE_INVALID); +#else + ret = double_zero() / double_zero(); + return ret; +#endif } - /* * FIXME: Of the many NaN values that we have, what NaN * should we return? ----------------------------------------------------------------------- Summary of changes: src/lisp/GNUmakefile | 2 +- src/lisp/double-values.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/lisp/setexception.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 src/lisp/double-values.c hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-06-33-ge9be6b4
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 e9be6b48a40993444db72d4a9434b9eb44099f65 (commit) via 040e27416d95cf0980d2e77f70f9430c1ff4e769 (commit) from 3b8bd8385a96685faeb26da60d9394feafb79907 (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 e9be6b48a40993444db72d4a9434b9eb44099f65 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Jul 31 17:05:47 2014 -0700 Add info for cross-compile scripts. diff --git a/src/bootfiles/README b/src/bootfiles/README index c96ff68..31890a7 100644 --- a/src/bootfiles/README +++ b/src/bootfiles/README @@ -12,3 +12,23 @@ fix that here is the convention to be used for all bootfiles after sequentially from 1 (n). Thus, the boot-2014-06-1.lisp is intended to be built from the 2014-06 snapshot, and is the first boot file to be applied. +3. The boot file should describe what it is for. + +If a cross-compile script is needed, we also have similar rules. + +1. The script must be in the version directory, as for boot files. +2. The names of the script file must have to format + boot-yyyy-mm-n-cross-aaa.lisp where yyyy, mm, and n have the same + meaning as for boot files above. + + A. The aaa field is flexible. + 1. If it is not included, then the script is intended to be + applicable to all architectures. If aaa is given, then it is + meant to be applied only for the architecture aaa. + 2. If the scrit is applicable to more than one architecture, the + aaa field is dropped and the script must take care to include + conditionals so that the script can be applied to all + architectures. + B. Additional information can be included if desired. + +3. The script should describe what it is for. commit 040e27416d95cf0980d2e77f70f9430c1ff4e769 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Jul 31 16:57:41 2014 -0700 Add README to document the naming convention of boot files. diff --git a/src/bootfiles/README b/src/bootfiles/README new file mode 100644 index 0000000..c96ff68 --- /dev/null +++ b/src/bootfiles/README @@ -0,0 +1,14 @@ +The nameing of the bootfiles have been historically inconsistent. To +fix that here is the convention to be used for all bootfiles after +2014-07. + +1. The bootfile must reside in the directory whose name is the current + CMUCL version for which this bootfile applies. For example, as of + this writing, the current version is 20e, so boot files must be in + the 20e directory. +2. The name of the boot file shall be boot-yyyy-mm-n.lisp where + yyyy-mm represents the year (yyyy) and month (mm) of the snapshot + that is used to build from. The boot files are numbered + sequentially from 1 (n). Thus, the boot-2014-06-1.lisp is intended + to be built from the 2014-06 snapshot, and is the first boot file + to be applied. ----------------------------------------------------------------------- Summary of changes: src/bootfiles/README | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/bootfiles/README hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-06-25-g7e56a8c
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 7e56a8c7ebb5b33e2d755ef725900fd4310ffc3e (commit) from 2ade088e991102f642e20a3d20239bf8b2b52633 (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 7e56a8c7ebb5b33e2d755ef725900fd4310ffc3e Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Jul 26 09:04:27 2014 -0700 Comment code, add license header, and conform to cmucl C style. diff --git a/src/lisp/sincos.c b/src/lisp/sincos.c index edd0eca..e879425 100644 --- a/src/lisp/sincos.c +++ b/src/lisp/sincos.c @@ -1,6 +1,19 @@ +/* + + This code was written as part of the CMU Common Lisp project at + Carnegie Mellon University, and has been placed in the public domain. + +*/ + #include "fdlibm.h" -void lisp_sincos (double x, double *s, double *c) +/* + * sincos function. Compute sin(x) and cos(x) faster than computing + * each individually. Speedup comes from doing the pi argument + * reduction just once. + */ +void +lisp_sincos (double x, double *s, double *c) { int ix; union { int i[2]; double d; } ux; ----------------------------------------------------------------------- Summary of changes: src/lisp/sincos.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-06-68-g60d71b6
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 60d71b68ef6af3e5fb3e045f7ce2a42a5ff23ac1 (commit) via 1b876280ab1774cb36fb63906c58cd5af1e5d230 (commit) from 21aad0ecc9f96297deedf9362c19fd877910592a (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 60d71b68ef6af3e5fb3e045f7ce2a42a5ff23ac1 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Aug 2 15:30:51 2014 -0700 Fix up the inverse hyperbolics. * fdlibm.h: * Declare fdlibm_log1p and __ieee754_log * e_acosh.c: * Use unions to get the parts of a double. * Use fdlibm_log1p instead of log1p. * e_atanh.c: * Use unions to get the parts of a double. * Use fdlibm_log1p instead of log1p. * s_asinh.c: * Rename from asinh to fdlibm_asinh. * Use unions to get the parts of a double. * Use fdlibm_log1p instead of log1p. diff --git a/src/lisp/e_acosh.c b/src/lisp/e_acosh.c index 6839554..fb248d5 100644 --- a/src/lisp/e_acosh.c +++ b/src/lisp/e_acosh.c @@ -45,7 +45,10 @@ ln2 = 6.93147180559945286227e-01; /* 0x3FE62E42, 0xFEFA39EF */ { double t; int hx; - hx = __HI(x); + union { int i[2]; double d; } ux; + + ux.d = x; + hx = ux.i[HIWORD]; if(hx<0x3ff00000) { /* x < 1 */ return (x-x)/(x-x); } else if(hx >=0x41b00000) { /* x > 2**28 */ @@ -53,13 +56,13 @@ ln2 = 6.93147180559945286227e-01; /* 0x3FE62E42, 0xFEFA39EF */ return x+x; } else return __ieee754_log(x)+ln2; /* acosh(huge)=log(2x) */ - } else if(((hx-0x3ff00000)|__LO(x))==0) { + } else if(((hx-0x3ff00000)|ux.i[LOWORD])==0) { return 0.0; /* acosh(1) = 0 */ } else if (hx > 0x40000000) { /* 2**28 > x > 2 */ t=x*x; return __ieee754_log(2.0*x-one/(x+sqrt(t-one))); } else { /* 1<x<2 */ t = x-one; - return log1p(t+sqrt(2.0*t+t*t)); + return fdlibm_log1p(t+sqrt(2.0*t+t*t)); } } diff --git a/src/lisp/e_atanh.c b/src/lisp/e_atanh.c index 302a89f..3588436 100644 --- a/src/lisp/e_atanh.c +++ b/src/lisp/e_atanh.c @@ -50,19 +50,24 @@ static double zero = 0.0; double t; int hx,ix; unsigned lx; - hx = __HI(x); /* high word */ - lx = __LO(x); /* low word */ + union { int i[2]; double d; } ux; + + ux.d = x; + hx = ux.i[HIWORD]; /* high word */ + lx = ux.i[LOWORD]; /* low word */ ix = hx&0x7fffffff; if ((ix|((lx|(-lx))>>31))>0x3ff00000) /* |x|>1 */ return (x-x)/(x-x); if(ix==0x3ff00000) return x/zero; if(ix<0x3e300000&&(huge+x)>zero) return x; /* x<2**-28 */ - __HI(x) = ix; /* x <- |x| */ + ux.d = x; + ux.i[HIWORD] = ix; /* x <- |x| */ + x = ux.d; if(ix<0x3fe00000) { /* x < 0.5 */ t = x+x; - t = 0.5*log1p(t+t*x/(one-x)); + t = 0.5*fdlibm_log1p(t+t*x/(one-x)); } else - t = 0.5*log1p((x+x)/(one-x)); + t = 0.5*fdlibm_log1p((x+x)/(one-x)); if(hx>=0) return t; else return -t; } diff --git a/src/lisp/fdlibm.h b/src/lisp/fdlibm.h index 325d7d4..72f57f8 100644 --- a/src/lisp/fdlibm.h +++ b/src/lisp/fdlibm.h @@ -52,7 +52,9 @@ extern double fdlibm_sin(double x); extern double fdlibm_cos(double x); extern double fdlibm_tan(double x); extern double fdlibm_expm1(double x); +extern double fdlibm_log1p(double x); extern double __ieee754_exp(double x); +extern double __ieee754_log(double x); #endif diff --git a/src/lisp/s_asinh.c b/src/lisp/s_asinh.c index c809467..6cae81f 100644 --- a/src/lisp/s_asinh.c +++ b/src/lisp/s_asinh.c @@ -34,15 +34,18 @@ ln2 = 6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */ huge= 1.00000000000000000000e+300; #ifdef __STDC__ - double asinh(double x) + double fdlibm_asinh(double x) #else - double asinh(x) + double fdlibm_asinh(x) double x; #endif { double t,w; int hx,ix; - hx = __HI(x); + union { int i[2]; double d; } ux; + + ux.d = x; + hx = ux.i[HIWORD]; ix = hx&0x7fffffff; if(ix>=0x7ff00000) return x+x; /* x is inf or NaN */ if(ix< 0x3e300000) { /* |x|<2**-28 */ @@ -55,7 +58,7 @@ huge= 1.00000000000000000000e+300; w = __ieee754_log(2.0*t+one/(sqrt(x*x+one)+t)); } else { /* 2.0 > |x| > 2**-28 */ t = x*x; - w =log1p(fabs(x)+t/(one+sqrt(one+t))); + w =fdlibm_log1p(fabs(x)+t/(one+sqrt(one+t))); } if(hx>0) return w; else return -w; } commit 1b876280ab1774cb36fb63906c58cd5af1e5d230 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Aug 2 15:17:58 2014 -0700 Import inverse hyperbolic functions from fdlibm, as is. diff --git a/src/lisp/e_acosh.c b/src/lisp/e_acosh.c new file mode 100644 index 0000000..6839554 --- /dev/null +++ b/src/lisp/e_acosh.c @@ -0,0 +1,65 @@ + +/* @(#)e_acosh.c 1.3 95/01/18 */ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunSoft, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + * + */ + +/* __ieee754_acosh(x) + * Method : + * Based on + * acosh(x) = log [ x + sqrt(x*x-1) ] + * we have + * acosh(x) := log(x)+ln2, if x is large; else + * acosh(x) := log(2x-1/(sqrt(x*x-1)+x)) if x>2; else + * acosh(x) := log1p(t+sqrt(2.0*t+t*t)); where t=x-1. + * + * Special cases: + * acosh(x) is NaN with signal if x<1. + * acosh(NaN) is NaN without signal. + */ + +#include "fdlibm.h" + +#ifdef __STDC__ +static const double +#else +static double +#endif +one = 1.0, +ln2 = 6.93147180559945286227e-01; /* 0x3FE62E42, 0xFEFA39EF */ + +#ifdef __STDC__ + double __ieee754_acosh(double x) +#else + double __ieee754_acosh(x) + double x; +#endif +{ + double t; + int hx; + hx = __HI(x); + if(hx<0x3ff00000) { /* x < 1 */ + return (x-x)/(x-x); + } else if(hx >=0x41b00000) { /* x > 2**28 */ + if(hx >=0x7ff00000) { /* x is inf of NaN */ + return x+x; + } else + return __ieee754_log(x)+ln2; /* acosh(huge)=log(2x) */ + } else if(((hx-0x3ff00000)|__LO(x))==0) { + return 0.0; /* acosh(1) = 0 */ + } else if (hx > 0x40000000) { /* 2**28 > x > 2 */ + t=x*x; + return __ieee754_log(2.0*x-one/(x+sqrt(t-one))); + } else { /* 1<x<2 */ + t = x-one; + return log1p(t+sqrt(2.0*t+t*t)); + } +} diff --git a/src/lisp/e_atanh.c b/src/lisp/e_atanh.c new file mode 100644 index 0000000..302a89f --- /dev/null +++ b/src/lisp/e_atanh.c @@ -0,0 +1,68 @@ + +/* @(#)e_atanh.c 1.3 95/01/18 */ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunSoft, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + * + */ + +/* __ieee754_atanh(x) + * Method : + * 1.Reduced x to positive by atanh(-x) = -atanh(x) + * 2.For x>=0.5 + * 1 2x x + * atanh(x) = --- * log(1 + -------) = 0.5 * log1p(2 * --------) + * 2 1 - x 1 - x + * + * For x<0.5 + * atanh(x) = 0.5*log1p(2x+2x*x/(1-x)) + * + * Special cases: + * atanh(x) is NaN if |x| > 1 with signal; + * atanh(NaN) is that NaN with no signal; + * atanh(+-1) is +-INF with signal. + * + */ + +#include "fdlibm.h" + +#ifdef __STDC__ +static const double one = 1.0, huge = 1e300; +#else +static double one = 1.0, huge = 1e300; +#endif + +static double zero = 0.0; + +#ifdef __STDC__ + double __ieee754_atanh(double x) +#else + double __ieee754_atanh(x) + double x; +#endif +{ + double t; + int hx,ix; + unsigned lx; + hx = __HI(x); /* high word */ + lx = __LO(x); /* low word */ + ix = hx&0x7fffffff; + if ((ix|((lx|(-lx))>>31))>0x3ff00000) /* |x|>1 */ + return (x-x)/(x-x); + if(ix==0x3ff00000) + return x/zero; + if(ix<0x3e300000&&(huge+x)>zero) return x; /* x<2**-28 */ + __HI(x) = ix; /* x <- |x| */ + if(ix<0x3fe00000) { /* x < 0.5 */ + t = x+x; + t = 0.5*log1p(t+t*x/(one-x)); + } else + t = 0.5*log1p((x+x)/(one-x)); + if(hx>=0) return t; else return -t; +} diff --git a/src/lisp/s_asinh.c b/src/lisp/s_asinh.c new file mode 100644 index 0000000..c809467 --- /dev/null +++ b/src/lisp/s_asinh.c @@ -0,0 +1,61 @@ + +/* @(#)s_asinh.c 1.3 95/01/18 */ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunSoft, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +/* asinh(x) + * Method : + * Based on + * asinh(x) = sign(x) * log [ |x| + sqrt(x*x+1) ] + * we have + * asinh(x) := x if 1+x*x=1, + * := sign(x)*(log(x)+ln2)) for large |x|, else + * := sign(x)*log(2|x|+1/(|x|+sqrt(x*x+1))) if|x|>2, else + * := sign(x)*log1p(|x| + x^2/(1 + sqrt(1+x^2))) + */ + +#include "fdlibm.h" + +#ifdef __STDC__ +static const double +#else +static double +#endif +one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ +ln2 = 6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */ +huge= 1.00000000000000000000e+300; + +#ifdef __STDC__ + double asinh(double x) +#else + double asinh(x) + double x; +#endif +{ + double t,w; + int hx,ix; + hx = __HI(x); + ix = hx&0x7fffffff; + if(ix>=0x7ff00000) return x+x; /* x is inf or NaN */ + if(ix< 0x3e300000) { /* |x|<2**-28 */ + if(huge+x>one) return x; /* return x inexact except 0 */ + } + if(ix>0x41b00000) { /* |x| > 2**28 */ + w = __ieee754_log(fabs(x))+ln2; + } else if (ix>0x40000000) { /* 2**28 > |x| > 2.0 */ + t = fabs(x); + w = __ieee754_log(2.0*t+one/(sqrt(x*x+one)+t)); + } else { /* 2.0 > |x| > 2**-28 */ + t = x*x; + w =log1p(fabs(x)+t/(one+sqrt(one+t))); + } + if(hx>0) return w; else return -w; +} ----------------------------------------------------------------------- Summary of changes: src/lisp/e_acosh.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ src/lisp/e_atanh.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/lisp/fdlibm.h | 2 ++ src/lisp/s_asinh.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 207 insertions(+) create mode 100644 src/lisp/e_acosh.c create mode 100644 src/lisp/e_atanh.c create mode 100644 src/lisp/s_asinh.c hooks/post-receive -- CMU Common Lisp

1 0