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

[Git][cmucl/cmucl][master] If -dynamic-space-size is 0, use the max heap.
by Raymond Toy 07 Jan '16

07 Jan '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: a5805ca0 by Raymond Toy at 2016-01-06T21:00:07Z If -dynamic-space-size is 0, use the max heap. If the user specifies -dynamic-space-size 0, then use the platform-specific maximum heap size. Update the docstring for the switch too. - - - - - 2 changed files: - src/code/commandline.lisp - src/lisp/lisp.c Changes: ===================================== src/code/commandline.lisp ===================================== --- a/src/code/commandline.lisp +++ b/src/code/commandline.lisp @@ -283,8 +283,9 @@ (defswitch "dynamic-space-size" nil "Specifies the number of megabytes that should be allocated to the - heap. If not specified, a platform-specific default is used. The - actual maximum allowed heap size is platform-specific." + heap. If not specified, a platform-specific default is used. If 0, + the platform-specific maximum heap size is used. The actual maximum + allowed heap size is platform-specific." "megabytes") (defswitch "read-only-space-size" nil ===================================== src/lisp/lisp.c ===================================== --- a/src/lisp/lisp.c +++ b/src/lisp/lisp.c @@ -622,7 +622,16 @@ main(int argc, const char *argv[], const char *envp[]) exit(1); } #ifndef sparc - dynamic_space_size = atoi(str) * 1024 * 1024; + dynamic_space_size = atoi(str); + + /* + * A size of 0 means using the largest possible space + */ + if (dynamic_space_size == 0) { + dynamic_space_size = DYNAMIC_SPACE_SIZE; + } else { + dynamic_space_size *= 1024 * 1024; + } #else { int val; @@ -646,6 +655,9 @@ main(int argc, const char *argv[], const char *envp[]) "Note: Rounding dynamic-space-size from %d MB to %d MB\n", val, dynamic_space_size); } + if (dynamic_space_size == 0) { + dynamic_space_size = DYNAMIC_SPACE_SIZE; + } dynamic_space_size *= 1024 * 1024; } #endif View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/a5805ca073019b470b8b21ac7…

1 0

[Git][cmucl/cmucl][master] 2 commits: Handle search lists in pathname-match-p.
by Raymond Toy 03 Jan '16

