diff --git a/racket/src/ChezScheme/BUILDING b/racket/src/ChezScheme/BUILDING index 074b2c092c..bb4054ac41 100644 --- a/racket/src/ChezScheme/BUILDING +++ b/racket/src/ChezScheme/BUILDING @@ -1,5 +1,5 @@ -Building Chez Scheme Version 9.5.3.x (Racket variant) -Copyright 1984-2019 Cisco Systems, Inc. +Building Chez Scheme Version 9.5.4.x (Racket variant) +Copyright 1984-2020 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/racket/src/ChezScheme/LOG b/racket/src/ChezScheme/LOG index 79c1b5912d..52ce61f2f1 100644 --- a/racket/src/ChezScheme/LOG +++ b/racket/src/ChezScheme/LOG @@ -2140,3 +2140,29 @@ is 64 bits. also now rounding rather than truncating nanoseconds in the coversion to milliseconds on Windows. thread.c +- fixed a bug in arm32 that caused an error when generating + instructions with immediate operands where the immediate was larger + than 8 bits. + arm32.ss +- fixed formatting in arm32.ss + arm32.ss +- disabled unsupported mats for arm32le + foreign.ms, misc.ms +- fixed callee-save floating point registers for arm32 + arm32.ss, ftype.ss, np-languages.ss, primdata.ss +- added a mat for the add-with-immediate bug + misc.ms, + mats/arm-immediate-1.ss (new), mats/arm-immediate-2.ss (new) +- added a note about arm32 targets requiring a kernel module for the + time stamp counter + prims.ss +9.5.4 changes: +- updated version to 9.5.4 + BUILDING NOTICE makefiles/Mf-install.in makefiles/Makefile-csug.in + scheme.1.in c/Makefile.a6nt c/Makefile.i3nt c/Makefile.ta6nt + c/Makefile.ti3nt mats/Mf-a6nt mats/Mf-i3nt mats/Mf-ta6nt + mats/Mf-ti3nt workarea c/scheme.rc s/7.ss s/cmacros.ss + release_notes/release_notes.stex csug/copyright.stex csug/csug.stex + bintar/Makefile rpm/Makefile pkg/Makefile wininstall/Makefile + wininstall/a6nt.wxs wininstall/i3nt.wxs wininstall/ta6nt.wxs + wininstall/ti3nt.wxs diff --git a/racket/src/ChezScheme/NOTICE b/racket/src/ChezScheme/NOTICE index 9fa93e4587..cedc001092 100644 --- a/racket/src/ChezScheme/NOTICE +++ b/racket/src/ChezScheme/NOTICE @@ -1,5 +1,5 @@ -Chez Scheme Version 9.5.3 -Copyright 1984-2019 Cisco Systems, Inc. +Chez Scheme Version 9.5.4 +Copyright 1984-2020 Cisco Systems, Inc. This product includes code developed by Cisco Systems, Inc. diff --git a/racket/src/ChezScheme/bintar/Makefile b/racket/src/ChezScheme/bintar/Makefile index 046ab70c10..7569e0354c 100644 --- a/racket/src/ChezScheme/bintar/Makefile +++ b/racket/src/ChezScheme/bintar/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -version = 9.5.3 +version = 9.5.4 m := $(shell find ../bin/* -type d | xargs basename) R = csv$(version) @@ -61,7 +61,7 @@ $(R)/boot: $(R) ( cd $(R)/boot/$(m) ; ln -s ../../../../boot/$(m)/{scheme.h,petite.boot,scheme.boot,revision} . ) case $(m) in \ *nt) \ - ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{csv953md.lib,csv953mt.lib,mainmd.obj,mainmt.obj,scheme.res} . ) \ + ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{csv954md.lib,csv954mt.lib,mainmd.obj,mainmt.obj,scheme.res} . ) \ ;; \ *) \ ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{main.o,kernel.o} . ) \ @@ -72,7 +72,7 @@ $(R)/bin: $(R) mkdir -p $(R)/bin/$(m) case $(m) in \ *nt) \ - ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/{scheme.exe,csv953.dll,csv953.lib,vcruntime140.lib} . ) \ + ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/{scheme.exe,csv954.dll,csv954.lib,vcruntime140.lib} . ) \ ;; \ *) \ ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/scheme . ) \ diff --git a/racket/src/ChezScheme/c/Makefile.a6nt b/racket/src/ChezScheme/c/Makefile.a6nt index 17f242e0e8..9d9d1f358d 100644 --- a/racket/src/ChezScheme/c/Makefile.a6nt +++ b/racket/src/ChezScheme/c/Makefile.a6nt @@ -17,11 +17,11 @@ m = a6nt # following have to use \ for directory separator SchemeInclude = ..\boot\$m -KernelDll = ..\bin\$m\csv953.dll -KernelLib = ..\bin\$m\csv953.lib -MTKernelLib = ..\boot\$m\csv953mt.lib -MDKernelLib = ..\boot\$m\csv953md.lib -KernelExp = ..\bin\$m\csv953.exp +KernelDll = ..\bin\$m\csv954.dll +KernelLib = ..\bin\$m\csv954.lib +MTKernelLib = ..\boot\$m\csv954mt.lib +MDKernelLib = ..\boot\$m\csv954md.lib +KernelExp = ..\bin\$m\csv954.exp Exec = ..\bin\$m\scheme.exe MTMain = ..\boot\$m\mainmt.obj MDMain = ..\boot\$m\mainmd.obj diff --git a/racket/src/ChezScheme/c/Makefile.i3nt b/racket/src/ChezScheme/c/Makefile.i3nt index 8f91283c1b..5cc8f99474 100644 --- a/racket/src/ChezScheme/c/Makefile.i3nt +++ b/racket/src/ChezScheme/c/Makefile.i3nt @@ -17,11 +17,11 @@ m = i3nt # following have to use \ for directory separator SchemeInclude = ..\boot\$m -KernelDll = ..\bin\$m\csv953.dll -KernelLib = ..\bin\$m\csv953.lib -MTKernelLib = ..\boot\$m\csv953mt.lib -MDKernelLib = ..\boot\$m\csv953md.lib -KernelExp = ..\bin\$m\csv953.exp +KernelDll = ..\bin\$m\csv954.dll +KernelLib = ..\bin\$m\csv954.lib +MTKernelLib = ..\boot\$m\csv954mt.lib +MDKernelLib = ..\boot\$m\csv954md.lib +KernelExp = ..\bin\$m\csv954.exp Exec = ..\bin\$m\scheme.exe MTMain = ..\boot\$m\mainmt.obj MDMain = ..\boot\$m\mainmd.obj diff --git a/racket/src/ChezScheme/c/Makefile.ta6nt b/racket/src/ChezScheme/c/Makefile.ta6nt index 55285a9e48..7d49e4d798 100644 --- a/racket/src/ChezScheme/c/Makefile.ta6nt +++ b/racket/src/ChezScheme/c/Makefile.ta6nt @@ -17,11 +17,11 @@ m = ta6nt # following have to use \ for directory separator SchemeInclude = ..\boot\$m -KernelDll = ..\bin\$m\csv953.dll -KernelLib = ..\bin\$m\csv953.lib -MTKernelLib = ..\boot\$m\csv953mt.lib -MDKernelLib = ..\boot\$m\csv953md.lib -KernelExp = ..\bin\$m\csv953.exp +KernelDll = ..\bin\$m\csv954.dll +KernelLib = ..\bin\$m\csv954.lib +MTKernelLib = ..\boot\$m\csv954mt.lib +MDKernelLib = ..\boot\$m\csv954md.lib +KernelExp = ..\bin\$m\csv954.exp Exec = ..\bin\$m\scheme.exe MTMain = ..\boot\$m\mainmt.obj MDMain = ..\boot\$m\mainmd.obj diff --git a/racket/src/ChezScheme/c/Makefile.ti3nt b/racket/src/ChezScheme/c/Makefile.ti3nt index c1450aba97..9d56cb0417 100644 --- a/racket/src/ChezScheme/c/Makefile.ti3nt +++ b/racket/src/ChezScheme/c/Makefile.ti3nt @@ -18,11 +18,11 @@ m = ti3nt # following have to use \ for directory separator SchemeInclude = ..\boot\$m -KernelDll = ..\bin\$m\csv953.dll -KernelLib = ..\bin\$m\csv953.lib -MTKernelLib = ..\boot\$m\csv953mt.lib -MDKernelLib = ..\boot\$m\csv953md.lib -KernelExp = ..\bin\$m\csv953.exp +KernelDll = ..\bin\$m\csv954.dll +KernelLib = ..\bin\$m\csv954.lib +MTKernelLib = ..\boot\$m\csv954mt.lib +MDKernelLib = ..\boot\$m\csv954md.lib +KernelExp = ..\bin\$m\csv954.exp Exec = ..\bin\$m\scheme.exe MTMain = ..\boot\$m\mainmt.obj MDMain = ..\boot\$m\mainmd.obj diff --git a/racket/src/ChezScheme/c/scheme.rc b/racket/src/ChezScheme/c/scheme.rc index 9f63ef0133..06cf95a16a 100644 --- a/racket/src/ChezScheme/c/scheme.rc +++ b/racket/src/ChezScheme/c/scheme.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,5,3,0 - PRODUCTVERSION 9,5,3,0 + FILEVERSION 9,5,4,0 + PRODUCTVERSION 9,5,4,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS VOS__WINDOWS32 @@ -12,13 +12,13 @@ VS_VERSION_INFO VERSIONINFO BLOCK "StringFileInfo" { BLOCK "04090000" { VALUE "CompanyName", "Cisco Systems, Inc." - VALUE "FileDescription", "Chez Scheme Version 9.5.3" - VALUE "FileVersion", "9.5.3" + VALUE "FileDescription", "Chez Scheme Version 9.5.4" + VALUE "FileVersion", "9.5.4" VALUE "InternalName", "scheme.exe" - VALUE "LegalCopyright", "Copyright 1984-2019 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0." + VALUE "LegalCopyright", "Copyright 1984-2020 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0." VALUE "OriginalFilename", "scheme.exe" VALUE "ProductName", "Chez Scheme" - VALUE "ProductVersion", "9.5.3" + VALUE "ProductVersion", "9.5.4" } } BLOCK "VarFileInfo" { diff --git a/racket/src/ChezScheme/csug/copyright.stex b/racket/src/ChezScheme/csug/copyright.stex index c75637f587..b0b1268d06 100644 --- a/racket/src/ChezScheme/csug/copyright.stex +++ b/racket/src/ChezScheme/csug/copyright.stex @@ -16,13 +16,13 @@ \centerline{}\vfill -\textbf{\copyright~2019 Cisco Systems, Inc.} +\textbf{\copyright~2020 Cisco Systems, Inc.} Licensed under the Apache License Version 2.0\\ http://www.apache.org/licenses/LICENSE-2.0 % NB: also update corresponding notice in csug.stex -Revised \revisiondate~for Chez Scheme Version 9.5.3. +Revised \revisiondate~for Chez Scheme Version 9.5.4. \medskip\noindent Cisco and the Cisco logo are trademarks or registered trademarks diff --git a/racket/src/ChezScheme/csug/csug.stex b/racket/src/ChezScheme/csug/csug.stex index c91e825802..5b73576f5b 100644 --- a/racket/src/ChezScheme/csug/csug.stex +++ b/racket/src/ChezScheme/csug/csug.stex @@ -65,10 +65,10 @@ \def\copyrightnotice{\raw{

Chez Scheme Version 9 User's Guide
-Copyright © 2019 Cisco Systems, Inc.
+Copyright © 2020 Cisco Systems, Inc.
Licensed under the Apache License Version 2.0 (full copyright notice.).
-Revised} \revisiondate\raw{ for Chez Scheme Version 9.5.3
+Revised} \revisiondate\raw{ for Chez Scheme Version 9.5.4
about this book }} diff --git a/racket/src/ChezScheme/makefiles/Mf-install.in b/racket/src/ChezScheme/makefiles/Mf-install.in index 05b968eb9c..8a29581c9f 100644 --- a/racket/src/ChezScheme/makefiles/Mf-install.in +++ b/racket/src/ChezScheme/makefiles/Mf-install.in @@ -62,7 +62,7 @@ InstallLZ4Target= # no changes should be needed below this point # ############################################################################### -Version=csv9.5.3.58 +Version=csv9.5.4.1 Include=boot/$m PetiteBoot=boot/$m/petite.boot SchemeBoot=boot/$m/scheme.boot diff --git a/racket/src/ChezScheme/mats/Mf-a6nt b/racket/src/ChezScheme/mats/Mf-a6nt index 9c6e07c75e..8bd81568b5 100644 --- a/racket/src/ChezScheme/mats/Mf-a6nt +++ b/racket/src/ChezScheme/mats/Mf-a6nt @@ -24,7 +24,7 @@ include Mf-base export MSYS_NO_PATHCONV=1 foreign1.so: $(fsrc) - cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv953.lib $(fsrc)" + cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv954.lib $(fsrc)" cat_flush: cat_flush.c cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /MD /nologo $<" diff --git a/racket/src/ChezScheme/mats/Mf-i3nt b/racket/src/ChezScheme/mats/Mf-i3nt index 4dfc3238b1..f132ca70c6 100644 --- a/racket/src/ChezScheme/mats/Mf-i3nt +++ b/racket/src/ChezScheme/mats/Mf-i3nt @@ -24,7 +24,7 @@ include Mf-base export MSYS_NO_PATHCONV=1 foreign1.so: $(fsrc) - cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv953.lib $(fsrc)" + cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv954.lib $(fsrc)" cat_flush: cat_flush.c cmd.exe /c "vs.bat x86 && cl /DWIN32 /MD /nologo $<" diff --git a/racket/src/ChezScheme/pkg/Makefile b/racket/src/ChezScheme/pkg/Makefile index 4f5f1c54d3..e0eef676ca 100644 --- a/racket/src/ChezScheme/pkg/Makefile +++ b/racket/src/ChezScheme/pkg/Makefile @@ -14,7 +14,7 @@ # limitations under the License. m := $(shell find ../bin/* -type d | xargs basename) -version = 9.5.3 +version = 9.5.4 release = 1 DOTUSER = $(shell ls -ld . | sed -e 's/[^ ]* *[^ ]* *\([^ ]*\).*/\1/') @@ -77,7 +77,7 @@ $(BUILDROOT)/Distribution: $(BUILDROOT) $(BUILDROOT)/Resources/en.lproj/Welcome.html: $(BUILDROOT)/Resources/en.lproj echo '' > $(BUILDROOT)/Resources/en.lproj/Welcome.html echo '

Chez Scheme Version $(version)

' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html - echo '

Copyright © 2019 Cisco Systems, Inc.

' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html + echo '

Copyright © 2020 Cisco Systems, Inc.

' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html echo '

Chez Scheme is a programming language and an implementation of that language, with supporting tools and documentation.

' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html echo '' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html chmod 644 $(BUILDROOT)/Resources/en.lproj/Welcome.html diff --git a/racket/src/ChezScheme/release_notes/release_notes.stex b/racket/src/ChezScheme/release_notes/release_notes.stex index a49fbfb69e..4cd4e924c1 100644 --- a/racket/src/ChezScheme/release_notes/release_notes.stex +++ b/racket/src/ChezScheme/release_notes/release_notes.stex @@ -1,6 +1,6 @@ \documentclass{releasenotes} -\thisversion{Version 9.5.3} +\thisversion{Version 9.5.4} \thatversion{Version 8.4} \pubmonth{June} \pubyear{2020} diff --git a/racket/src/ChezScheme/rpm/Makefile b/racket/src/ChezScheme/rpm/Makefile index 901358bcdd..3aba25ce8d 100644 --- a/racket/src/ChezScheme/rpm/Makefile +++ b/racket/src/ChezScheme/rpm/Makefile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -version = 9.5.3 +version = 9.5.4 release = 1 m := $(shell find ../bin/* -type d | xargs basename) arch := $(shell if test "$(m)" == "i3le" ; then echo i686 ; elif test "$(m)" == "a6le" ; then echo x86_64 ; else echo UNKNOWN ; fi) diff --git a/racket/src/ChezScheme/s/7.ss b/racket/src/ChezScheme/s/7.ss index 9c19a51230..fb8c79d9bf 100644 --- a/racket/src/ChezScheme/s/7.ss +++ b/racket/src/ChezScheme/s/7.ss @@ -771,7 +771,7 @@ (define $scheme-greeting (lambda () - (format "~a\nCopyright 1984-2019 Cisco Systems, Inc.\n" + (format "~a\nCopyright 1984-2020 Cisco Systems, Inc.\n" (scheme-version)))) (define $session-key #f) diff --git a/racket/src/ChezScheme/s/cmacros.ss b/racket/src/ChezScheme/s/cmacros.ss index 7337af659f..e12e83fc40 100644 --- a/racket/src/ChezScheme/s/cmacros.ss +++ b/racket/src/ChezScheme/s/cmacros.ss @@ -357,7 +357,7 @@ ;; --------------------------------------------------------------------- ;; Version and machine types: -(define-constant scheme-version #x0905033A) +(define-constant scheme-version #x09050401) (define-syntax define-machine-types (lambda (x) diff --git a/racket/src/ChezScheme/scheme.1.in b/racket/src/ChezScheme/scheme.1.in index 2a34f0f2d0..b99fbe242e 100644 --- a/racket/src/ChezScheme/scheme.1.in +++ b/racket/src/ChezScheme/scheme.1.in @@ -3,7 +3,7 @@ .if t .ds c caf\o'\'e' .if n .ds c cafe .ds ]W -.TH SCHEME 1 "Chez Scheme Version 9.5.3 September 2019" +.TH SCHEME 1 "Chez Scheme Version 9.5.4 August 2020" .SH NAME \fIChez Scheme\fP .br @@ -794,6 +794,6 @@ Second Edition\fP, MIT press (1996). .in -5 .SH AUTHOR -Copyright 2019 Cisco Systems, Inc. +Copyright 2020 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) diff --git a/racket/src/ChezScheme/wininstall/Makefile b/racket/src/ChezScheme/wininstall/Makefile index b32ace217e..4d07151e7d 100644 --- a/racket/src/ChezScheme/wininstall/Makefile +++ b/racket/src/ChezScheme/wininstall/Makefile @@ -1,4 +1,4 @@ -VERSION := 9.5.3 +VERSION := 9.5.4 WIXEXTENSIONS := -ext WixUIExtension -ext WixBalExtension export MSYS_NO_PATHCONV=1 diff --git a/racket/src/ChezScheme/wininstall/a6nt.wxs b/racket/src/ChezScheme/wininstall/a6nt.wxs index c1d6cc28eb..924976012e 100644 --- a/racket/src/ChezScheme/wininstall/a6nt.wxs +++ b/racket/src/ChezScheme/wininstall/a6nt.wxs @@ -4,16 +4,16 @@ - + - + - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/racket/src/ChezScheme/wininstall/i3nt.wxs b/racket/src/ChezScheme/wininstall/i3nt.wxs index a530b092fe..aa7712aca6 100644 --- a/racket/src/ChezScheme/wininstall/i3nt.wxs +++ b/racket/src/ChezScheme/wininstall/i3nt.wxs @@ -4,16 +4,16 @@ - + - + - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/racket/src/ChezScheme/wininstall/ta6nt.wxs b/racket/src/ChezScheme/wininstall/ta6nt.wxs index f137baa657..d6d6feea38 100644 --- a/racket/src/ChezScheme/wininstall/ta6nt.wxs +++ b/racket/src/ChezScheme/wininstall/ta6nt.wxs @@ -4,16 +4,16 @@ - + - + - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/racket/src/ChezScheme/wininstall/ti3nt.wxs b/racket/src/ChezScheme/wininstall/ti3nt.wxs index 3c65019ef5..f9bb2aa5ba 100644 --- a/racket/src/ChezScheme/wininstall/ti3nt.wxs +++ b/racket/src/ChezScheme/wininstall/ti3nt.wxs @@ -4,16 +4,16 @@ - + - + - + - + @@ -40,10 +40,10 @@ - + - + diff --git a/racket/src/ChezScheme/workarea b/racket/src/ChezScheme/workarea index d1b0aa80b4..6b4d903ee7 100755 --- a/racket/src/ChezScheme/workarea +++ b/racket/src/ChezScheme/workarea @@ -321,8 +321,8 @@ case $M in *nt) (cd $W/boot/$M; workln "$upupupbootdir"/boot/$M/mainmd.obj mainmd.obj) (cd $W/boot/$M; workln "$upupupbootdir"/boot/$M/mainmt.obj mainmt.obj) - (cd $W/boot/$M; workln "$upupupbootdir"/boot/$M/csv953md.lib csv953md.lib) - (cd $W/boot/$M; workln "$upupupbootdir"/boot/$M/csv953mt.lib csv953mt.lib) + (cd $W/boot/$M; workln "$upupupbootdir"/boot/$M/csv954md.lib csv954md.lib) + (cd $W/boot/$M; workln "$upupupbootdir"/boot/$M/csv954mt.lib csv954mt.lib) (cd $W/boot/$M; workln "$upupupbootdir"/boot/$M/scheme.res scheme.res) ;; *) @@ -337,8 +337,8 @@ case $M in *nt) (cd $W/bin/$M; workln "$upupupsrcdir"/bin/$M/scheme.exe scheme.exe) (cd $W/bin/$M; forceworkln2 scheme.exe petite.exe) - (cd $W/bin/$M; workln "$upupupsrcdir"/bin/$M/csv953.dll csv953.dll) - (cd $W/bin/$M; workln "$upupupsrcdir"/bin/$M/csv953.lib csv953.lib) + (cd $W/bin/$M; workln "$upupupsrcdir"/bin/$M/csv954.dll csv954.dll) + (cd $W/bin/$M; workln "$upupupsrcdir"/bin/$M/csv954.lib csv954.lib) ;; *) (cd $W/bin/$M; workln "$upupupsrcdir"/bin/$M/scheme scheme)