From aa4df518a149c0416f6c6fa094a961eb9af2cde6 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sun, 1 Sep 2024 16:26:30 -0700 Subject: [PATCH] Release 201 corrections (#510) * Fix compilation for maiko version 201 Version 201 does not have BIGVM, so SWA_FNHEAD requires swapx which is defined in byteswapdefs.h * Fix compilation for maiko version 201 Version 201 did not have NEWCDRCODING, so the implementation of N_OP_rplcons requires definitions from gcdata.h and address.h * Set up makeright etc. to allow for easier compilation of alternate versions The makeright script and the makefile-* slices it depends are modified to allow easily specifying the RELEASE version number of the Maiko emulator to be built. The default version remains 351, but can be changed with e.g. RELEASE=201 ./makeright x The object directories and executables are NOT named with the version. * Remove unnecessary include of gcdata.h from bbtsub.c * Users of gcdata.h should include gchtfinddefs.h explicitly if they use gcdata.h macros * Correct modify_big_reference_count entry parameter type to reflect dependence on GCENTRY size differences between releases * Add MAIKO_RELEASE to CMake options for building --- CMakeLists.txt | 8 ++++++-- bin/makefile-cygwin.x86_64-sdl | 2 +- bin/makefile-cygwin.x86_64-x | 2 +- bin/makefile-darwin.386-x | 2 +- bin/makefile-darwin.aarch64-sdl | 2 +- bin/makefile-darwin.aarch64-x | 2 +- bin/makefile-darwin.ppc-x | 2 +- bin/makefile-darwin.x86_64-sdl | 2 +- bin/makefile-darwin.x86_64-x | 2 +- bin/makefile-emscripten.wasm-wasm | 2 +- bin/makefile-emscripten.wasm_nl-wasm_nl | 2 +- bin/makefile-freebsd.386-sdl | 2 +- bin/makefile-freebsd.386-x | 2 +- bin/makefile-freebsd.aarch64-sdl | 2 +- bin/makefile-freebsd.aarch64-x | 2 +- bin/makefile-freebsd.x86_64-sdl | 2 +- bin/makefile-freebsd.x86_64-x | 2 +- bin/makefile-haiku.x86_64-sdl | 2 +- bin/makefile-init-darwin.386 | 2 +- bin/makefile-init-darwin.aarch64 | 2 +- bin/makefile-init-darwin.x86_64 | 2 +- bin/makefile-init-freebsd.386 | 2 +- bin/makefile-init-freebsd.aarch64 | 2 +- bin/makefile-init-freebsd.x86_64 | 2 +- bin/makefile-init-linux.aarch64 | 2 +- bin/makefile-init-linux.x86_64 | 2 +- bin/makefile-init-openbsd.x86_64 | 2 +- bin/makefile-init-sunos5.sparc | 2 +- bin/makefile-linux.386-sdl | 2 +- bin/makefile-linux.386-x | 2 +- bin/makefile-linux.aarch64-sdl | 2 +- bin/makefile-linux.aarch64-x | 2 +- bin/makefile-linux.armv7l-sdl | 2 +- bin/makefile-linux.armv7l-x | 2 +- bin/makefile-linux.x86_64-sdl | 2 +- bin/makefile-linux.x86_64-x | 2 +- bin/makefile-openbsd.x86_64-x | 2 +- bin/makefile-sunos5.386-x | 2 +- bin/makefile-sunos5.sparc-x | 2 +- bin/makefile-sunos5.x86_64-x | 2 +- bin/makeright | 7 ++++--- inc/gcdata.h | 1 - inc/gchtfinddefs.h | 3 ++- inc/my.h | 1 + src/bbtsub.c | 1 - src/car-cdr.c | 1 + src/conspage.c | 1 + src/fvar.c | 1 + src/gc.c | 1 + src/gccode.c | 1 + src/gcfinal.c | 1 + src/gchtfind.c | 2 +- src/gcmain3.c | 1 + src/gcoflow.c | 1 + src/gcrcell.c | 1 + src/gvar2.c | 1 + src/initsout.c | 1 + src/loopsops.c | 1 + src/mkcell.c | 1 + src/mvs.c | 1 + src/rplcons.c | 5 +++++ src/storage.c | 1 + 62 files changed, 73 insertions(+), 48 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c40df4c..60921b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,12 +37,16 @@ IF(NEED_LIB_M) SET(MAIKO_LIBRARIES m) ENDIF() +SET (MAIKO_RELEASE 351 CACHE STRING "Release version to build. Release: 115, 200, 201, 210, 300, 350, 351") +SET_PROPERTY(CACHE MAIKO_RELEASE PROPERTY STRINGS 115 200 201 210 300 350 351) + +MESSAGE("-- Configured for release ${MAIKO_RELEASE}") SET(MAIKO_DEFINITIONS - "-DRELEASE=351" + "-DRELEASE=${MAIKO_RELEASE}" ) SET(MAIKO_INIT_DEFINITIONS - "-DRELEASE=351" "-DINIT" "-DNOVERSION" + "-DRELEASE=${MAIKO_RELEASE}" "-DINIT" "-DNOVERSION" ) OPTION(MAIKO_DISPLAY_X11 "Use X11 for display." ON) diff --git a/bin/makefile-cygwin.x86_64-sdl b/bin/makefile-cygwin.x86_64-sdl index 17a893e..28531eb 100644 --- a/bin/makefile-cygwin.x86_64-sdl +++ b/bin/makefile-cygwin.x86_64-sdl @@ -15,7 +15,7 @@ XFLAGS = -DSDL=2 # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -lm -L/usr/local/lib -lSDL2 # diff --git a/bin/makefile-cygwin.x86_64-x b/bin/makefile-cygwin.x86_64-x index f280cba..499d5d1 100644 --- a/bin/makefile-cygwin.x86_64-x +++ b/bin/makefile-cygwin.x86_64-x @@ -18,7 +18,7 @@ XFLAGS = -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x index abd20e8..8b6f487 100644 --- a/bin/makefile-darwin.386-x +++ b/bin/makefile-darwin.386-x @@ -19,7 +19,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW OPTFLAGS = -O2 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE DFLAGS = $(DEBUGFLAGS) $(XFLAGS) \ - -DRELEASE=351 # -DSTACKCHECK -DFSBCHECK -DPCTRACE + -DRELEASE=$(RELEASE) # -DSTACKCHECK -DFSBCHECK -DPCTRACE LDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm diff --git a/bin/makefile-darwin.aarch64-sdl b/bin/makefile-darwin.aarch64-sdl index d55bf66..30df940 100644 --- a/bin/makefile-darwin.aarch64-sdl +++ b/bin/makefile-darwin.aarch64-sdl @@ -16,7 +16,7 @@ SDLFLAGS = -DSDL=2 -F /Library/Frameworks # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=351 +DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -rpath /Library/Frameworks -F /Library/Frameworks -framework SDL2 LDELDFLAGS = diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x index 867eb5d..37da65e 100644 --- a/bin/makefile-darwin.aarch64-x +++ b/bin/makefile-darwin.aarch64-x @@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 +DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm diff --git a/bin/makefile-darwin.ppc-x b/bin/makefile-darwin.ppc-x index 50db58f..8914076 100644 --- a/bin/makefile-darwin.ppc-x +++ b/bin/makefile-darwin.ppc-x @@ -19,7 +19,7 @@ XFLAGS = -I/usr/X11/include -DXWINDOW OPTFLAGS = -O2 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE DFLAGS = $(DEBUGFLAGS) $(XFLAGS) \ - -DRELEASE=351 + -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/X11/lib -lX11 -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lm diff --git a/bin/makefile-darwin.x86_64-sdl b/bin/makefile-darwin.x86_64-sdl index 86d7a9c..3af48da 100644 --- a/bin/makefile-darwin.x86_64-sdl +++ b/bin/makefile-darwin.x86_64-sdl @@ -15,7 +15,7 @@ SDLFLAGS = -DSDL=2 -F /Library/Frameworks # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=351 +DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -rpath /Library/Frameworks -F /Library/Frameworks -framework SDL2 LDELDFLAGS = diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x index 54d61d4..35a6be8 100644 --- a/bin/makefile-darwin.x86_64-x +++ b/bin/makefile-darwin.x86_64-x @@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O1 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 +DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm diff --git a/bin/makefile-emscripten.wasm-wasm b/bin/makefile-emscripten.wasm-wasm index 48c91b4..37f213a 100644 --- a/bin/makefile-emscripten.wasm-wasm +++ b/bin/makefile-emscripten.wasm-wasm @@ -14,7 +14,7 @@ XFLAGS = -DSDL=2 -sUSE_SDL=2 # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_NETHUB MEDLEY?=../../medley SYSOUT?=$(MEDLEY)/loadups/full.sysout diff --git a/bin/makefile-emscripten.wasm_nl-wasm_nl b/bin/makefile-emscripten.wasm_nl-wasm_nl index cf5a712..3ec7af1 100644 --- a/bin/makefile-emscripten.wasm_nl-wasm_nl +++ b/bin/makefile-emscripten.wasm_nl-wasm_nl @@ -14,7 +14,7 @@ XFLAGS = -DSDL=2 -sUSE_SDL=2 # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_NETHUB MEDLEY?=../../medley SYSOUT?=$(MEDLEY)/loadups/full.sysout diff --git a/bin/makefile-freebsd.386-sdl b/bin/makefile-freebsd.386-sdl index 774acff..fffdabd 100644 --- a/bin/makefile-freebsd.386-sdl +++ b/bin/makefile-freebsd.386-sdl @@ -14,7 +14,7 @@ SDLFLAGS = -DSDL=2 -I/usr/local/include # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g -DFLAGS = $(SDLFLAGS) -DRELEASE=351 +DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/local/lib -lSDL2 -lm LDELDFLAGS = diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x index fa98c63..bb42820 100644 --- a/bin/makefile-freebsd.386-x +++ b/bin/makefile-freebsd.386-x @@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm diff --git a/bin/makefile-freebsd.aarch64-sdl b/bin/makefile-freebsd.aarch64-sdl index 51b3b69..fadb7e6 100644 --- a/bin/makefile-freebsd.aarch64-sdl +++ b/bin/makefile-freebsd.aarch64-sdl @@ -14,7 +14,7 @@ SDLFLAGS = -DSDL=2 -I/usr/local/include # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g -DFLAGS = $(SDLFLAGS) -DRELEASE=351 +DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/local/lib -lSDL2 -lm LDELDFLAGS = diff --git a/bin/makefile-freebsd.aarch64-x b/bin/makefile-freebsd.aarch64-x index 7318c9a..699bd2a 100644 --- a/bin/makefile-freebsd.aarch64-x +++ b/bin/makefile-freebsd.aarch64-x @@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm diff --git a/bin/makefile-freebsd.x86_64-sdl b/bin/makefile-freebsd.x86_64-sdl index 4a5ba02..c04bb87 100644 --- a/bin/makefile-freebsd.x86_64-sdl +++ b/bin/makefile-freebsd.x86_64-sdl @@ -14,7 +14,7 @@ SDLFLAGS = -DSDL=2 -I/usr/local/include # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g -DFLAGS = $(SDLFLAGS) -DRELEASE=351 +DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/local/lib -lSDL2 -lm LDELDFLAGS = diff --git a/bin/makefile-freebsd.x86_64-x b/bin/makefile-freebsd.x86_64-x index 223ba40..1c17157 100644 --- a/bin/makefile-freebsd.x86_64-x +++ b/bin/makefile-freebsd.x86_64-x @@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm diff --git a/bin/makefile-haiku.x86_64-sdl b/bin/makefile-haiku.x86_64-sdl index 57ddedd..7b72dec 100644 --- a/bin/makefile-haiku.x86_64-sdl +++ b/bin/makefile-haiku.x86_64-sdl @@ -15,7 +15,7 @@ XFLAGS = -DSDL=2 # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -lSDL2 -lnetwork LDELDFLAGS = -lnetwork -lbsd diff --git a/bin/makefile-init-darwin.386 b/bin/makefile-init-darwin.386 index c7aaa62..862ab12 100644 --- a/bin/makefile-init-darwin.386 +++ b/bin/makefile-init-darwin.386 @@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it OPTFLAGS = -O0 -g DEBUGFLAGS = -DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT LDFLAGS = -L/usr/X11/lib -lX11 -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lm diff --git a/bin/makefile-init-darwin.aarch64 b/bin/makefile-init-darwin.aarch64 index 65cdfb3..feee458 100644 --- a/bin/makefile-init-darwin.aarch64 +++ b/bin/makefile-init-darwin.aarch64 @@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O0 -g3 DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT LDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm diff --git a/bin/makefile-init-darwin.x86_64 b/bin/makefile-init-darwin.x86_64 index 71288cf..fa669bc 100644 --- a/bin/makefile-init-darwin.x86_64 +++ b/bin/makefile-init-darwin.x86_64 @@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O0 -g DEBUGFLAGS = # -DDEBUG -DOPTRACE -DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT LDFLAGS = -L/opt/X11/lib -lX11 -lm LDELDFLAGS = -L/opt/X11/lib -lX11 -lm diff --git a/bin/makefile-init-freebsd.386 b/bin/makefile-init-freebsd.386 index ffb691b..a216d97 100644 --- a/bin/makefile-init-freebsd.386 +++ b/bin/makefile-init-freebsd.386 @@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW # OPTFLAGS is normally -O0 for init OPTFLAGS = -O0 -g -DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm diff --git a/bin/makefile-init-freebsd.aarch64 b/bin/makefile-init-freebsd.aarch64 index be70868..0069df9 100644 --- a/bin/makefile-init-freebsd.aarch64 +++ b/bin/makefile-init-freebsd.aarch64 @@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW # OPTFLAGS is normally -O0 for init OPTFLAGS = -O0 -g -DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm diff --git a/bin/makefile-init-freebsd.x86_64 b/bin/makefile-init-freebsd.x86_64 index 8da5044..e303dcf 100644 --- a/bin/makefile-init-freebsd.x86_64 +++ b/bin/makefile-init-freebsd.x86_64 @@ -17,7 +17,7 @@ XFLAGS = -I/usr/local/include -DXWINDOW # OPTFLAGS is normally -O0 for init OPTFLAGS = -O0 -g -DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT LDFLAGS = -L/usr/local/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm diff --git a/bin/makefile-init-linux.aarch64 b/bin/makefile-init-linux.aarch64 index f750561..52ab52b 100644 --- a/bin/makefile-init-linux.aarch64 +++ b/bin/makefile-init-linux.aarch64 @@ -19,7 +19,7 @@ XFLAGS = -DXWINDOW # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it OPTFLAGS = -O0 -g DEBUGFLAGS = -DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm diff --git a/bin/makefile-init-linux.x86_64 b/bin/makefile-init-linux.x86_64 index 89bcfac..8eeb208 100644 --- a/bin/makefile-init-linux.x86_64 +++ b/bin/makefile-init-linux.x86_64 @@ -19,7 +19,7 @@ XFLAGS = -DXWINDOW # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it OPTFLAGS = -O0 -g DEBUGFLAGS = -DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm diff --git a/bin/makefile-init-openbsd.x86_64 b/bin/makefile-init-openbsd.x86_64 index 3267621..facc9a0 100644 --- a/bin/makefile-init-openbsd.x86_64 +++ b/bin/makefile-init-openbsd.x86_64 @@ -17,7 +17,7 @@ XFLAGS = -I/usr/X11R6/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DNOVERSION -DINIT LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm diff --git a/bin/makefile-init-sunos5.sparc b/bin/makefile-init-sunos5.sparc index b75871b..60ac765 100644 --- a/bin/makefile-init-sunos5.sparc +++ b/bin/makefile-init-sunos5.sparc @@ -50,7 +50,7 @@ DFLAGS = -DINIT \ $(XFLAGS) \ $(DEBUGFLAGS) \ $(MACHINEFLAGS) \ - -DNOVERSION -DRELEASE=351 + -DNOVERSION -DRELEASE=$(RELEASE) LDFLAGS = -lX11 -lc -lm -lsocket -lnsl diff --git a/bin/makefile-linux.386-sdl b/bin/makefile-linux.386-sdl index 39bea78..733f3c7 100644 --- a/bin/makefile-linux.386-sdl +++ b/bin/makefile-linux.386-sdl @@ -15,7 +15,7 @@ XFLAGS = -DSDL=2 # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -lm -lSDL2 LDELDFLAGS = diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x index 5250683..e733b9a 100644 --- a/bin/makefile-linux.386-x +++ b/bin/makefile-linux.386-x @@ -17,7 +17,7 @@ XFLAGS = -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm diff --git a/bin/makefile-linux.aarch64-sdl b/bin/makefile-linux.aarch64-sdl index b87f0c1..94b719c 100644 --- a/bin/makefile-linux.aarch64-sdl +++ b/bin/makefile-linux.aarch64-sdl @@ -15,7 +15,7 @@ SDLFLAGS = -DSDL=2 # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(SDLFLAGS) -DRELEASE=351 +DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -lSDL2 -lm LDELDFLAGS = diff --git a/bin/makefile-linux.aarch64-x b/bin/makefile-linux.aarch64-x index ac16213..ff0b349 100644 --- a/bin/makefile-linux.aarch64-x +++ b/bin/makefile-linux.aarch64-x @@ -17,7 +17,7 @@ XFLAGS = -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm diff --git a/bin/makefile-linux.armv7l-sdl b/bin/makefile-linux.armv7l-sdl index a1adbe3..da9c4cc 100644 --- a/bin/makefile-linux.armv7l-sdl +++ b/bin/makefile-linux.armv7l-sdl @@ -15,7 +15,7 @@ XFLAGS = -DSDL=2 # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -lm -lSDL2 LDELDFLAGS = diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x index 1f2f156..ee283b4 100644 --- a/bin/makefile-linux.armv7l-x +++ b/bin/makefile-linux.armv7l-x @@ -17,7 +17,7 @@ XFLAGS = -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm diff --git a/bin/makefile-linux.x86_64-sdl b/bin/makefile-linux.x86_64-sdl index 0595b63..ccf98c3 100644 --- a/bin/makefile-linux.x86_64-sdl +++ b/bin/makefile-linux.x86_64-sdl @@ -15,7 +15,7 @@ XFLAGS = -DSDL=2 # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -lm -lSDL2 LDELDFLAGS = diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x index 64c3eb0..e9225aa 100644 --- a/bin/makefile-linux.x86_64-x +++ b/bin/makefile-linux.x86_64-x @@ -18,7 +18,7 @@ XFLAGS = -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm diff --git a/bin/makefile-openbsd.x86_64-x b/bin/makefile-openbsd.x86_64-x index b95e5f5..9624f31 100644 --- a/bin/makefile-openbsd.x86_64-x +++ b/bin/makefile-openbsd.x86_64-x @@ -17,7 +17,7 @@ XFLAGS = -I/usr/X11R6/include -DXWINDOW # OPTFLAGS is normally -O2. OPTFLAGS = -O2 -g3 -DFLAGS = $(XFLAGS) -DRELEASE=351 +DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm LDELDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x index 22bedc6..108712d 100644 --- a/bin/makefile-sunos5.386-x +++ b/bin/makefile-sunos5.386-x @@ -36,7 +36,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK DFLAGS = $(XFLAGS) \ $(DEBUGFLAGS) \ -DOS5 \ - -DRELEASE=351 + -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl diff --git a/bin/makefile-sunos5.sparc-x b/bin/makefile-sunos5.sparc-x index cca4965..ed266c4 100644 --- a/bin/makefile-sunos5.sparc-x +++ b/bin/makefile-sunos5.sparc-x @@ -45,7 +45,7 @@ MACHINEFLAGS = -DOS5 -DUSE_DLPI DFLAGS = $(XFLAGS) \ $(DEBUGFLAGS) \ $(MACHINEFLAGS) \ - -DRELEASE=351 + -DRELEASE=$(RELEASE) LDFLAGS = -lX11 -lc -lm -lsocket -lnsl LDELDFLAGS = -lX11 -lc -lm -lsocket -lnsl diff --git a/bin/makefile-sunos5.x86_64-x b/bin/makefile-sunos5.x86_64-x index 8322b1b..5cc9cc4 100644 --- a/bin/makefile-sunos5.x86_64-x +++ b/bin/makefile-sunos5.x86_64-x @@ -37,7 +37,7 @@ DFLAGS = $(XFLAGS) \ $(DEBUGFLAGS) \ -DOS5 \ -DUSE_DLPI \ - -DRELEASE=351 + -DRELEASE=$(RELEASE) LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl LDELDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl diff --git a/bin/makeright b/bin/makeright index 08a68ea..69c06b3 100755 --- a/bin/makeright +++ b/bin/makeright @@ -54,9 +54,10 @@ if test $# -gt 0 shift fi +: ${RELEASE=351} architecture=`machinetype` osversion=`osversion` -echo "making so far for ${osversion} on ${architecture}." +echo "making release ${RELEASE} for ${osversion} on ${architecture}." case "$display" in init) display=single releasename=init-${osversion}.${architecture} @@ -106,12 +107,12 @@ if [ ! -d ../${releasename} ]; then mkdir ../${releasename} fi -echo start making lde for ${releasename}. +echo start making lde for ${releasename} # then finally do the make, including the right stuff # With makefile-tail merged, this should only take ONE make command.... -make RELEASENAME=${releasename} LDENAME=${ldename} \ +make RELEASENAME=${releasename} RELEASE=${RELEASE} LDENAME=${ldename} \ OSARCHNAME=${osversion}.${architecture} \ -f makefile-header -f makefile-${releasename} \ -f makefile-tail $* diff --git a/inc/gcdata.h b/inc/gcdata.h index abcdb9f..ea35601 100644 --- a/inc/gcdata.h +++ b/inc/gcdata.h @@ -19,7 +19,6 @@ /**********************************************************************/ #include "lispemul.h" /* for LispPTR, DLword */ #include "version.h" /* for USHORT */ -#include "gchtfinddefs.h" #define ADDREF 0 /* for gclookup routine. */ #define DELREF 1 /* for gclookup routine. */ diff --git a/inc/gchtfinddefs.h b/inc/gchtfinddefs.h index 20a5243..7616625 100644 --- a/inc/gchtfinddefs.h +++ b/inc/gchtfinddefs.h @@ -1,8 +1,9 @@ #ifndef GCHTFINDDEFS_H #define GCHTFINDDEFS_H 1 #include "lispemul.h" /* for LispPTR, DLword */ +#include "gcdata.h" /* for GCENTRY */ void enter_big_reference_count(LispPTR ptr); -void modify_big_reference_count(LispPTR *entry, DLword casep, LispPTR ptr); +void modify_big_reference_count(GCENTRY *entry, DLword casep, LispPTR ptr); LispPTR htfind(LispPTR ptr, int casep); LispPTR rec_htfind(LispPTR ptr, int casep); #endif diff --git a/inc/my.h b/inc/my.h index f193568..4a9fc3e 100644 --- a/inc/my.h +++ b/inc/my.h @@ -20,6 +20,7 @@ #include "version.h" // for BIGVM #include "adr68k.h" // for NativeAligned2FromLAddr, NativeAligned4FromLAddr, LAddrFromNative #include "arith.h" // for N_ARITH_SWITCH, N_GETNUMBER +#include "gchtfinddefs.h"// for htfind, rec_htfind, from gcdata.h macros #include "gcdata.h" // for ADDREF, DELREF #include "lispemul.h" // for ERROR_EXIT, LispPTR, DLword, SEGMASK, state #include "lispmap.h" // for S_POSITIVE, S_CHARACTER, S_NEGATIVE diff --git a/src/bbtsub.c b/src/bbtsub.c index e824b09..d1a2232 100644 --- a/src/bbtsub.c +++ b/src/bbtsub.c @@ -49,7 +49,6 @@ #include "stack.h" #include "return.h" #include "cell.h" -#include "gcdata.h" #include "bbtsubdefs.h" #include "car-cdrdefs.h" diff --git a/src/car-cdr.c b/src/car-cdr.c index 1033382..b4fed46 100644 --- a/src/car-cdr.c +++ b/src/car-cdr.c @@ -38,6 +38,7 @@ #include "conspagedefs.h" // for next_conspage #include "emlglob.h" #include "gcdata.h" // for GCLOOKUP, ADDREF, DELREF +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "lispemul.h" // for ConsCell, LispPTR, DLword, NIL_PTR, state #include "lspglob.h" // for ListpDTD #include "lsptypes.h" // for Listp, dtd diff --git a/src/conspage.c b/src/conspage.c index c503085..6b22e09 100644 --- a/src/conspage.c +++ b/src/conspage.c @@ -23,6 +23,7 @@ #include "commondefs.h" // for error #include "conspagedefs.h" // for N_OP_cons, cons, next_conspage #include "gcdata.h" // for GCLOOKUP, ADDREF, DELREF +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "lispemul.h" // for ConsCell, DLword, LispPTR, NIL_PTR, DLWORD... #include "lspglob.h" #include "lsptypes.h" // for dtd, Listp, TYPE_LISTP diff --git a/src/fvar.c b/src/fvar.c index 2e06eb6..bb23ad5 100644 --- a/src/fvar.c +++ b/src/fvar.c @@ -15,6 +15,7 @@ #include "emlglob.h" #include "fvardefs.h" // for N_OP_fvar_, N_OP_fvarn, N_OP_stkscan, nati... #include "gcdata.h" // for GCLOOKUP, ADDREF, DELREF +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "lispmap.h" // for ATOMS_HI, STK_HI #include "lspglob.h" // for Stackspace #include "lsptypes.h" // for DLword, LispPTR, GETBASEWORD, state, FRAME... diff --git a/src/gc.c b/src/gc.c index f73536d..ac5b775 100644 --- a/src/gc.c +++ b/src/gc.c @@ -12,6 +12,7 @@ #include // for printf #include "emlglob.h" #include "gcdata.h" // for GCLOOKUPV +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "gcdefs.h" // for OP_gcref #include "lspglob.h" #include "lsptypes.h" // for state, ByteCode, PC, TopOfStack, Get_code_... diff --git a/src/gccode.c b/src/gccode.c index 01ac2c3..d054b8b 100644 --- a/src/gccode.c +++ b/src/gccode.c @@ -35,6 +35,7 @@ #include "commondefs.h" // for error #include "gccodedefs.h" // for code_block_size, reclaimcodeblock #include "gcdata.h" // for REC_GCLOOKUP, DELREF, ADDREF +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "lspglob.h" // for Deleted_Implicit_Hash_Slot_word, UFNTable #include "lsptypes.h" // for LispPTR, NIL, UFN, Get_code_BYTE, POINTERMASK #include "stack.h" // for fnhead diff --git a/src/gcfinal.c b/src/gcfinal.c index 40ddca6..19f2434 100644 --- a/src/gcfinal.c +++ b/src/gcfinal.c @@ -49,6 +49,7 @@ #include "commondefs.h" // for error #include "gccodedefs.h" // for reclaimcodeblock #include "gcdata.h" // for DELREF, REC_GCLOOKUP +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "gcfinaldefs.h" // for arrayblockmerger, checkarrayblock, deleteblock #include "lispemul.h" // for LispPTR, NIL, T, POINTERMASK, DLword, ATOM_T #include "llstkdefs.h" // for decusecount68k diff --git a/src/gchtfind.c b/src/gchtfind.c index d9fd474..19f0221 100644 --- a/src/gchtfind.c +++ b/src/gchtfind.c @@ -253,7 +253,7 @@ void enter_big_reference_count(LispPTR ptr) { /* */ /************************************************************************/ -void modify_big_reference_count(LispPTR *entry, DLword casep, LispPTR ptr) { +void modify_big_reference_count(GCENTRY *entry, DLword casep, LispPTR ptr) { struct gc_ovfl *oventry; LispPTR tmp; diff --git a/src/gcmain3.c b/src/gcmain3.c index f79f942..5baf19d 100644 --- a/src/gcmain3.c +++ b/src/gcmain3.c @@ -39,6 +39,7 @@ #include "commondefs.h" // for error #include "emlglob.h" #include "gcdata.h" // for GCENTRY, REC_GCLOOKUP, STKREF, hashentry +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "gcmain3defs.h" // for gcmapscan, gcmapunscan, gcscanstack #include "gcrcelldefs.h" // for gcreccell #include "gcscandefs.h" // for gcscan1, gcscan2 diff --git a/src/gcoflow.c b/src/gcoflow.c index d92207d..6604554 100644 --- a/src/gcoflow.c +++ b/src/gcoflow.c @@ -31,6 +31,7 @@ #include "arith.h" // for GetSmalldata #include "gcdata.h" // for htoverflow, REC_GCLOOKUP +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "gcoflowdefs.h" // for gc_handleoverflow, gcmaptable #include "gcrdefs.h" // for doreclaim #include "lispemul.h" // for NIL, DLword, LispPTR diff --git a/src/gcrcell.c b/src/gcrcell.c index 17040c7..5ee66fd 100644 --- a/src/gcrcell.c +++ b/src/gcrcell.c @@ -71,6 +71,7 @@ #include "commondefs.h" // for error #include "gccodedefs.h" // for reclaimcodeblock #include "gcdata.h" // for DELREF, REC_GCLOOKUPV, ADDREF, REC_GCLOOKUP +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "gcfinaldefs.h" // for reclaimarrayblock, reclaimstackp, releasing... #include "gcrcelldefs.h" // for freelistcell, gcreccell #include "lispemul.h" // for LispPTR, ConsCell, NIL, POINTERMASK, DLword diff --git a/src/gvar2.c b/src/gvar2.c index 870bb25..41249cb 100644 --- a/src/gvar2.c +++ b/src/gvar2.c @@ -15,6 +15,7 @@ #include "dbprint.h" // for DEBUGGER #include "emlglob.h" #include "gcdata.h" // for FRPLPTR +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "gvar2defs.h" // for N_OP_gvar_, N_OP_rplptr #include "lispemul.h" // for LispPTR, DLword, NEWATOM_VALUE_OFFSET, NEWAT... #include "lspglob.h" // for AtomSpace diff --git a/src/initsout.c b/src/initsout.c index aed4261..f0f6396 100644 --- a/src/initsout.c +++ b/src/initsout.c @@ -34,6 +34,7 @@ #include "etherdefs.h" // for init_ifpage_ether #include "gcarraydefs.h" // for get_package_atom #include "gcdata.h" // for ADDREF, GCLOOKUP +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "ifpage.h" // for IFPAGE, MACHINETYPE_MAIKO #include "initsoutdefs.h" // for build_lisp_map, fixp_value, init_for_bitblt #include "iopage.h" // for IOPAGE diff --git a/src/loopsops.c b/src/loopsops.c index 90e2c1e..779ecd9 100644 --- a/src/loopsops.c +++ b/src/loopsops.c @@ -25,6 +25,7 @@ #include "commondefs.h" // for error #include "gcarraydefs.h" // for get_package_atom #include "gcdata.h" // for FRPLPTR +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "lispemul.h" // for LispPTR, state, CurrentStackPTR, NIL_PTR, NIL #include "lispmap.h" // for S_POSITIVE #include "loopsopsdefs.h" // for lcfuncall, LCFetchMethod, LCFetchMethodOrHelp diff --git a/src/mkcell.c b/src/mkcell.c index f7d4896..e82e0f6 100644 --- a/src/mkcell.c +++ b/src/mkcell.c @@ -32,6 +32,7 @@ #include "commondefs.h" // for error #include "emlglob.h" #include "gcdata.h" // for DELREF, GCLOOKUP +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "lispemul.h" // for LispPTR, DLword, NIL, POINTERMASK, state #include "lispmap.h" // for S_POSITIVE #include "lspglob.h" diff --git a/src/mvs.c b/src/mvs.c index 4bbffaa..715206d 100644 --- a/src/mvs.c +++ b/src/mvs.c @@ -35,6 +35,7 @@ #ifdef BIGVM #define SWA_FNHEAD #else +#include "byteswapdefs.h" // for swapx #define SWA_FNHEAD swapx #endif /* BIGVM */ diff --git a/src/rplcons.c b/src/rplcons.c index 7d72ae5..ff7e5ba 100644 --- a/src/rplcons.c +++ b/src/rplcons.c @@ -29,6 +29,11 @@ #include "lspglob.h" #include "lsptypes.h" // for Listp #include "rplconsdefs.h" // for N_OP_rplcons +#ifndef NEWCDRCODING +#include "gcdata.h" +#include "gchtfinddefs.h" // for htfind, rec_htfind +#include "address.h" +#endif /***************************************************/ diff --git a/src/storage.c b/src/storage.c index 9741781..8452138 100644 --- a/src/storage.c +++ b/src/storage.c @@ -23,6 +23,7 @@ #include "commondefs.h" // for error #include "conspagedefs.h" // for cons #include "gcdata.h" // for ADDREF, GCLOOKUP +#include "gchtfinddefs.h" // for htfind, rec_htfind #include "gcfinaldefs.h" // for makefreearrayblock, mergebackward #include "ifpage.h" // for IFPAGE, MACHINETYPE_MAIKO #include "lispemul.h" // for LispPTR, NIL, GETFPTOVP, INTSTAT, ATOM_T