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

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-08-1-gd523020
by Raymond Toy 05 Aug '12

05 Aug '12

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 d52302047c19a31092fdc02ca7c29963bf4d33ec (commit) from 0609ed422540f6c3e6840c600b9aea9671475ecd (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 d52302047c19a31092fdc02ca7c29963bf4d33ec Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Aug 5 16:32:21 2012 -0700 Support Lion and Mountain Lion which return x86-64 for uname -m. diff --git a/bin/make-dist.sh b/bin/make-dist.sh index b38f924..feb47a4 100755 --- a/bin/make-dist.sh +++ b/bin/make-dist.sh @@ -73,7 +73,7 @@ def_arch_os () { OS=darwin # x86 or ppc? case `uname -m` in - i386) ARCH=x86 ;; + i386|x86_64) ARCH=x86 ;; *) ARCH=ppc ;; esac ;; NetBSD) ----------------------------------------------------------------------- Summary of changes: bin/make-dist.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp annotated tag snapshot-2012-08 created. snapshot-2012-08
by Raymond Toy 05 Aug '12

05 Aug '12

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-2012-08 has been created at af4069aaad9590c3659a03cf40c2652ddd7ebaa8 (tag) tagging 0609ed422540f6c3e6840c600b9aea9671475ecd (commit) replaces snapshot-2012-07 tagged by Raymond Toy on Sun Aug 5 10:35:01 2012 -0700 - Log ----------------------------------------------------------------- Snapshot 2012-08 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) iEYEABECAAYFAlAerssACgkQJ5IjUmgZO7KC/gCghz1ycIGvIUVPG4XsNBjQYv1p G6cAoLg3enPVFJySuDuuFpSsioVHJTk2 =lyNh -----END PGP SIGNATURE----- Raymond Toy (16): Clean up alloc overflow routine. Cross-compile needed. Remove old inline allocation function and corresponding assembly routines. Clean up not-inline-allocation. Change url to www.cmucl.org. Clean up and correct some comments. Fix possible stack corruption caused by possibly not allocating enough Add -R option to force recompilation of C runtime. Fix ticket:61, using option 2. Remove comment about compiling with clang, which now works fine. Update to asdf 2.23. * Remove comments about gcc-4.2. gcc or clang should work. Recognize x86_64 (for OSX Lion). Update. Merge branch 'master' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl Add note that OSX Lion can compile cmucl. Add note that OSX 10.4 is no longer supported. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-07-16-g0609ed4
by Raymond Toy 04 Aug '12

04 Aug '12

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 0609ed422540f6c3e6840c600b9aea9671475ecd (commit) from a3e696a84115d2880712983d7d665035dbe5f262 (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 0609ed422540f6c3e6840c600b9aea9671475ecd Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Aug 3 21:57:38 2012 -0700 Add note that OSX 10.4 is no longer supported. diff --git a/src/general-info/release-20d.txt b/src/general-info/release-20d.txt index 42aefd9..da2f979 100644 --- a/src/general-info/release-20d.txt +++ b/src/general-info/release-20d.txt @@ -51,6 +51,7 @@ New in this release: caused the exception to be immediately signaled. This no longer happens and now matches how ppc and sparc behave. * OSX Lion and XCode 4 can now compile cmucl without problems. + * OSX 10.4 is no longer supported. * ANSI compliance fixes: * CMUCL was not printing pathnames like (make-pathname :directory ----------------------------------------------------------------------- Summary of changes: src/general-info/release-20d.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-07-15-ga3e696a
by Raymond Toy 04 Aug '12

04 Aug '12

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 a3e696a84115d2880712983d7d665035dbe5f262 (commit) from 4937b238ccc8c92c4c4db007499e794e4863404f (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 a3e696a84115d2880712983d7d665035dbe5f262 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Aug 3 21:41:20 2012 -0700 Add note that OSX Lion can compile cmucl. diff --git a/src/general-info/release-20d.txt b/src/general-info/release-20d.txt index 3b21f1a..42aefd9 100644 --- a/src/general-info/release-20d.txt +++ b/src/general-info/release-20d.txt @@ -50,6 +50,7 @@ New in this release: enabling a trap when the current exception also listed that trap caused the exception to be immediately signaled. This no longer happens and now matches how ppc and sparc behave. + * OSX Lion and XCode 4 can now compile cmucl without problems. * ANSI compliance fixes: * CMUCL was not printing pathnames like (make-pathname :directory ----------------------------------------------------------------------- Summary of changes: src/general-info/release-20d.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-07-14-g4937b23
by Raymond Toy 04 Aug '12

04 Aug '12

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 4937b238ccc8c92c4c4db007499e794e4863404f (commit) via 31b5915a71aa773522aaccf7b82f0ac622a01024 (commit) via 72e45c7cc6bd85ee97da12dce06245a4bb9793f2 (commit) from 55805e97ba4f651a13f65d72ceb5398fe1cacef8 (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 4937b238ccc8c92c4c4db007499e794e4863404f Merge: 31b5915 55805e9 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Aug 3 21:39:13 2012 -0700 Merge branch 'master' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl commit 31b5915a71aa773522aaccf7b82f0ac622a01024 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Aug 3 21:28:21 2012 -0700 Update. diff --git a/src/i18n/locale/cmucl.pot b/src/i18n/locale/cmucl.pot index 6a45d45..e338251 100644 --- a/src/i18n/locale/cmucl.pot +++ b/src/i18n/locale/cmucl.pot @@ -6698,7 +6698,7 @@ msgid " on " msgstr "" #: src/code/save.lisp -msgid "See <http://www.cons.org/cmucl/> for support information." +msgid "See <http://www.cmucl.org/> for support information." msgstr "" #: src/code/save.lisp commit 72e45c7cc6bd85ee97da12dce06245a4bb9793f2 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Aug 3 21:27:36 2012 -0700 Recognize x86_64 (for OSX Lion). diff --git a/bin/create-target.sh b/bin/create-target.sh index 477f636..7da3941 100755 --- a/bin/create-target.sh +++ b/bin/create-target.sh @@ -37,7 +37,7 @@ uname_m=`uname -m 2>/dev/null` Darwin) case $uname_m in ppc) lisp_variant=ppc_darwin ;; - i386) lisp_variant=x86_darwin ;; + i386|x86_64) lisp_variant=x86_darwin ;; esac ;; NetBSD) lisp_variant=x86_netbsd ;; ----------------------------------------------------------------------- Summary of changes: bin/create-target.sh | 2 +- src/i18n/locale/cmucl.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-07-11-g55805e9
by Raymond Toy 03 Aug '12

03 Aug '12

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 55805e97ba4f651a13f65d72ceb5398fe1cacef8 (commit) from 3db9313fc2da525dcc3923dd7ec20f015e9a5f79 (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 55805e97ba4f651a13f65d72ceb5398fe1cacef8 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Aug 3 09:57:27 2012 -0700 * Remove comments about gcc-4.2. gcc or clang should work. * Min OSX version is 10.5 now. Don't have access to anything older than 10.5 anyway. diff --git a/src/lisp/Config.x86_darwin b/src/lisp/Config.x86_darwin index e1daf4f..f50a857 100644 --- a/src/lisp/Config.x86_darwin +++ b/src/lisp/Config.x86_darwin @@ -2,14 +2,8 @@ include Config.x86_common -# Use gcc-4.2 on Darwin in case someone has Xcode 4 installed. -# Currently there are bugs in cmucl that cause errors when using gcc -# from Xcode 4. Xcode 3 (for OSX 10.5 and 10.6) has gcc-4.2, so this -# shouldn't be a problem. -CC = gcc-4.2 - -# Compile code that will run on OSX 10.4 (Tiger) -MIN_VER = -mmacosx-version-min=10.4 +# Compile code that will run on OSX 10.5 (Tiger) +MIN_VER = -mmacosx-version-min=10.5 CPPFLAGS += -DDARWIN $(MIN_VER) -m32 CFLAGS += -g3 ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.x86_darwin | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-07-10-g3db9313
by Raymond Toy 18 Jul '12

18 Jul '12

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 3db9313fc2da525dcc3923dd7ec20f015e9a5f79 (commit) from 6180b3963ea5a38ef9f2f82bc53995e6dba349c1 (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 3db9313fc2da525dcc3923dd7ec20f015e9a5f79 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Jul 17 23:09:21 2012 -0700 Update to asdf 2.23. diff --git a/src/contrib/asdf/asdf.lisp b/src/contrib/asdf/asdf.lisp index 5981f67..263bb5e 100644 --- a/src/contrib/asdf/asdf.lisp +++ b/src/contrib/asdf/asdf.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*- -;;; This is ASDF 2.22: Another System Definition Facility. +;;; This is ASDF 2.23: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel(a)common-lisp.net>. @@ -116,7 +116,7 @@ ;; "2.345.6" would be a development version in the official upstream ;; "2.345.0.7" would be your seventh local modification of official release 2.345 ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6 - (asdf-version "2.22") + (asdf-version "2.23") (existing-asdf (find-class 'component nil)) (existing-version *asdf-version*) (already-there (equal asdf-version existing-version))) @@ -371,7 +371,8 @@ #:coerce-name #:directory-pathname-p #:ensure-directory-pathname #:absolute-pathname-p #:ensure-pathname-absolute #:pathname-root - #:getenv + #:getenv #:getenv-pathname #:getenv-pathname + #:getenv-absolute-directory #:getenv-absolute-directories #:probe-file* #:find-symbol* #:strcat #:make-pathname-component-logical #:make-pathname-logical @@ -2464,11 +2465,11 @@ recursive calls to traverse.") (*compile-file-failure-behaviour* (operation-on-failure operation))) (multiple-value-bind (output warnings-p failure-p) (call-with-around-compile-hook - c #'(lambda () + c #'(lambda (&rest flags) (apply *compile-op-compile-file-function* source-file :output-file output-file :external-format (component-external-format c) - (compile-op-flags operation)))) + (append flags (compile-op-flags operation))))) (unless output (error 'compile-error :component c :operation operation)) (when failure-p @@ -3290,37 +3291,44 @@ located." #+mcl (current-user-homedir-pathname) #-mcl (user-homedir-pathname)))) -(defun* ensure-absolute-pathname* (x fmt &rest args) - (and (plusp (length x)) - (or (absolute-pathname-p x) - (cerror "ignore relative pathname" - "Invalid relative pathname ~A~@[ ~?~]" x fmt args)) - x)) -(defun* split-absolute-pathnames (x fmt &rest args) +(defun* ensure-pathname* (x want-absolute want-directory fmt &rest args) + (when (plusp (length x)) + (let ((p (if want-directory (ensure-directory-pathname x) (pathname x)))) + (when want-absolute + (unless (absolute-pathname-p p) + (cerror "ignore relative pathname" + "Invalid relative pathname ~A~@[ ~?~]" x fmt args) + (return-from ensure-pathname* nil))) + p))) +(defun* split-pathnames* (x want-absolute want-directory fmt &rest args) (loop :for dir :in (split-string x :separator (string (inter-directory-separator))) - :do (apply 'ensure-absolute-pathname* dir fmt args) - :collect dir)) -(defun getenv-absolute-pathname (x &aux (s (getenv x))) - (ensure-absolute-pathname* s "from (getenv ~S)" x)) -(defun getenv-absolute-pathnames (x &aux (s (getenv x))) + :collect (apply 'ensure-pathname* dir want-absolute want-directory fmt args))) +(defun getenv-pathname (x &key want-absolute want-directory &aux (s (getenv x))) + (ensure-pathname* s want-absolute want-directory "from (getenv ~S)" x)) +(defun getenv-pathnames (x &key want-absolute want-directory &aux (s (getenv x))) (and (plusp (length s)) - (split-absolute-pathnames s "from (getenv ~S) = ~S" x s))) + (split-pathnames* s want-absolute want-directory "from (getenv ~S) = ~S" x s))) +(defun getenv-absolute-directory (x) + (getenv-pathname x :want-absolute t :want-directory t)) +(defun getenv-absolute-directories (x) + (getenv-pathnames x :want-absolute t :want-directory t)) + (defun* user-configuration-directories () (let ((dirs `(,@(when (os-unix-p) (cons - (subpathname* (getenv-absolute-pathname "XDG_CONFIG_HOME") "common-lisp/") - (loop :for dir :in (getenv-absolute-pathnames "XDG_CONFIG_DIRS") + (subpathname* (getenv-absolute-directory "XDG_CONFIG_HOME") "common-lisp/") + (loop :for dir :in (getenv-absolute-directories "XDG_CONFIG_DIRS") :collect (subpathname* dir "common-lisp/")))) ,@(when (os-windows-p) `(,(subpathname* (or #+lispworks (sys:get-folder-path :local-appdata) - (getenv-absolute-pathname "LOCALAPPDATA")) + (getenv-absolute-directory "LOCALAPPDATA")) "common-lisp/config/") ;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\AppData ,(subpathname* (or #+lispworks (sys:get-folder-path :appdata) - (getenv-absolute-pathname "APPDATA")) + (getenv-absolute-directory "APPDATA")) "common-lisp/config/"))) ,(subpathname (user-homedir) ".config/common-lisp/")))) (remove-duplicates (remove-if-not #'absolute-pathname-p dirs) @@ -3333,8 +3341,8 @@ located." (aif ;; read-windows-registry HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders\Common AppData (subpathname* (or #+lispworks (sys:get-folder-path :common-appdata) - (getenv-absolute-pathname "ALLUSERSAPPDATA") - (subpathname* (getenv-absolute-pathname "ALLUSERSPROFILE") "Application Data/")) + (getenv-absolute-directory "ALLUSERSAPPDATA") + (subpathname* (getenv-absolute-directory "ALLUSERSPROFILE") "Application Data/")) "common-lisp/config/") (list it))))) @@ -3458,12 +3466,12 @@ and the order is by decreasing length of namestring of the source pathname.") (defvar *user-cache* (flet ((try (x &rest sub) (and x `(,x ,@sub)))) (or - (try (getenv-absolute-pathname "XDG_CACHE_HOME") "common-lisp" :implementation) + (try (getenv-absolute-directory "XDG_CACHE_HOME") "common-lisp" :implementation) (when (os-windows-p) (try (or #+lispworks (sys:get-folder-path :local-appdata) - (getenv-absolute-pathname "LOCALAPPDATA") + (getenv-absolute-directory "LOCALAPPDATA") #+lispworks (sys:get-folder-path :appdata) - (getenv-absolute-pathname "APPDATA")) + (getenv-absolute-directory "APPDATA")) "common-lisp" "cache" :implementation)) '(:home ".cache" "common-lisp" :implementation)))) @@ -3687,8 +3695,8 @@ Please remove it from your ASDF configuration")) `(:output-translations ;; Some implementations have precompiled ASDF systems, ;; so we must disable translations for implementation paths. - #+sbcl ,(let ((h (getenv "SBCL_HOME"))) - (when (plusp (length h)) `((,(truenamize h) ,*wild-inferiors*) ()))) + #+sbcl ,(let ((h (getenv-pathname "SBCL_HOME" :want-directory t))) + (when h `((,(truenamize h) ,*wild-inferiors*) ()))) ;; The below two are not needed: no precompiled ASDF system there #+ecl (,(translate-logical-pathname "SYS:**;*.*") ()) ;; #+clozure ,(ignore-errors (list (wilden (let ((*default-pathname-defaults* #p"")) (truename #p"ccl:"))) ())) @@ -3882,12 +3890,13 @@ effectively disabling the output translation facility." (when (and x (probe-file* x)) (delete-file x))) -(defun* compile-file* (input-file &rest keys &key output-file &allow-other-keys) - (let* ((output-file (apply 'compile-file-pathname* input-file :output-file output-file keys)) +(defun* compile-file* (input-file &rest keys &key compile-check output-file &allow-other-keys) + (let* ((keywords (remove-keyword :compile-check keys)) + (output-file (apply 'compile-file-pathname* input-file :output-file output-file keywords)) (tmp-file (tmpize-pathname output-file)) (status :error)) (multiple-value-bind (output-truename warnings-p failure-p) - (apply 'compile-file input-file :output-file tmp-file keys) + (apply 'compile-file input-file :output-file tmp-file keywords) (cond (failure-p (setf status *compile-file-failure-behaviour*)) @@ -3895,15 +3904,19 @@ effectively disabling the output translation facility." (setf status *compile-file-warnings-behaviour*)) (t (setf status :success))) - (ecase status - ((:success :warn :ignore) + (cond + ((and (ecase status + ((:success :warn :ignore) t) + ((:error nil))) + (or (not compile-check) + (apply compile-check input-file :output-file tmp-file keywords))) (delete-file-if-exists output-file) (when output-truename (rename-file output-truename output-file) (setf output-truename output-file))) - (:error + (t ;; error or failed check (delete-file-if-exists output-truename) - (setf output-truename nil))) + (setf output-truename nil failure-p t))) (values output-truename warnings-p failure-p)))) #+abcl @@ -4179,7 +4192,7 @@ with a different configuration, so the configuration would be re-read then." (defun* wrapping-source-registry () `(:source-registry - #+sbcl (:tree ,(truenamize (getenv "SBCL_HOME"))) + #+sbcl (:tree ,(truenamize (getenv-pathname "SBCL_HOME" :want-directory t))) :inherit-configuration #+cmu (:tree #p"modules:") #+scl (:tree #p"file://modules/"))) @@ -4189,18 +4202,18 @@ with a different configuration, so the configuration would be re-read then." (:directory ,(default-directory)) ,@(loop :for dir :in `(,@(when (os-unix-p) - `(,(or (getenv-absolute-pathname "XDG_DATA_HOME") + `(,(or (getenv-absolute-directory "XDG_DATA_HOME") (subpathname (user-homedir) ".local/share/")) - ,@(or (getenv-absolute-pathnames "XDG_DATA_DIRS") + ,@(or (getenv-absolute-directories "XDG_DATA_DIRS") '("/usr/local/share" "/usr/share")))) ,@(when (os-windows-p) `(,(or #+lispworks (sys:get-folder-path :local-appdata) - (getenv-absolute-pathname "LOCALAPPDATA")) + (getenv-absolute-directory "LOCALAPPDATA")) ,(or #+lispworks (sys:get-folder-path :appdata) - (getenv-absolute-pathname "APPDATA")) + (getenv-absolute-directory "APPDATA")) ,(or #+lispworks (sys:get-folder-path :common-appdata) - (getenv-absolute-pathname "ALLUSERSAPPDATA") - (subpathname* (getenv-absolute-pathname "ALLUSERSPROFILE") "Application Data/"))))) + (getenv-absolute-directory "ALLUSERSAPPDATA") + (subpathname* (getenv-absolute-directory "ALLUSERSPROFILE") "Application Data/"))))) :collect `(:directory ,(subpathname* dir "common-lisp/systems/")) :collect `(:tree ,(subpathname* dir "common-lisp/source/"))) :inherit-configuration)) diff --git a/src/general-info/release-20d.txt b/src/general-info/release-20d.txt index 5444383..3b21f1a 100644 --- a/src/general-info/release-20d.txt +++ b/src/general-info/release-20d.txt @@ -30,7 +30,7 @@ New in this release: * Added external format for EUC-KR. * Changes - * ASDF2 updated to version 2.22. + * ASDF2 updated to version 2.23. * Behavior of STRING-TO-OCTETS has changed. This is an incompatible change from the previous version but should be more useful when a buffer is given which is not large enough to hold ----------------------------------------------------------------------- Summary of changes: src/contrib/asdf/asdf.lisp | 99 +++++++++++++++++++++---------------- src/general-info/release-20d.txt | 2 +- 2 files changed, 57 insertions(+), 44 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-07-9-g6180b39
by Raymond Toy 18 Jul '12

18 Jul '12

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 6180b3963ea5a38ef9f2f82bc53995e6dba349c1 (commit) via 40b532c59cd9ff6d48588ed8c36880a625009142 (commit) from ebb2b74c4b31d9e28432993958657c67bef50f0d (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 6180b3963ea5a38ef9f2f82bc53995e6dba349c1 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Jul 17 20:13:39 2012 -0700 Remove comment about compiling with clang, which now works fine. diff --git a/src/lisp/Config.x86_common b/src/lisp/Config.x86_common index edf4476..ea52b94 100644 --- a/src/lisp/Config.x86_common +++ b/src/lisp/Config.x86_common @@ -45,23 +45,9 @@ ifdef FEATURE_UNICODE CPP_DEFINE_OPTIONS += -DUNICODE endif -# Default to using gcc +# Default to using gcc. But clang also works. CC = gcc -# But we can use clang. -# -# However, clang seems to want to use SSE instructions in various -# places, but we DON'T want that because we need a lisp that will run -# on chips without sse. -# -# But on Mac, every machine has SSE2 so we can use SSE2. However, -# there's some code path through GC or allocation where we aren't -# saving the FPU state so after GC or allocation, some XMM FP -# registers are corrupted. -# -# Got that? - -#CC = clang -mno-sse LD = ld commit 40b532c59cd9ff6d48588ed8c36880a625009142 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Jul 17 20:11:13 2012 -0700 Fix ticket:61, using option 2. src/lisp/gencgc.c: o Save and restore the FPU state in alloc(). src/compiler/x86/alloc.lisp src/compiler/x86/array.lisp src/compiler/x86/call.lisp src/compiler/x86/float-sse2.lisp src/compiler/x86/float.lisp src/compiler/x86/move.lisp src/compiler/x86/sap.lisp: o Don't need to use :save-p anymore because the allocation routine saves an live registers anyway. This improves code generation as well. src/general-info/release-20d.txt: o Update. diff --git a/src/compiler/x86/alloc.lisp b/src/compiler/x86/alloc.lisp index bff6d0b..85d95d1 100644 --- a/src/compiler/x86/alloc.lisp +++ b/src/compiler/x86/alloc.lisp @@ -53,7 +53,6 @@ (:variant-vars star) (:policy :safe) (:node-var node) - (:save-p t) (:generator 0 (cond ((zerop num) ;; (move result nil-value) @@ -142,7 +141,6 @@ (:temporary (:sc unsigned-reg :from (:argument 0)) boxed) (:temporary (:sc unsigned-reg :from (:argument 1)) unboxed) (:node-var node) - (:save-p t) (:generator 100 (move boxed boxed-arg) (inst add boxed (fixnumize (1+ code-trace-table-offset-slot))) @@ -171,7 +169,6 @@ (:args (name :scs (descriptor-reg) :to :eval)) (:results (result :scs (descriptor-reg) :from :argument)) (:node-var node) - (:save-p t) (:generator 37 (with-fixed-allocation (result fdefn-type fdefn-size node) (storew name result fdefn-name-slot other-pointer-type) @@ -185,7 +182,6 @@ (:args (name :scs (descriptor-reg) :to :eval)) (:results (result :scs (descriptor-reg) :from :argument)) (:node-var node) - (:save-p t) (:generator 37 (with-fixed-allocation (result fdefn-type fdefn-size node) (storew name result fdefn-name-slot other-pointer-type) @@ -200,7 +196,6 @@ (:temporary (:sc any-reg) temp) (:results (result :scs (descriptor-reg))) (:node-var node) - (:save-p t) (:generator 10 (let ((*enable-pseudo-atomic* (unless dynamic-extent *enable-pseudo-atomic*))) @@ -220,7 +215,6 @@ (:args (value :scs (descriptor-reg any-reg) :to :result)) (:results (result :scs (descriptor-reg) :from :eval)) (:node-var node) - (:save-p t) (:generator 10 (with-fixed-allocation (result value-cell-header-type value-cell-size node) @@ -242,7 +236,6 @@ (:ignore name) (:results (result :scs (descriptor-reg))) (:node-var node) - (:save-p t) (:generator 50 (let ((*enable-pseudo-atomic* (unless dynamic-extent *enable-pseudo-atomic*))) @@ -261,7 +254,6 @@ (:temporary (:sc any-reg :from :eval :to (:eval 1)) bytes) (:temporary (:sc any-reg :from :eval :to :result) header) (:node-var node) - (:save-p t) (:generator 50 (inst lea bytes (make-ea :dword :base extra :disp (* (1+ words) word-bytes))) @@ -287,7 +279,6 @@ (:temporary (:sc unsigned-reg :from :eval) state-addr) (:results (result :scs (descriptor-reg) :from :argument)) (:node-var node) - (:save-p t) (:generator 37 (with-fixed-allocation (result symbol-header-type symbol-size node) (storew name result symbol-name-slot other-pointer-type) diff --git a/src/compiler/x86/array.lisp b/src/compiler/x86/array.lisp index 79b3ad1..ae86e43 100644 --- a/src/compiler/x86/array.lisp +++ b/src/compiler/x86/array.lisp @@ -35,7 +35,6 @@ (:temporary (:sc any-reg :to :result) header) (:results (result :scs (descriptor-reg) :from :eval)) (:node-var node) - (:save-p t) (:generator 13 (inst lea bytes (make-ea :dword :base rank diff --git a/src/compiler/x86/call.lisp b/src/compiler/x86/call.lisp index d0188c9..63104de 100644 --- a/src/compiler/x86/call.lisp +++ b/src/compiler/x86/call.lisp @@ -1365,7 +1365,6 @@ (:temporary (:sc unsigned-reg) dst) (:results (result :scs (descriptor-reg))) (:node-var node) - (:save-p t) (:generator 20 (let ((enter (gen-label)) (loop (gen-label)) diff --git a/src/compiler/x86/float-sse2.lisp b/src/compiler/x86/float-sse2.lisp index 9fe6d5d..f54f072 100644 --- a/src/compiler/x86/float-sse2.lisp +++ b/src/compiler/x86/float-sse2.lisp @@ -413,7 +413,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:single-float-type vm:single-float-size node) (inst movss (ea-for-sf-desc y) x)))) @@ -425,7 +424,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:double-float-type vm:double-float-size node) (inst movsd (ea-for-df-desc y) x)))) @@ -438,7 +436,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:long-float-type vm:long-float-size node) (with-tn@fp-top(x) @@ -501,7 +498,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"complex float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:complex-single-float-type vm:complex-single-float-size node) @@ -514,7 +510,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"complex float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:complex-double-float-type vm:complex-double-float-size node) @@ -529,7 +524,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"complex float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:complex-long-float-type vm:complex-long-float-size node) @@ -549,7 +543,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"complex double-double float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm::complex-double-double-float-type vm::complex-double-double-float-size node) @@ -1570,7 +1563,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"double double float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:double-double-float-type vm:double-double-float-size node) diff --git a/src/compiler/x86/float.lisp b/src/compiler/x86/float.lisp index e0e90b0..e4d5952 100644 --- a/src/compiler/x86/float.lisp +++ b/src/compiler/x86/float.lisp @@ -498,7 +498,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:single-float-type vm:single-float-size node) (with-tn@fp-top(x) @@ -511,7 +510,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:double-float-type vm:double-float-size node) (with-tn@fp-top(x) @@ -525,7 +523,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:long-float-type vm:long-float-size node) (with-tn@fp-top(x) @@ -604,7 +601,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"complex float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:complex-single-float-type vm:complex-single-float-size node) @@ -622,7 +618,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"complex float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:complex-double-float-type vm:complex-double-float-size node) @@ -641,7 +636,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"complex float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:complex-long-float-type vm:complex-long-float-size node) @@ -661,7 +655,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"complex double-double float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm::complex-double-double-float-type vm::complex-double-double-float-size node) @@ -5061,7 +5054,6 @@ (:results (y :scs (descriptor-reg))) (:node-var node) (:note _N"double double float to pointer coercion") - (:save-p t) (:generator 13 (with-fixed-allocation (y vm:double-double-float-type vm:double-double-float-size node) diff --git a/src/compiler/x86/move.lisp b/src/compiler/x86/move.lisp index 7c6f0b9..2ff54ee 100644 --- a/src/compiler/x86/move.lisp +++ b/src/compiler/x86/move.lisp @@ -300,7 +300,6 @@ (:results (y :scs (any-reg descriptor-reg) :from :argument)) (:note _N"signed word to integer coercion") (:node-var node) - (:save-p t) (:generator 20 (assert (not (location= x y))) (let ((bignum (gen-label)) @@ -349,7 +348,6 @@ (:results (y :scs (any-reg descriptor-reg))) (:node-var node) (:note _N"unsigned word to integer coercion") - (:save-p t) (:generator 20 (assert (not (location= x y))) (assert (not (location= x alloc))) diff --git a/src/compiler/x86/sap.lisp b/src/compiler/x86/sap.lisp index 43e1a0e..a01112e 100644 --- a/src/compiler/x86/sap.lisp +++ b/src/compiler/x86/sap.lisp @@ -44,7 +44,6 @@ (:results (res :scs (descriptor-reg) :from :argument)) (:note "SAP to pointer coercion") (:node-var node) - (:save-p t) (:generator 20 (with-fixed-allocation (res sap-type sap-size node) (storew sap res sap-pointer-slot other-pointer-type)))) diff --git a/src/general-info/release-20d.txt b/src/general-info/release-20d.txt index 4f9637e..5444383 100644 --- a/src/general-info/release-20d.txt +++ b/src/general-info/release-20d.txt @@ -94,6 +94,7 @@ New in this release: * #55: blocked signals. * #58: UTF-16 buffering problem. * #60: compile-file and export problem + * #61: Darwin+clang doesn't produce a working lisp * Other changes: * The layout of the cmucl directories has been changed. diff --git a/src/lisp/gencgc.c b/src/lisp/gencgc.c index fc095f8..cab6a0c 100644 --- a/src/lisp/gencgc.c +++ b/src/lisp/gencgc.c @@ -8027,6 +8027,7 @@ void do_pending_interrupt(void); char * alloc(int nbytes) { + void *new_obj; #if !(defined(sparc) || (defined(DARWIN) && defined(__ppc__))) /* * *current-region-free-pointer* is the same as alloc-tn (= @@ -8041,24 +8042,44 @@ alloc(int nbytes) bytes_allocated_sum += nbytes; for (;;) { - void *new_obj; char *new_free_pointer = (void *) (get_current_region_free() + nbytes); if (new_free_pointer <= boxed_region.end_addr) { /* Allocate from the current region. */ new_obj = (void *) get_current_region_free(); set_current_region_free((lispobj) new_free_pointer); - return new_obj; + break; } else if (bytes_allocated <= auto_gc_trigger) { +#if defined(i386) || defined(__x86_64) + /* + * Need to save and restore the FPU registers on x86, but only for + * sse2. See Ticket #61. + * + * Not needed by sparc or ppc because we never call alloc from + * Lisp directly to do allocation. + */ + FPU_STATE(fpu_state); + + if (fpu_mode == SSE2) { + save_fpu_state(fpu_state); + } +#endif /* Call gc_alloc. */ boxed_region.free_pointer = (void *) get_current_region_free(); boxed_region.end_addr = (void *) SymbolValue(CURRENT_REGION_END_ADDR); new_obj = gc_alloc(nbytes); + set_current_region_free((lispobj) boxed_region.free_pointer); set_current_region_end((lispobj) boxed_region.end_addr); - return new_obj; + +#if defined(i386) || defined(__x86_64) + if (fpu_mode == SSE2) { + restore_fpu_state(fpu_state); + } +#endif + break; } else { /* Run GC and try again. */ auto_gc_trigger *= 2; @@ -8070,6 +8091,8 @@ alloc(int nbytes) set_pseudo_atomic_atomic(); } } + + return new_obj; } char * ----------------------------------------------------------------------- Summary of changes: src/compiler/x86/alloc.lisp | 9 --------- src/compiler/x86/array.lisp | 1 - src/compiler/x86/call.lisp | 1 - src/compiler/x86/float-sse2.lisp | 8 -------- src/compiler/x86/float.lisp | 8 -------- src/compiler/x86/move.lisp | 2 -- src/compiler/x86/sap.lisp | 1 - src/general-info/release-20d.txt | 1 + src/lisp/Config.x86_common | 16 +--------------- src/lisp/gencgc.c | 29 ++++++++++++++++++++++++++--- 10 files changed, 28 insertions(+), 48 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-07-7-gebb2b74
by Raymond Toy 18 Jul '12

18 Jul '12

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 ebb2b74c4b31d9e28432993958657c67bef50f0d (commit) from 5e57578ad6f1d02d86379986f79755e993ce2c72 (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 ebb2b74c4b31d9e28432993958657c67bef50f0d Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Jul 17 19:51:28 2012 -0700 Add -R option to force recompilation of C runtime. diff --git a/bin/build-all.sh b/bin/build-all.sh index 8455de6..4585f37 100755 --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -34,12 +34,13 @@ usage () echo " -U Update and overwite the translations files." echo " -P On the last build, (re)generate cmucl.pot and the" echo " translations" + echo " -R Force recompilation of C runtime" } CREATE_OPT="" UPDATE_POT="-P" -while getopts "PUB:b:v:C:o:8:?" arg +while getopts "PRUB:b:v:C:o:8:?" arg do case $arg in b) BASE="$OPTARG" ;; @@ -50,6 +51,7 @@ do v) VERSION="$OPTARG"; VERSION_SET=true ;; U) UPDATE_TRANS="-U" ;; P) UPDATE_POT="" ;; + R) RECOMPILEC="-R" ;; \?) usage; exit 1 ;; esac done @@ -81,15 +83,15 @@ buildx86 () if [ -n "$OLD8" ]; then # Build non-unicode versions set -x - $BINDIR/build.sh -f x87 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" - $BINDIR/build.sh -f sse2 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" + $BINDIR/build.sh -f x87 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} -o "$OLD8" + $BINDIR/build.sh -f sse2 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} -o "$OLD8" set +x fi # Build the unicode versions if [ -n "$OLDLISP" ]; then set -x - $BINDIR/build.sh -f x87 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" - $BINDIR/build.sh -f sse2 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" + $BINDIR/build.sh -f x87 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} -o "$OLDLISP" + $BINDIR/build.sh -f sse2 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} -o "$OLDLISP" set +x fi } @@ -102,13 +104,13 @@ buildsun4 () # Build non-unicode versions if [ -n "$OLD8" ]; then set -x - $BINDIR/build.sh -b ${BASE}-8bit $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLD8" + $BINDIR/build.sh -b ${BASE}-8bit $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} -o "$OLD8" set +x fi # Build the unicode version. if [ -n "$OLDLISP" ]; then set -x - $BINDIR/build.sh -b ${BASE} $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} -o "$OLDLISP" + $BINDIR/build.sh -b ${BASE} $bootfiles ${VERS} -C "$CREATE_OPT" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} -o "$OLDLISP" set +x fi } diff --git a/src/general-info/release-20d.txt b/src/general-info/release-20d.txt index 631fcca..4f9637e 100644 --- a/src/general-info/release-20d.txt +++ b/src/general-info/release-20d.txt @@ -102,6 +102,8 @@ New in this release: in Xcode 4. * Add -R option to build.sh to force recompiling the C runtime. (Default it to compile only what is changed.) + * Add -R option to build-all.sh to force recompiling the C + runtime. * Improvements to the PCL implementation of CLOS: ----------------------------------------------------------------------- Summary of changes: bin/build-all.sh | 16 +++++++++------- src/general-info/release-20d.txt | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-07-6-g5e57578
by Raymond Toy 18 Jul '12

18 Jul '12

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 5e57578ad6f1d02d86379986f79755e993ce2c72 (commit) via ea2dae80bcc9be55607ce8d9b62c268db53e98c5 (commit) from 5a06638f9d7e8309d4bb8eee49436489d5ce525f (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 5e57578ad6f1d02d86379986f79755e993ce2c72 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Jul 17 19:35:23 2012 -0700 Fix possible stack corruption caused by possibly not allocating enough stack space to hold the SSE2 state. (Forgot to add extra bytes for 16-byte alignment!) diff --git a/src/lisp/x86-assem.S b/src/lisp/x86-assem.S index 34c1ef0..57b69c0 100644 --- a/src/lisp/x86-assem.S +++ b/src/lisp/x86-assem.S @@ -172,7 +172,11 @@ FUNCDEF(call_into_lisp) cmp $2, %eax # SSE2 mode? jne x87_save movl %esp, %eax # Remember the current stack pointer - subl $512,%esp # Make room for the SSE state + /* + * The SSE state is 512 bytes, but we need 16 more because we + * need 16-byte alignment. + */ + subl $512+16,%esp andl $-16, %esp # fxsave needs 16-byte alignment fxsave (%esp) pushl %eax # Save the old stack pointer @@ -194,7 +198,7 @@ x87_save: fldcw (%esp) # Recover modes popl %eax npx_save_done: - + /* Is this still necessary with sse2? */ fldz # insure no FP regs are empty fldz fldz commit ea2dae80bcc9be55607ce8d9b62c268db53e98c5 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Jul 17 19:32:17 2012 -0700 Clean up and correct some comments. diff --git a/src/compiler/x86/macros.lisp b/src/compiler/x86/macros.lisp index 21b68e4..ca2c267 100644 --- a/src/compiler/x86/macros.lisp +++ b/src/compiler/x86/macros.lisp @@ -140,22 +140,25 @@ (defun inline-allocation (alloc-tn size) (let ((ok (gen-label)) (done (gen-label))) - ;; + ;; Load the size first so that the size can be in the same ;; register as alloc-tn. (load-size alloc-tn alloc-tn size) - ;; + + ;; Try inline allocation, incrementing the + ;; current-region-free-pointer by the size. If we didn't pass the + ;; end of the region, then inline allocation succeeded, and we're + ;; done. (inst add alloc-tn (make-symbol-value-ea '*current-region-free-pointer*)) (inst cmp alloc-tn (make-symbol-value-ea '*current-region-end-addr*)) (inst jmp :be OK) - ;; Inline allocation didn't work so we need to call alloc, carefully. - - ;; Recompute the size. Can't just reload size because it might - ;; have already been destroyed if size = alloc-tn (which does - ;; happen). + ;; Inline allocation didn't work so we need to call alloc, + ;; carefully. Need to recompute the size because we can't just + ;; reload size because it might have already been destroyed if + ;; size = alloc-tn (which does happen). (inst sub alloc-tn (make-symbol-value-ea '*current-region-free-pointer*)) (case (tn-offset alloc-tn) (#.eax-offset @@ -169,7 +172,7 @@ (inst call (make-fixup (extern-alien-name #-sse2 "alloc_overflow_x87" #+sse2 "alloc_overflow_sse2") :foreign)) - (inst mov alloc-tn eax-tn) ; Save allocated address in alloc-tn + (inst mov alloc-tn eax-tn) ; Put allocated address in alloc-tn (inst pop eax-tn) ; Restore old value of eax (inst jmp done))) @@ -181,8 +184,7 @@ (values)) (defun not-inline-allocation (alloc-tn size) - ;; C call to allocate via dispatch routines. Each destination has a - ;; special entry point. The size may be a register or a constant. + ;; C call to allocate. The size may be a register or a constant. (load-size alloc-tn alloc-tn size) (case (tn-offset alloc-tn) (#.eax-offset diff --git a/src/lisp/x86-assem.S b/src/lisp/x86-assem.S index 9583e84..34c1ef0 100644 --- a/src/lisp/x86-assem.S +++ b/src/lisp/x86-assem.S @@ -484,7 +484,7 @@ FUNCDEF(alloc_overflow_sse2) movl %ecx, 8(%esp) # Save ecx and edx registers movl %edx, 4(%esp) stmxcsr 12(%esp) # Save MXCSR - /* Clear the exceptions that might occurred */ + /* Clear the exceptions that might have occurred */ movl 12(%esp), %edx and $-64, %edx # Clear the exceptions movl %edx, 16(%esp) ----------------------------------------------------------------------- Summary of changes: src/compiler/x86/macros.lisp | 22 ++++++++++++---------- src/lisp/x86-assem.S | 10 +++++++--- 2 files changed, 19 insertions(+), 13 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0