03 Jan '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 521f8392 by Raymond Toy at 2015-12-31T15:38:08Z Handle search lists in pathname-match-p. Allow search lists in pathname-match-p. For each arg, we enumerate the possible values of the search list and try to find a match between the path and the wild path. If there's a match, return true. Tests added for some cases of pathname-match-p with search lists. Fix issue #16. - - - - - c7e71ee2 by Raymond Toy at 2016-01-03T18:11:53Z Merge branch 'rtoy-issue-16' into 'master' Handle search lists in pathname-match-p. Allow search lists in pathname-match-p. For each arg, we enumerate the possible values of the search list and try to find a match between the path and the wild path. If there's a match, return true. Tests added for some cases of pathname-match-p with search lists. Fix issue #16. See merge request !6 - - - - - 2 changed files: - src/code/pathname.lisp - + tests/pathname.lisp Changes: ===================================== src/code/pathname.lisp ===================================== --- a/src/code/pathname.lisp +++ b/src/code/pathname.lisp @@ -1227,18 +1227,21 @@ a host-structure or string." ;; Not path-designator because a file-stream can't have a ;; wild pathname. (type (or string pathname) in-wildname)) - (with-pathname (pathname in-pathname) - (with-pathname (wildname in-wildname) - (macrolet ((frob (field &optional (op 'components-match )) - `(or (null (,field wildname)) - (,op (,field pathname) (,field wildname))))) - (and (or (null (%pathname-host wildname)) - (eq (%pathname-host wildname) (%pathname-host pathname))) - (frob %pathname-device) - (frob %pathname-directory directory-components-match) - (frob %pathname-name) - (frob %pathname-type) - (frob %pathname-version)))))) + (with-pathname (in-path in-pathname) + (enumerate-search-list (pathname in-path) + (with-pathname (in-wild in-wildname) + (enumerate-search-list (wildname in-wild) + (macrolet ((frob (field &optional (op 'components-match )) + `(or (null (,field wildname)) + (,op (,field pathname) (,field wildname))))) + (when (and (or (null (%pathname-host wildname)) + (eq (%pathname-host wildname) (%pathname-host pathname))) + (frob %pathname-device) + (frob %pathname-directory directory-components-match) + (frob %pathname-name) + (frob %pathname-type) + (frob %pathname-version)) + (return-from pathname-match-p pathname)))))))) ;;; SUBSTITUTE-INTO -- Internal ===================================== tests/pathname.lisp ===================================== --- /dev/null +++ b/tests/pathname.lisp @@ -0,0 +1,43 @@ +;; Tests for pathnames + +(defpackage :pathname-tests + (:use :cl :lisp-unit)) + +(in-package "PATHNAME-TESTS") + +;; Define "foo:" search list. /tmp and /usr should exist on all unix +;; systems. +(setf (ext:search-list "foo:") + '(#p"/tmp/" #p"/usr/")) + +;; Define "bar:" search list. The second entry should match the +;; second entry of the "foo:" search list. +(setf (ext:search-list "bar:") + '(#p"/bin/" #p"/usr/")) + +(define-test pathname-match-p.search-lists + (:tag :search-list) + ;; Basic tests where the wild path is search-list + + (assert-true (pathname-match-p "/tmp/foo.lisp" "foo:*")) + (assert-true (pathname-match-p "/tmp/zot/foo.lisp" "foo:**/*")) + (assert-true (pathname-match-p "/tmp/zot/foo.lisp" "foo:**/*.lisp")) + ;; These match because the second entry of the "foo:" search list is + ;; "/usr/". + (assert-true (pathname-match-p "/usr/foo.lisp" "foo:*")) + (assert-true (pathname-match-p "/usr/bin/foo" "foo:**/*")) + (assert-true (pathname-match-p "/usr/bin/foo.lisp" "foo:**/*.lisp")) + + ;; This fails because "/bin/" doesn't match any path of the search + ;; list. + (assert-false (pathname-match-p "/bin/foo.lisp" "foo:*")) + + ;; Basic test where the pathname is a search-list and the wild path is not. + (assert-true (pathname-match-p "foo:foo.lisp" "/tmp/*")) + (assert-true (pathname-match-p "foo:foo" "/usr/*")) + (assert-true (pathname-match-p "foo:zot/foo.lisp" "/usr/**/*.lisp")) + + (assert-false (pathname-match-p "foo:foo" "/bin/*")) + + ;; Tests where both args are search-lists. + (assert-true "foo:foo.lisp" "bar:*")) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/f3b73541a4918c50abdc17da…

1 0

[Git][cmucl/cmucl][master] Add special case for (expt 0 power)
by Raymond Toy 01 Jan '16

