use cify by default when the JIT is not available

Also, fix problems cross-compiling for Windows.

Author: mflatt

INSTALL.txt

@@ -1,27 +1,11 @@
-This is a work-in-progress implementation of Racket with
-
- * the macro expander and module system implemented in Racket, and
-
- * a reimplementation of Racket to run on top of Chez Scheme.
-
-When you just `make`, then you get Racket with the new expander and
-the (mostly) old virtual machine.
-
-When you `make cs`, you get Racket-on-Chez as `racket/bin/racketcs`.
-
-Thee "INSTALL.txt" for more information.
-
-----------------------------------------
-
-This is the source code for the core of Racket.  See
-"INSTALL.txt" for full information on building Racket.
+This is the source code for the core of Racket. See "INSTALL.txt" for
+full information on building Racket.
 
 To build the full Racket distribution from this repository, run `make`
-in the top-level directory. To build the Minimal Racket, run `make
-base`.
+in the top-level directory. To build minimal Racket, run `make base`.
 
 The rest of the Racket distribution source code is in other
-repositories under [the Racket GitHub
+repositories, mostly under [the Racket GitHub
 organization](https://github.com/racket).
 
 Contribute to Racket by submitting a pull request, joining the

README.md

@@ -625,6 +625,7 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 subdirs
 MAKE_LOCAL_RACKET
+STARTUP_AS_AUTO
 STARTUP_AS_C
 STARTUP_AS_BYTECODE
 CGC_IF_NEEDED_FOR_MMM
@@ -3078,6 +3079,7 @@ show_explicitly_disabled "${enable_sgc}" SGC
 show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode"
 show_explicitly_enabled "${enable_backtrace}" "3m GC backtraces" "Note that this mode is not intended for normal Racket use"
 show_explicitly_enabled "${enable_cify}" "Startup compiled to C"
+show_explicitly_disabled "${enable_cify}" "Startup compiled to C"
 
 show_explicitly_disabled "${enable_float}" "Single-precision floats"
 show_explicitly_enabled "${enable_floatinstead}" "Single-precision default floats" "Note that this mode is NOT RECOMMENDED"
@@ -3235,11 +3237,19 @@ check_page_size=yes
 try_no_nullability_completeness=no
 
 if test "${enable_cify}" = "yes" ; then
-  STARTUP_AS_BYTECODE=_no
+  STARTUP_AS_BYTECODE=_bytecode
   STARTUP_AS_C=
+  STARTUP_AS_AUTO=_auto
 else
-  STARTUP_AS_BYTECODE=
-  STARTUP_AS_C=_no
+  if test "${enable_cify}" = "yes" ; then
+    STARTUP_AS_BYTECODE=
+    STARTUP_AS_C=_c
+    STARTUP_AS_AUTO=_auto
+  else
+    STARTUP_AS_BYTECODE=_bytecode
+    STARTUP_AS_C=_c
+    STARTUP_AS_AUTO=
+  fi
 fi
 
 MAKE_LOCAL_RACKET=no-local-racket
@@ -6842,6 +6852,7 @@ LIBS="$LIBS $EXTRALIBS"
 
 
 
+
 
 
 mk_needed_dir()

racket/src/README

@@ -1,10 +1,8 @@
-Work-in-progress Racket on Chez Scheme.
+If you just want to build the variant of Racket that runs on Chez
+Scheme, then you probably meant to read "./c/README.txt" instead of
+this file.
 
-You can just use `make cs` in the top-level directory of the "racket7"
-repo to build Racket-on-Chez. See "INSTALL.txt" in the top-level
-directory for more information.
-
-I you're working on the implementation of Racket-on-Chez, then it's
+If you're working on the implementation of Racket-on-Chez, then it's
 more convenient to work in this directory, so keep reading here.
 
 

racket/src/configure

@@ -0,0 +1,60 @@
+This directory contains a `configure` script and a makefile (template)
+for building the variant of Racket that runs on Chez Scheme. The
+result of the build is a `racketcs` executable that embeds both Chez
+Scheme and the Racket startup code to behave the same as the
+traditional `racket` executable.
+
+If you have a checkout of the main Racket repo, you can just use `make
+cs` in the top-level directory of the repo to build Racket-on-Chez.
+See "INSTALL.txt" in the top-level directory for more information.
+
+If you want to know more about how Racket-on-Chez is put together, see
+"../README.txt".
+
+========================================================================
+ Requirements
+========================================================================
+
+Building Racket-on-Chez requires both an existing Racket build and
+Chez Scheme build:
+
+ * By default, the build uses Racket as built and installed in-place
+   in the same way as described in "../../README", so that the Racket
+   executable is "../../../bin/racket".
+
+   You can select a different Racket excutable by supplying
+   `--enable-racket=...` to `configure`.
+
+ * By default, the build uses Chez Scheme as built in a "ChezScheme"
+   sibling directory of the build directory. The Racket-on-Chez build
+   needs a Chez Scheme build directory, and not an end-user Chez
+   Scheme installation, because it needs "kernel.o" as created in a
+   Chez Scheme build; it may also need makefiles or other scripts in
+   the Chez Scheme build directory.
+
+   See "../README.txt" for information on the required Chez Scheme
+   version.
+
+   You can select a different Chez Scheme build path by supplying
+   `--enable-scheme=...` to `configure`.
+
+========================================================================
+ Compiling for supported Unix variants (including Linux and Mac OS)
+========================================================================
+
+From two directories up, run the following commands:
+
+   mkdir build
+   cd build
+   ../cs/c/configure
+   make
+   make install
+
+Those commands will create an in-place installation of Racket and
+store the results of various compilation steps in a separate "build"
+subdirectory, which is useful if you need to update your sources,
+delete the build, and start from scratch.
+
+You can also run the typical `./configure && make && make install` if
+you don't anticipate updating/rebuilding, but it will be harder to
+restart from scratch should you need to.

racket/src/cs/README.txt

@@ -16,7 +16,7 @@ AC_ARG_ENABLE(pthread,    [  --enable-pthread        link with pthreads (usually
 AC_ARG_ENABLE(iconv,      [  --enable-iconv          use iconv (usually auto-enabled)])
 AC_ARG_ENABLE(xonx,       [  --enable-xonx           use Unix style (e.g., use Gtk) for Mac OS])
 AC_ARG_ENABLE(racket,     [  --enable-racket=<path>  use <path> as Racket to build; or "auto" to create])
-AC_ARG_ENABLE(scheme,     [  --enable-scheme=<path>  Chez Scheme build dierctory at <path>])
+AC_ARG_ENABLE(scheme,     [  --enable-scheme=<path>  Chez Scheme build directory at <path>])
 AC_ARG_ENABLE(mach,       [  --enable-mach=<mac>     Use Chez Scheme machine type <mach>])
 
 show_explicitly_disabled()

racket/src/cs/c/README.txt

@@ -308,20 +308,31 @@ headers:
 	@RUN_RACKET_CGC@ -cqu $(srcdir)/mkincludes.rkt @DIRCVTPRE@"$(DESTDIR)$(includepltdir)"@DIRCVTPOST@ "$(srcdir)" $(MZCONFIGDIR)
 	cd ..; cp racket/system.rktd "$(DESTDIR)$(libpltdir)/system.rktd"
 
-# This target may update "cstartup.inc", either replacing a stub
-# "cstartup.inc" that redirects to "startup.inc" or rebuilding because
-# "startup.inc" or "schvers.h" changed; so, during a CGC build, we try
-# again after building this target to potentially update the CGC build
-# to a compiled-startup build
+# The `cstartup` target may update "cstartup.inc", either replacing a
+# stub "cstartup.inc" that redirects to "startup.inc" or rebuilding
+# because "startup.inc" or "schvers.h" changed; so, during a CGC
+# build, we try again after building this target to potentially update
+# the CGC build to a compiled-startup build. A particular `cstartup`
+# target variant is selected by the `configure` script based on whether
+# `--{en,dis}able-cify` is specified; for example `STARTUP_AS_AUTO`
+# with be the empty string is neither is specified, in which case
+# of the the other targets is selected by a recursive `$(MAKE)`.
+
+cstartup@STARTUP_AS_AUTO@:
+	$(MAKE) `@RUN_RACKET_CGC@ -cu $(srcdir)/src/startup-select.rkt`
+
+# For compiling the startup code to bytecode
 cstartup@STARTUP_AS_BYTECODE@:
 	@RUN_RACKET_CGC@ -cu $(srcdir)/src/compile-startup.rkt $(CSTARTUPDEST) cstartup.zo $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h
 
-# Similar to above, but when compiling to C instead of bytecode
+# For compiling the startup code to C
 cstartup@STARTUP_AS_C@:
 	@RUN_RACKET_CGC@ -cu $(srcdir)/src/cify-check.rkt $(CSTARTUPDEST)
 	$(MAKE) cstartup.inc
 
-$(CSTARTUPDEST)@STARTUP_AS_C@: $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h
+# Running "cify-startup.rkt" through "$(SETUP_BOOT)" generates more
+# dependencies in "cstartup.d" for `$(CSTARTUPDEST)`
+$(CSTARTUPDEST): $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h
 	@RUN_RACKET_CGC@ $(SELF_RACKET_FLAGS) $(SETUP_BOOT) cstartup.inc cstartup.d $(srcdir)/src/cify-startup.rkt $(srcdir)/src/startup.inc $(srcdir)/src/schvers.h
 @INCLUDEDEP@ cstartup.d
 

racket/src/cs/c/configure.ac

@@ -12,7 +12,7 @@ static void (*console_printf)(char *str, ...);
 #ifdef DOS_FILE_SYSTEM
 static void record_dll_path(void)
 {
-  GC_CAN_IGNORE char *dlldir;
+  GC_CAN_IGNORE wchar_t *dlldir;
   dlldir = extract_dlldir();
   if (dlldir)
     scheme_set_dll_path(dlldir);

racket/src/racket/Makefile.in

@@ -326,6 +326,7 @@ show_explicitly_disabled "${enable_sgc}" SGC
 show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode"
 show_explicitly_enabled "${enable_backtrace}" "3m GC backtraces" "Note that this mode is not intended for normal Racket use"
 show_explicitly_enabled "${enable_cify}" "Startup compiled to C"
+show_explicitly_disabled "${enable_cify}" "Startup compiled to C"
 
 show_explicitly_disabled "${enable_float}" "Single-precision floats"
 show_explicitly_enabled "${enable_floatinstead}" "Single-precision default floats" "Note that this mode is NOT RECOMMENDED"
@@ -483,11 +484,19 @@ check_page_size=yes
 try_no_nullability_completeness=no
 
 if test "${enable_cify}" = "yes" ; then
-  STARTUP_AS_BYTECODE=_no
+  STARTUP_AS_BYTECODE=_bytecode
   STARTUP_AS_C=
+  STARTUP_AS_AUTO=_auto
 else
-  STARTUP_AS_BYTECODE=
-  STARTUP_AS_C=_no
+  if test "${enable_cify}" = "yes" ; then
+    STARTUP_AS_BYTECODE=
+    STARTUP_AS_C=_c
+    STARTUP_AS_AUTO=_auto
+  else
+    STARTUP_AS_BYTECODE=_bytecode
+    STARTUP_AS_C=_c
+    STARTUP_AS_AUTO=
+  fi
 fi
 
 MAKE_LOCAL_RACKET=no-local-racket
@@ -1797,6 +1806,7 @@ AC_SUBST(CGC_IF_NEEDED_FOR_MMM)
 
 AC_SUBST(STARTUP_AS_BYTECODE)
 AC_SUBST(STARTUP_AS_C)
+AC_SUBST(STARTUP_AS_AUTO)
 
 AC_SUBST(MAKE_LOCAL_RACKET)
 

racket/src/racket/cmdline.inc

@@ -66,7 +66,7 @@ dynexmpl.o: $(srcdir)/dynexmpl.c  $(HEADERS)
 ../starter@MINGW@@EXE_SUFFIX@: $(srcdir)/../../start/start.c ../mrstarter@EXE_SUFFIX@ sres.o
 	$(PLAIN_CC) $(ALL_CFLAGS) -o ../starter@EXE_SUFFIX@ $(srcdir)/../../start/start.c sres.o
 ../mrstarter@EXE_SUFFIX@:  smrres.o
-	$(PLAIN_CC) $(ALL_CFLAGS) -mwindows -DMRSTART -o ../mrstarter@EXE_SUFFIX@ $(srcdir)/start.c smrres.o
+	$(PLAIN_CC) $(ALL_CFLAGS) -mwindows -DMRSTART -o ../mrstarter@EXE_SUFFIX@ $(srcdir)/../../start/start.c smrres.o
 
 sres.o:
 	@WINDRES@ -DMZSTART -i $(srcdir)/../../worksp/starters/start.rc -o sres.o

racket/src/racket/configure.ac

@@ -680,9 +680,9 @@ Scheme_Linklet *scheme_jit_linklet(Scheme_Linklet *linklet, int step)
 
 #else
 
-static Scheme_Object *scheme_jit_linklet(Scheme_Object *expr)
+Scheme_Linklet *scheme_jit_linklet(Scheme_Linklet *linklet, int step)
 {
-  return expr;
+  return linklet;
 }
 
 #endif

racket/src/racket/dynsrc/Makefile.in

@@ -0,0 +1,6 @@
+(module startup-select '#%kernel
+  (if (eval-jit-enabled)
+      (display "cstartup_bytecode")
+      (display "cstartup_c"))
+  (newline))
+

racket/src/racket/src/jitprep.c

@@ -103,7 +103,7 @@ static int _configdir_offset = 17; /* Skip permanent tag */
 #endif
 #include "delayed.inc"
 
-static char *extract_dlldir()
+static wchar_t *extract_dlldir()
 {
   if (_dlldir[_dlldir_offset] != '<')
     return _dlldir + _dlldir_offset;