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

[Git][cmucl/cmucl][master] 2 commits: Address #336: get-nil-indexed-object returns object and validp value
by Raymond Toy (＠rtoy) 20 Jul '24

20 Jul '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: e31f4716 by Raymond Toy at 2024-07-20T02:07:48+00:00 Address #336: get-nil-indexed-object returns object and validp value - - - - - 75ddf400 by Raymond Toy at 2024-07-20T02:07:54+00:00 Merge branch 'issue-336-2-fix-compiler-notes' into 'master' Address #336: get-nil-indexed-object returns object and validp value See merge request cmucl/cmucl!235 - - - - - 1 changed file: - src/compiler/disassem.lisp Changes: ===================================== src/compiler/disassem.lisp ===================================== @@ -3609,7 +3609,12 @@ symbol object that we know about.") (defun get-nil-indexed-object (byte-offset) "Returns the lisp object located BYTE-OFFSET from NIL." (declare (type offset byte-offset)) - (kernel:make-lisp-obj (+ nil-addr byte-offset))) + (values (kernel:make-lisp-obj (+ nil-addr byte-offset)) + ;; Assume NIL indexed objects only come from the static + ;; space, so the byte offset must be in the static space + (<= 0 byte-offset + (- (* lisp::*static-space-free-pointer* vm:word-bytes) + (lisp::static-space-start))))) (defun get-code-constant (byte-offset dstate) "Returns two values; the lisp-object located at BYTE-OFFSET in the constant @@ -3787,11 +3792,13 @@ symbol object that we know about.") disassembled. Returns non-NIL iff a note was recorded." (declare (type offset nil-byte-offset) (type disassem-state dstate)) - (let ((obj (get-nil-indexed-object nil-byte-offset))) - (note #'(lambda (stream) - (prin1-quoted-short obj stream)) - dstate) - t)) + (multiple-value-bind (obj validp) + (get-nil-indexed-object nil-byte-offset) + (when validp + (note #'(lambda (stream) + (prin1-quoted-short obj stream)) + dstate)) + validp)) (defun maybe-note-assembler-routine (address note-address-p dstate) "If ADDRESS is the address of a primitive assembler routine or View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b7b29443aac68dad6a0fc1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/b7b29443aac68dad6a0fc1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-340-srctran-use-ascii-limit] 5 commits: Address #336: Fix compiler warnings in srctran.lisp
by Raymond Toy (＠rtoy) 20 Jul '24

20 Jul '24

Raymond Toy pushed to branch issue-340-srctran-use-ascii-limit at cmucl / cmucl Commits: a85f2a01 by Raymond Toy at 2024-07-17T16:44:16+00:00 Address #336: Fix compiler warnings in srctran.lisp - - - - - ba2176ab by Raymond Toy at 2024-07-17T16:44:27+00:00 Merge branch 'issue-336-1-fix-compiler-notes' into 'master' Address #336: Fix compiler warnings in srctran.lisp See merge request cmucl/cmucl!233 - - - - - 61fd177a by Raymond Toy at 2024-07-20T02:01:13+00:00 Fix #337: Import lisp::+ascii-limit+ to the C package - - - - - b7b29443 by Raymond Toy at 2024-07-20T02:01:16+00:00 Merge branch 'issue-337-cross-compile-linux-x86-fails' into 'master' Fix #337: Import lisp::+ascii-limit+ to the C package Closes #337 See merge request cmucl/cmucl!234 - - - - - 2caed26f by Raymond Toy at 2024-07-19T19:05:01-07:00 Merge branch 'master' into issue-340-srctran-use-ascii-limit - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/98fd0f9a7fa9ed4478d8ce… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/98fd0f9a7fa9ed4478d8ce… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-340-srctran-use-ascii-limit] Revert the change to the version features
by Raymond Toy (＠rtoy) 20 Jul '24

20 Jul '24

Raymond Toy pushed to branch issue-340-srctran-use-ascii-limit at cmucl / cmucl Commits: 98fd0f9a by Raymond Toy at 2024-07-19T19:04:36-07:00 Revert the change to the version features We'll do that in a different merge. - - - - - 1 changed file: - src/tools/cross-scripts/cross-x86-x86.lisp Changes: ===================================== src/tools/cross-scripts/cross-x86-x86.lisp ===================================== @@ -21,7 +21,7 @@ :conservative-float-type :hash-new :random-xoroshiro ; RNG - :cmu :cmu21 :cmu21e ; Version features + :cmu :cmu20 :cmu20a ; Version features :double-double ; double-double float support ) ;; Features to remove from current *features* here. Normally don't View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/98fd0f9a7fa9ed4478d8ce0… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/98fd0f9a7fa9ed4478d8ce0… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #337: Import lisp::+ascii-limit+ to the C package
by Raymond Toy (＠rtoy) 20 Jul '24

20 Jul '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 61fd177a by Raymond Toy at 2024-07-20T02:01:13+00:00 Fix #337: Import lisp::+ascii-limit+ to the C package - - - - - b7b29443 by Raymond Toy at 2024-07-20T02:01:16+00:00 Merge branch 'issue-337-cross-compile-linux-x86-fails' into 'master' Fix #337: Import lisp::+ascii-limit+ to the C package Closes #337 See merge request cmucl/cmucl!234 - - - - - 3 changed files: - .gitlab-ci.yml - src/code/exports.lisp - src/compiler/srctran.lisp Changes: ===================================== .gitlab-ci.yml ===================================== @@ -52,6 +52,32 @@ linux:build: # describe return something that make-dist.sh doesn't like. - bin/make-dist.sh -V `git describe --dirty` -I dist linux-4 +linux:cross-build: + stage: build + tags: + - linux + artifacts: + paths: + - xdist/ + - linux-2/*.log + - linux-3/*.log + - linux-4/*.log + needs: + + # Normally need the linux:install stage to get the compiler to + # use. But for #337, we need the normal build from linux:build to + # do the cross-compile. Once the snapshot is made, we can use + # linux:install instead. + - job: linux:build + #- job: linux:install + artifacts: true + script: + - bin/create-target.sh xtarget + - bin/create-target.sh xcross + - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp dist/bin/lisp + - bin/build.sh -b xlinux $bootstrap -R -C "" -o xtarget/lisp/lisp + - bin/make-dist.sh -V `git describe --dirty` -I xdist xlinux-4 + linux:test: stage: test tags: @@ -67,6 +93,21 @@ linux:test: script: - bin/run-unit-tests.sh -l dist/bin/lisp 2>&1 | tee test.log +linux:cross-test: + stage: test + tags: + - linux + artifacts: + paths: + - ansi-test/test.out + - cross-test.log + needs: + # Needs artifacts from build (dist/) + - job: linux:cross-build + artifacts: true + script: + - bin/run-unit-tests.sh -l xdist/bin/lisp 2>&1 | tee cross-test.log + linux:ansi-test: stage: ansi-test tags: ===================================== src/code/exports.lisp ===================================== @@ -1067,7 +1067,8 @@ "CHAR-TITLECASE" "TITLE-CASE-P" "GLYPH" "SGLYPH" "STRING-TO-NFC" - "CODEPOINT-LIMIT" "CODEPOINT") + "CODEPOINT-LIMIT" "CODEPOINT" + "+ASCII-LIMIT+") ;; Unicode (:export "STRING-TO-NFC" "STRING-TO-NFD" "STRING-TO-NFKC" "STRING-TO-NFKD" @@ -1858,7 +1859,8 @@ "%SP-STRING-COMPARE" "%SVSET" "%TYPEP" "SHORT-FLOAT-P" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*" - "STRING>*" "STRING>=*") + "STRING>*" "STRING>=*" + "+ASCII-LIMIT+") (:import-from "SYSTEM" "FOREIGN-SYMBOL-ADDRESS" "FOREIGN-SYMBOL-CODE-ADDRESS" "FOREIGN-SYMBOL-DATA-ADDRESS") (:import-from "EXTENSIONS" ===================================== src/compiler/srctran.lisp ===================================== @@ -3335,7 +3335,7 @@ '(let ((m (char-code x))) (cond ((<= (char-code #\a) m (char-code #\z)) (code-char (logxor m #x20))) - ((> m lisp::+ascii-limit+) + ((> m +ascii-limit+) (code-char (lisp::case-mapping-upper-case m))) (t x)))) @@ -3349,7 +3349,7 @@ '(let ((m (char-code x))) (cond ((<= (char-code #\A) m (char-code #\Z)) (code-char (logxor m #x20))) - ((> m lisp::+ascii-limit+) + ((> m +ascii-limit+) (code-char (lisp::case-mapping-lower-case m))) (t x)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/ba2176abe77531cdd4c246… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/ba2176abe77531cdd4c246… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-341-update-version-feature-for-xcompile
by Raymond Toy (＠rtoy) 20 Jul '24

20 Jul '24

Raymond Toy pushed new branch issue-341-update-version-feature-for-xcompile at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-341-update-version-… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-337-cross-compile-linux-x86-fails] Revert the change to the version features
by Raymond Toy (＠rtoy) 20 Jul '24

20 Jul '24

Raymond Toy pushed to branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl Commits: f48dcfc0 by Raymond Toy at 2024-07-19T18:24:20-07:00 Revert the change to the version features We'll do that in a different merge. - - - - - 1 changed file: - src/tools/cross-scripts/cross-x86-x86.lisp Changes: ===================================== src/tools/cross-scripts/cross-x86-x86.lisp ===================================== @@ -21,7 +21,7 @@ :conservative-float-type :hash-new :random-xoroshiro ; RNG - :cmu :cmu21 :cmu21e ; Version features + :cmu :cmu20 :cmu20a ; Version features :double-double ; double-double float support ) ;; Features to remove from current *features* here. Normally don't View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f48dcfc0d74ba9041f882f3… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f48dcfc0d74ba9041f882f3… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-340-srctran-use-ascii-limit
by Raymond Toy (＠rtoy) 19 Jul '24

19 Jul '24

Raymond Toy pushed new branch issue-340-srctran-use-ascii-limit at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-340-srctran-use-asc… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-337-cross-compile-linux-x86-fails] Use different directory when rebuilding lisp with the cross-compiler
by Raymond Toy (＠rtoy) 19 Jul '24

19 Jul '24

Raymond Toy pushed to branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl Commits: 9a46eb81 by Raymond Toy at 2024-07-18T19:34:36-07:00 Use different directory when rebuilding lisp with the cross-compiler Not sure what's going on, but let's just do the normal build (using the cross-compiled result) using different base directory name. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -75,8 +75,8 @@ linux:cross-build: - bin/create-target.sh xtarget - bin/create-target.sh xcross - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp dist/bin/lisp - - bin/build.sh $bootstrap -R -C "" -o xtarget/lisp/lisp - - bin/make-dist.sh -V `git describe --dirty` -I xdist linux-4 + - bin/build.sh -b xlinux $bootstrap -R -C "" -o xtarget/lisp/lisp + - bin/make-dist.sh -V `git describe --dirty` -I xdist xlinux-4 linux:test: stage: test View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9a46eb816dc87ca1b9f9bbc… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9a46eb816dc87ca1b9f9bbc… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-337-cross-compile-linux-x86-fails] Actually use the build from linux:build for cross-compiling
by Raymond Toy (＠rtoy) 18 Jul '24

18 Jul '24

Raymond Toy pushed to branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl Commits: 05421c98 by Raymond Toy at 2024-07-18T06:55:03-07:00 Actually use the build from linux:build for cross-compiling Forgot to change the compiler to dist/bin/lisp instead of the snapshot. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -74,7 +74,7 @@ linux:cross-build: script: - bin/create-target.sh xtarget - bin/create-target.sh xcross - - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp + - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp dist/bin/lisp - bin/build.sh $bootstrap -R -C "" -o xtarget/lisp/lisp - bin/make-dist.sh -V `git describe --dirty` -I xdist linux-4 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/05421c985d37b5f10aa18ba… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/05421c985d37b5f10aa18ba… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-337-cross-compile-linux-x86-fails] 2 commits: Import lisp::+ascii-limit+ to the C package
by Raymond Toy (＠rtoy) 18 Jul '24

18 Jul '24

Raymond Toy pushed to branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl Commits: 4bb23b29 by Raymond Toy at 2024-07-18T06:29:53-07:00 Import lisp::+ascii-limit+ to the C package Revert the previous changes, leaving `+ascii-limit+` in the `lisp` package. But then import it into the `C` package. For this to work, the compiler using for cross-compiling has to have this change already. - - - - - 8ada0f1e by Raymond Toy at 2024-07-18T06:35:36-07:00 Update CI to use the linux:build as the cross-compiling lisp. - - - - - 6 changed files: - .gitlab-ci.yml - src/code/char.lisp - src/code/exports.lisp - src/code/unicode.lisp - src/compiler/srctran.lisp - src/i18n/locale/cmucl.pot Changes: ===================================== .gitlab-ci.yml ===================================== @@ -63,7 +63,13 @@ linux:cross-build: - linux-3/*.log - linux-4/*.log needs: - - job: linux:install + + # Normally need the linux:install stage to get the compiler to + # use. But for #337, we need the normal build from linux:build to + # do the cross-compile. Once the snapshot is made, we can use + # linux:install instead. + - job: linux:build + #- job: linux:install artifacts: true script: - bin/create-target.sh xtarget ===================================== src/code/char.lisp ===================================== @@ -59,6 +59,11 @@ (deftype codepoint () `(integer 0 (,codepoint-limit))) +(defconstant +ascii-limit+ + 127 + "A character code strictly larger than this is handled using Unicode + rules.") + ;; Table of mappings for upper case and lower case letters. See ;; src/lisp/case-mapping.c. (alien:def-alien-variable "case_mapping" @@ -255,7 +260,7 @@ (let ((m (char-code (the base-char char)))) (or (<= (char-code #\space ) m (char-code #\~)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (>= (unicode-category m) +unicode-category-graphic+)))))) @@ -267,7 +272,7 @@ (or (<= (char-code #\A) m (char-code #\Z)) (<= (char-code #\a) m (char-code #\z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (<= +unicode-category-letter+ (unicode-category m) (+ +unicode-category-letter+ #x0F)))))) @@ -279,7 +284,7 @@ (let ((m (char-code char))) (or (<= (char-code #\A) m (char-code #\Z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (not (zerop (ldb +lower-case-entry+ (case-mapping-entry m)))))))) @@ -290,7 +295,7 @@ (let ((m (char-code char))) (or (<= (char-code #\a) m (char-code #\z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (not (zerop (ldb +upper-case-entry+ (case-mapping-entry m)))))))) (defun both-case-p (char) @@ -302,7 +307,7 @@ (or (<= (char-code #\A) m (char-code #\Z)) (<= (char-code #\a) m (char-code #\z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (not (zerop (case-mapping-entry m))))))) @@ -336,7 +341,7 @@ (<= (char-code #\A) m (char-code #\Z)) (<= (char-code #\a) m (char-code #\z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (<= +unicode-category-letter+ (unicode-category m) (+ +unicode-category-letter+ #x0F)))))) @@ -409,7 +414,7 @@ (cond ((<= (char-code #\A) ch (char-code #\Z)) (logxor ch #x20)) #+(and unicode (not unicode-bootstrap)) - ((> ch c::+ascii-limit+) + ((> ch +ascii-limit+) (case-mapping-lower-case ch)) (t ch)))) ===================================== src/code/exports.lisp ===================================== @@ -1067,7 +1067,8 @@ "CHAR-TITLECASE" "TITLE-CASE-P" "GLYPH" "SGLYPH" "STRING-TO-NFC" - "CODEPOINT-LIMIT" "CODEPOINT") + "CODEPOINT-LIMIT" "CODEPOINT" + "+ASCII-LIMIT+") ;; Unicode (:export "STRING-TO-NFC" "STRING-TO-NFD" "STRING-TO-NFKC" "STRING-TO-NFKD" @@ -1858,7 +1859,8 @@ "%SP-STRING-COMPARE" "%SVSET" "%TYPEP" "SHORT-FLOAT-P" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*" - "STRING>*" "STRING>=*") + "STRING>*" "STRING>=*" + "+ASCII-LIMIT+") (:import-from "SYSTEM" "FOREIGN-SYMBOL-ADDRESS" "FOREIGN-SYMBOL-CODE-ADDRESS" "FOREIGN-SYMBOL-DATA-ADDRESS") (:import-from "EXTENSIONS" ===================================== src/code/unicode.lisp ===================================== @@ -495,7 +495,7 @@ (cond ((<= (char-code #\a) m (char-code #\z)) (code-char (logxor m #x20))) #+(and unicode (not unicode-bootstrap)) - ((> m c::+ascii-limit+) + ((> m lisp::+ascii-limit+) (code-char (lisp::unicode-title m))) (t char)))) @@ -506,7 +506,7 @@ (let ((m (char-code char))) (or (<= (char-code #\A) m (char-code #\Z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m lisp::+ascii-limit+) (= (unicode-category m) +unicode-category-title+))))) (defun string-capitalize-unicode (string &key (start 0) end (casing :simple)) ===================================== src/compiler/srctran.lisp ===================================== @@ -21,11 +21,6 @@ (in-package "C") (intl:textdomain "cmucl") -(defconstant +ascii-limit+ - 127 - "A character code strictly larger than this is handled using Unicode - rules.") - ;;; Source transform for Not, Null -- Internal ;;; ;;; Convert into an IF so that IF optimizations will eliminate redundant @@ -1814,8 +1809,7 @@ (round-it pos))))))) (defun round-derive-type-quot (number-type divisor-type) - (let* ((rem-type (rem-result-type number-type divisor-type)) - (number-interval (numeric-type->interval number-type)) + (let* ((number-interval (numeric-type->interval number-type)) (divisor-interval (numeric-type->interval divisor-type))) (let ((quot (round-quotient-bound (interval-div number-interval @@ -1824,9 +1818,7 @@ ,(or (interval-high quot) '*)))))) (defun round-derive-type-rem (number-type divisor-type) - (let* ((rem-type (rem-result-type number-type divisor-type)) - (number-interval (numeric-type->interval number-type)) - (divisor-interval (numeric-type->interval divisor-type))) + (let* ((rem-type (rem-result-type number-type divisor-type))) (multiple-value-bind (class format) (ecase rem-type (integer @@ -1840,13 +1832,6 @@ (values 'float nil)) (real (values nil nil))) - #+nil - (when (member rem-type '(float single-float double-float - #+long-float long-float - #+double-double double-double-float)) - (setf rem (interval-func #'(lambda (x) - (coerce x rem-type)) - rem))) (make-numeric-type :class class :format format :low nil ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -5443,6 +5443,12 @@ msgstr "" msgid "The upper exclusive bound on the value of a Unicode codepoint" msgstr "" +#: src/code/char.lisp +msgid "" +"A character code strictly larger than this is handled using Unicode\n" +" rules." +msgstr "" + #: src/code/char.lisp msgid "" "Number of bits used for the index of the second stage table of the\n" @@ -19149,12 +19155,6 @@ msgstr "" msgid "FOREIGN-SYMBOL-ADDRESS flavor ~S is not :CODE or :DATA" msgstr "" -#: src/compiler/srctran.lisp -msgid "" -"A character code strictly larger than this is handled using Unicode\n" -" rules." -msgstr "" - #: src/compiler/srctran.lisp msgid "Function doesn't have fixed argument count." msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/92732c62ca7118fa87c172… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/92732c62ca7118fa87c172… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0