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

[Git][cmucl/cmucl][issue-156-add-two-arg-ge-le] Add bootstrap file for CI
by Raymond Toy (＠rtoy) 02 Mar '23

02 Mar '23

Raymond Toy pushed to branch issue-156-add-two-arg-ge-le at cmucl / cmucl Commits: 9ca44f6d by Raymond Toy at 2023-03-02T10:41:16-08:00 Add bootstrap file for CI Forgot to add boot-2021-07-3.lisp that's required to add the new static functions for x86. - - - - - 2 changed files: - .gitlab-ci.yml - + src/bootfiles/21d/boot-2021-07-3.lisp Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,7 +1,7 @@ variables: download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/2021/07" version: "2021-07-x86" - bootstrap: "-B boot-2021-07-1 -B boot-2021-07-2" + bootstrap: "-B boot-2021-07-1 -B boot-2021-07-2 -B boot-2021-07-3" stages: - install ===================================== src/bootfiles/21d/boot-2021-07-3.lisp ===================================== @@ -0,0 +1,14 @@ +;; Bootstrap file for x86 to add two-arg->= and two-arg-<= to static +;; functions list. +;; +;; Use bin/build.sh -B boot-2021-07-3 to build this (along with any +;; other bootfiles that are still needed). +(in-package :x86) +#+x86 +(ext:without-package-locks + (defparameter static-functions + '(length + two-arg-+ two-arg-- two-arg-* two-arg-/ two-arg-< two-arg-> two-arg-= eql + %negate two-arg-and two-arg-ior two-arg-xor two-arg-gcd two-arg-lcm + two-arg-<= two-arg->= two-arg-/= + ))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9ca44f6d211c5e7624f4e89… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9ca44f6d211c5e7624f4e89… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-156-add-vops-for-ge-le] Fix typo: :naa should be :nae
by Raymond Toy (＠rtoy) 02 Mar '23

02 Mar '23

Raymond Toy pushed to branch issue-156-add-vops-for-ge-le at cmucl / cmucl Commits: 62d141d7 by Raymond Toy at 2023-03-01T17:09:05-08:00 Fix typo: :naa should be :nae - - - - - 1 changed file: - src/compiler/x86/float-sse2.lisp Changes: ===================================== src/compiler/x86/float-sse2.lisp ===================================== @@ -978,7 +978,7 @@ (frob < double comisd :b :nb) (frob <= double comisd :be :nbe) (frob > double comisd :a :na) - (frob >= double comisd :ae :naa)) + (frob >= double comisd :ae :nae)) ;;;; Conversion: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/62d141d795281b5bfe99752… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/62d141d795281b5bfe99752… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-156-add-two-arg-ge-le
by Raymond Toy (＠rtoy) 01 Mar '23

01 Mar '23

Raymond Toy pushed new branch issue-156-add-two-arg-ge-le at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-156-add-two-arg-ge-… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-156-add-vops-for-ge-le
by Raymond Toy (＠rtoy) 01 Mar '23

01 Mar '23

Raymond Toy pushed new branch issue-156-add-vops-for-ge-le at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-156-add-vops-for-ge… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Update cmucl.pot
by Raymond Toy (＠rtoy) 01 Mar '23

01 Mar '23

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 80f89a62 by Raymond Toy at 2023-02-28T21:20:02-08:00 Update cmucl.pot We forgot to update this when adding --version command line option. - - - - - 1 changed file: - src/i18n/locale/cmucl.pot Changes: ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -6153,6 +6153,10 @@ msgstr "" msgid "Prints the cmucl version and exits" msgstr "" +#: src/code/commandline.lisp +msgid "Prints the cmucl version and exits; same as -version" +msgstr "" + #: src/code/env-access.lisp msgid "" "Returns information about the symbol VAR in the lexical environment ENV.\n" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/80f89a62d10176604e5c664… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/80f89a62d10176604e5c664… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #163: Add -version command line switch
by Raymond Toy (＠rtoy) 01 Mar '23

