From 147abac04c9bd8fc48db57bfcc5ff37b78994d5f Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Mon, 5 Sep 2022 20:27:08 -0700 Subject: [PATCH] CL:ROOM no longer errors (#890) With 4-byte atoms it no longer makes sense to report atom-space separately. --- sources/CMLENVIRONMENT | 35 ++++++++++++++++++----------------- sources/CMLENVIRONMENT.DFASL | Bin 5159 -> 5074 bytes 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/sources/CMLENVIRONMENT b/sources/CMLENVIRONMENT index 44448461..eec1dcb8 100644 --- a/sources/CMLENVIRONMENT +++ b/sources/CMLENVIRONMENT @@ -1,13 +1,13 @@ -(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE "LISP") -(IL:FILECREATED " 3-Sep-93 09:49:06" IL:|{PELE:MV:ENVOS}SOURCES>CMLENVIRONMENT.;4| 7109 +(DEFINE-FILE-INFO PACKAGE "LISP" READTABLE "XCL" BASE 10) - IL:|changes| IL:|to:| (IL:VARIABLES *FEATURES*) +(IL:FILECREATED "12-Aug-2022 12:31:32" IL:|{DSK}larry>medley>sources>CMLENVIRONMENT.;2| 6958 - IL:|previous| IL:|date:| " 8-Nov-90 17:26:56" -IL:|{PELE:MV:ENVOS}SOURCES>CMLENVIRONMENT.;3|) + :CHANGES-TO (IL:FUNCTIONS ROOM) + + :PREVIOUS-DATE " 3-Sep-93 09:49:06" IL:|{DSK}larry>medley>sources>CMLENVIRONMENT.;1|) -; Copyright (c) 1986, 1987, 1988, 1990, 1993 by Venue & Xerox Corporation. All rights reserved. +; Copyright (c) 1986-1988, 1990, 1993 by Venue & Xerox Corporation. (IL:PRETTYCOMPRINT IL:CMLENVIRONMENTCOMS) @@ -22,8 +22,7 @@ IL:|{PELE:MV:ENVOS}SOURCES>CMLENVIRONMENT.;3|) (IL:FUNCTIONS ROOM) (IL:COMS - (IL:* IL:|;;| - "Functions for printing the system information for Customer Support:") + (IL:* IL:|;;| "Functions for printing the system information for Customer Support:") (IL:FNS IL:PRINT-LISP-INFORMATION IL:PRINT-LOADED-FILE-INFORMATION)) (IL:VARIABLES *FEATURES*) @@ -61,7 +60,7 @@ IL:|{PELE:MV:ENVOS}SOURCES>CMLENVIRONMENT.;3|) (DEFUN MACHINE-VERSION () (IL:SELECTQ (IL:MACHINETYPE) (IL:MAIKO (IL:* IL:\; - "For emulators, convert the emulator creation date from microcodeversion.") + "For emulators, convert the emulator creation date from microcodeversion.") (FORMAT NIL "Emulator created: ~A, memory size: ~D" (IL:SUBSTRING (IL:GDATE (+ (IL:IDATE "14-OCT-87 12:00:00") (* 86400 (IL:MICROCODEVERSION)))) @@ -100,23 +99,21 @@ IL:|{PELE:MV:ENVOS}SOURCES>CMLENVIRONMENT.;3|) (OR XCL:*LONG-SITE-NAME* XCL:*SHORT-SITE-NAME* "Unknown")) (DEFUN ROOM (&OPTIONAL (TYPES NIL SP) - (PAGE-LIMIT (IF SP - NIL - 20)) - (IN-USE-LIMIT NIL)) + (PAGE-LIMIT (IF SP + NIL + 20)) + (IN-USE-LIMIT NIL)) (IL:* IL:\; "Edited 12-Aug-2022 12:25 by lmm") (IL:* IL:|;;| "The three args are identical to those of IL:STORAGE, except that TYPES = NIL, T or omitted is handled per silver book (small, maximal, medium, respectively).") (LET* ((STORAGE-LEFT (IL:STORAGE.LEFT)) (DATA-REMAINING (ROUND (* 100 (SECOND STORAGE-LEFT)))) - (SYMBOLS-REMAINING (ROUND (* 100 (FIFTH STORAGE-LEFT)))) (ONE-PERCENT-VMEM (ROUND (+ IL:\\LASTVMEMFILEPAGE 50) 100)) (VMEM-PERCENT (- 100 (ROUND (+ (IL:VMEMSIZE) (ASH ONE-PERCENT-VMEM -1)) ONE-PERCENT-VMEM)))) (FORMAT T "Data area remaining:~25t~a%~%" DATA-REMAINING) - (FORMAT T "Symbol area remaining:~25t~a%~%" SYMBOLS-REMAINING) (FORMAT T "Vmem remaining:~25t~a%~%" VMEM-PERCENT) (WHEN (OR TYPES PAGE-LIMIT IN-USE-LIMIT) (TERPRI T) @@ -172,6 +169,10 @@ IL:|{PELE:MV:ENVOS}SOURCES>CMLENVIRONMENT.;3|) (IL:PUTPROPS IL:CMLENVIRONMENT IL:FILETYPE :COMPILE-FILE) (IL:PUTPROPS IL:CMLENVIRONMENT IL:COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1988 1990 1993)) (IL:DECLARE\: IL:DONTCOPY - (IL:FILEMAP (NIL (5523 6724 (IL:PRINT-LISP-INFORMATION 5536 . 6161) (IL:PRINT-LOADED-FILE-INFORMATION -6163 . 6722))))) + (IL:FILEMAP (NIL (1272 1329 (LISP-IMPLEMENTATION-TYPE 1272 . 1329)) (1331 1534 ( +LISP-IMPLEMENTATION-VERSION 1331 . 1534)) (1536 2186 (MACHINE-INSTANCE 1536 . 2186)) (2188 2886 ( +MACHINE-VERSION 2188 . 2886)) (2888 2934 (SOFTWARE-TYPE 2888 . 2934)) (2936 3140 (SOFTWARE-VERSION +2936 . 3140)) (3142 3456 (MACHINE-TYPE 3142 . 3456)) (3537 3607 (SHORT-SITE-NAME 3537 . 3607)) (3609 +3699 (LONG-SITE-NAME 3609 . 3699)) (3701 5278 (ROOM 3701 . 5278)) (5372 6573 (IL:PRINT-LISP-INFORMATION + 5385 . 6010) (IL:PRINT-LOADED-FILE-INFORMATION 6012 . 6571))))) IL:STOP diff --git a/sources/CMLENVIRONMENT.DFASL b/sources/CMLENVIRONMENT.DFASL index 0b64979e28c6b1d25dcb8d92c09ac96867a0393c..615ad144f1ba533a539ed0576bf2c405c0dbcd63 100644 GIT binary patch delta 1395 zcmb7EO>7%Q6yCAdUjM|7i4%vAA8*p6Hg=uXn?OneK^uFMn0VJ_*NIFe+BmTrBAg$R z1{6?|ibJ`Ww&As5AL4)zhywyDMF@~8dO$*zs6Z-(0~ZbmaYew1OPKM7QY0=|>v`{e z^Ua(0-n^OjqPHWL6UUxeS*nayOKWSJqf3=?wX!+7zOu14Us)ebsaZvv$>=#vRkT9? zh~(MLH%}&|guJnkkWNUFn3RSGlEVX%XIwV2;@QP&MVw!&l+IPk;`rKPxwLtVQbbDM zSU)GS70jmm;pCua_xdNto#y45ke5?a@`Pg6_-w|=Q^c(+a=IXoWhrJarm_^`$7DnC z>?65BoJUQtV>_I-KiJ-GUaIkWE~iq+yjtT^In`jZt$07YZNEf%LE`0d$ZG;Iuh`65 z^M3_@wU&G-ZA@)F`adecy@?&>9w)4D^cUc;1HR|Qu1*S_SYXgB8{BNDGiI3v0Y_^W zb}|+1G@|qN7!BW>%4sRNplI~}0Gx63Oz^!l6|X8!DaKPqn!+vAZf3Pf=t@?hg-FaO zx{=9g&U=WOtSW^1a~cIbqfOYt@R1`#y5LL44jspxF`~nB&LeywgwtR;&yz5;38x#w zYgJJ_|>fh zBZQb>qnQatUP)!-EJom_J3^wc>WQ~(IdPjbV6;xc9gNbGiNQ5bb2)-BayJx?BZ65I zrk9^xUU^}ea^mKmEvSF0?@k7c&y3wn;P52vHjLWs7{R#B_IDn1vF~4t6EyjkY2E&W zs8=7Er5ab2?o`VjrhQ&5yO`9L4t}|#)uHds_-`!MH&DH7>d?sf;kI{)$ApW6Qw@*r z_?ge&XsHFGkkjdvVD^uwGx4n@zOcl;CEjA^T~PGAo?)De7J44_Rr5942zqW>OXJZB z_2`;W71hX`Ql3V}yrNQ!AI}tZnJNv|b`bOR+K2&iLrc)fSU;FG$MAOFb{{it!JO}S z$91z76t~mjYH6XeE|#j*m3emC8R0|tz}H1yfm^pUvfqvRVxj;vgxKj`F+PWo{unV>Vt%Ko|We-^* zi9K;k3tOTMJA;-cSc1@tc{A`e_5J#N&-c+t>hL=_$a9>HH7Wb*SnY5|1*yp(EpVYJ zO@`pBrU==F-<@*4KI|U~4~>NVql5Ozh$Q^iOIlm0cm+oA1$kvnF0AWLV?G=TkI;|$9Nf`% zOrXwO@1I0#6zL*a40-9dP@ylOY#CA zj?aYo#Ed9yoY6x?#WX)Ii5JsRUK)?a1*(dr#YCJ>Ob?zOW^NOYw#!&5NxK;0fu|e} zwrRV_S1Dm$ufwX7ibe8>o!5nSvrb(M%fMDua|dZ-5W^6bX1T@o(2{IXF%gYS^9lMl zf>3q5j>WV*TRbwwOD{?jR18{GTeC+~ZMe8z%&(Pj{xWuHD#A3icKEVt6Sae2?nf!O zYVP8sMlua|&0DAgyq4FT9W>lwyc&t5K(+L9sWCDSpITax3{NbY!~1M`Ubt3`5r*5< zp+O3rddaMd%px)iU|m2x z@Q0PJ??Ffd6Rp}JCHZJ9B9I<dNA)koKOi(ya`4BFCj*(Je5 z2l}?MO%G<>*}&uMQVs19bIGxvU8>eO(UCj&<+13fh@V_??Pn^{<2GG+I7vJ^5nb?^ zEoWk_;IcPx#Aij|t9^dcrN?#B-Ly#4Vw#?9I%obSDII<{;0FV~HsEvG8uK)tPNrkJ z%}0jxjse>SY-u-Cvy>JuCMHOCkuF|66X)Yn>?J-!bf=rI=(l4sHkY=@%+akL=e-i*VFkO1?}(_G-xNC@6{o1CCfVm7R+U#CG`bG4JZV{psM~AK=8FqW}N^