01 Jan '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: f3b73541 by Raymond Toy at 2016-01-01T09:30:18Z Add special case for (expt 0 power) We know the result of (expt 0 power) so return it immediately without first checking if the power exceeds the limit. Also took the opportunity to add a better message to the intexp-limit-error condition to make it more explicit what is being computed and why it's failing. Tests added too. - - - - - 2 changed files: - src/code/irrat.lisp - tests/irrat.lisp Changes: ===================================== src/code/irrat.lisp ===================================== --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -252,6 +252,13 @@ (return-from intexp base)) (when (eql base -1) (return-from intexp (if (oddp power) -1 1))) + + ;; Handle 0 raised to a power. Return 0 if the power is + ;; non-negative or signal a divide-by-zero if the power is negative. + (when (zerop base) + (if (minusp power) + (error 'division-by-zero) + (return-from intexp base))) (when (> (abs power) *intexp-maximum-exponent*) ;; Allow user the option to continue with calculation, possibly ===================================== tests/irrat.lisp ===================================== --- a/tests/irrat.lisp +++ b/tests/irrat.lisp @@ -152,3 +152,23 @@ for logx = (kernel::dd-%log2 x) for log1/x = (kernel::dd-%log2 (/ x)) do (assert-true (<= (abs (+ logx log1/x)) (* 1 double-float-epsilon))))) + +(define-test expt-integer + (let ((power (1+ kernel::*intexp-maximum-exponent*))) + ;; Make sure we error out in the usual case with the power too + ;; large. + (assert-error 'kernel::intexp-limit-error + (expt 2 power)) + (assert-error 'kernel::intexp-limit-error + (expt 2 (- power))) + ;; But raising 0 or 1 to a power shouldn't signal anything, except + ;; the obvious division-by-zero. + (assert-eql 1 (expt 1 power)) + (cond ((evenp power) + (assert-eql 1 (expt -1 power)) + (assert-eql -1 (expt -1 (1+ power)))) + (t + (assert-eql -1 (expt -1 power)) + (assert-eql 1 (expt -1 (1+ power))))) + (assert-eql 0 (expt 0 power)) + (assert-error 'division-by-zero (expt 0 (- power))))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/f3b73541a4918c50abdc17da4…

1 0

[Git][cmucl/cmucl][master] 2 commits: Regenerated.
by Raymond Toy 01 Jan '16

01 Jan '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 107f067a by Raymond Toy at 2016-01-01T08:26:31Z Regenerated. - - - - - 6162f24e by Raymond Toy at 2016-01-01T09:25:09Z Add more to docstring for set-system-external-format. - - - - - 2 changed files: - src/code/extfmts.lisp - src/i18n/locale/cmucl.pot Changes: ===================================== src/code/extfmts.lisp ===================================== --- a/src/code/extfmts.lisp +++ b/src/code/extfmts.lisp @@ -1133,9 +1133,12 @@ character and illegal outputs are replaced by a question mark.") The standard streams are sys::*stdin*, sys::*stdout*, and sys::*stderr*, which are normally the input and/or output streams for *standard-input* and *standard-output*. Also sets sys::*tty* - (normally *terminal-io* to the given external format. If the - optional argument Filenames is gvien, then the filename encoding is - set to the specified format." + (normally *terminal-io* to the given external format. The value of + *default-external-format* is not changed. + + If the optional argument Filenames is given, then the filename + encoding is set to the specified format, if it has not already been + specified previously." (unless (find-external-format terminal) (error (intl:gettext "Can't find external-format ~S.") terminal)) (setf (stream-external-format sys:*stdin*) terminal ===================================== src/i18n/locale/cmucl.pot ===================================== --- a/src/i18n/locale/cmucl.pot +++ b/src/i18n/locale/cmucl.pot @@ -4729,7 +4729,7 @@ msgstr "" #: src/code/float-trap.lisp msgid "" -"Sets floating-point modes according to the give options and the\n" +"Encode the floating-point modes according to the give options and the\n" " specified mode, Floating-Point-Modes. The resulting new mode is\n" " returned. If a keyword is not supplied, then the current value is\n" " preserved. Possible keywords:\n" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/e28e38cee467fee161d8acba…

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-issue-16
by Raymond Toy 31 Dec '15

31 Dec '15

Raymond Toy pushed new branch rtoy-issue-16 at cmucl / cmucl

1 0

[Git][cmucl/cmucl][master] Add better description of the output of x87-floating-point-modes
by Raymond Toy 31 Dec '15

31 Dec '15

Raymond Toy pushed to branch master at cmucl / cmucl Commits: e28e38ce by Raymond Toy at 2015-12-31T14:02:26Z Add better description of the output of x87-floating-point-modes - - - - - 1 changed file: - src/compiler/x86/float.lisp Changes: ===================================== src/compiler/x86/float.lisp ===================================== --- a/src/compiler/x86/float.lisp +++ b/src/compiler/x86/float.lisp @@ -2340,6 +2340,13 @@ ;; ;; When one of the mask bits (0-5) is set, then that exception is ;; masked so that no exception is generated. +;; +;; Returns the control and status words merged into one. The low 16 +;; bits contains the control word with the exception mask bits +;; inverted to indicate exception enable bits. The high 16 bits +;; contains the status word, but the top 8 bits of the status word are +;; cleared, effectively removing the condition code, top-of-stack +;; bits, and the FPU busy bit. (define-vop (x87-floating-point-modes) (:results (res :scs (unsigned-reg))) (:result-types unsigned-num) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/e28e38cee467fee161d8acba7…

1 0

[Git][cmucl/cmucl][master] Rename %get/%set-floating-point-modes to encode/decode-floating-point-modes.
by Raymond Toy 31 Dec '15

31 Dec '15

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 16ae6709 by Raymond Toy at 2015-12-31T13:08:00Z Rename %get/%set-floating-point-modes to encode/decode-floating-point-modes. - - - - - 2 changed files: - src/code/exports.lisp - src/code/float-trap.lisp Changes: ===================================== src/code/exports.lisp ===================================== --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -1579,10 +1579,10 @@ "DOUBLE-FLOAT-POSITIVE-INFINITY" "LONG-FLOAT-POSITIVE-INFINITY" "SINGLE-FLOAT-NEGATIVE-INFINITY" "SHORT-FLOAT-NEGATIVE-INFINITY" "DOUBLE-FLOAT-NEGATIVE-INFINITY" "LONG-FLOAT-NEGATIVE-INFINITY" - "%GET-FLOATING-POINT-MODES" "GET-FLOATING-POINT-MODES" "SET-FLOATING-POINT-MODES" - "%SET-FLOATING-POINT-MODES" + "ENCODE-FLOATING-POINT-MODES" + "DECODE-FLOATING-POINT-MODES" "FLOAT-DENORMALIZED-P" "FLOAT-INFINITY-P" "FLOAT-NAN-P" "FLOAT-TRAPPING-NAN-P" "FLOAT-SIGNALING-NAN-P" ===================================== src/code/float-trap.lisp ===================================== --- a/src/code/float-trap.lisp +++ b/src/code/float-trap.lisp @@ -23,9 +23,9 @@ ) (in-package "EXTENSIONS") (export '(set-floating-point-modes - %set-floating-point-modes get-floating-point-modes - %get-floating-point-modes + decode-floating-point-modes + encode-floating-point-modes with-float-traps-masked with-float-traps-enabled)) (in-package "VM") @@ -140,13 +140,13 @@ ;;; %SET-FLOATING-POINT-MODES -- Public ;;; -(defun %set-floating-point-modes (&key (floating-point-modes (floating-point-modes)) +(defun encode-floating-point-modes (&key (floating-point-modes (floating-point-modes)) (traps nil traps-p) (rounding-mode nil round-p) (current-exceptions nil current-x-p) (accrued-exceptions nil accrued-x-p) (fast-mode nil fast-mode-p)) - "Sets floating-point modes according to the give options and the + "Encode the floating-point modes according to the give options and the specified mode, Floating-Point-Modes. The resulting new mode is returned. If a keyword is not supplied, then the current value is preserved. Possible keywords: @@ -260,13 +260,13 @@ (declare (ignorable traps rounding-mode current-exceptions accrued-exceptions fast-mode)) (setf (floating-point-modes) - (apply #'%set-floating-point-modes args)) + (apply #'encode-floating-point-modes args)) (values)) ;;; %GET-FLOATING-POINT-MODES -- Public ;;; -(defun %get-floating-point-modes (modes) +(defun decode-floating-point-modes (modes) "This function returns a list representing the state of the floating point modes given in Modes. The list is in the same format as the keyword arguments to SET-FLOATING-POINT-MODES." @@ -295,7 +295,7 @@ (apply #'set-floating-point-modes (get-floating-point-modes)) sets the floating point modes to their current values (and thus is a no-op)." - (%get-floating-point-modes (floating-point-modes))) + (decode-floating-point-modes (floating-point-modes))) ;;; CURRENT-FLOAT-TRAP -- Interface View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/16ae67097d669531ec23c4243…

1 0

[Git][cmucl/cmucl][master] 2 commits: WITH-FLOAT-TRAPS-ENABLED was incorrectly setting accrued exceptions.
by Raymond Toy 30 Dec '15

30 Dec '15

Raymond Toy pushed to branch master at cmucl / cmucl Commits: edb5af9b by Raymond Toy at 2015-12-29T18:24:24Z WITH-FLOAT-TRAPS-ENABLED was incorrectly setting accrued exceptions. Fix issue #14. WITH-FLOAT-TRAPS-ENABLED was leaving the accrued (and current) exceptions unchanged, but it should have cleared out any values there that matched the exceptions to be enabled. Without this, the next x87 operation would signal an exception if an accrued exception matched an enabled exception. This was the cause of issue #14. (Note that for x87, the accrued exception is the same as current exception.) - - - - - a610d96c by Raymond Toy at 2015-12-30T02:36:39Z Merge branch 'rtoy-issue-14' into 'master' WITH-FLOAT-TRAPS-ENABLED was incorrectly setting accrued exceptions. Fix issue #14. WITH-FLOAT-TRAPS-ENABLED was leaving the accrued (and current) exceptions unchanged, but it should have cleared out any values there that matched the exceptions to be enabled. Without this, the next x87 operation would signal an exception if an accrued exception matched an enabled exception. This was the cause of issue #14. (Note that for x87, the accrued exception is the same as current exception.) See merge request !5 - - - - - 1 changed file: - src/code/float-trap.lisp Changes: ===================================== src/code/float-trap.lisp ===================================== --- a/src/code/float-trap.lisp +++ b/src/code/float-trap.lisp @@ -417,11 +417,14 @@ code))))))) (macrolet - ((with-float-traps (name logical-op docstring) + ((with-float-traps (name merge-traps docstring) ;; Define macros to enable or disable floating-point ;; exceptions. Masked exceptions and enabled exceptions only ;; differ whether we AND in the bits or OR them, respectively. - ;; Logical-op is the operation to use. + ;; MERGE-TRAPS is the logical operation to merge the traps with + ;; the current floating-point mode. Thus, use and MERGE-EXCEPTIONS is the + ;; logical operation to merge the exceptions (sticky bits) with + ;; the current mode. (let ((macro-name (symbolicate "WITH-FLOAT-TRAPS-" name))) `(progn (defmacro ,macro-name (traps &body body) @@ -450,7 +453,8 @@ (progn (setf (floating-point-modes) (ldb (byte 32 0) - (,',logical-op ,orig-modes ,(logand trap-mask exception-mask)))) + (logand (,',merge-traps ,orig-modes ,trap-mask) + ,exception-mask))) ,@body) ;; Restore the original traps and exceptions. (setf (floating-point-modes) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/a65cf4a4c020fa3272ae3507…

1 0

[Git][cmucl/cmucl] Pushed new branch rtoy-issue-14
by Raymond Toy 30 Dec '15

30 Dec '15

Raymond Toy pushed new branch rtoy-issue-14 at cmucl / cmucl

1 0

[Git][cmucl/cmucl][master] Regenerate due to new functions.
by Raymond Toy 30 Dec '15

30 Dec '15

Raymond Toy pushed to branch master at cmucl / cmucl Commits: a65cf4a4 by Raymond Toy at 2015-12-29T18:10:00Z Regenerate due to new functions. - - - - - 1 changed file: - src/i18n/locale/cmucl.pot Changes: ===================================== src/i18n/locale/cmucl.pot ===================================== --- a/src/i18n/locale/cmucl.pot +++ b/src/i18n/locale/cmucl.pot @@ -4729,6 +4729,45 @@ msgstr "" #: src/code/float-trap.lisp msgid "" +"Sets floating-point modes according to the give options and the\n" +" specified mode, Floating-Point-Modes. The resulting new mode is\n" +" returned. If a keyword is not supplied, then the current value is\n" +" preserved. Possible keywords:\n" +"\n" +" :TRAPS\n" +" A list of the exception conditions that should cause traps. Possible" +"\n" +" exceptions are :UNDERFLOW, :OVERFLOW, :INEXACT, :INVALID,\n" +" :DIVIDE-BY-ZERO, and on the X86 :DENORMALIZED-OPERAND. Initially\n" +" all traps except :INEXACT are enabled.\n" +"\n" +" :ROUNDING-MODE\n" +" The rounding mode to use when the result is not exact. Possible " +"values\n" +" are :NEAREST, :POSITIVE-INFINITY, :NEGATIVE-INFINITY and :ZERO.\n" +" Initially, the rounding mode is :NEAREST.\n" +"\n" +" :CURRENT-EXCEPTIONS\n" +" :ACCRUED-EXCEPTIONS\n" +" These arguments allow setting of the exception flags. The main use " +"is\n" +" setting the accrued exceptions to NIL to clear them.\n" +"\n" +" :FAST-MODE\n" +" Set the hardware's \"fast mode\" flag, if any. When set, IEEE\n" +" conformance or debuggability may be impaired. Some machines may not\n" +" have this feature, in which case the value is always NIL.\n" +"\n" +" GET-FLOATING-POINT-MODES may be used to find the floating point modes\n" +" currently in effect." +msgstr "" + +#: src/code/float-trap.lisp +msgid "Unknown rounding mode: ~S." +msgstr "" + +#: src/code/float-trap.lisp +msgid "" "This function sets options controlling the floating-point hardware. If a\n" " keyword is not supplied, then the current value is preserved. Possible\n" " keywords:\n" @@ -4762,7 +4801,11 @@ msgid "" msgstr "" #: src/code/float-trap.lisp -msgid "Unknown rounding mode: ~S." +msgid "" +"This function returns a list representing the state of the floating point\n" +" modes given in Modes. The list is in the same format as the keyword " +"arguments to\n" +" SET-FLOATING-POINT-MODES." msgstr "" #: src/code/float-trap.lisp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/a65cf4a4c020fa3272ae3507c…

1 0