01 Mar '23

Raymond Toy pushed to branch master at cmucl / cmucl Commits: ca9b6e0c by Raymond Toy at 2023-03-01T03:43:18+00:00 Fix #163: Add -version command line switch - - - - - 3f4e2d0c by Raymond Toy at 2023-03-01T03:43:19+00:00 Merge branch 'issue-163-add-command-line-version' into 'master' Fix #163: Add -version command line switch Closes #163 See merge request cmucl/cmucl!112 - - - - - 3 changed files: - src/code/commandline.lisp - src/code/save.lisp - src/i18n/locale/cmucl.pot Changes: ===================================== src/code/commandline.lisp ===================================== @@ -394,3 +394,17 @@ (defswitch "-help" #'help-switch-demon "Same as -help.") + +(defun version-switch-demon (switch) + (declare (ignore switch)) + (format t "~A~%" (lisp-implementation-version)) + (ext:quit)) + +(defswitch "version" #'version-switch-demon + "Prints the cmucl version and exits") + +;; Make --version work for the benefit of those who are accustomed to +;; GNU software. +(defswitch "-version" #'version-switch-demon + "Prints the cmucl version and exits; same as -version") + ===================================== src/code/save.lisp ===================================== @@ -336,8 +336,12 @@ *gc-verbose* nil)) (when (and process-command-line (or (find-switch "help") - (find-switch "-help"))) - ;; Don't load any init files if -help or --help is given + (find-switch "-help") + (find-switch "version") + (find-switch "-version"))) + ;; Don't load any init files if -help, --help, + ;; -version, or --version is given. These exit right + ;; away, so loading the init file is wasteful. (setf site-init nil) (setf load-init-file nil)) (when (and site-init ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -6149,6 +6149,10 @@ msgstr "" msgid "Same as -help." msgstr "" +#: src/code/commandline.lisp +msgid "Prints the cmucl version and exits" +msgstr "" + #: src/code/env-access.lisp msgid "" "Returns information about the symbol VAR in the lexical environment ENV.\n" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/68ef4c5b2708fd3c26e93d… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/68ef4c5b2708fd3c26e93d… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-163-add-command-line-version] Better comment.
by Raymond Toy (＠rtoy) 01 Mar '23

01 Mar '23

