From 3c53b8b9401e414f87e68073160437ff404a548d Mon Sep 17 00:00:00 2001 From: Gustavo Massaccesi Date: Thu, 23 May 2019 14:34:54 -0400 Subject: [PATCH 1/3] small fix in relop-length to enable the optimization original commit: 587e0f4c01bf6bc187fc4e829fba9cc8ca7c38dd --- LOG | 4 +++- s/cpnanopass.ss | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/LOG b/LOG index 05d15b1a33..f71a16dc12 100644 --- a/LOG +++ b/LOG @@ -1365,4 +1365,6 @@ csug/control.stex - fix signatures of $annotation-options, $fasl-strip-options, $file-options, and $library-requirements-options - primdata.ss \ No newline at end of file + primdata.ss +- small fix in relop-length to enable the optimization + cpnanopass.ss diff --git a/s/cpnanopass.ss b/s/cpnanopass.ss index 90852ba135..9004f2a851 100644 --- a/s/cpnanopass.ss +++ b/s/cpnanopass.ss @@ -3718,8 +3718,8 @@ (define RELOP< -2) (define RELOP<= -1) (define RELOP= 0) - (define RELOP>= 2) - (define RELOP> 1) + (define RELOP>= 1) + (define RELOP> 2) (define (mirror op) (fx- op)) (define go (lambda (op e n) @@ -3772,7 +3772,7 @@ (define relop-length (case-lambda [(op e) (relop-length1 op e 0)] - [(op e1 e2) (or (relop-length2 op e1 e2) (relop-length2 (mirror op) e1 e2))]))) + [(op e1 e2) (or (relop-length2 op e1 e2) (relop-length2 (mirror op) e2 e1))]))) (define make-ftype-pointer-equal? (lambda (e1 e2) (bind #f (e1 e2) From 40d33fc72e41a35bef6518edba86db87d1a369f8 Mon Sep 17 00:00:00 2001 From: Gustavo Massaccesi Date: Thu, 23 May 2019 19:57:47 -0300 Subject: [PATCH 2/3] make test for relop-length more sensitive 5_2.ms original commit: b34695bb3faa28c3e55d65cc659f6a9f2c3b1547 --- LOG | 2 ++ mats/5_2.ms | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/LOG b/LOG index f71a16dc12..2820179afb 100644 --- a/LOG +++ b/LOG @@ -1368,3 +1368,5 @@ primdata.ss - small fix in relop-length to enable the optimization cpnanopass.ss +- make test for relop-length more sensitive + 5_2.ms diff --git a/mats/5_2.ms b/mats/5_2.ms index c291c79696..8410009f24 100644 --- a/mats/5_2.ms +++ b/mats/5_2.ms @@ -188,7 +188,7 @@ [(_ prim) (let () (define (f x) - (and + (list (prim (#3%length x) 0) (prim 0 (#3%length x)) (prim (#3%length x) 1) @@ -204,7 +204,7 @@ (let ([n (length x)]) (equal? (f x) - (and + (list (prim n 0) (prim 0 n) (prim n 1) From 21c7dd839d2b53b3885fca1e0757f9d61dc0aadc Mon Sep 17 00:00:00 2001 From: Steven Watson <16228203+steven741@users.noreply.github.com> Date: Tue, 4 Jun 2019 13:37:57 -0700 Subject: [PATCH 3/3] Added support for building chez with VS2019. (#435) added support for Microsoft Visual Studio 2019 on Windows original commit: 549b4468b619a9377332509472a4346ac223b5ae --- BUILDING | 7 ++++++- LOG | 2 ++ c/vs.bat | 16 ++++++++++++++++ wininstall/locate-vcredist.bat | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/BUILDING b/BUILDING index 5fb42f179f..89b1b40224 100644 --- a/BUILDING +++ b/BUILDING @@ -210,11 +210,16 @@ env OS=Windows_NT make Prerequisites: * Bash/WSL, MinGW/MSYS, or Cygwin with bash, git, grep, make, sed, etc. -* Microsoft Visual Studio 2017 or 2015 +* Microsoft Visual Studio 2019, 2017, or 2015 * WiX Toolset (for making an install) Be sure that git config core.autocrlf is set to false. +If you're using Visual Studio 2019, install "Desktop development with C++" +on the "Workloads" tabs and the "C++ 2019 Redistributable MSMs" on the +"Individual components" tab under the "Compilers, build tools, and runtimes" +section. + To run Chez Scheme or Petite Chez Scheme from a Windows command prompt, set PATH: diff --git a/LOG b/LOG index 2820179afb..7655424816 100644 --- a/LOG +++ b/LOG @@ -1370,3 +1370,5 @@ cpnanopass.ss - make test for relop-length more sensitive 5_2.ms +- added support for Microsoft Visual Studio 2019 on Windows + BUILDING, c/vs.bat, wininstall/locate-vcredist.bat \ No newline at end of file diff --git a/c/vs.bat b/c/vs.bat index 7a1d2c45d0..92251f2901 100644 --- a/c/vs.bat +++ b/c/vs.bat @@ -7,6 +7,22 @@ set Applications=%ProgramFiles% :: Set up Visual Studio command line environment variables given a :: machine type, e.g., amd64 or x86. +:: Visual Studio 2019 Enterprise +set BATDIR=%Applications%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build +if exist "%BATDIR%\vcvarsall.bat" goto found + +:: Visual Studio 2019 Professional +set BATDIR=%Applications%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build +if exist "%BATDIR%\vcvarsall.bat" goto found + +:: Visual Studio 2019 Community +set BATDIR=%Applications%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build +if exist "%BATDIR%\vcvarsall.bat" goto found + +:: Visual Studio 2019 BuildTools +set BATDIR=%Applications%\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build +if exist "%BATDIR%\vcvarsall.bat" goto found + :: Visual Studio 2017 Enterprise set BATDIR=%Applications%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build if exist "%BATDIR%\vcvarsall.bat" goto found diff --git a/wininstall/locate-vcredist.bat b/wininstall/locate-vcredist.bat index f9b39cbf3e..cddf128dd6 100755 --- a/wininstall/locate-vcredist.bat +++ b/wininstall/locate-vcredist.bat @@ -7,7 +7,7 @@ SET "Path64=%CommonProgramFiles(x86)%\Merge Modules\Microsoft_VC140_CRT_x64.msm" ) -@IF "%VisualStudioVersion%"=="15.0" ( +@IF "%VisualStudioVersion%"=="15.0" or "%VisualStudioVersion%"=="16.0" ( @PUSHD "%VCINSTALLDIR%Redist\MSVC" @FOR /D %%D IN (*) DO ( @PUSHD %%D