Raymond Toy pushed to branch issue-163-add-command-line-version at cmucl / cmucl Commits: 17c15601 by Carl S. Shapiro at 2023-03-01T03:10:22+00:00 Better comment. - - - - - 1 changed file: - src/code/commandline.lisp Changes: ===================================== src/code/commandline.lisp ===================================== @@ -403,8 +403,8 @@ (defswitch "version" #'version-switch-demon "Prints the cmucl version and exits") -;; Make --version work too since that's a common command line option -;; for GNU software. +;; Make --version work for the benefit of those who are accustomed to +;; GNU software. (defswitch "-version" #'version-switch-demon "Prints the cmucl version and exits; same as -version") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/17c15601aa9e17e7ce79de5… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/17c15601aa9e17e7ce79de5… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #170: reduce duplicated code for x86 float-compares
by Raymond Toy (＠rtoy) 01 Mar '23

01 Mar '23

Raymond Toy pushed to branch master at cmucl / cmucl Commits: a25354e9 by Raymond Toy at 2023-03-01T03:08:58+00:00 Fix #170: reduce duplicated code for x86 float-compares - - - - - 68ef4c5b by Raymond Toy at 2023-03-01T03:09:00+00:00 Merge branch 'issue-170-clean-up-x86-float-compare' into 'master' Fix #170: reduce duplicated code for x86 float-compares Closes #170 See merge request cmucl/cmucl!122 - - - - - 1 changed file: - src/compiler/x86/float-sse2.lisp Changes: ===================================== src/compiler/x86/float-sse2.lisp ===================================== @@ -901,130 +901,80 @@ ;;; comiss and comisd can cope with one or other arg in memory: we ;;; could (should, indeed) extend these to cope with descriptor args ;;; and stack args +(macrolet + ((frob (name sc ptype) + `(define-vop (,name float-compare) + (:args (x :scs (,sc)) + (y :scs (,sc descriptor-reg))) + (:arg-types ,ptype ,ptype)))) + (frob single-float-compare single-reg single-float) + (frob double-float-compare double-reg double-float)) -(define-vop (single-float-compare float-compare) - (:args (x :scs (single-reg)) (y :scs (single-reg descriptor-reg))) - (:conditional) - (:arg-types single-float single-float)) -(define-vop (double-float-compare float-compare) - (:args (x :scs (double-reg)) (y :scs (double-reg descriptor-reg))) - (:conditional) - (:arg-types double-float double-float)) - -(define-vop (=/single-float single-float-compare) - (:translate =) - (:info target not-p) - (:vop-var vop) - (:generator 3 - (note-this-location vop :internal-error) - (sc-case y - (single-reg - (inst ucomiss x y)) - (descriptor-reg - (inst ucomiss x (ea-for-sf-desc y)))) - ;; if PF&CF, there was a NaN involved => not equal - ;; otherwise, ZF => equal - (cond (not-p - (inst jmp :p target) - (inst jmp :ne target)) - (t - (let ((not-lab (gen-label))) - (inst jmp :p not-lab) - (inst jmp :e target) - (emit-label not-lab)))))) - -(define-vop (=/double-float double-float-compare) - (:translate =) - (:info target not-p) - (:vop-var vop) - (:generator 3 - (note-this-location vop :internal-error) - (sc-case y - (double-reg - (inst ucomisd x y)) - (descriptor-reg - (inst ucomisd x (ea-for-df-desc y)))) - (cond (not-p - (inst jmp :p target) - (inst jmp :ne target)) - (t - (let ((not-lab (gen-label))) - (inst jmp :p not-lab) - (inst jmp :e target) - (emit-label not-lab)))))) - -(define-vop (</double-float double-float-compare) - (:translate <) - (:info target not-p) - (:generator 3 - (sc-case y - (double-reg - (inst comisd x y)) - (descriptor-reg - (inst comisd x (ea-for-df-desc y)))) - (cond (not-p - (inst jmp :p target) - (inst jmp :nc target)) - (t - (let ((not-lab (gen-label))) - (inst jmp :p not-lab) - (inst jmp :c target) - (emit-label not-lab)))))) - -(define-vop (</single-float single-float-compare) - (:translate <) - (:info target not-p) - (:generator 3 - (sc-case y - (single-reg - (inst comiss x y)) - (descriptor-reg - (inst comiss x (ea-for-sf-desc y)))) - (cond (not-p - (inst jmp :p target) - (inst jmp :nc target)) - (t - (let ((not-lab (gen-label))) - (inst jmp :p not-lab) - (inst jmp :c target) - (emit-label not-lab)))))) - -(define-vop (>/double-float double-float-compare) - (:translate >) - (:info target not-p) - (:generator 3 - (sc-case y - (double-reg - (inst comisd x y)) - (descriptor-reg - (inst comisd x (ea-for-df-desc y)))) - (cond (not-p - (inst jmp :p target) - (inst jmp :na target)) - (t - (let ((not-lab (gen-label))) - (inst jmp :p not-lab) - (inst jmp :a target) - (emit-label not-lab)))))) - -(define-vop (>/single-float single-float-compare) - (:translate >) - (:info target not-p) - (:generator 3 - (sc-case y - (single-reg - (inst comiss x y)) - (descriptor-reg - (inst comiss x (ea-for-sf-desc y)))) - (cond (not-p - (inst jmp :p target) - (inst jmp :na target)) - (t - (let ((not-lab (gen-label))) - (inst jmp :p not-lab) - (inst jmp :a target) - (emit-label not-lab)))))) +(macrolet + ((frob (size inst) + (let ((ea (ecase size + (single + 'ea-for-sf-desc) + (double + 'ea-for-df-desc))) + (name (symbolicate "=/" size "-FLOAT")) + (sc-type (symbolicate size "-REG")) + (inherit (symbolicate size "-FLOAT-COMPARE"))) + `(define-vop (,name ,inherit) + (:translate =) + (:info target not-p) + (:vop-var vop) + (:generator 3 + (note-this-location vop :internal-error) + (sc-case y + (,sc-type + (inst ,inst x y)) + (descriptor-reg + (inst ,inst x (,ea y)))) + ;; if PF&CF, there was a NaN involved => not equal + ;; otherwise, ZF => equal + (cond (not-p + (inst jmp :p target) + (inst jmp :ne target)) + (t + (let ((not-lab (gen-label))) + (inst jmp :p not-lab) + (inst jmp :e target) + (emit-label not-lab))))))))) + (frob single ucomiss) + (frob double ucomisd)) +(macrolet + ((frob (op size inst yep nope) + (let ((ea (ecase size + (single + 'ea-for-sf-desc) + (double + 'ea-for-df-desc))) + (name (symbolicate op "/" size "-FLOAT")) + (sc-type (symbolicate size "-REG")) + (inherit (symbolicate size "-FLOAT-COMPARE"))) + `(define-vop (,name ,inherit) + (:translate ,op) + (:info target not-p) + (:generator 3 + (sc-case y + (,sc-type + (inst ,inst x y)) + (descriptor-reg + (inst ,inst x (,ea y)))) + (cond (not-p + (inst jmp :p target) + (inst jmp ,nope target)) + (t + (let ((not-lab (gen-label))) + (inst jmp :p not-lab) + (inst jmp ,yep target) + (emit-label not-lab))))))))) + (frob < single comiss :b :nb) + (frob > single comiss :a :na) + (frob < double comisd :b :nb) + (frob > double comisd :a :na)) ;;;; Conversion: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/6ba270b2d4b70c37d4bd36… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/6ba270b2d4b70c37d4bd36… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-163-add-command-line-version] Add comment about adding --version
by Raymond Toy (＠rtoy) 28 Feb '23

28 Feb '23

Raymond Toy pushed to branch issue-163-add-command-line-version at cmucl / cmucl Commits: 1d9b25b2 by Raymond Toy at 2023-02-28T11:58:30-08:00 Add comment about adding --version It's added because it's a common command line option for GNU. - - - - - 1 changed file: - src/code/commandline.lisp Changes: ===================================== src/code/commandline.lisp ===================================== @@ -403,7 +403,8 @@ (defswitch "version" #'version-switch-demon "Prints the cmucl version and exits") -;; Make --version work too since that's a common option. +;; Make --version work too since that's a common command line option +;; for GNU software. (defswitch "-version" #'version-switch-demon - "Prints the cmucl version and exits") + "Prints the cmucl version and exits; same as -version") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1d9b25b290a9955742ec7ca… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/1d9b25b290a9955742ec7ca… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-170-clean-up-x86-float-compare] Keep single-float/double-float cases together
by Raymond Toy (＠rtoy) 28 Feb '23

28 Feb '23

Raymond Toy pushed to branch issue-170-clean-up-x86-float-compare at cmucl / cmucl Commits: 8d18d306 by Raymond Toy at 2023-02-28T11:46:39-08:00 Keep single-float/double-float cases together Just minor reordering the of the float compare frobs; keep the single-float and double-float cases together instead of ordering them by the operation. I find this easier to read and think about. - - - - - 1 changed file: - src/compiler/x86/float-sse2.lisp Changes: ===================================== src/compiler/x86/float-sse2.lisp ===================================== @@ -972,8 +972,8 @@ (inst jmp ,yep target) (emit-label not-lab))))))))) (frob < single comiss :b :nb) - (frob < double comisd :b :nb) (frob > single comiss :a :na) + (frob < double comisd :b :nb) (frob > double comisd :a :na)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8d18d306a79505c3874c1b0… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/8d18d306a79505c3874c1b0… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0