Typo in nethub builds for MacOS

.github/workflows/Dockerfile_builder

@@ -8,7 +8,7 @@
 #
 # ******************************************************************************
 
-FROM ubuntu:22.04
+FROM ubuntu:latest
 SHELL ["/bin/bash", "-c"]
 USER root:root
 # Install build tools

.github/workflows/Dockerfile_maiko

@@ -18,7 +18,7 @@ COPY . ${INSTALL_LOCATION}
 # Build maiko
 RUN cd ${INSTALL_LOCATION}/bin \
     && ./makeright x cleanup \
-    && ./makeright x
+    && ./makeright x nethub
 RUN cd ${INSTALL_LOCATION}/bin \
     && if [ "$(./machinetype)" = "x86_64" ]; then \
            ./makeright init; \

.github/workflows/buildRelease.yml

@@ -152,7 +152,7 @@ jobs:
          || needs.inputs.outputs.force == 'true'
       )
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       # Checkout the actions for this repo owner
@@ -310,8 +310,8 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          gh release download release-2.30.11 --repo libsdl-org/SDL --pattern SDL2-2.30.11.dmg
+          gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
-          hdiutil attach SDL2-2.30.11.dmg
+          hdiutil attach SDL2-2.26.5.dmg
           sudo ditto /Volumes/SDL2/SDL2.framework /Library/Frameworks/SDL2.framework
           hdiutil detach /Volumes/SDL2/
 
@@ -337,8 +337,9 @@ jobs:
           # -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12
           cmake .. \
             -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-            -DMAIKO_DISPLAY_SDL=2 \
+            -DMAIKO_DISPLAY_SDL=ON \
             -DMAIKO_DISPLAY_X11=ON \
+            -DMAIKO_ENABLE_NETHUB=true \
             -DCMAKE_BUILD_TYPE=Release
           cmake --build . --config Release
           for exe in lde ldex ldesdl
@@ -412,7 +413,7 @@ jobs:
         run: |
           wget https://cygwin.com/setup-x86_64.exe -OutFile setup-x86_64.exe
           Unblock-File setup-x86_64.exe
-          Start-Process setup-x86_64.exe -Wait -ArgumentList @("--root", ".\cygwin", "--quiet-mode", "--no-admin", "--wait", "--no-shortcuts", "--no-write-registry",  "--verbose", "--site", "https://mirrors.kernel.org/sourceware/cygwin/", "--packages", "nano,binutils,make,cmake,gcc,clang")
+          Start-Process setup-x86_64.exe -Wait -ArgumentList @("--root", ".\cygwin", "--quiet-mode", "--no-admin", "--wait", "--no-shortcuts", "--no-write-registry",  "--verbose", "--site", "http://www.gtlib.gatech.edu/pub/cygwin/", "--packages", "nano,binutils,make,cmake,gcc,clang")
           cygwin\bin\bash -login -c 'sed -i -e "s/^none/#none/" /etc/fstab; echo "none / cygdrive binary,posix=0,user 0 0" >>/etc/fstab'
 
       # Retrieve SDL2 and install in cygwin
@@ -503,7 +504,6 @@ jobs:
       - name: Install SDL2
         run: |
           export DEBIAN_FRONTEND=noninteractive
-          sudo -E apt-get update
           sudo -E apt-get install -y libsdl2-dev libsdl2-2.0-0
 
       # Install Emscripten SDK

.gitignore

@@ -10,7 +10,6 @@ cmake-build-*/**
 .idea/
 *.m68k-x/**
 *.m68k/**
-*.386-sdl/**
 *.386-x/**
 *.386/**
 *.ppc-x/**

CMakeLists.txt

@@ -37,21 +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=${MAIKO_RELEASE}"
+    "-DRELEASE=351"
 )
 
 SET(MAIKO_INIT_DEFINITIONS
-    "-DRELEASE=${MAIKO_RELEASE}" "-DINIT" "-DNOVERSION"
+    "-DRELEASE=351" "-DINIT" "-DNOVERSION"
 )
 
 OPTION(MAIKO_DISPLAY_X11 "Use X11 for display." ON)
-SET(MAIKO_DISPLAY_SDL OFF CACHE STRING "Use SDL for display. Version: OFF, 2, 3")
+OPTION(MAIKO_DISPLAY_SDL "Use SDL for display." OFF)
-SET_PROPERTY(CACHE MAIKO_DISPLAY_SDL PROPERTY STRINGS OFF 2 3)
 
 IF(MAIKO_DISPLAY_X11)
   FIND_PACKAGE(X11 REQUIRED)
@@ -80,39 +75,25 @@ IF(MAIKO_DISPLAY_X11)
     inc/xmkicondefs.h
     inc/xrdoptdefs.h
     inc/xscrolldefs.h
+    inc/xscroll.h
     inc/xwinmandefs.h
   )
   MESSAGE("-- Configured for X11 display")
 ENDIF()
 
-IF(MAIKO_DISPLAY_SDL STREQUAL "2")
+IF(MAIKO_DISPLAY_SDL)
-  FIND_PACKAGE(SDL2 REQUIRED CONFIG REQUIRED COMPONENTS SDL2)
+  FIND_PACKAGE(SDL2 REQUIRED)
   SET(MAIKO_DISPLAY_SDL_DEFINITIONS
-          "-DSDL=2"
+          "-DSDL"
           )
-  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS SDL2::Headers)
+  SET(MAIKO_DISPLAY_SDL_LIBRARIES ${SDL2_LIBRARIES})
-  SET(MAIKO_DISPLAY_SDL_LIBRARIES SDL2::SDL2)
   SET(MAIKO_DISPLAY_SDL_SRCS
           src/sdl.c
           )
   SET(MAIKO_DISPLAY_SDL_HDRS
           inc/sdldefs.h
           )
-  MESSAGE("-- Configured for SDL2 display")
+  MESSAGE("-- Configured for SDL display")
-ELSEIF(MAIKO_DISPLAY_SDL STREQUAL "3")
-  FIND_PACKAGE(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
-  SET(MAIKO_DISPLAY_SDL_DEFINITIONS
-          "-DSDL=3"
-          )
-  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS SDL3::Headers)
-  SET(MAIKO_DISPLAY_SDL_LIBRARIES SDL3::SDL3)
-  SET(MAIKO_DISPLAY_SDL_SRCS
-          src/sdl.c
-          )
-  SET(MAIKO_DISPLAY_SDL_HDRS
-          inc/sdldefs.h
-          )
-  MESSAGE("-- Configured for SDL3 display")
 ENDIF()
 
 # according to: https://cmake.org/pipermail/cmake/2016-October/064342.html
@@ -141,9 +122,6 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
   LIST(APPEND MAIKO_DEFINITIONS
     "-DOS5"
   )
-  LIST(APPEND MAIKO_INIT_DEFINITIONS
-    "-DOS5"
-  )
 ENDIF()
 
 IF(APPLE)
@@ -294,7 +272,7 @@ SET(MAIKO_HDRS
     inc/bindefs.h
     inc/bindsdefs.h
     inc/bitbltdefs.h
-    inc/bbtmacro.h
+    inc/bitblt.h
     inc/bltdefs.h
     inc/byteswapdefs.h
     inc/car-cdrdefs.h
@@ -319,6 +297,7 @@ SET(MAIKO_HDRS
     inc/emlglob.h
     inc/eqfdefs.h
     inc/etherdefs.h
+    inc/ether.h
     inc/fast_dsp.h
     inc/findkeydefs.h
     inc/foreigndefs.h
@@ -397,14 +376,14 @@ SET(MAIKO_HDRS
     inc/opcodes.h
     inc/os.h
     inc/osmsgdefs.h
-    inc/osmsgprint.h
+    inc/osmsg.h
     inc/perrnodefs.h
     inc/picture.h
     inc/pilotbbt.h
     inc/print.h
     inc/rawrs232c.h
-    inc/retmacro.h
     inc/returndefs.h
+    inc/return.h
     inc/rpcdefs.h
     inc/rplconsdefs.h
     inc/rs232c.h
@@ -422,6 +401,7 @@ SET(MAIKO_HDRS
     inc/tos1defs.h
     inc/tosfns.h
     inc/tosret.h
+    inc/tty.h
     inc/typeofdefs.h
     inc/ubf1defs.h
     inc/ubf2defs.h
@@ -437,33 +417,34 @@ SET(MAIKO_HDRS
     inc/vars3defs.h
     inc/version.h
     inc/vmemsavedefs.h
+    inc/vmemsave.h
     inc/xcdefs.h
     inc/z2defs.h
 )
 
-ADD_CUSTOM_COMMAND(OUTPUT vdate.c
+ADD_CUSTOM_TARGET(gen-vdate
   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bin/mkvdate > vdate.c
-  DEPENDS ${MAIKO_SRCS} ${MAIKO_HDRS} ${MAIKO_DISPLAY_X11_SRCS} ${MAIKO_DISPLAY_X11_HDRS} ${MAIKO_DISPLAY_SDL_SRCS} ${MAIKO_DISPLAY_SDL_HDRS} 
+  BYPRODUCTS vdate.c
 )
 
 ADD_EXECUTABLE(lde src/ldeboot.c src/unixfork.c)
-TARGET_COMPILE_DEFINITIONS(lde PRIVATE ${MAIKO_DEFINITIONS})
+TARGET_COMPILE_DEFINITIONS(lde PUBLIC ${MAIKO_DEFINITIONS})
-TARGET_INCLUDE_DIRECTORIES(lde PRIVATE inc)
+TARGET_INCLUDE_DIRECTORIES(lde PUBLIC inc)
 IF(MAIKO_DISPLAY_X11)
   # Tell it that the X11 launcher is available.
-  TARGET_COMPILE_DEFINITIONS(lde PRIVATE ${MAIKO_DISPLAY_X11_DEFINITIONS})
+  TARGET_COMPILE_DEFINITIONS(lde PUBLIC ${MAIKO_DISPLAY_X11_DEFINITIONS})
   # This is needed so that it can call XOpenDisplay.
   TARGET_LINK_LIBRARIES(lde X11::X11)
 ENDIF()
 
 IF(MAIKO_DISPLAY_SDL)
   # Tell it that the SDL launcher is available.
-  TARGET_COMPILE_DEFINITIONS(lde PRIVATE ${MAIKO_DISPLAY_SDL_DEFINITIONS})
+  TARGET_COMPILE_DEFINITIONS(lde PUBLIC ${MAIKO_DISPLAY_SDL_DEFINITIONS})
 ENDIF()
 
 ADD_EXECUTABLE(ldeether src/ldeether.c src/dlpi.c)
-TARGET_COMPILE_DEFINITIONS(ldeether PRIVATE ${MAIKO_DEFINITIONS})
+TARGET_COMPILE_DEFINITIONS(ldeether PUBLIC ${MAIKO_DEFINITIONS})
-TARGET_INCLUDE_DIRECTORIES(ldeether PRIVATE inc)
+TARGET_INCLUDE_DIRECTORIES(ldeether PUBLIC inc)
 
 IF(MAIKO_DISPLAY_X11)
   ADD_EXECUTABLE(ldex
@@ -474,8 +455,8 @@ IF(MAIKO_DISPLAY_X11)
     ${MAIKO_DISPLAY_X11_SRCS}
     ${MAIKO_DISPLAY_X11_HDRS}
   )
-  TARGET_COMPILE_DEFINITIONS(ldex PRIVATE ${MAIKO_DEFINITIONS} ${MAIKO_DISPLAY_X11_DEFINITIONS})
+  TARGET_COMPILE_DEFINITIONS(ldex PUBLIC ${MAIKO_DEFINITIONS} ${MAIKO_DISPLAY_X11_DEFINITIONS})
-  TARGET_INCLUDE_DIRECTORIES(ldex PRIVATE inc)
+  TARGET_INCLUDE_DIRECTORIES(ldex PUBLIC inc)
   TARGET_LINK_LIBRARIES(ldex ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_X11_LIBRARIES})
 
   ADD_EXECUTABLE(ldeinit
@@ -486,8 +467,8 @@ IF(MAIKO_DISPLAY_X11)
     ${MAIKO_DISPLAY_X11_SRCS}
     ${MAIKO_DISPLAY_X11_HDRS}
   )
-  TARGET_COMPILE_DEFINITIONS(ldeinit PRIVATE ${MAIKO_INIT_DEFINITIONS} ${MAIKO_DISPLAY_X11_DEFINITIONS})
+  TARGET_COMPILE_DEFINITIONS(ldeinit PUBLIC ${MAIKO_INIT_DEFINITIONS} ${MAIKO_DISPLAY_X11_DEFINITIONS})
-  TARGET_INCLUDE_DIRECTORIES(ldeinit PRIVATE inc)
+  TARGET_INCLUDE_DIRECTORIES(ldeinit PUBLIC inc)
   TARGET_LINK_LIBRARIES(ldeinit ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_X11_LIBRARIES})
 ENDIF()
 
@@ -500,32 +481,20 @@ IF(MAIKO_DISPLAY_SDL)
     ${MAIKO_DISPLAY_SDL_SRCS}
     ${MAIKO_DISPLAY_SDL_HDRS}
   )
-  TARGET_COMPILE_DEFINITIONS(ldesdl PRIVATE ${MAIKO_DEFINITIONS} ${MAIKO_DISPLAY_SDL_DEFINITIONS})
+  TARGET_COMPILE_DEFINITIONS(ldesdl PUBLIC ${MAIKO_DEFINITIONS} ${MAIKO_DISPLAY_SDL_DEFINITIONS})
-  TARGET_INCLUDE_DIRECTORIES(ldesdl PRIVATE inc)
+  TARGET_INCLUDE_DIRECTORIES(ldesdl PUBLIC inc)
-  TARGET_INCLUDE_DIRECTORIES(ldesdl PRIVATE ${MAIKO_DISPLAY_SDL_INCLUDE_DIRS})
+  TARGET_INCLUDE_DIRECTORIES(ldesdl PRIVATE ${SDL2_INCLUDE_DIRS})
-
-IF(APPLE)
-	IF(MAIKO_DISPLAY_SDL STREQUAL "3")
-#
-# Until CMake properly supports .xcframeworks, https://gitlab.kitware.com/cmake/cmake/-/issues/25998
-# we need to manually set the RPATH to produce a working executable
-#
-	MESSAGE("-- Applying fixup for macOS RPATH for SDL3.xcframework")
-	SET_PROPERTY(TARGET ldesdl APPEND PROPERTY BUILD_RPATH "/Library/Frameworks/SDL3.xcframework/macos-arm64_x86_64")
-#
-	ENDIF()
-ENDIF()
   TARGET_LINK_LIBRARIES(ldesdl ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_SDL_LIBRARIES})
 ENDIF()
 
 ADD_EXECUTABLE(mkvdate src/mkvdate.c)
-TARGET_COMPILE_DEFINITIONS(mkvdate PRIVATE ${MAIKO_DEFINITIONS})
+TARGET_COMPILE_DEFINITIONS(mkvdate PUBLIC ${MAIKO_DEFINITIONS})
-TARGET_INCLUDE_DIRECTORIES(mkvdate PRIVATE inc)
+TARGET_INCLUDE_DIRECTORIES(mkvdate PUBLIC inc)
 
 ADD_EXECUTABLE(setsout src/setsout.c src/byteswap.c)
-TARGET_COMPILE_DEFINITIONS(setsout PRIVATE ${MAIKO_DEFINITIONS})
+TARGET_COMPILE_DEFINITIONS(setsout PUBLIC ${MAIKO_DEFINITIONS})
-TARGET_INCLUDE_DIRECTORIES(setsout PRIVATE inc)
+TARGET_INCLUDE_DIRECTORIES(setsout PUBLIC inc)
 
 ADD_EXECUTABLE(tstsout src/tstsout.c src/byteswap.c)
-TARGET_COMPILE_DEFINITIONS(tstsout PRIVATE ${MAIKO_DEFINITIONS})
+TARGET_COMPILE_DEFINITIONS(tstsout PUBLIC ${MAIKO_DEFINITIONS})
-TARGET_INCLUDE_DIRECTORIES(tstsout PRIVATE inc)
+TARGET_INCLUDE_DIRECTORIES(tstsout PUBLIC inc)

README.md

@@ -1,9 +1,8 @@
 # Maiko
 
-Maiko is the implementation of the Medley Interlisp virtual machine for a
+Maiko is the implementation of the Medley Interlisp virtual machine, for a
-byte-coded Lisp instruction set, and some low-level functions for
+byte-coded Lisp instruction set and some low-level functions for
-connecting Lisp to a display (via X11 or SDL), the local filesystem,
+connecting with Lisp for access to display (via X11) and disk etc.
-and a network subsystem.
 
 For an overview, see [Medley Interlisp Introduction](https://interlisp.org/medley/using/docs/medley/).
 
@@ -16,14 +15,13 @@ Bug reports, feature requests, fixes and improvements, support for additional pl
 
 ## Development Platforms
 
-Development has been primarily on macOS, FreeBSD, and Linux, with testing on Solaris and Windows.
+We are developing on FreeBSD, Linux, macOS, and Solaris currently
-Processor architectures i386, x86\_64, arm64, arm7l, and SPARC.
+on arm7l, arm64, PowerPC, SPARC, i386, and x86_64 hardware.
 
 
 ## Building Maiko
 
-### Building with make
+Building requires `clang`, `make`, X11 client libraries (`libx11-dev`). For example, 
-Building requires a C compiler (`clang` preferred), either `make` or `CMake`, and X11 client libraries (`libx11-dev`), or SDL2. For example, using `make` and X11:
 
 ``` sh
 $ sudo apt update
@@ -35,21 +33,17 @@ $ cd maiko/bin
 $ ./makeright x
 ```
 
-* The build will (attempt to) detect the OS-type and cpu-type. It will build binaries `lde` and `ldex` in `../`_`ostype.cputype`_ (with .o files in `../`_`ostype.cputype-x`_. For example, Linux on a 64-bit x86 will use `linux.x86_64`, while macOS 11 on a (new M1) Mac will use `darwin.aarch64`.
+* The build will (attempt to) detect the OS-type and cpu-type. It will build binaries `lde` and `ldex` in `../ostype.cputype` (with .o files in `..ostype.cputype-x`. For example, Linux on a 64-bit x86 will use `linux.x86_64`, while macOS 11 on a (new M1) Mac will use `darwin.aarch64`.
-* If you prefer `gcc` over `clang`, you will need to edit the makefile fragment for your configuration (`makefile-ostype.cputype-x`) and comment out the line (with a #) that defines `CC` as `clang` and uncomment the line (delete the #) for the line that defines `CC` as `gcc`.
+* If you prefer using `gcc` over `clang`, you will need to edit the makefile fragment for your configuration (`makefile-ostype.cputype-x`) and comment out the line (with a #) that defines `CC` for `clang` and uncomment the line (delete the #) for the line that defines `CC` for `gcc`.
-
+* There is a cmake configuration (TBD To Be Described here).
-### Building with CMake
-We provide a `CMakeLists.txt` which provides mostly matching build capabilities to the `make` setup.
-CMake options are provided to control the configuration of the Maiko executables:
-* MAIKO\_DISPLAY\_SDL: [OFF], 2, 3 - selects display subsystem SDL of version specified
-* MAIKO\_DISPLAY\_X11: [ON], OFF - selects X11 display subsystem
-* MAIKO\_NETWORK\_TYPE: [NONE], SUN\_DLPI, SUN\_NIT, NETHUB - network subsystem access
-* MAIKO_RELEASE: [351], various - see `maiko/inc/version.h`
-
-While SDL3 is selectable, the Maiko code has not yet been updated to work with the SDL3 API.
 
 ### Building For macOS
 
-* Building/running on macOS requires either an X server and X client libraries or the SDL2 library.
+* Running on macOS requires an X server, and building on a Mac requires X client libraries.
 An X-server for macOS (and X11 client libraries) can be freely obtained at https://www.xquartz.org/releases
-The SDL library is freely available from https://libsdl.org
+
+### Building for Windows 10
+
+Windows 10 currently requires "Docker for Desktop" or WSL2 and a (Windows X-server).
+See [Medley's README](https://github.com/Interlisp/medley/blob/master/README.md) for more.
+

bin/makefile-cygwin.x86_64-sdl

@@ -5,17 +5,11 @@ CC = gcc -m64 $(GCC_CFLAGS) -I/usr/local/include
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+XFLAGS = -DSDL
-#  For SDL version 2
-#      -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS
-#
-XFLAGS = -DSDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -lm -L/usr/local/lib -lSDL2
 #

bin/makefile-cygwin.x86_64-x

@@ -18,7 +18,7 @@ XFLAGS = -DXWINDOW
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm

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=$(RELEASE) # -DSTACKCHECK -DFSBCHECK -DPCTRACE
+	-DRELEASE=351 # -DSTACKCHECK -DFSBCHECK -DPCTRACE
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm

bin/makefile-darwin.aarch64-sdl

@@ -4,21 +4,14 @@ CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+SDLFLAGS = -DSDL -F /Library/Frameworks
-#  For SDL version 2
-#      -DSDL=2 in SDLFLAGS and -framework SDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in SDLFLAGS and -framework SDL3 in LDFLAGS
-#
-
-SDLFLAGS = -DSDL=2 -F /Library/Frameworks
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
-DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=351
 
-LDFLAGS = -rpath /Library/Frameworks -F /Library/Frameworks -framework SDL2
+LDFLAGS = -F /Library/Frameworks -framework SDL2
 LDELDFLAGS =
 
 OBJECTDIR = ../$(RELEASENAME)/

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=$(RELEASE)
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm

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=$(RELEASE)
+	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lm

bin/makefile-darwin.x86_64-sdl

@@ -2,22 +2,16 @@
 
 CC = clang -m64 -target x86_64-apple-darwin $(CLANG_CFLAGS)
 
-#
-#  For SDL version 2
-#      -DSDL=2 in SDLFLAGS and -framework SDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in SDLFLAGS and -framework SDL3 in LDFLAGS
-#
 XFILES = $(OBJECTDIR)sdl.o
 
-SDLFLAGS = -DSDL=2 -F /Library/Frameworks
+SDLFLAGS = -DSDL -F /Library/Frameworks
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
-DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=351
 
-LDFLAGS = -rpath /Library/Frameworks -F /Library/Frameworks -framework SDL2
+LDFLAGS = -F /Library/Frameworks -framework SDL2
 LDELDFLAGS =
 
 OBJECTDIR = ../$(RELEASENAME)/

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=$(RELEASE)
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm

bin/makefile-dos

@@ -18,7 +18,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c         gcrcell.c llstk.
 OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj         gcr.obj  gcrcell.obj llstk.obj  gcscan.obj loopsops.obj storage.obj     allocmds.obj dir.obj gvar2.obj lowlev1.obj      subr.obj arithops.obj lowlev2.obj       subr0374.obj doscomm.obj     hardrtn.obj lsthandl.obj sxhash.obj draw.obj main.obj testtool.obj array.obj        dsk.obj inet.obj misc7.obj timer.obj    array2.obj dspif.obj initdsp.obj miscn.obj      typeof.obj array3.obj initkbd.obj ubf1.obj      array4.obj dspsubrs.obj initsout.obj    mkatom.obj ubf2.obj array5.obj eqf.obj  intcall.obj mkcell.obj ubf3.obj array6.obj      ether.obj ufn.obj atom.obj      findkey.obj kbdsubrs.obj mouseif.obj ufs.obj    bbtsub.obj foreign.obj keyevent.obj     unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj      unwind.obj bitblt.obj gc.obj    uraid.obj blt.obj gc2.obj       kprint.obj osmsg.obj usrsubr.obj byteswap.obj   gcarray.obj perrno.obj uutils.obj       carcdr.obj asmbbt.obj gccode.obj        vars3.obj gcfinal.obj ldsout.obj        return.obj vmemsave.obj chardev.obj     gchtfind.obj lineblt8.obj rpc.obj xc.obj        common.obj gcmain3.obj lisp2c.obj rplcons.obj   z2.obj  vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES)
 
 
-HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bbtmacro.h debug.h devconf.h dspdata.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsgprint.h pilotbbt.h print.h retmacro.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h xdefs.h xbitmaps.h xkeymap.h
+HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h
 
 
 
@@ -35,7 +35,7 @@ emul.exe : $(OFILES)
 	del copts
 	@ echo "Executable is now named '$@'"
    
-main.o  :       lispemul.h address.h lsptypes.h adr68k.h stack.h lspglob.h lispmap.h ifpage.h iopage.h retmacro.h debug.h
+main.o  :       lispemul.h address.h lsptypes.h adr68k.h stack.h lspglob.h lispmap.h ifpage.h iopage.h return.h debug.h
 
 
 													

bin/makefile-emscripten.wasm-wasm

@@ -4,17 +4,11 @@ CC = emcc $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+XFLAGS = -DSDL -sUSE_SDL=2
-#  For SDL version 2
-#      -DSDL=2 and -sUSE_SDL=2 in XFLAGS and -sUSE_SDL=2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 and -sUSE_SDL=3 in XFLAGS and -sUSE_SDL=3 in LDFLAGS
-#
-XFLAGS = -DSDL=2 -sUSE_SDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS = -O2
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_NETHUB
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
 
 MEDLEY?=../../medley
 SYSOUT?=$(MEDLEY)/loadups/full.sysout

bin/makefile-emscripten.wasm_nl-wasm_nl

@@ -4,17 +4,11 @@ CC = emcc $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+XFLAGS = -DSDL -sUSE_SDL=2
-#  For SDL version 2
-#      -DSDL=2 and -sUSE_SDL=2 in XFLAGS and -sUSE_SDL=2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 and -sUSE_SDL=3 in XFLAGS and -sUSE_SDL=3 in LDFLAGS
-#
-XFLAGS = -DSDL=2 -sUSE_SDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS = -O2
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -DMAIKO_ENABLE_NETHUB
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
 
 MEDLEY?=../../medley
 SYSOUT?=$(MEDLEY)/loadups/full.sysout

bin/makefile-freebsd.386-sdl

@@ -4,17 +4,11 @@ CC = clang -m32 $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+SDLFLAGS = -DSDL -I/usr/local/include
-#  For SDL version 2
-#      -DSDL=2 in SDLFLAGS and -lSDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in SDLFLAGS and -lSDL3 in LDFLAGS
-#
-SDLFLAGS = -DSDL=2 -I/usr/local/include
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS = -O2 -g
-DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(SDLFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/local/lib -lSDL2 -lm
 LDELDFLAGS =

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=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm

bin/makefile-freebsd.aarch64-sdl

@@ -4,17 +4,11 @@ CC = clang -m64 $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+SDLFLAGS = -DSDL -I/usr/local/include
-#  For SDL version 2
-#      -DSDL=2 in SDLFLAGS and -lSDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in SDLFLAGS and -lSDL3 in LDFLAGS
-#
-SDLFLAGS = -DSDL=2 -I/usr/local/include
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS = -O2 -g
-DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(SDLFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/local/lib -lSDL2 -lm
 LDELDFLAGS =

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=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm

bin/makefile-freebsd.x86_64-sdl

@@ -4,17 +4,11 @@ CC = clang -m64 $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+SDLFLAGS = -DSDL -I/usr/local/include
-#  For SDL version 2
-#      -DSDL=2 in SDLFLAGS and -lSDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in SDLFLAGS and -lSDL3 in LDFLAGS
-#
-SDLFLAGS = -DSDL=2 -I/usr/local/include
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS = -O2 -g
-DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(SDLFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/local/lib -lSDL2 -lm
 LDELDFLAGS =

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=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm

bin/makefile-haiku.x86_64-sdl

@@ -5,17 +5,11 @@ CC = gcc -m64 $(GCC_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+XFLAGS = -DSDL
-#  For SDL version 2
-#      -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS
-#
-XFLAGS = -DSDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS =  -lSDL2 -lnetwork
 LDELDFLAGS = -lnetwork -lbsd

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=$(RELEASE) -DNOVERSION -DINIT
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lm

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=$(RELEASE) -DNOVERSION -DINIT
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS = -L/opt/X11/lib -lX11 -lm

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=$(RELEASE) -DNOVERSION -DINIT
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm

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=$(RELEASE) -DNOVERSION -DINIT
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm

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=$(RELEASE) -DNOVERSION -DINIT
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm

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=$(RELEASE) -DNOVERSION -DINIT
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm

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=$(RELEASE) -DNOVERSION -DINIT
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm

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=$(RELEASE) -DNOVERSION -DINIT
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm

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=$(RELEASE) -DNOVERSION -DINIT
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11R6/lib -lX11 -lc -lm

bin/makefile-init-sunos5.sparc

@@ -50,7 +50,7 @@ DFLAGS = -DINIT \
 	 $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	 $(MACHINEFLAGS) \
-	 -DNOVERSION -DRELEASE=$(RELEASE) 
+	 -DNOVERSION -DRELEASE=351 
 
 
 LDFLAGS = -lX11 -lc -lm -lsocket -lnsl

bin/makefile-linux.386-sdl

@@ -5,17 +5,11 @@ CC = gcc -m32 $(GCC_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+XFLAGS = -DSDL
-#  For SDL version 2
-#      -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS
-#
-XFLAGS = -DSDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -lm -lSDL2
 LDELDFLAGS =

bin/makefile-linux.386-x

@@ -17,7 +17,7 @@ XFLAGS = -DXWINDOW
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm

bin/makefile-linux.aarch64-sdl

@@ -5,17 +5,11 @@ CC = gcc $(GCC_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+SDLFLAGS = -DSDL
-#  For SDL version 2
-#      -DSDL=2 in SDLFLAGS and -lSDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in SDLFLAGS and -lSDL3 in LDFLAGS
-#
-SDLFLAGS = -DSDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(SDLFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(SDLFLAGS) -DRELEASE=351
 
 LDFLAGS = -lSDL2 -lm
 LDELDFLAGS =

bin/makefile-linux.aarch64-x

@@ -17,7 +17,7 @@ XFLAGS = -DXWINDOW
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm

bin/makefile-linux.armv7l-sdl

@@ -5,17 +5,11 @@ CC = gcc $(GCC_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+XFLAGS = -DSDL
-#  For SDL version 2
-#      -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS
-#
-XFLAGS = -DSDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -lm -lSDL2
 LDELDFLAGS =

bin/makefile-linux.armv7l-x

@@ -17,7 +17,7 @@ XFLAGS = -DXWINDOW
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm

bin/makefile-linux.x86_64-sdl

@@ -5,17 +5,11 @@ CC = gcc -m64 $(GCC_CFLAGS)
 
 XFILES = $(OBJECTDIR)sdl.o
 
-#
+XFLAGS = -DSDL
-#  For SDL version 2
-#      -DSDL=2 in XFLAGS and -lSDL2 in LDFLAGS
-#  For SDL version 3
-#      -DSDL=3 in XFLAGS and -lSDL3 in LDFLAGS
-#
-XFLAGS = -DSDL=2
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -lm -lSDL2
 LDELDFLAGS =

bin/makefile-linux.x86_64-x

@@ -18,7 +18,7 @@ XFLAGS = -DXWINDOW
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
-DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm

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=$(RELEASE)
+DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm
 LDELDFLAGS =  -L/usr/X11R6/lib -lX11 -lc -lm

bin/makefile-sunos5.386-x

@@ -36,7 +36,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	-DOS5 \
-	-DRELEASE=$(RELEASE)
+	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl
 LDELDFLAGS = -L/usr/X11/lib -lX11  -lc -lm -lsocket -lnsl

bin/makefile-sunos5.sparc-x

@@ -45,7 +45,7 @@ MACHINEFLAGS = -DOS5 -DUSE_DLPI
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	 $(MACHINEFLAGS) \
-	 -DRELEASE=$(RELEASE)
+	 -DRELEASE=351
 
 LDFLAGS = -lX11 -lc -lm -lsocket -lnsl
 LDELDFLAGS = -lX11  -lc -lm -lsocket -lnsl

bin/makefile-sunos5.x86_64-x

@@ -37,7 +37,7 @@ DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	-DOS5 \
 	-DUSE_DLPI \
-	-DRELEASE=$(RELEASE)
+	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl
 LDELDFLAGS = -L/usr/X11/lib -lX11  -lc -lm -lsocket -lnsl

bin/makefile-tail

@@ -192,7 +192,7 @@ $(OBJECTDIR)ldeether.o: $(SRCDIR)ldeether.c $(REQUIRED-INCS)
 $(OBJECTDIR)main.o: $(SRCDIR)main.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)dbprint.h \
 	$(INCDIR)emlglob.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h \
-	$(INCDIR)retmacro.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
+	$(INCDIR)return.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)debug.h \
 	$(INCDIR)timeout.h $(INCDIR)maindefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)dirdefs.h $(INCDIR)dspifdefs.h $(INCDIR)devif.h \
@@ -292,7 +292,7 @@ $(OBJECTDIR)bitblt.o: $(SRCDIR)bitblt.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)pilotbbt.h $(INCDIR)display.h \
-	$(INCDIR)bbtmacro.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
+	$(INCDIR)bitblt.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)bitblt.c -o $(OBJECTDIR)bitblt.o
 
 $(OBJECTDIR)bbt68k.o: $(OBJECTDIR)bbt68k.i $(SRCDIR)bbt68k.s
@@ -308,10 +308,10 @@ $(OBJECTDIR)bbtsub.o: $(SRCDIR)bbtsub.c $(REQUIRED-INCS) \
 	$(INCDIR)xdefs.h $(INCDIR)lispemul.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h $(INCDIR)lsptypes.h \
 	$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)arith.h \
-	$(INCDIR)stack.h $(INCDIR)retmacro.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
+	$(INCDIR)stack.h $(INCDIR)return.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
 	$(INCDIR)bbtsubdefs.h $(INCDIR)car-cdrdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)kprintdefs.h \
-	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dspdata.h $(INCDIR)display.h $(INCDIR)dbprint.h \
 	$(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)bbtsub.c -o $(OBJECTDIR)bbtsub.o
@@ -340,7 +340,7 @@ $(OBJECTDIR)car-cdr.o: $(SRCDIR)car-cdr.c $(REQUIRED-INCS) \
 $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)timeout.h \
-	$(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \
+	$(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h \
 	$(INCDIR)chardevdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)perrnodefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)chardev.c -o $(OBJECTDIR)chardev.o
@@ -348,7 +348,7 @@ $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \
 $(OBJECTDIR)rawcolor.o: $(SRCDIR)rawcolor.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 	$(INCDIR)lspglob.h $(INCDIR)lispmap.h $(INCDIR)lsptypes.h \
 	$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h \
-	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bitblt.h \
 	$(INCDIR)arith.h $(INCDIR)cell.h $(INCDIR)dspdata.h $(INCDIR)debug.h \
 	$(INCDIR)stream.h $(INCDIR)bbtsubdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)rawcolor.c -o $(OBJECTDIR)rawcolor.o
@@ -357,7 +357,7 @@ $(OBJECTDIR)llcolor.o: $(SRCDIR)llcolor.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)llcolordefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)llcolor.c -o $(OBJECTDIR)llcolor.o
 
@@ -391,7 +391,7 @@ $(OBJECTDIR)mkcell.o: $(SRCDIR)mkcell.c $(REQUIRED-INCS) \
 $(OBJECTDIR)draw.o: $(SRCDIR)draw.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
-	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bitblt.h \
 	$(INCDIR)display.h $(INCDIR)drawdefs.h $(INCDIR)bbtsubdefs.h \
 	$(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)draw.c -o $(OBJECTDIR)draw.o
@@ -423,7 +423,7 @@ $(OBJECTDIR)fp.o: $(SRCDIR)fp.c $(REQUIRED-INCS) \
 $(OBJECTDIR)intcall.o: $(SRCDIR)intcall.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)address.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \
-	$(INCDIR)retmacro.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
+	$(INCDIR)return.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h \
 	$(INCDIR)tosfns.h $(INCDIR)intcalldefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h
@@ -450,7 +450,7 @@ $(OBJECTDIR)ubf3.o: $(SRCDIR)ubf3.c $(REQUIRED-INCS) \
 $(OBJECTDIR)uutils.o: $(SRCDIR)uutils.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)adr68k.h \
 	$(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)osmsgprint.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \
+	$(INCDIR)miscstat.h $(INCDIR)osmsg.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \
 	$(INCDIR)osmsgdefs.h $(INCDIR)uraiddefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)uutils.c -o $(OBJECTDIR)uutils.o
 
@@ -478,21 +478,21 @@ $(OBJECTDIR)ether_common.o: $(SRCDIR)ether_common.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_common.c -o $(OBJECTDIR)ether_common.o
 
 $(OBJECTDIR)ether_sunos.o: $(SRCDIR)ether_sunos.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_sunos.c -o $(OBJECTDIR)ether_sunos.o
 
 $(OBJECTDIR)ether_nethub.o: $(SRCDIR)ether_nethub.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_nethub.c -o $(OBJECTDIR)ether_nethub.o
 
 $(OBJECTDIR)findkey.o: $(SRCDIR)findkey.c $(REQUIRED-INCS) \
@@ -505,7 +505,7 @@ $(OBJECTDIR)dsk.o: $(SRCDIR)dsk.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)arith.h $(INCDIR)stream.h \
-	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \
 	$(INCDIR)dbprint.h $(INCDIR)dskdefs.h $(INCDIR)byteswapdefs.h \
 	$(INCDIR)car-cdrdefs.h $(INCDIR)cell.h $(INCDIR)commondefs.h \
 	$(INCDIR)ufsdefs.h
@@ -632,7 +632,7 @@ $(OBJECTDIR)hardrtn.o: $(SRCDIR)hardrtn.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.h $(INCDIR)hardrtndefs.h \
+	$(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h $(INCDIR)hardrtndefs.h \
 	$(INCDIR)commondefs.h $(INCDIR)llstkdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)hardrtn.c -o $(OBJECTDIR)hardrtn.o
 
@@ -640,7 +640,7 @@ $(OBJECTDIR)inet.o: $(SRCDIR)inet.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
 	$(INCDIR)inetdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)mkcelldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)inet.c -o $(OBJECTDIR)inet.o
@@ -649,7 +649,7 @@ $(OBJECTDIR)initdsp.o: $(SRCDIR)initdsp.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)initdspdefs.h \
 	$(INCDIR)byteswapdefs.h $(INCDIR)xcursordefs.h $(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)initdsp.c -o $(OBJECTDIR)initdsp.o
@@ -682,7 +682,7 @@ $(OBJECTDIR)keyevent.o: $(SRCDIR)keyevent.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
 	$(INCDIR)address.h $(INCDIR)stack.h $(INCDIR)keyboard.h $(INCDIR)display.h \
-	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h $(INCDIR)pilotbbt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bitblt.h $(INCDIR)pilotbbt.h \
 	$(INCDIR)keyeventdefs.h $(INCDIR)osmsgdefs.h $(INCDIR)xwinmandefs.h \
 	$(INCDIR)devif.h $(INCDIR)dbprint.h
 	$(CC) $(RFLAGS) $(SRCDIR)keyevent.c -o $(OBJECTDIR)keyevent.o
@@ -698,7 +698,7 @@ $(OBJECTDIR)llstk.o: $(SRCDIR)llstk.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)lsptypes.h $(INCDIR)initatms.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.h \
+	$(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h \
 	$(INCDIR)llstkdefs.h $(INCDIR)commondefs.h $(INCDIR)dbgtooldefs.h \
 	$(INCDIR)testtooldefs.h $(INCDIR)kprintdefs.h $(INCDIR)storagedefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)llstk.c -o $(OBJECTDIR)llstk.o
@@ -758,7 +758,7 @@ $(OBJECTDIR)osmsg.o: $(SRCDIR)osmsg.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsgprint.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \
 	$(INCDIR)dbprint.h $(INCDIR)commondefs.h $(INCDIR)osmsgdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)osmsg.c -o $(OBJECTDIR)osmsg.o
 
@@ -766,7 +766,7 @@ $(OBJECTDIR)return.o: $(SRCDIR)return.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)address.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \
 	$(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h $(INCDIR)retmacro.h \
+	$(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h $(INCDIR)return.h \
 	$(INCDIR)returndefs.h $(INCDIR)commondefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)return.c -o $(OBJECTDIR)return.o
 
@@ -828,7 +828,7 @@ $(OBJECTDIR)subr0374.o: $(SRCDIR)subr0374.c $(REQUIRED-INCS) \
 	$(CC) $(RFLAGS) $(SRCDIR)subr0374.c -o $(OBJECTDIR)subr0374.o
 
 $(OBJECTDIR)perrno.o: $(SRCDIR)perrno.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)osmsgprint.h \
+	$(INCDIR)lispemul.h $(INCDIR)osmsg.h \
 	$(INCDIR)perrnodefs.h $(INCDIR)osmsgdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)perrno.c -o $(OBJECTDIR)perrno.o
 
@@ -843,7 +843,7 @@ $(OBJECTDIR)timer.o: $(SRCDIR)timer.c $(REQUIRED-INCS) \
 $(OBJECTDIR)tty.o: $(SRCDIR)tty.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
-	$(INCDIR)commondefs.h $(INCDIR)ttydefs.h
+	$(INCDIR)commondefs.h $(INCDIR)tty.h $(INCDIR)ttydefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)tty.c -o $(OBJECTDIR)tty.o
 
 $(OBJECTDIR)typeof.o: $(SRCDIR)typeof.c $(REQUIRED-INCS) \
@@ -876,7 +876,7 @@ $(OBJECTDIR)uraid.o: $(SRCDIR)uraid.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h $(INCDIR)cell.h \
-	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bitblt.h \
 	$(INCDIR)uraiddefs.h $(INCDIR)dbgtooldefs.h $(INCDIR)stack.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)initkbddefs.h \
 	$(INCDIR)kprintdefs.h $(INCDIR)llstkdefs.h $(INCDIR)mkatomdefs.h \
@@ -908,7 +908,7 @@ $(OBJECTDIR)vars3.o: $(SRCDIR)vars3.c $(REQUIRED-INCS) \
 $(OBJECTDIR)vmemsave.o: $(SRCDIR)vmemsave.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
+	$(INCDIR)miscstat.h $(INCDIR)vmemsave.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
 	$(INCDIR)lsptypes.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \
 	$(INCDIR)devif.h $(INCDIR)vmemsavedefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)dskdefs.h $(INCDIR)initkbddefs.h $(INCDIR)perrnodefs.h \
@@ -929,7 +929,7 @@ $(OBJECTDIR)usrsubr.o: $(SRCDIR)usrsubr.c $(REQUIRED-INCS) \
 
 $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)emlglob.h \
-	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)retmacro.h \
+	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)return.h \
 	$(INCDIR)dbprint.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \
 	$(INCDIR)initatms.h $(INCDIR)gcdata.h $(INCDIR)arith.h $(INCDIR)stream.h \
@@ -992,7 +992,7 @@ $(OBJECTDIR)xcursor.o: $(SRCDIR)xcursor.c $(REQUIRED-INCS) \
 
 $(OBJECTDIR)xwinman.o: $(SRCDIR)xwinman.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)miscstat.h $(INCDIR)devif.h $(INCDIR)xdefs.h \
-	$(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
+	$(INCDIR)xscroll.h $(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
 	$(INCDIR)xlspwindefs.h $(INCDIR)xscrolldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)xwinman.c -o $(OBJECTDIR)xwinman.o
 

bin/makeright

@@ -20,7 +20,7 @@
 # Nov 20 2001 JDS:  Convert to use BASH, not CSH, for open-source...
 #
 # usage:  makeright [display-option] [other-option]
-# 
+#
 # example: makeright single	;  make lde for mmaped displayFB
 #	   makeright multi	;  make lde for cg3,cg6
 #	   makeright x		;  make lde for X-windows
@@ -33,31 +33,44 @@
 #
 # makeright init  requires directory "maiko/init.${architecture}
 #
-# Note: X11R4 environment link shared libraries. 
+# Note: X11R4 environment link shared libraries.
-#	lde need X library. If lde links shared libraries, 
+#	lde need X library. If lde links shared libraries,
 #	X shared libraries are needed at run time.
 #
 # Hide X shared libraries from link libraries search path.
-LD_LIBRARY_PATH=/usr/local/lib 
+LD_LIBRARY_PATH=/usr/local/lib
 
 export PATH=".:$PATH"
 
+noshift="false"
 if test "$1" = ""
    then
 	display="single"
+        noshift="true"
+elif test "$1" = "nethub"
+    then
+        display="single"
+        noshift="true"
 else
     display="$1"
+    noshift="false"
 fi
 
-if test $# -gt 0
+if test "$noshift" = "false"
     then
 	shift
 fi
 
-: ${RELEASE=351}
+nethub="false"
+if test "$1" = "nethub"
+    then
+        nethub="true"
+        shift
+fi
+
 architecture=`machinetype`
 osversion=`osversion`
-echo "making release ${RELEASE} for ${osversion} on ${architecture}."
+echo "making so far for ${osversion} on ${architecture}."
 case "$display" in
 	init)	display=single
 		releasename=init-${osversion}.${architecture}
@@ -72,7 +85,7 @@ case "$display" in
 	x)	releasename=${osversion}.${architecture}-${display}
 		ldename=ldex
 		;;
-	sdl*)	releasename=${osversion}.${architecture}-${display}
+	sdl)	releasename=${osversion}.${architecture}-${display}
 		ldename=ldesdl
 		;;
 	wasm)	osversion=emscripten
@@ -107,12 +120,17 @@ 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} RELEASE=${RELEASE} LDENAME=${ldename} \
+cp -p makefile-${releasename} /tmp/makefile-${releasename}-$$
+if test "$nethub" = "true"
+    then
+        sed -e "/^DFLAGS = /s/$/ -DMAIKO_ENABLE_NETHUB/" -i /tmp/makefile-${releasename}-$$
+fi
+make RELEASENAME=${releasename} LDENAME=${ldename} \
 			OSARCHNAME=${osversion}.${architecture} \
-			-f makefile-header -f makefile-${releasename} \
+			-f makefile-header -f /tmp/makefile-${releasename}-$$ \
 			-f makefile-tail $*

bin/mkvdate

@@ -1,22 +1,6 @@
 #!/bin/sh
-if command -v "git" >/dev/null 2>&1; then
-    MAIKO_REV="$(git status --porcelain)"
-    if [ $? == 0 ]; then
-	if [ ! -z "$(git status --porcelain)" ]; then
-            MAIKO_REV="$(git rev-parse --short HEAD)-dirty"
-	else
-	    MAIKO_REV="$(git rev-parse --short HEAD)"
-	fi
-    else
-	MAIKO_REV="none"
-    fi
-else
-    MAIKO_REV = "none"
-fi
 cat <<EOF
 #include <time.h>
 extern const time_t MDate;
 const time_t MDate = $(date +%s);
-extern const char *MaikoGitVersion;
-const char *MaikoGitVersion = "maiko git version: $MAIKO_REV";
 EOF

inc/XKeymap.h

@@ -221,17 +221,17 @@ static const int generic_X_keymap[] = {
     /* keypad digit assignments above, try assigning */
     /* the new arrow-key key#s assigned for RS/6000  */
     /* Failing that, try assigning the keypad #s.    */
-    1, 84, XK_Left,
     0, 129, XK_Left,
+    0, 84, XK_Left,
 
-    1, 82, XK_Up,
     0, 130, XK_Up,
+    0, 82, XK_Up,
 
-    1, 69, XK_Down,
     0, 131, XK_Down,
+    0, 69, XK_Down,
 
-    1, 87, XK_Right,
     0, 132, XK_Right,
+    0, 87, XK_Right,
 
     0, 93, XK_Multi_key,   /* Expand, Sun type-4 */
     0, 93, XK_Alt_R,       /* Expand, RH Alt key  */

inc/bitblt.h

@@ -1,10 +1,10 @@
-#ifndef BBTMACRO_H
+#ifndef BITBLT_H
-#define BBTMACRO_H 1
+#define BITBLT_H 1
 /* $Id: bitblt.h,v 1.2 1999/01/03 02:05:54 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
 /*
  *	Copyright (C) 1988 by Fuji Xerox Co., Ltd. All rights reserved.
  *
- *	File :  bbtmacro.h (was bitblt.h)
+ *	File :  bitblt.h
  *
  *	Author :  Osamu Nakamura
  *
@@ -85,4 +85,4 @@ extern DLword *EmCursorX68K,*EmCursorY68K;
 #define UNLOCKSCREEN ScreenLocked = NIL
 
 #endif /* DOS */
-#endif /* BBTMACRO_H */
+#endif /* BITBLT_H */

inc/ether.h

@@ -0,0 +1,120 @@
+#ifndef ETHER_H
+#define ETHER_H 1
+/* $Id: ether.h,v 1.2 1999/01/03 02:05:59 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
+
+/************************************************************************/
+/*									*/
+/*	(C) Copyright 1989-92 Venue. All Rights Reserved.		*/
+/*	Manufactured in the United States of America.			*/
+/*									*/
+/************************************************************************/
+#include "lispemul.h" /* for LispPTR, DLword */
+
+#ifndef BYTESWAP
+
+typedef struct { 
+	DLword	DLLOCALHOST0;
+	DLword	DLLOCALHOST1;
+	DLword	DLLOCALHOST2;
+	DLword	DLFIRSTICB;
+	DLword	DLINPUTMASK;
+	DLword	DLFIRSTOCB;
+	DLword	DLOUTPUTMASK;
+	DLword	DLMISSEDPACKETS;
+	DLword	DLLASTICB;
+	DLword	DLLASTOCB;
+} DLETHERCSB;
+
+typedef struct{ 
+	DLword	DLIOCBLENGTH;
+	DLword	DLIOCBBUFFERLO;
+	DLword	DLIOCBBUFFERHI;
+	DLword	DLRETRANSMISSIONMASK;
+	DLword	DLIOCBBYTESUSED;
+	DLword	DLIOCBSTATUS;
+	DLword	DLNEXTIOCB;
+	DLword	DLFOROUTPUTUSE;
+} DLETHERIOCB;
+
+typedef struct { 
+	unsigned int	NETTYPE : 8;
+	unsigned int	NDBNEXT : 24;
+	unsigned int	NDBPUPNET : 8;
+	unsigned int	NDBNSNET : 24;
+	unsigned int	NDBTASK : 8;
+	unsigned int	NDBBROADCASTP : 24;
+	unsigned int	NDBPUPHOST : 8;
+	unsigned int	NDBTRANSMITTER : 24;
+	unsigned int	nil1: 8;
+	unsigned int	NDBENCAPSULATOR : 24;
+	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
+	unsigned int	NDBCSB : 24; /* DATATYPE */
+	LispPTR		NDBIQ;
+	LispPTR		NDBTQ;
+	LispPTR		NDBTRANSLATIONS;
+	LispPTR		NDBETHERFLUSHER;
+	LispPTR		NDBWATCHER;
+	LispPTR		NDBCANHEARSELF;
+	LispPTR		NDBIPNET;
+	LispPTR		NDBIPHOST;
+	DLword		NDBPUPTYPE;
+	DLword		nil2;
+	LispPTR		nil3;
+} NDB;
+#else
+	/***********************************************/
+	/* Byte-swapped definitions, for e.g., 80386's */
+	/***********************************************/
+typedef struct { 
+	DLword	DLLOCALHOST1;
+	DLword	DLLOCALHOST0;
+	DLword	DLFIRSTICB;
+	DLword	DLLOCALHOST2;
+	DLword	DLFIRSTOCB;
+	DLword	DLINPUTMASK;
+	DLword	DLMISSEDPACKETS;
+	DLword	DLOUTPUTMASK;
+	DLword	DLLASTOCB;
+	DLword	DLLASTICB;
+} DLETHERCSB;
+
+typedef struct{ 
+	DLword	DLIOCBBUFFERLO;
+	DLword	DLIOCBLENGTH;
+	DLword	DLRETRANSMISSIONMASK;
+	DLword	DLIOCBBUFFERHI;
+	DLword	DLIOCBSTATUS;
+	DLword	DLIOCBBYTESUSED;
+	DLword	DLFOROUTPUTUSE;
+	DLword	DLNEXTIOCB;
+} DLETHERIOCB;
+
+typedef struct { 
+	unsigned int	NDBNEXT : 24;
+	unsigned int	NETTYPE : 8;
+	unsigned int	NDBNSNET : 24;
+	unsigned int	NDBPUPNET : 8;
+	unsigned int	NDBBROADCASTP : 24;
+	unsigned int	NDBTASK : 8;
+	unsigned int	NDBTRANSMITTER : 24;
+	unsigned int	NDBPUPHOST : 8;
+	unsigned int	NDBENCAPSULATOR : 24;
+	unsigned int	nil1: 8;
+	unsigned int	NDBCSB : 24; /* DATATYPE */
+	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
+	LispPTR		NDBIQ;
+	LispPTR		NDBTQ;
+	LispPTR		NDBTRANSLATIONS;
+	LispPTR		NDBETHERFLUSHER;
+	LispPTR		NDBWATCHER;
+	LispPTR		NDBCANHEARSELF;
+	LispPTR		NDBIPNET;
+	LispPTR		NDBIPHOST;
+	DLword		nil2;
+	DLword		NDBPUPTYPE;
+	LispPTR		nil3;
+} NDB;
+
+#endif /* BYTESWAP */
+
+#endif /* ETHER_H */

inc/gcdata.h

@@ -18,7 +18,8 @@
 */
 /**********************************************************************/
 #include "lispemul.h" /* for LispPTR, DLword */
-#include "version.h" /* for BIGVM */
+#include "version.h" /* for USHORT */
+#include "gchtfinddefs.h"
 
 #define ADDREF  0       /* for gclookup routine. */
 #define DELREF  1       /* for gclookup routine. */
@@ -131,10 +132,10 @@
 #ifdef BIGVM  
 struct   hashentry
   { /* GC hashtable entry */
-    DLword count        :15;
+    unsigned short count        :15;
-    DLword stackref     :1;
+    unsigned short stackref     :1;
-    DLword segnum       :15;
+    unsigned short segnum       :15;
-    DLword collision    :1;
+    unsigned short collision    :1;
   };
 
 struct  htlinkptr
@@ -162,10 +163,10 @@ struct  htoverflow
 #else
 struct   hashentry
   { /* GC hashtable entry */
-    DLword count        :6;
+    USHORT count        :6;
-    DLword stackref     :1;
+    USHORT stackref     :1;
-    DLword segnum       :8;
+    USHORT segnum       :8;
-    DLword collision    :1;
+    USHORT collision    :1;
   };
 
 struct  htlinkptr
@@ -200,10 +201,10 @@ struct  htoverflow
 #ifdef BIGVM
 struct   hashentry
   { /* GC hashtable entry */
-    DLword collision    :1;
+    USHORT collision    :1;
-    DLword segnum       :15;
+    USHORT segnum       :15;
-    DLword stackref     :1;
+    USHORT stackref     :1;
-    DLword count        :15;
+    USHORT count        :15;
   };
 
 struct  htlinkptr
@@ -231,10 +232,10 @@ struct  htoverflow
 #else
 struct   hashentry
   { /* GC hashtable entry */
-    DLword collision    :1;
+    USHORT collision    :1;
-    DLword segnum       :8;
+    USHORT segnum       :8;
-    DLword stackref     :1;
+    USHORT stackref     :1;
-    DLword count        :6;
+    USHORT count        :6;
   };
 
 struct  htlinkptr

inc/gchtfinddefs.h

@@ -1,9 +1,8 @@
 #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(GCENTRY *entry, DLword casep, LispPTR ptr);
+void modify_big_reference_count(LispPTR *entry, DLword casep, LispPTR ptr);
 LispPTR htfind(LispPTR ptr, int casep);
 LispPTR rec_htfind(LispPTR ptr, int casep);
 #endif

inc/inlineC.h

@@ -217,7 +217,7 @@
 
 #define FJUMPMACRO(x)                         \
   do {                                        \
-    if (TOPOFSTACK != 0) { POP; nextop1; }    \
+    if (TOPOFSTACK != 0) { goto PopNextop1; } \
     {                                         \
       CHECK_INTERRUPT;                        \
       POP;                                    \
@@ -227,7 +227,7 @@
   } while (0)
 #define TJUMPMACRO(x)                         \
   do {                                        \
-    if (TOPOFSTACK == 0) { POP; nextop1; }    \
+    if (TOPOFSTACK == 0) { goto PopNextop1; } \
     {                                         \
       CHECK_INTERRUPT;                        \
       POP;                                    \

inc/lispemul.h

@@ -267,22 +267,22 @@ struct state {
 
 /* For bit test */
 typedef struct wbits {
-  DLword LSB : 1;
+  USHORT LSB : 1;
-  DLword B14 : 1;
+  USHORT B14 : 1;
-  DLword B13 : 1;
+  USHORT B13 : 1;
-  DLword B12 : 1;
+  USHORT B12 : 1;
-  DLword B11 : 1;
+  USHORT B11 : 1;
-  DLword B10 : 1;
+  USHORT B10 : 1;
-  DLword B9 : 1;
+  USHORT B9 : 1;
-  DLword B8 : 1;
+  USHORT B8 : 1;
-  DLword B7 : 1;
+  USHORT B7 : 1;
-  DLword B6 : 1;
+  USHORT B6 : 1;
-  DLword B5 : 1;
+  USHORT B5 : 1;
-  DLword B4 : 1;
+  USHORT B4 : 1;
-  DLword B3 : 1;
+  USHORT B3 : 1;
-  DLword B2 : 1;
+  USHORT B2 : 1;
-  DLword B1 : 1;
+  USHORT B1 : 1;
-  DLword xMSB : 1;
+  USHORT xMSB : 1;
 } WBITS;
 
 #define PUTBASEBIT68K(base68k, offset, bitvalue)                                             \

inc/locfile.h

@@ -499,8 +499,7 @@ do  {				\
 #define	MAXVERSION		999999999
 
 #define	LASTVERSIONARRAY	((unsigned) -1)
-#define	VERSIONARRAYCHUNKLENGTH	200
+#define	VERSIONARRAYLENGTH	200
-#define	VERSIONARRAYMAXLENGTH   2000
 
 #define NoFileP(varray)						\
         (((varray)->version_no == LASTVERSIONARRAY)? 1 : 0)

inc/lsptypes.h

@@ -699,111 +699,4 @@ typedef
 			/* low-order 12 bits first.            */
     } BIGNUM;
 
-
-/* Ethernet records */
-
-#ifndef BYTESWAP
-typedef struct { 
-	DLword	DLLOCALHOST0;
-	DLword	DLLOCALHOST1;
-	DLword	DLLOCALHOST2;
-	DLword	DLFIRSTICB;
-	DLword	DLINPUTMASK;
-	DLword	DLFIRSTOCB;
-	DLword	DLOUTPUTMASK;
-	DLword	DLMISSEDPACKETS;
-	DLword	DLLASTICB;
-	DLword	DLLASTOCB;
-} DLETHERCSB;
-
-typedef struct{ 
-	DLword	DLIOCBLENGTH;
-	DLword	DLIOCBBUFFERLO;
-	DLword	DLIOCBBUFFERHI;
-	DLword	DLRETRANSMISSIONMASK;
-	DLword	DLIOCBBYTESUSED;
-	DLword	DLIOCBSTATUS;
-	DLword	DLNEXTIOCB;
-	DLword	DLFOROUTPUTUSE;
-} DLETHERIOCB;
-
-typedef struct { 
-	unsigned int	NETTYPE : 8;
-	unsigned int	NDBNEXT : 24;
-	unsigned int	NDBPUPNET : 8;
-	unsigned int	NDBNSNET : 24;
-	unsigned int	NDBTASK : 8;
-	unsigned int	NDBBROADCASTP : 24;
-	unsigned int	NDBPUPHOST : 8;
-	unsigned int	NDBTRANSMITTER : 24;
-	unsigned int	nil1: 8;
-	unsigned int	NDBENCAPSULATOR : 24;
-	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
-	unsigned int	NDBCSB : 24; /* DATATYPE */
-	LispPTR		NDBIQ;
-	LispPTR		NDBTQ;
-	LispPTR		NDBTRANSLATIONS;
-	LispPTR		NDBETHERFLUSHER;
-	LispPTR		NDBWATCHER;
-	LispPTR		NDBCANHEARSELF;
-	LispPTR		NDBIPNET;
-	LispPTR		NDBIPHOST;
-	DLword		NDBPUPTYPE;
-	DLword		nil2;
-	LispPTR		nil3;
-} NDB;
-#else
-	/***********************************************/
-	/* Byte-swapped definitions, for e.g., 80386's */
-	/***********************************************/
-typedef struct { 
-	DLword	DLLOCALHOST1;
-	DLword	DLLOCALHOST0;
-	DLword	DLFIRSTICB;
-	DLword	DLLOCALHOST2;
-	DLword	DLFIRSTOCB;
-	DLword	DLINPUTMASK;
-	DLword	DLMISSEDPACKETS;
-	DLword	DLOUTPUTMASK;
-	DLword	DLLASTOCB;
-	DLword	DLLASTICB;
-} DLETHERCSB;
-
-typedef struct{ 
-	DLword	DLIOCBBUFFERLO;
-	DLword	DLIOCBLENGTH;
-	DLword	DLRETRANSMISSIONMASK;
-	DLword	DLIOCBBUFFERHI;
-	DLword	DLIOCBSTATUS;
-	DLword	DLIOCBBYTESUSED;
-	DLword	DLFOROUTPUTUSE;
-	DLword	DLNEXTIOCB;
-} DLETHERIOCB;
-
-typedef struct { 
-	unsigned int	NDBNEXT : 24;
-	unsigned int	NETTYPE : 8;
-	unsigned int	NDBNSNET : 24;
-	unsigned int	NDBPUPNET : 8;
-	unsigned int	NDBBROADCASTP : 24;
-	unsigned int	NDBTASK : 8;
-	unsigned int	NDBTRANSMITTER : 24;
-	unsigned int	NDBPUPHOST : 8;
-	unsigned int	NDBENCAPSULATOR : 24;
-	unsigned int	nil1: 8;
-	unsigned int	NDBCSB : 24; /* DATATYPE */
-	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
-	LispPTR		NDBIQ;
-	LispPTR		NDBTQ;
-	LispPTR		NDBTRANSLATIONS;
-	LispPTR		NDBETHERFLUSHER;
-	LispPTR		NDBWATCHER;
-	LispPTR		NDBCANHEARSELF;
-	LispPTR		NDBIPNET;
-	LispPTR		NDBIPHOST;
-	DLword		nil2;
-	DLword		NDBPUPTYPE;
-	LispPTR		nil3;
-} NDB;
-#endif /* BYTESWAP */
 #endif /* LSPTYPES_H */

inc/my.h

@@ -20,7 +20,6 @@
 #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

inc/osmsg.h

@@ -1,5 +1,5 @@
-#ifndef OSMSGPRINT_H
+#ifndef OSMSG_H
-#define OSMSGPRINT_H 1
+#define OSMSG_H 1
 /* $Id: osmsg.h,v 1.2 1999/01/03 02:06:20 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
 
 
@@ -23,4 +23,4 @@
     print_exp;					\
   } while (0)
 
-#endif /* OSMSGPRINT_H */
+#endif /* OSMSG_H */

inc/rawcolordefs.h

@@ -1,8 +0,0 @@
-#ifndef RAWCOLORDEFS_H
-#define RAWCOLORDEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-void C_slowbltchar(LispPTR *args);
-LispPTR Colorize_Bitmap(LispPTR args[]);
-void Draw_8BppColorLine(LispPTR *args);
-void Uncolorize_Bitmap(LispPTR args[]);
-#endif

inc/return.h

@@ -1,12 +1,12 @@
-#ifndef RETMACRO_H
+#ifndef RETURN_H
-#define RETMACRO_H 1
+#define RETURN_H 1
 /* $Id: return.h,v 1.2 1999/01/03 02:06:22 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
 
 
 /**************************************************************/
 /*
 
-	File Name : 	retmacro.h (was return.h)
+	File Name : 	return.h
 	Desc. :		Macros for return,contextsw
 
 	Written by :	Takeshi Shimizu
@@ -111,4 +111,4 @@
     S_CHECK( EndSTKP > CurrentStackPTR, 				\
 		"End of stack isn't beyond current stk pointer."); 	\
   } while (0)
-#endif /* RETMACRO_H */
+#endif /* RETURN_H */

inc/stack.h

@@ -79,22 +79,22 @@ typedef struct fnhead {
 } FNHEAD;
 
 typedef struct frameex1 {
-  DLword flags : 3;
+  unsigned short flags : 3;
-  DLword fast : 1;
+  unsigned short fast : 1;
-  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
-  DLword incall : 1;
+  unsigned short incall : 1;
-  DLword validnametable : 1;
+  unsigned short validnametable : 1;
   /* 0: look for FunctionHeader
      1: look for NameTable on this FrameEx */
-  DLword nopush : 1;
+  unsigned short nopush : 1;
-  DLword usecount : 8;
+  unsigned short usecount : 8;
   DLword alink; /* alink pointer (Low addr) */
 #ifdef BIGVM
   LispPTR fnheader; /* pointer to FunctionHeader (Hi2 addr) */
 #else
   DLword lofnheader;        /* pointer to FunctionHeader (Low addr) */
-  DLword hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
+  unsigned short hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
-  DLword hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
+  unsigned short hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
 #endif /* BIGVM */
   DLword nextblock; /* pointer to FreeStackBlock */
   DLword pc;        /* Program counter */
@@ -102,23 +102,23 @@ typedef struct frameex1 {
   LispPTR nametable; /* ptr to NameTable of this FrameEx (Hi2 addr) */
 #else
   DLword lonametable;        /* ptr to NameTable of this FrameEx (Low addr) */
-  DLword hi1nametable : 8; /* ptr to NameTable of this FrameEx (Hi1 addr) */
+  unsigned short hi1nametable : 8; /* ptr to NameTable of this FrameEx (Hi1 addr) */
-  DLword hi2nametable : 8; /* ptr to NameTable of this FrameEx (Hi2 addr) */
+  unsigned short hi2nametable : 8; /* ptr to NameTable of this FrameEx (Hi2 addr) */
 #endif /* BIGVM */
   DLword blink; /* blink pointer (Low addr) */
   DLword clink; /* clink pointer (Low addr) */
 } FX;
 
 typedef struct frameex2 {
-  DLword flags : 3;
+  unsigned short flags : 3;
-  DLword fast : 1;
+  unsigned short fast : 1;
-  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
-  DLword incall : 1;
+  unsigned short incall : 1;
-  DLword validnametable : 1;
+  unsigned short validnametable : 1;
   /* 0: look for FunctionHeader
      1: look for NameTable on this FrameEx */
-  DLword nopush : 1;
+  unsigned short nopush : 1;
-  DLword usecount : 8;
+  unsigned short usecount : 8;
   DLword alink;      /* alink pointer (Low addr) */
   LispPTR fnheader;  /* pointer to FunctionHeader */
   DLword nextblock;  /* pointer to FreeStackBlock */
@@ -135,19 +135,19 @@ typedef struct fxblock {
 } FXBLOCK;
 
 typedef struct basic_frame {
-  DLword flags : 3;
+  unsigned short flags : 3;
-  DLword nil : 3;
+  unsigned short nil : 3;
-  DLword residual : 1;
+  unsigned short residual : 1;
-  DLword padding : 1;
+  unsigned short padding : 1;
-  DLword usecnt : 8;
+  unsigned short usecnt : 8;
   DLword ivar; /* stk offset of IVARs for this frame ?? */
 
 } Bframe;
 
 typedef struct stkword {
-  DLword flags : 3;
+  unsigned short flags : 3;
-  DLword nil : 5;
+  unsigned short nil : 5;
-  DLword usecount : 8;
+  unsigned short usecount : 8;
 } StackWord;
 
 typedef struct stack_block {
@@ -185,33 +185,33 @@ typedef struct fnhead {
   unsigned nil3 : 2;       /* not used */
   unsigned nil2 : 2;       /* not used */
 #endif /* BIGVM */
-  DLword argtype : 2;     /* ?? */
+  unsigned short argtype : 2;     /* ?? */
-  DLword byteswapped : 1; /* code was reswapped.	*/
+  unsigned short byteswapped : 1; /* code was reswapped.	*/
-  DLword nil4 : 1;        /* not used, prev: native translated? */
+  unsigned short nil4 : 1;        /* not used, prev: native translated? */
-  DLword fvaroffset : 8;
+  unsigned short fvaroffset : 8;
   /* DLword offset from head of NameTable */
-  DLword nlocals : 8; /* ?? */
+  unsigned short nlocals : 8; /* ?? */
   DLword ntsize;        /* size of NameTable */
                         /* NameTable of variable length is following with this structure. */
 } FNHEAD;
 
 typedef struct frameex1 {
   DLword alink; /* alink pointer (Low addr) */
-  DLword usecount : 8;
+  unsigned short usecount : 8;
-  DLword nopush : 1;
+  unsigned short nopush : 1;
-  DLword validnametable : 1;
+  unsigned short validnametable : 1;
   /* 0: look for FunctionHeader
      1: look for NameTable on this FrameEx */
-  DLword incall : 1;
+  unsigned short incall : 1;
-  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
-  DLword fast : 1;
+  unsigned short fast : 1;
-  DLword flags : 3; /* hi word */
+  unsigned short flags : 3; /* hi word */
 
 #ifdef BIGVM
   LispPTR fnheader; /* pointer to FunctionHeader (Hi2 addr) */
 #else
-  DLword hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
+  unsigned short hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
-  DLword hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
+  unsigned short hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
   DLword lofnheader;        /* pointer to FunctionHeader (Low addr) */
 #endif /* BIGVM */
 
@@ -221,8 +221,8 @@ typedef struct frameex1 {
 #ifdef BIGVM
   LispPTR nametable; /* pointer to NameTable of this FX (Hi2 addr) */
 #else
-  DLword hi2nametable : 8; /* pointer to NameTable of this FX (Hi2 addr) */
+  unsigned short hi2nametable : 8; /* pointer to NameTable of this FX (Hi2 addr) */
-  DLword hi1nametable : 8; /* pointer to NameTable of this FX (Hi1 addr) */
+  unsigned short hi1nametable : 8; /* pointer to NameTable of this FX (Hi1 addr) */
   DLword lonametable;        /* pointer to NameTable of this FX (Low addr) */
 #endif /* BIGVM */
 
@@ -232,15 +232,15 @@ typedef struct frameex1 {
 
 typedef struct frameex2 {
   DLword alink; /* alink pointer (Low addr) */
-  DLword usecount : 8;
+  unsigned short usecount : 8;
-  DLword nopush : 1;
+  unsigned short nopush : 1;
-  DLword validnametable : 1;
+  unsigned short validnametable : 1;
   /* 0: look for FunctionHeader
      1: look for NameTable on this FrameEx */
-  DLword incall : 1;
+  unsigned short incall : 1;
-  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
-  DLword fast : 1;
+  unsigned short fast : 1;
-  DLword flags : 3;
+  unsigned short flags : 3;
 
   LispPTR fnheader; /* pointer to FunctionHeader (swapped) */
 
@@ -261,18 +261,18 @@ typedef struct fxblock {
 
 typedef struct basic_frame {
   DLword ivar;
-  DLword usecnt : 8;
+  unsigned short usecnt : 8;
-  DLword padding : 1;
+  unsigned short padding : 1;
-  DLword residual : 1;
+  unsigned short residual : 1;
-  DLword nil : 3;
+  unsigned short nil : 3;
-  DLword flags : 3;
+  unsigned short flags : 3;
 
 } Bframe;
 
 typedef struct stkword {
-  DLword usecount : 8;
+  USHORT usecount : 8;
-  DLword nil : 5;
+  USHORT nil : 5;
-  DLword flags : 3;
+  USHORT flags : 3;
 } StackWord;
 
 typedef struct stack_block {

inc/tty.h

@@ -0,0 +1,67 @@
+#ifndef TTY_H
+#define TTY_H 1
+/* $Id: tty.h,v 1.2 1999/01/03 02:06:29 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
+
+/************************************************************************/
+/*									*/
+/*	(C) Copyright 1989-96 Venue. All Rights Reserved.		*/
+/*	Manufactured in the United States of America.			*/
+/*									*/
+/************************************************************************/
+#include "lispemul.h" /* for DLword */
+
+/*
+ TTY Command
+*/
+
+#define TTY_GET_STATUS     33280>>8
+#define TTY_ON             33536>>8
+#define TTY_OFF            33792>>8
+#define TTY_BREAK_ON       34304>>8
+#define TTY_BREAK_OFF      34560>>8
+#define PUT_CHAR             128
+#define ABORT_PUT            133
+#define SET_PARAM            129
+#define SET_DSR            33025
+#define SET_CTS            33026
+#define SET_CHAR_LENGTH    33028
+#define SET_PARITY         33032
+#define SET_STOP_BITS      33040
+#define SET_BAUD_RATE      33056
+#define SET_ALL_PARAMETERS 33087
+
+typedef struct {
+	unsigned command             : 8;
+	unsigned outdata             : 8;
+} DLTTY_OUT_COMMAND;
+
+typedef struct {
+	unsigned on_off              : 4;
+	unsigned line_speed          : 4;
+	unsigned stop_bits           : 2;
+	unsigned parity              : 2;
+	unsigned char_length         : 2;
+	unsigned clear_to_send       : 1;
+	unsigned data_set_ready      : 1;
+	DLword  notify_mask;
+} DLTTY_OUT_CSB;
+
+typedef struct {
+	unsigned state               : 1;
+	unsigned nil1                : 7;
+	unsigned success             : 1;
+	unsigned break_detected      : 1;
+	unsigned framing_error       : 1;
+	unsigned data_lost           : 1;
+	unsigned parity_error        : 1;
+	unsigned nil2                : 2;
+	unsigned not_ready           : 1;
+	char     in_data;
+	unsigned data_terminal_ready : 1;
+	unsigned nil3                : 4;
+	unsigned request_to_send     : 1;
+	unsigned rx_ready            : 1;
+	unsigned tx_ready            : 1;
+} DLTTY_IN_CSB;
+
+#endif /* TTY_H */

inc/uutilsdefs.h

@@ -6,5 +6,5 @@ LispPTR unix_username(LispPTR *args);
 LispPTR unix_getparm(LispPTR *args);
 LispPTR unix_getenv(LispPTR *args);
 LispPTR unix_fullname(LispPTR *args);
-LispPTR suspend_lisp(void);
+LispPTR suspend_lisp(LispPTR *args);
 #endif

inc/version.h

@@ -227,6 +227,9 @@ typedef unsigned char u_char;
 typedef unsigned long u_int;
 typedef unsigned short u_short;
 #undef UNALIGNED_FETCH_OK
+typedef unsigned USHORT;
+#else
+typedef unsigned short USHORT;
 #endif /* DOS */
 
 	/****************************************************************/
@@ -234,14 +237,6 @@ typedef unsigned short u_short;
 	/* 	    --Start of system-specific flags		 	*/
 	/*								*/
 	/****************************************************************/
-#ifdef MAIKO_OS_MACOS
-/* macOS does not follow the POSIX standard for the names of the stat
-   fields that allow access to the nanosecond resolution times
-*/
-#define st_atim st_atimespec
-#define st_mtim st_mtimespec
-#define st_ctim st_ctimespec
-#endif
 
 	/****************************************************************/
 	/* 	    End of system-specific flag settings		*/

inc/vmemsave.h

@@ -0,0 +1,25 @@
+#ifndef VMEMSAVE_H
+#define VMEMSAVE_H 1
+/* $Id: vmemsave.h,v 1.2 1999/01/03 02:06:29 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
+
+
+
+/************************************************************************/
+/*									*/
+/*	(C) Copyright 1989-96 Venue. All Rights Reserved.		*/
+/*	Manufactured in the United States of America.			*/
+/*									*/
+/************************************************************************/
+
+
+/*
+	File Name : vmemsave.h
+	DEfinition for vmemsave
+*/
+
+#define	FP_IFPAGE  512			/* IFPAGE address in sysoutfile by Byte */
+#define	DOMINOPAGES  301		/* skip dominopages  in  fptovp */
+#define	SKIPPAGES  301			/* save first filepage  */
+#define	SKIP_DOMINOPAGES  153600	/* Byte size in sysoutfile for dominocode */
+#define	SAVE_IFPAGE	223		/* Virtual address for IFPAGES's buffer page. This value is \EMUSWAPBUFFERS in lisp. */
+#endif /* VMEMSAVE_H */

inc/vmemsavedefs.h

@@ -4,5 +4,5 @@
 int lispstringP(LispPTR Lisp);
 LispPTR vmem_save(char *sysout_file_name);
 LispPTR vmem_save0(LispPTR *args);
-void lisp_finish(int exit_status);
+void lisp_finish(void);
 #endif

inc/xscroll.h

@@ -0,0 +1,18 @@
+#ifndef XSCROLL_H
+#define XSCROLL_H 1
+/************************************************************************/
+/*									*/
+/*			xscroll.h					*/
+/*									*/
+/* Scrolling functions implemented in xscroll.c				*/
+/*									*/
+/************************************************************************/
+#include "devif.h" /* for DspInterface */
+void Scroll(DspInterface dsp, int newX, int newY);
+void JumpScrollVer(DspInterface dsp, int y);
+void JumpScrollHor(DspInterface dsp, int x);
+void ScrollLeft(DspInterface dsp);
+void ScrollRight(DspInterface dsp);
+void ScrollUp(DspInterface dsp);
+void ScrollDown(DspInterface dsp);
+#endif /* XSCROLL_H */

src/bbtsub.c

@@ -47,8 +47,9 @@
 #include "address.h"
 #include "arith.h"
 #include "stack.h"
-#include "retmacro.h"
+#include "return.h"
 #include "cell.h"
+#include "gcdata.h"
 
 #include "bbtsubdefs.h"
 #include "car-cdrdefs.h"
@@ -60,7 +61,7 @@
 #include "returndefs.h"
 
 #include "bb.h"
-#include "bbtmacro.h"
+#include "bitblt.h"
 #include "pilotbbt.h"
 #include "dspdata.h"
 #include "display.h"

src/bitblt.c

@@ -25,7 +25,7 @@
 
 #include "pilotbbt.h"
 #include "display.h"
-#include "bbtmacro.h"
+#include "bitblt.h"
 #include "bb.h"
 
 #include "bitbltdefs.h"
@@ -126,7 +126,7 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl, LispPTR tos)
   if (displayflg) (currentdsp->mouse_visible)(IOPage->dlmousex, IOPage->dlmousey);
 #endif /* SUNDISPLAY / DOS */
 
-#if defined(XWINDOW) || defined(SDL)
+#ifdef XWINDOW
   flush_display_lineregion(dx, dstbase, w, h);
 #endif /* XWINDOW */
 

src/car-cdr.c

@@ -38,7 +38,6 @@
 #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

src/chardev.c

@@ -43,6 +43,7 @@
 #include "arith.h"
 #include "timeout.h"
 #include "locfile.h"
+#include "osmsg.h"
 #include "dbprint.h"
 
 #include "chardevdefs.h"

src/conspage.c

@@ -23,7 +23,6 @@
 #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

src/dbgtool.c

@@ -589,8 +589,8 @@ void bt1(FX *startFX) {
   BT_morep;
   while ((fnobj->framename != ATOM_T) && (fx->alink != 11)) {
     if (fnum > URMAXFXNUM - 1) {
-      /* Internal buf overflow, too many stack frames */
+      /* Internal buf overflow,more than 100 stacks */
-      printf("***There are more than %d stack frames.\n", URMAXFXNUM);
+      printf("***There are more than 100 stack frames.\n");
       printf(
           "If you want to continue, Uraid will smash its internal table for FX pointer. Do you "
           "accept?(Y or N)\n");

src/draw.c

@@ -20,7 +20,7 @@
 #include <stddef.h>       // for ptrdiff_t
 #include <stdlib.h>       // for abs
 #include "adr68k.h"       // for NativeAligned2FromLAddr
-#include "bbtmacro.h"       // for MOUSEXR, MOUSEYH
+#include "bitblt.h"       // for MOUSEXR, MOUSEYH
 #include "display.h"      // for DISPLAYBUFFER, DisplayRegion68k, in_display...
 #include "drawdefs.h"     // for N_OP_drawline
 #include "emlglob.h"

src/dsk.c

@@ -13,7 +13,7 @@
 #include <fcntl.h>          // for O_RDWR, O_CREAT, open, O_RDONLY, O_TRUNC
 #include <stdio.h>          // for NULL, sprintf, size_t, rename, SEEK_SET
 #include <stddef.h>         // for ptrdiff_t
-#include <stdlib.h>         // for strtoul, qsort
+#include <stdlib.h>         // for strtoul
 #include <string.h>         // for strcpy, strcmp, strlen, strncpy, strchr
 #include <sys/stat.h>       // for stat, fstat, mkdir, S_ISREG, st_atime, chmod
 #include <sys/types.h>      // for ino_t, time_t, off_t
@@ -38,13 +38,12 @@
 #include <pwd.h>            // for getpwuid, passwd
 #include <sys/param.h>      // for MAXPATHLEN
 #include <sys/statvfs.h>    // for statvfs
-#include <sys/time.h>       // for timeval, utimes, futimens
+#include <sys/time.h>       // for timeval, utimes
 #else
 #include <direct.h>
 #include <dos.h>
 #include <time.h>
 #include <io.h>
-#include <search.h>         // for qsort(?)
 #define MAXPATHLEN _MAX_PATH
 #define MAXNAMLEM _MAX_PATH
 #define alarm(x) 0
@@ -58,32 +57,25 @@ typedef struct filename_entry {
   unsigned version_no;
 } FileName;
 
-/*
+typedef struct current_varray {
- * VA, a structure representing the file names and version numbers
+  char path[MAXPATHLEN]; /* pathname of directory */
- *  that were present in a directory at a particular moment in time.
+  char file[MAXPATHLEN]; /* file name  (down cased name) */
- *  The {DSK} device presents a case-insensitive (to Medley) but
+  time_t mtime;
- *  case-preserving (to the host) file system. The VA (Version Array)
+} CurrentVArray;
- */
+
-static struct {
+static FileName VersionArray[VERSIONARRAYLENGTH];
-  char name[MAXPATHLEN];     /* lowercase unversioned file name */
+static CurrentVArray VArrayInfo;
-  ino_t dir_ino;             /* inode of the directory */
-  struct timespec lastMTime; /* modification time of the directory */
-  int allocated;             /* number of entries in the files array */
-  int lastUsed;              /* index of the last entry in use in files array */
-  FileName *files;           /* array of files */
-} VA = {0};
 
 static int locate_file(char *dir, char *name);
 static int make_directory(char *dir);
-static int maintain_version(char *file, int forcep);
+static int maintain_version(char *file, FileName *varray, int forcep);
-static int compare_file_versions(const void *a, const void *b);
 static int get_versionless(FileName *varray, char *file, char *dir);
 static int check_vless_link(char *vless, FileName *varray, char *to_file, int *highest_p);
 static int get_old(char *dir, FileName *varray, char *afile, char *vfile);
 static int get_oldest(char *dir, FileName *varray, char *afile, char *vfile);
 static int get_new(char *dir, FileName *varray, char *afile, char *vfile);
 static int get_old_new(char *dir, FileName *varray, char *afile, char *vfile);
-static int get_version_array(char *dir, char *file);
+static int get_version_array(char *dir, char *file, FileName *varray, CurrentVArray *cache);
 
 #ifdef DOS
 static void separate_drive(char *lfname, char *drive)
@@ -375,24 +367,24 @@ LispPTR COM_openfile(LispPTR *args)
   if (dskp) {
     if (unpack_filename(file, dir, name, ver, 1) == 0) return (NIL);
     if (true_name(dir) != -1) return (0);
-    if (get_version_array(dir, name) == 0) return (NIL);
+    if (get_version_array(dir, name, VersionArray, &VArrayInfo) == 0) return (NIL);
     ConcNameAndVersion(name, ver, file);
 
     switch (args[1]) {
       case RECOG_OLD:
-        if (get_old(dir, VA.files, file, name) == 0) return (NIL);
+        if (get_old(dir, VersionArray, file, name) == 0) return (NIL);
         break;
 
       case RECOG_OLDEST:
-        if (get_oldest(dir, VA.files, file, name) == 0) return (NIL);
+        if (get_oldest(dir, VersionArray, file, name) == 0) return (NIL);
         break;
 
       case RECOG_NEW:
-        if (get_new(dir, VA.files, file, name) == 0) return (NIL);
+        if (get_new(dir, VersionArray, file, name) == 0) return (NIL);
         break;
 
       case RECOG_OLD_NEW:
-        if (get_old_new(dir, VA.files, file, name) == 0) return (NIL);
+        if (get_old_new(dir, VersionArray, file, name) == 0) return (NIL);
         break;
 
       default: return (NIL);
@@ -447,7 +439,7 @@ LispPTR COM_openfile(LispPTR *args)
          * Actually we are creating a new file.  We have to
          * maintain a version status.
          */
-        if (maintain_version(file, 1) == 0) {
+        if (maintain_version(file, (FileName *)NULL, 1) == 0) {
           TIMEOUT(rval = close(fd));
           *Lisp_errno = errno;
           return (NIL);
@@ -493,7 +485,7 @@ LispPTR COM_openfile(LispPTR *args)
      * the entirely newly created file, versionless file, should not
      * be linked to any file.
      */
-    if (maintain_version(file, 0) == 0) {
+    if (maintain_version(file, (FileName *)NULL, 0) == 0) {
       TIMEOUT(close(fd));
       *Lisp_errno = errno;
       return (NIL);
@@ -678,7 +670,7 @@ LispPTR COM_closefile(LispPTR *args)
     *Lisp_errno = errno;
     return (NIL);
   }
-#ifndef DOS /* effectively NEVER, since we're in an ifdef DOS */
+#ifndef DOS
   TIMEOUT(rval = utimes(file, time));
   if (rval != 0) {
     *Lisp_errno = errno;
@@ -689,9 +681,13 @@ LispPTR COM_closefile(LispPTR *args)
   int fd, fatp, dskp, rval;
   time_t cdate;
   char lfname[MAXPATHLEN + 5], host[MAXNAMLEN];
-  char file[MAXPATHLEN];
+  char file[MAXPATHLEN], dir[MAXPATHLEN], name[MAXNAMLEN + 1];
+  char ver[VERSIONLEN];
+  DIR *dirp;
+  struct dirent *dp;
   struct stat sbuf;
-  struct timespec timesp[2];
+  struct timeval time[2];
+  ino_t ino;
 
   ERRSETJMP(NIL);
   Lisp_errno = (int *)NativeAligned4FromLAddr(args[3]);
@@ -756,24 +752,60 @@ LispPTR COM_closefile(LispPTR *args)
     }
   }
 
-  /* introduction of futimens() allows us to set the times on an open
+  if (!unpack_filename(file, dir, name, ver, 1)) return (NIL);
-   * file descriptor so a lot of directory manipulation to find the
-   * appropriate name associated with the inode is no longer required
-   */
 
-  timesp[0].tv_sec = (long)sbuf.st_atime;
+  if (dskp) {
-  timesp[0].tv_nsec = 0L;
+    /*
-  timesp[1].tv_sec = (long)ToUnixTime(cdate);
+     * On {DSK}, we have to make sure dir is case sensitively existing
-  timesp[1].tv_nsec = 0L;
+     * directory.
+     */
+    if (true_name(dir) != -1) return (NIL);
 
-  TIMEOUT(rval = futimens(fd, timesp));
+    /*
-  if (rval != 0) {
+     * There is a very troublesome problem here.  The file name Lisp
+     * recognizes is not always the same as the name which COM_openfile
+     * used to open the file.  Sometimes COM_openfile uses the versionless
+     * file name to open a file, although Lisp always recognizes with
+     * *versioned* file name.
+     * Thus, we compare i-node number of the requested file with ones of all
+     * of files on the directory.   This is time spending implementation.
+     * More clean up work is needed.
+     */
+    TIMEOUT(rval = fstat(fd, &sbuf));
+    if (rval != 0) {
+      *Lisp_errno = errno;
+      return (NIL);
+    }
+    ino = sbuf.st_ino;
+
+    errno = 0;
+    TIMEOUT0(dirp = opendir(dir));
+    if (dirp == (DIR *)NULL) {
+      *Lisp_errno = errno;
+      return (NIL);
+    }
+
+    for (S_TOUT(dp = readdir(dirp)); dp != (struct dirent *)NULL || errno == EINTR;
+         errno = 0, S_TOUT(dp = readdir(dirp)))
+      if (dp) {
+        if (ino == (ino_t)dp->d_ino) sprintf(file, "%s/%s", dir, dp->d_name);
+      }
+    TIMEOUT(closedir(dirp));
+  }
+
+  time[0].tv_sec = (long)sbuf.st_atime;
+  time[0].tv_usec = 0L;
+  time[1].tv_sec = (long)ToUnixTime(cdate);
+  time[1].tv_usec = 0L;
+
+  TIMEOUT(rval = close(fd));
+  if (rval == -1) {
     *Lisp_errno = errno;
     return (NIL);
   }
 
-  TIMEOUT(rval = close(fd));
+  TIMEOUT(rval = utimes(file, time));
-  if (rval == -1) {
+  if (rval != 0) {
     *Lisp_errno = errno;
     return (NIL);
   }
@@ -886,10 +918,10 @@ LispPTR DSK_getfilename(LispPTR *args)
          * Recognizing a file on DSK device needs the version information.
          * We gather version information in a version array first.
          */
-        if (get_version_array(dir, name) == 0) return (NIL);
+        if (get_version_array(dir, name, VersionArray, &VArrayInfo) == 0) return (NIL);
 
         ConcNameAndVersion(name, ver, aname);
-        if (get_old(dir, VA.files, aname, vname) == 0) return (NIL);
+        if (get_old(dir, VersionArray, aname, vname) == 0) return (NIL);
 
         if ((rval = true_name(aname)) == 0) return (NIL);
         if (rval == -1) {
@@ -926,10 +958,10 @@ LispPTR DSK_getfilename(LispPTR *args)
         strcpy(vname, dir);
         dirp = 1;
       } else {
-        if (get_version_array(dir, name) == 0) return (NIL);
+        if (get_version_array(dir, name, VersionArray, &VArrayInfo) == 0) return (NIL);
 
         ConcNameAndVersion(name, ver, aname);
-        if (get_oldest(dir, VA.files, aname, vname) == 0) return (NIL);
+        if (get_oldest(dir, VersionArray, aname, vname) == 0) return (NIL);
 
         if ((rval = true_name(aname)) == 0) return (NIL);
         if (rval == -1) {
@@ -975,10 +1007,10 @@ LispPTR DSK_getfilename(LispPTR *args)
            * Here, dir is an existing directory.  We have to perform
            * "new" recognition with the version information.
            */
-          if (get_version_array(dir, name) == 0) return (NIL);
+          if (get_version_array(dir, name, VersionArray, &VArrayInfo) == 0) return (NIL);
 
           ConcNameAndVersion(name, ver, aname);
-          if (get_new(dir, VA.files, aname, vname) == 0) return (NIL);
+          if (get_new(dir, VersionArray, aname, vname) == 0) return (NIL);
           dirp = 0;
         }
       }
@@ -1001,10 +1033,10 @@ LispPTR DSK_getfilename(LispPTR *args)
           strcpy(vname, aname);
           dirp = 1;
         } else {
-          if (get_version_array(dir, name) == 0) return (NIL);
+          if (get_version_array(dir, name, VersionArray, &VArrayInfo) == 0) return (NIL);
 
           ConcNameAndVersion(name, ver, aname);
-          if (get_old_new(dir, VA.files, aname, vname) == 0) return (NIL);
+          if (get_old_new(dir, VersionArray, aname, vname) == 0) return (NIL);
           dirp = 0;
         }
       }
@@ -1100,6 +1132,7 @@ LispPTR DSK_deletefile(LispPTR *args)
   char file[MAXPATHLEN], fbuf[MAXPATHLEN], vless[MAXPATHLEN];
   char dir[MAXPATHLEN], ver[VERSIONLEN];
   int rval, fatp;
+  FileName *varray;
 #ifdef DOS
   char drive[1], rawname[MAXNAMLEN];
   int extlen; /* len of extension, for making backup filename */
@@ -1127,9 +1160,10 @@ LispPTR DSK_deletefile(LispPTR *args)
 #endif
 
   if (unpack_filename(file, dir, fbuf, ver, 1) == 0) return (NIL);
-  if (get_version_array(dir, fbuf) == 0) return (NIL);
+  if (get_version_array(dir, fbuf, VersionArray, &VArrayInfo) == 0) return (NIL);
+  varray = VersionArray;
 
-  if (NoFileP(VA.files))
+  if (NoFileP(varray))
     return (NIL); /*
                    * If the specified file is deleted from
                    * outside of Lisp during the last time
@@ -1144,9 +1178,9 @@ LispPTR DSK_deletefile(LispPTR *args)
    */
 
   ConcNameAndVersion(fbuf, ver, file);
-  if (get_oldest(dir, VA.files, file, fbuf) == 0) return (NIL);
+  if (get_oldest(dir, varray, file, fbuf) == 0) return (NIL);
 
-  if (get_versionless(VA.files, vless, dir) == 0) {
+  if (get_versionless(varray, vless, dir) == 0) {
     /*
      * There is no versionless file.  All we have to do is to simply
      * try to unlink the specified file.
@@ -1165,7 +1199,7 @@ LispPTR DSK_deletefile(LispPTR *args)
    * file is linked will destroy the consistency of the version status.
    */
 
-  if (check_vless_link(vless, VA.files, fbuf, &rval) == 0) return (NIL);
+  if (check_vless_link(vless, varray, fbuf, &rval) == 0) return (NIL);
 
   if (strcmp(file, vless) == 0 || strcmp(file, fbuf) == 0) {
     if (*fbuf != '\0') {
@@ -1186,12 +1220,12 @@ LispPTR DSK_deletefile(LispPTR *args)
       /*
        * Finally, we have to maintain the version status.
        */
-      if (maintain_version(vless, 0) == 0) return (NIL);
+      if (maintain_version(vless, (FileName *)NULL, 0) == 0) return (NIL);
       return (ATOM_T);
     } else {
       /*
        * Although the versionfile is specified, it is not linked
-       * to any file in VA.files.  We should not maintain the version
+       * to any file in varray.  We should not maintain the version
        * status after deleting the versionless file, because
        * we cannot say whether the versionless file is actually under
        * control of the Medley DSK file system or not.
@@ -1246,6 +1280,7 @@ LispPTR DSK_renamefile(LispPTR *args)
   char dir[MAXPATHLEN], ver[VERSIONLEN];
   int rval, fatp;
   int need_maintain_flg;
+  FileName *varray;
 #ifdef DOS
   char drive1[1], drive2[1];
   int extlen1, extlen2; /* len of extension */
@@ -1296,9 +1331,10 @@ LispPTR DSK_renamefile(LispPTR *args)
    * We maintain the destination to handle the link damaged case correctly.
    */
   ConcDirAndName(dir, fbuf, dst);
-  if (maintain_version(dst, 0) == 0) return (NIL);
+  if (maintain_version(dst, (FileName *)NULL, 0) == 0) return (NIL);
 
-  if (get_version_array(dir, fbuf) == 0) return (NIL);
+  if (get_version_array(dir, fbuf, VersionArray, &VArrayInfo) == 0) return (NIL);
+  varray = VersionArray;
 
   /*
    * Although the file should have been recognized with "new" mode in Lisp
@@ -1307,7 +1343,7 @@ LispPTR DSK_renamefile(LispPTR *args)
    */
 
   ConcNameAndVersion(fbuf, ver, dst);
-  if (get_new(dir, VA.files, dst, fbuf) == 0) return (NIL);
+  if (get_new(dir, varray, dst, fbuf) == 0) return (NIL);
 
   /*
    * At this point, there are three cases for the destination.  If there is
@@ -1317,9 +1353,9 @@ LispPTR DSK_renamefile(LispPTR *args)
    * "real" destination file is the file to which the versionless file is linked,
    * we have to unlink the versionless file.
    */
-  if (!NoFileP(VA.files)) {
+  if (!NoFileP(varray)) {
-    if (OnlyVersionlessP(VA.files)) {
+    if (OnlyVersionlessP(varray)) {
-      get_versionless(VA.files, vless, dir);
+      get_versionless(varray, vless, dir);
       if (strcmp(dst, vless) != 0) {
         ConcNameAndVersion(vless, "1", fbuf);
         TIMEOUT(rval = rename(vless, fbuf));
@@ -1333,8 +1369,8 @@ LispPTR DSK_renamefile(LispPTR *args)
        * We are sure that the versionless file is linked to one of
        * the higher versioned file here.
        */
-      get_versionless(VA.files, vless, dir);
+      get_versionless(varray, vless, dir);
-      if (check_vless_link(vless, VA.files, fbuf, &rval) == 0) { return (NIL); }
+      if (check_vless_link(vless, varray, fbuf, &rval) == 0) { return (NIL); }
       if (strcmp(dst, fbuf) == 0) {
         TIMEOUT(rval = unlink(vless));
         if (rval == -1) {
@@ -1346,9 +1382,9 @@ LispPTR DSK_renamefile(LispPTR *args)
   }
 
   if (unpack_filename(src, dir, fbuf, ver, 1) == 0) return (NIL);
-  if (get_version_array(dir, fbuf) == 0) return (NIL);
+  if (get_version_array(dir, fbuf, varray, &VArrayInfo) == 0) return (NIL);
 
-  if (NoFileP(VA.files))
+  if (NoFileP(varray))
     return (NIL); /*
                    * If the specified file is deleted from
                    * outside of Lisp during the last time
@@ -1362,9 +1398,9 @@ LispPTR DSK_renamefile(LispPTR *args)
    * of it.
    */
   ConcNameAndVersion(fbuf, ver, src);
-  if (get_old(dir, VA.files, src, fbuf) == 0) return (NIL);
+  if (get_old(dir, varray, src, fbuf) == 0) return (NIL);
 
-  if (get_versionless(VA.files, vless, dir) == 0) {
+  if (get_versionless(varray, vless, dir) == 0) {
     /*
      * There is no versionless file.  All we have to do is to simply
      * try to rename the specified file.
@@ -1377,7 +1413,7 @@ LispPTR DSK_renamefile(LispPTR *args)
      * versionless file is linked will destroy the consistency of the
      * version status.
      */
-    if (check_vless_link(vless, VA.files, fbuf, &rval) == 0) return (NIL);
+    if (check_vless_link(vless, varray, fbuf, &rval) == 0) return (NIL);
 
     if (strcmp(src, vless) == 0 && *fbuf != '\0') {
       /*
@@ -1422,9 +1458,9 @@ LispPTR DSK_renamefile(LispPTR *args)
    * is on.
    */
 
-  if (maintain_version(dst, 0) == 0) return (NIL);
+  if (maintain_version(dst, (FileName *)NULL, 0) == 0) return (NIL);
   if (need_maintain_flg) {
-    if (maintain_version(src, 0) == 0) return (NIL);
+    if (maintain_version(src, (FileName *)NULL, 0) == 0) return (NIL);
   }
 
   return (ATOM_T);
@@ -1622,9 +1658,9 @@ LispPTR COM_getfileinfo(LispPTR *args)
        */
       strcpy(file, dir);
     } else {
-      if (get_version_array(dir, name) == 0) return (NIL);
+      if (get_version_array(dir, name, VersionArray, &VArrayInfo) == 0) return (NIL);
       ConcNameAndVersion(name, ver, file);
-      if (get_old(dir, VA.files, file, name) == 0) return (NIL);
+      if (get_old(dir, VersionArray, file, name) == 0) return (NIL);
     }
   }
 
@@ -1811,9 +1847,9 @@ LispPTR COM_setfileinfo(LispPTR *args)
   if (dskp) {
     if (unpack_filename(file, dir, name, ver, 1) == 0) return (NIL);
     if (true_name(dir) != -1) return (0);
-    if (get_version_array(dir, name) == 0) return (NIL);
+    if (get_version_array(dir, name, VersionArray, &VArrayInfo) == 0) return (NIL);
     ConcNameAndVersion(name, ver, file);
-    if (get_old(dir, VA.files, file, name) == 0) return (NIL);
+    if (get_old(dir, VersionArray, file, name) == 0) return (NIL);
   }
 
   switch (args[1]) {
@@ -2767,26 +2803,34 @@ static int make_directory(char *dir)
  *		and highest version number respectively.
  *
  * Description:
- * Finds the highest versioned entry in varray.
  *
- * Preconditions:
+ * Find the highest versioned entry in varray.  Varray has to include at least
- *     Varray must include at least one versioned file, satisfying the condition:
+ * one versioned file, that is varray has to satisfy (!NoFileP(varray) &&
- *       (!NoFileP(varray) && !OnlyVersionlessP(varray))
+ * !OnlyVersionlessP(varray)).
- *     Varray must be sorted from highest to lowest version
+ *
  */
-
 #ifdef DOS
 #define FindHighestVersion(varray, mentry, max_no)                                         \
-  do {                                    \
+  do {                                                                                        \
-    (max_no) = varray[0].version_no;      \
+    FileName *centry;                                                             \
-    (mentry) = &varray[0];                \
+    for (centry = varray, max_no = -1; centry->version_no != LASTVERSIONARRAY; centry++) { \
-  } while (0)
+      if (centry->version_no > max_no) {                                                   \
+        max_no = centry->version_no;                                                       \
+        mentry = centry;                                                                   \
+      }                                                                                    \
+    }                                                                                      \
+    } while (0)
 #else
 #define FindHighestVersion(varray, mentry, max_no)                                        \
-  do {                                    \
+  do {                                                                                       \
-    (max_no) = varray[0].version_no;      \
+    FileName *centry;                                                            \
-    (mentry) = &varray[0];                \
+    for (centry = (varray), (max_no) = 0; centry->version_no != LASTVERSIONARRAY; centry++) { \
-  } while (0)
+      if (centry->version_no > (max_no)) {                                                  \
+        (max_no) = centry->version_no;                                                      \
+        (mentry) = centry;                                                                  \
+      }                                                                                   \
+    }                                                                                     \
+    } while (0)
 #endif /* DOS */
 
 /*
@@ -2873,19 +2917,6 @@ static int make_directory(char *dir)
       }                                                                     \
   } while (0)
 
-/*
- * comparison function for qsort to sort file versions in descending order
- */
-static int compare_file_versions(const void *a, const void *b)
-{
-  unsigned a_ver = ((FileName *)a)->version_no;
-  unsigned b_ver = ((FileName *)b)->version_no;
-
-  if (a_ver > b_ver) return (-1);
-  if (a_ver < b_ver) return (1);
-  return (0);
-}
-
 /************************************************************************/
 /*									*/
 /*		    g e t _ v e r s i o n _ a r r a y			*/
@@ -2897,6 +2928,7 @@ static int compare_file_versions(const void *a, const void *b)
 /*		guarantee that the directory exists.			*/
 /*	file	File name, optionally including a (unix) version	*/
 /*	varray	Place to put the version array entries.			*/
+/*	cache	Place to hold info about the new version array		*/
 /*									*/
 /*	Read thru DIR and gather all files that match FILE into		*/
 /*	VARRAY.  DIR's case must match existing directory's, but	*/
@@ -2906,15 +2938,15 @@ static int compare_file_versions(const void *a, const void *b)
 /*									*/
 /************************************************************************/
 
-static int get_version_array(char *dir, char *file)
+static int get_version_array(char *dir, char *file, FileName *varray, CurrentVArray *cache)
 {
 #ifdef DOS
-  /* DOS version-array builder */
+
   char lcased_file[MAXPATHLEN];
   char old_file[MAXPATHLEN];
   char name[MAXNAMLEN];
   char ver[VERSIONLEN];
-  int varray_index = 0;
+  FileName *svarray;
   struct find_t dirp;
   struct direct *dp;
   int rval, drive = 0, isslash = 0;
@@ -2955,12 +2987,14 @@ static int get_version_array(char *dir, char *file)
 
   make_old_version(old_file, lcased_file);
 
+  svarray = varray;
+
   TIMEOUT(res = _dos_findfirst(old_file, _A_NORMAL | _A_SUBDIR, &dirp));
   if (res == 0) {
     strcpy(name, dirp.name);
-    strcpy(VA.files[varray_index].name, name);
+    strcpy(svarray->name, name);
-    VA.files[varray_index].version_no = 0;
+    svarray->version_no = 0;
-    varray_index++;
+    svarray++;
   }
 
   /*******************************/
@@ -2979,48 +3013,34 @@ static int get_version_array(char *dir, char *file)
     separate_version(name, ver, 1);
     DOWNCASE(name);
 
-    strcpy(VA.files[varray_index].name, dirp.name);
+    strcpy(svarray->name, dirp.name);
     if (*ver == '\0') {
       /* Versionless file */
-      VA.files[varray_index].version_no = 1;
+      svarray->version_no = 1;
     } else {
       /*
-       * separate_version guarantees ver is a numeric string.
+       * separator_version guarantees ver is a numeric
+       * string.
        */
-      VA.files[varray_index].version_no = strtoul(ver, (char **)NULL, 10);
+      svarray->version_no = strtoul(ver, (char **)NULL, 10);
-    }
-    varray_index++;
-    if (varray_index >= VERSIONARRAYMAXLENGTH) {
-      *Lisp_errno = EIO;
-      return (0);
-    } else if (varray_index >= VA.allocated) {
-      VA.allocated += VERSIONARRAYCHUNKLENGTH;
-      VA.files = realloc(VA.files,
-                             sizeof(*VA.files) * VA.allocated);
     }
+    svarray++;
   }
 
   /*
-   * The last entry of VA.files is indicated by setting LASTVERSIONARRAY into
+   * The last entry of varray is indicated by setting LASTVERSIONARRAY into
    * version_no field.
    */
-  VA.files[varray_index].version_no = LASTVERSIONARRAY;
+  svarray->version_no = LASTVERSIONARRAY;
-  VA.lastUsed = varray_index;
 
   /*
-   * If any files have been stored in VA.files, we store the name
+   * If more than one files have been stored in varray, we store the name
    * without version in the last marker entry.
-   *
-   * NOTE: sorting "varray_index" entries will leave the LASTVERSIONARRAY item
-   * untouched by the sort, which is intentional.
    */
-  if (!NoFileP(VA.files)) {
+  if (!NoFileP(varray)) {
-    strcpy(name, VA.files[0].name);
+    strcpy(name, varray->name);
     separate_version(name, ver, 1);
-    strcpy(VA.files[varray_index].name, name);
+    strcpy(svarray->name, name);
-    if (varray_index > 1) {
-      qsort(VA.files, varray_index, sizeof(*VA.files), compare_file_versions);
-    }
   }
 
   return (1);
@@ -3030,7 +3050,7 @@ static int get_version_array(char *dir, char *file)
   char lcased_file[MAXNAMLEN];
   char name[MAXNAMLEN];
   char ver[VERSIONLEN];
-  int varray_index = 0;
+  FileName *svarray;
   DIR *dirp;
   struct dirent *dp;
   int rval;
@@ -3044,28 +3064,29 @@ static int get_version_array(char *dir, char *file)
   separate_version(lcased_file, ver, 1);
   DOWNCASE(lcased_file);
 
-  /* Cache for VA.files reinstated using nanosecond timestamps which many
-   * systems provide for directory modification times.
-   * POSIX defines the struct stat field containing the nanosecond resolution
-   * modification time as "st_mtim".  See "version.h" for accomodations
-   * for systems that call it something else (e.g., macOS st_mtimespec).
-   */
-
   TIMEOUT(rval = stat(dir, &sbuf));
   if (rval == -1) {
     *Lisp_errno = errno;
     return(0);
   }
-  if (sbuf.st_ino == VA.dir_ino &&
+
-      0 == strcmp(lcased_file, VA.name) &&
+  /*
-      sbuf.st_mtim.tv_sec == VA.lastMTime.tv_sec &&
+   * Cache mechanism was not used because of a bug in Sun OS.
-      sbuf.st_mtim.tv_nsec == VA.lastMTime.tv_nsec) {
+   * Sometimes just after unlinking a file on a directory, the st_mtime
-    return (1);
+   * of the directory does not change.  This will make Maiko believe
-  } else {
+   * cached version array is still valid, although it is already invalid.
-    VA.dir_ino = sbuf.st_ino;
+   * sync(2) has no effect on such case.
-    VA.lastMTime = sbuf.st_mtim;
+   */
-    strcpy(VA.name, lcased_file);
+
-  }
+  /*
+   * If the cached version array is still valid, we can return immediately.
+   */
+
+#if 0
+  /* there is a (different?) problem (#1661) with the caching - disable until it's solved */
+  if ((sbuf.st_mtime == cache->mtime) && strcmp(dir, cache->path) == 0
+      && strcmp(lcased_file, cache->file) == 0) return(1);
+#endif
 
   errno = 0;
   TIMEOUT0(dirp = opendir(dir));
@@ -3074,13 +3095,7 @@ static int get_version_array(char *dir, char *file)
     return (0);
   }
 
-  /* There is no initialization call for the local file system, so we
+  for (S_TOUT(dp = readdir(dirp)), svarray = varray; dp != NULL || errno == EINTR;
-   * must ensure there is initial storage allocated for the version array */
-  if (VA.files == NULL) {
-    VA.files = calloc(VERSIONARRAYCHUNKLENGTH, sizeof(*VA.files));
-    VA.allocated = VERSIONARRAYCHUNKLENGTH;
-  }
-  for (S_TOUT(dp = readdir(dirp)); dp != NULL || errno == EINTR;
        errno = 0, S_TOUT(dp = readdir(dirp)))
     if (dp) {
       strcpy(name, dp->d_name);
@@ -3090,50 +3105,42 @@ static int get_version_array(char *dir, char *file)
         /*
          * This file can be regarded as a same file in Lisp sense.
          */
-        strcpy(VA.files[varray_index].name, dp->d_name);
+        strcpy(svarray->name, dp->d_name);
         if (*ver == '\0') {
           /* Versionless file */
-          VA.files[varray_index].version_no = 0;
+          svarray->version_no = 0;
         } else {
           /*
-           * separate_version guarantees ver is a numeric string.
+           * separator_version guarantees ver is a numeric
+           * string.
            */
-          VA.files[varray_index].version_no = strtoul(ver, (char **)NULL, 10);
+          svarray->version_no = strtoul(ver, (char **)NULL, 10);
-        }
-        varray_index++;
-        if (varray_index >= VERSIONARRAYMAXLENGTH) {
-          *Lisp_errno = EIO;
-          return (0);
-        } else if (varray_index >= VA.allocated) {
-          VA.allocated += VERSIONARRAYCHUNKLENGTH;
-          VA.files = realloc(VA.files,
-                                 sizeof(*VA.files) * VA.allocated);
         }
+        svarray++;
       }
     }
   /*
    * The last entry of varray is indicated by setting LASTVERSIONARRAY into
    * version_no field.
    */
-  VA.files[varray_index].version_no = LASTVERSIONARRAY;
+  svarray->version_no = LASTVERSIONARRAY;
-  VA.lastUsed = varray_index;
 
   /*
-   * If any files have been stored in VA.files, we store the name
+   * If more than one files have been stored in varray, we store the name
    * without version in the last marker entry.
-   *
-   * NOTE: sorting "varray_index" entries will leave the LASTVERSIONARRAY item
-   * untouched by the sort, which is intentional.
    */
-  if (!NoFileP(VA.files)) {
+  if (!NoFileP(varray)) {
-    strcpy(name, VA.files[0].name);
+    strcpy(name, varray->name);
     separate_version(name, ver, 1);
-    strcpy(VA.files[varray_index].name, name);
+    strcpy(svarray->name, name);
-    if (varray_index > 1) {
-      qsort(VA.files, varray_index, sizeof(*VA.files), compare_file_versions);
-    }
   }
 
+  /*
+   * Update cache information.
+   */
+  strcpy(cache->path, dir);
+  strcpy(cache->file, lcased_file);
+  cache->mtime = sbuf.st_mtime;
   TIMEOUT(closedir(dirp));
   return (1);
 #endif /* DOS */
@@ -3165,7 +3172,7 @@ static int get_version_array(char *dir, char *file)
  * to maintain the directory on which a file is being created.
  */
 
-static int maintain_version(char *file, int forcep)
+static int maintain_version(char *file, FileName *varray, int forcep)
 {
   char dir[MAXPATHLEN], fname[MAXNAMLEN], ver[VERSIONLEN];
   char old_file[MAXPATHLEN], vless[MAXPATHLEN];
@@ -3173,14 +3180,17 @@ static int maintain_version(char *file, int forcep)
   int rval, max_no;
   FileName *entry;
 
-  if (unpack_filename(file, dir, fname, ver, 1) == 0) return (0);
+  if (varray == (FileName *)NULL) {
-  /*
+    if (unpack_filename(file, dir, fname, ver, 1) == 0) return (0);
-   * We have to make sure that dir is the existing directory.
+    /*
-   */
+     * We have to make sure that dir is the existing directory.
-  if (true_name(dir) != -1) return (0);
+     */
-  if (get_version_array(dir, fname) == 0) return (0);
+    if (true_name(dir) != -1) return (0);
+    if (get_version_array(dir, fname, VersionArray, &VArrayInfo) == 0) return (0);
+    varray = VersionArray;
+  }
 
-  if (NoFileP(VA.files)) {
+  if (NoFileP(varray)) {
     /*
      * We don't need to care about such case that there is no such file
      * or an only versionless file exists.
@@ -3188,14 +3198,14 @@ static int maintain_version(char *file, int forcep)
     return (1);
   }
 
-  if (OnlyVersionlessP(VA.files)) {
+  if (OnlyVersionlessP(varray)) {
     if (forcep) {
 /*
  * If forcep, we link the versionless file to the version
  * 1 file.
  */
 #ifndef DOS
-      get_versionless(VA.files, vless, dir);
+      get_versionless(varray, vless, dir);
       ConcNameAndVersion(vless, "1", fname);
       TIMEOUT(rval = link(vless, fname));
       if (rval == -1) {
@@ -3212,13 +3222,13 @@ static int maintain_version(char *file, int forcep)
    * exists.  Thus, FindHighestVersion works fine from now on.
    */
 
-  if (get_versionless(VA.files, vless, dir) == 0) {
+  if (get_versionless(varray, vless, dir) == 0) {
     /*
      * There is not a versionless file, but at least one versioned file.
      * Thus, the thing we have to do is to link a versionless file
      * to the existing highest versioned file.
      */
-    FindHighestVersion(VA.files, entry, max_no);
+    FindHighestVersion(varray, entry, max_no);
     ConcDirAndName(dir, entry->name, old_file);
 /*
  * The versionless file should have the same case name as the old
@@ -3237,15 +3247,15 @@ static int maintain_version(char *file, int forcep)
     return (1);
   }
 
-  if (check_vless_link(vless, VA.files, old_file, &highest_p) == 0) return (0);
+  if (check_vless_link(vless, varray, old_file, &highest_p) == 0) return (0);
 
   if (*old_file == '\0') {
     /*
-     * The versionless file is not linked to any file in VA.files.
+     * The versionless file is not linked to any file in varray.
      * Thus, we have to link the versionless file to the file which
      * is versioned one higher than the existing highest version.
      */
-    FindHighestVersion(VA.files, entry, max_no);
+    FindHighestVersion(varray, entry, max_no);
     sprintf(ver, "%u", max_no + 1);
 /*
  * The old file should have the same case name as the versionless
@@ -3270,7 +3280,7 @@ static int maintain_version(char *file, int forcep)
     return (1);
   } else {
     /*
-     * Although the  versionless file is linked to a file in VA.files,
+     * Although the  versionless file is linked to a file in varray,
      * the file is not the highest versioned file.  We have to unlink
      * the wrongly linked versionless file, and link the highest versioned
      * file to a versionless file.
@@ -3280,7 +3290,7 @@ static int maintain_version(char *file, int forcep)
       *Lisp_errno = errno;
       return (0);
     }
-    FindHighestVersion(VA.files, entry, max_no);
+    FindHighestVersion(varray, entry, max_no);
     ConcDirAndName(dir, entry->name, old_file);
 /*
  * The versionless file should have the same case name as the old

src/dspsubrs.c

@@ -40,12 +40,7 @@ extern int Mouse_Included;
  ****************************************************/
 
 void DSP_dspbout(LispPTR *args) /* args[0] :	charcode	*/
-{
+{ putc((args[0] & 0xFFFF) & 0x7f, BCPLDISPLAY); }
-  int charcode = (args[0] & 0x7F);
-  /* Interlisp-D uses CR as EOL which isn't useful here */
-  putc((charcode == '\r') ? '\n' : charcode, BCPLDISPLAY);
-  fflush(BCPLDISPLAY);
-}
 
 /****************************************************
  *
@@ -57,16 +52,7 @@ void DSP_dspbout(LispPTR *args) /* args[0] :	charcode	*/
 extern int DisplayInitialized;
 
 void DSP_showdisplay(LispPTR *args)
-{
+{ DisplayInitialized = 1; }
-  LispPTR base = args[0];   /* pointer to the display bitmap */
-  LispPTR rasterwidth = args[1];  /* should be a smallp */
-
-  if (base == NIL) {
-    DisplayInitialized = 0;
-  } else {
-    DisplayInitialized = 1;
-  }
-}
 
 /****************************************************
  *

src/ether_nethub.c

@@ -31,6 +31,7 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
+#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"

src/ether_sunos.c

@@ -71,6 +71,7 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
+#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"

src/fvar.c

@@ -15,7 +15,6 @@
 #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...

src/gc.c

@@ -12,7 +12,6 @@
 #include <stdio.h>         // 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_...

src/gccode.c

@@ -35,7 +35,6 @@
 #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

src/gcfinal.c

@@ -49,7 +49,6 @@
 #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
@@ -552,15 +551,15 @@ void printarrayblock(LispPTR base) {
   printf("          Length: %d cells.\n\n", bbase->arlen);
 
   addr = ((LispPTR *)bbase) - 20;
-  for (; addr < (LispPTR *)bbase; addr++) printf("%16p %8x\n", (void *)addr, *addr);
+  for (; addr < (LispPTR *)bbase; addr++) printf("%p	%8x\n", (void *)addr, *addr);
-  printf("%16p %8x <- array header\n", (void *)addr, *addr);
+  printf("%p	%8x <- array header\n", (void *)addr, *addr);
   addr++;
-  for (; addr < (LispPTR *)bbase + 20; addr++) printf("%16p %8x\n", (void *)addr, *addr);
+  for (; addr < (LispPTR *)bbase + 20; addr++) printf("%p	%8x\n", (void *)addr, *addr);
   printf(". . .\n");
 
   addr = ((LispPTR *)btrailer) - 20;
-  for (; addr < (LispPTR *)btrailer; addr++) printf("%16p %8x\n", (void *)addr, *addr);
+  for (; addr < (LispPTR *)btrailer; addr++) printf("%p	%8x\n", (void *)addr, *addr);
-  printf("%16p %8x <- array trailer\n", (void *)addr, *addr);
+  printf("%p	%8x <- array trailer\n", (void *)addr, *addr);
   addr++;
-  for (; addr < (LispPTR *)btrailer + 20; addr++) printf("%16p %8x\n", (void *)addr, *addr);
+  for (; addr < (LispPTR *)btrailer + 20; addr++) printf("%p	%8x\n", (void *)addr, *addr);
 }

src/gchtfind.c

@@ -253,7 +253,7 @@ void enter_big_reference_count(LispPTR ptr) {
 /*									*/
 /************************************************************************/
 
-void modify_big_reference_count(GCENTRY *entry, DLword casep, LispPTR ptr) {
+void modify_big_reference_count(LispPTR *entry, DLword casep, LispPTR ptr) {
   struct gc_ovfl *oventry;
   LispPTR tmp;
 

src/gcmain3.c

@@ -39,7 +39,6 @@
 #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

src/gcoflow.c

@@ -31,7 +31,6 @@
 
 #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

src/gcrcell.c

@@ -71,7 +71,6 @@
 #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

src/gvar2.c

@@ -15,7 +15,6 @@
 #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

src/hardrtn.c

@@ -32,7 +32,7 @@
 #include "llstkdefs.h"    // for decusecount68k, freestackblock, blt, stack_...
 #include "lspglob.h"
 #include "lsptypes.h"     // for GETWORD
-#include "retmacro.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
+#include "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
 #include "stack.h"        // for FX, frameex1, Bframe, CHECK_FX, StackWord
 
 #define MAKE_FXCOPY(fx68k)                                                                   \

src/inet.c

@@ -41,6 +41,7 @@
 #include "emlglob.h"
 #include "lspglob.h"
 #include "adr68k.h"
+#include "ether.h"
 #include "dbprint.h"
 #include "locfile.h"
 

src/initdsp.c

@@ -98,11 +98,6 @@ extern int *Xdisplay; /* DAANGER -jarl nilsson 27-apr-92 */
 /************************************************************************/
 
 void init_cursor(void) {
-  /* init_cursor sets up any OS/hardware that is necessary
-   * for the rest of the display system to get a cursor displayed.
-   * For display subsystems like X11 or SDL there's nothing to do
-   * Originally this did work for memory mapped Sun display boards
-   */
 }
 
 /************************************************************************/
@@ -142,7 +137,7 @@ void clear_display(void) {
 #else /* COLOR */
 
 void clear_display(void) {
-  DLword *word;
+  short *word;
   int w, h;
   if (MonoOrColor == MONO_SCREEN) {
 #ifndef DISPLAYBUFFER
@@ -155,7 +150,7 @@ void clear_display(void) {
            0);
 #endif /* DISPLAYBUFFER */
   } else { /* MonoOrColo is COLOR_SCREEN */
-    word = ColorDisplayRegion68k;
+    word = (short *)ColorDisplayRegion68k;
     for (h = displayheight; (h--);) {
       for (w = DisplayRasterWidth * 8; (w--);) { *word++ = 0; }
     } /* end for(h) */

src/initkbd.c

@@ -71,8 +71,6 @@ extern DspInterface currentdsp;
 extern int LispKbdFd;
 int LispKbdFd = -1;
 
-extern int runtime_debug_level;
-
 extern fd_set LispReadFds;
 
 extern DLword *EmMouseX68K;
@@ -377,20 +375,6 @@ static u_char *make_X_keymap(void) {
     table[xcode - 7] = code;
   }
 
-  if (runtime_debug_level > 0) {
-    printf("*********************************************************************\n");
-    printf("(DEFINE-FILE-INFO \036PACKAGE \"INTERLISP\" \036READTABLE \"XCL\" \036 BASE 10)\n");
-    printf("(SETQ XGetKeyboardMappingTable '(\n");
-    for (i = 0; i < codecount * symspercode; i += symspercode) {
-      printf("(%d (", minkey + (i / symspercode));
-      for (int j = 0; j < symspercode; j++) {
-        printf("    #X%lx", (unsigned long)mapping[i+j]);
-      }
-      printf(" ))\n");
-    }
-    printf("\n))\nSTOP\n");
-    printf("*********************************************************************\n");
-  }
 #ifdef DEBUG
   printf("\n\n\tXGetKeyboardMapping table\n\n");
   for (i = 0; i < codecount * symspercode; i += symspercode) {

src/initsout.c

@@ -34,7 +34,6 @@
 #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

src/keyevent.c

@@ -51,7 +51,7 @@ void Mouse_hndlr(void); /* Fields mouse events from driver        */
 #include "lsptypes.h"
 
 #include "bb.h"
-#include "bbtmacro.h"
+#include "bitblt.h"
 #include "pilotbbt.h"
 
 #include "keyeventdefs.h"

src/ldsout.c

@@ -15,10 +15,7 @@
 #include <stdio.h>        // for perror, fprintf, printf, stderr, sprintf
 #include <stdlib.h>       // for exit, free, malloc
 #include <string.h>       // for memset
-#include <sys/mman.h>     // for mmap, MAP_FAILED
+#include <sys/mman.h>     // for mmap
-#ifndef MAP_FAILED
-#define MAP_FAILED	((void *)-1)
-#endif
 #include <sys/stat.h>     // for stat, fstat
 #include <sys/types.h>    // for off_t
 #include <unistd.h>       // for lseek, read, close, getpagesize

src/llcolor.c

@@ -28,7 +28,7 @@
 #include "devconf.h"
 
 #include "bb.h"
-#include "bbtmacro.h"
+#include "bitblt.h"
 #include "pilotbbt.h"
 #include "dbprint.h"
 

src/llstk.c

@@ -33,7 +33,7 @@
 #include "llstkdefs.h"    // for blt, check_BF, check_FX, check_stack_rooms
 #include "lspglob.h"      // for InterfacePage, Stackspace, STACKOVERFLOW_word
 #include "lsptypes.h"     // for GETWORD
-#include "retmacro.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW
+#include "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW
 #include "stack.h"        // for StackWord, Bframe, FX, frameex1, STKWORD
 #include "storagedefs.h"  // for newpage
 // #include "testtooldefs.h" // for print_atomname

src/loopsops.c

@@ -25,7 +25,6 @@
 #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

src/main.c

@@ -40,7 +40,7 @@
 #include "emlglob.h"
 #include "adr68k.h"
 #include "stack.h"
-#include "retmacro.h"
+#include "return.h"
 
 #include "lispemul.h"
 #include "lspglob.h"
@@ -226,16 +226,10 @@ int save_argc;
 char **save_argv;
 int display_max = 65536 * 16 * 2;
 
-long runtime_debug_level = 0;
-
 /* diagnostic flag for sysout dumping */
 extern unsigned maxpages;
 
-char sysout_name_cl[MAXPATHLEN] = "\0"; /* sysout name as per -sysout command line arg ; Set by read_Xoption, in the X version. */
+char sysout_name[MAXPATHLEN]; /* Set by read_Xoption, in the X version. */
-char sysout_name_xrm[MAXPATHLEN] = "\0"; /* sysout name as per X resource manager, if any */
-char sysout_name_first_arg[MAXPATHLEN] = "\0"; /* sysout name as per 1st command line arg, if any */
-char sysout_name[MAXPATHLEN] = "\0"; /* "final" sysout name chosen from above */
-
 unsigned sysout_size = 0;    /* ditto */
 
 int flushing = FALSE; /* see dbprint.h if set, all debug/trace printing will call fflush(stdout) after each printf */
@@ -245,10 +239,9 @@ int flushing = FALSE; /* see dbprint.h if set, all debug/trace printing will cal
 extern DspInterface currentdsp;
 #endif /* DOS || XWINDOW */
 #ifdef SDL
-#include "sdldefs.h"	/* for init_SDL */
+extern int init_SDL(char*, int, int, int);
 #endif
 extern const time_t MDate;
-extern const char *MaikoGitVersion;
 extern int nokbdflag;
 extern int nomouseflag;
 #ifdef DOS
@@ -291,8 +284,6 @@ const char *helpstring =
  -info                    Print general info about the system\n\
  -help                    Print this message\n\
  -pixelscale <n>          The amount of pixels to show for one Medley screen pixel.\n\
- -fg/-foreground <color>  Screen foreground color, default Black.  X color name or #RRBBGG hex\n\
- -bg/-background <color>  Screen background color, default White.  X color name or #RRBBGG hex\n\
  -sc[reen] <w>x<h>]       The Medley screen geometry\n\
  -t <title>               The window title\n\
  -title <title>           The window title\n";
@@ -321,21 +312,6 @@ const char *nethubHelpstring = "";
 extern int insnsCountdownForTimerAsyncEmulation;
 #endif
 
-#if defined(XWINDOW) || defined(SDL)
-char foregroundColorName[64] = {0};
-extern char foregroundColorName[64];
-char backgroundColorName[64] = {0};
-extern char backgroundColorName[64];
-#endif
-char windowTitle[255] = "Medley";
-extern char windowTitle[255];
-unsigned LispDisplayRequestedWidth = 1024, LispDisplayRequestedHeight = 768;
-extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
-int LispDisplayRequestedX = 0, LispDisplayRequestedY = 0;
-extern int LispDisplayRequestedX, LispDisplayRequestedY;
-int pixelScale = 1;
-extern int pixelScale;
-
 /************************************************************************/
 /*									*/
 /*		     M A I N   E N T R Y   P O I N T			*/
@@ -347,10 +323,12 @@ int main(int argc, char *argv[])
 {
   int i;
   char *envname;
-  char *rtdebug;
   extern int TIMER_INTERVAL;
   extern fd_set LispReadFds;
   long tmpint;
+  int width = 1024, height = 768;
+  int pixelscale = 1;
+  char *windowtitle = "Medley";
 
 #ifdef MAIKO_ENABLE_FOREIGN_FUNCTION_INTERFACE
   if (dld_find_executable(argv[0]) == 0) {
@@ -360,24 +338,6 @@ int main(int argc, char *argv[])
   }
 #endif /* MAIKO_ENABLE_FOREIGN_FUNCTION_INTERFACE */
 
-#ifdef PROFILE
-  moncontrol(0); /* initially stop sampling */
-#endif           /* PROFILE */
-
-  //
-  //
-  //  Process Command Line Arguments
-  //
-  //
-
-  // First check if the first argument is a sysout name
-  // and save it away if it is in case the X windows
-  // arg processing changes argc/argv
-  if (argc > 1 && argv[1][0] != '-') {
-    strncpy(sysout_name_first_arg, argv[1], MAXPATHLEN);
-  }
-
-
 #ifdef XWINDOW
   read_Xoption(&argc, argv);
 #endif /* XWINDOW */
@@ -385,6 +345,17 @@ int main(int argc, char *argv[])
   save_argc = argc;
   save_argv = argv;
 
+#ifdef PROFILE
+  moncontrol(0); /* initially stop sampling */
+#endif           /* PROFILE */
+
+/* Sysout is found as follows:
+        If the first argument doesn't begin with '-', assume it's the sysout
+        Look at the environment variable LDESRCESYSOUT if that fails
+        Look for ~/lisp.virtualmem if that fails
+        Barf and print the command line if tha fails
+*/
+
   i = 1;
 
   if (argv[i] && ((strcmp(argv[i], "-info") == 0) || (strcmp(argv[i], "-INFO") == 0))) {
@@ -397,34 +368,46 @@ int main(int argc, char *argv[])
     exit(0);
   }
 
+  if (argc > 1 && argv[1][0] != '-') {
+    strncpy(sysout_name, argv[1], MAXPATHLEN);
+    i++;
+  } else if ((envname = getenv("LDESRCESYSOUT")) != NULL) {
+    strncpy(sysout_name, envname, MAXPATHLEN);
+  } else if ((envname = getenv("LDESOURCESYSOUT")) != NULL)
+    strncpy(sysout_name, envname, MAXPATHLEN);
+  else {
+#ifdef DOS
+    strncpy(sysout_name, "lisp.vm", MAXPATHLEN);
+#else
+    if ((envname = getenv("HOME")) != NULL) {
+      strncpy(sysout_name, envname, MAXPATHLEN);
+      strncat(sysout_name, "/lisp.virtualmem", MAXPATHLEN - 17);
+    }
+#endif /* DOS */
+  }
+  if (access(sysout_name, R_OK)) {
+    perror("Couldn't find a sysout to run");
+    (void)fprintf(stderr, "%s%s", helpstring, nethubHelpstring);
+    exit(1);
+  }
+  /* OK, sysout name is now in sysout_name, and i is moved past a supplied name */
 
   for (; i < argc; i += 1) { /* step by 1 in case of typo */
 
-   // NOTE:  in the case of X Windows, some of the args being checked for in this loop
+    /* -t and -m are undocumented and somewhat dangerous... */
-   // have already been processed (and removed from argv) by the call to read_Xoption()
-   // above.  (See readXoption() in xrdopt.c)
 
-   /* Check for -sysout arg */
+    if (!strcmp(argv[i], "-t")) { /**** timer interval	****/
-    if (!strcmp(argv[i], "-sysout")) {
-      if (argc > ++i) {
-        strncpy(sysout_name_cl, argv[i], MAXPATHLEN);
-      }
-    }
-
-    /* -timer and -m are undocumented and somewhat dangerous... */
-
-    else if (!strcmp(argv[i], "-timer")) { /**** timer interval	****/
       if (argc > ++i) {
         errno = 0;
         tmpint = strtol(argv[i], (char **)NULL, 10);
         if (errno == 0 && tmpint > 0) {
           TIMER_INTERVAL = tmpint;
         } else {
-          (void)fprintf(stderr, "Bad value for -timer (integer > 0)\n");
+          (void)fprintf(stderr, "Bad value for -t (integer > 0)\n");
           exit(1);
         }
       } else {
-        (void)fprintf(stderr, "Missing argument after -timer\n");
+        (void)fprintf(stderr, "Missing argument after -t\n");
         exit(1);
       }
     }
@@ -477,7 +460,7 @@ int main(int argc, char *argv[])
 #ifdef SDL
     else if ((strcmp(argv[i], "-sc") == 0) || (strcmp(argv[i], "-SC") == 0)) {
       if (argc > ++i) {
-        int read = sscanf(argv[i], "%dx%d", &LispDisplayRequestedWidth, &LispDisplayRequestedHeight);
+        int read = sscanf(argv[i], "%dx%d", &width, &height);
         if(read != 2) {
           (void)fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]);
           exit(1);
@@ -488,7 +471,7 @@ int main(int argc, char *argv[])
       }
     } else if ((strcmp(argv[i], "-pixelscale") == 0) || (strcmp(argv[i], "-PIXELSCALE") == 0)) {
       if (argc > ++i) {
-        int read = sscanf(argv[i], "%d", &pixelScale);
+        int read = sscanf(argv[i], "%d", &pixelscale);
         if(read != 1) {
           (void)fprintf(stderr, "Could not parse -pixelscale argument %s\n", argv[i]);
           exit(1);
@@ -500,26 +483,13 @@ int main(int argc, char *argv[])
     } else if ((strcmp(argv[i], "-t") == 0) || (strcmp(argv[i], "-T") == 0)
                || (strcmp(argv[i], "-title") == 0) || (strcmp(argv[i], "-TITLE") == 0)) {
       if (argc > ++i) {
-        strncpy(windowTitle, argv[i], sizeof(windowTitle) - 1);
+        windowtitle = argv[i];
       } else {
         (void)fprintf(stderr, "Missing argument after -title\n");
         exit(1);
       }
-    } else if (strcmp(argv[i], "-fg") == 0 || strcmp(argv[i], "-foreground") == 0) {
-      if (argc > ++i) {
-        strncpy(foregroundColorName, argv[i], sizeof(foregroundColorName) - 1);
-      } else {
-        (void)fprintf(stderr, "Missing argument after -fg/-foreground\n");
-        exit(1);
-      }
-    } else if (strcmp(argv[i], "-bg") == 0 || strcmp(argv[i], "-background") == 0) {
-      if (argc > ++i) {
-        strncpy(backgroundColorName, argv[i], sizeof(backgroundColorName) - 1);
-      } else {
-        (void)fprintf(stderr, "Missing argument after -bg/-background\n");
-        exit(1);
-      }
     }
+
 #endif /* SDL */
     /* Can only do this under SUNOs, for now */
     else if (!strcmp(argv[i], "-E")) { /**** ethernet info	****/
@@ -640,55 +610,6 @@ int main(int argc, char *argv[])
     }
   }
 
-  //
-  //  OK, now we can process the sysout_name
-  //  Order of priority:
-  //    1. Value of -sysout command line arg
-  //    2. Value of the first command line arg
-  //    3. Value of LDESRCESYSOUT env variable
-  //    4. Value of LDESOURCESYSOUT env variable
-  //    5. Value as determined by X resource manager, if any
-  //    6. Value of $HOME/lisp.virtualmem (or lisp.vm for DOS)
-  //
-  if (sysout_name_cl[0] != '\0') { strncpy(sysout_name, sysout_name_cl, MAXPATHLEN); }
-  else if (sysout_name_first_arg[0] != '\0') { strncpy(sysout_name, sysout_name_first_arg, MAXPATHLEN); }
-  else if ((envname = getenv("LDESRCESYSOUT")) != NULL) { strncpy(sysout_name, envname, MAXPATHLEN); }
-  else if ((envname = getenv("LDESOURCESYSOUT")) != NULL) { strncpy(sysout_name, envname, MAXPATHLEN); }
-  else if (sysout_name_xrm[0] != '\0') { strncpy(sysout_name, sysout_name_xrm, MAXPATHLEN); }
-  else {
-#ifdef DOS
-    strncpy(sysout_name, "lisp.vm", MAXPATHLEN);
-#else
-    if ((envname = getenv("HOME")) != NULL) {
-      strncpy(sysout_name, envname, MAXPATHLEN);
-      strncat(sysout_name, "/lisp.virtualmem", MAXPATHLEN - 17);
-    }
-#endif /* DOS */
-  }
-  if ((sysout_name[0] == '\0') || (access(sysout_name, R_OK))) {
-    perror("Couldn't find a sysout to run");
-    fprintf(stderr, "Looking for: %s\n", sysout_name);
-    (void)fprintf(stderr, "%s%s", helpstring, nethubHelpstring);
-    exit(1);
-  }
-  /* OK, sysout name is now in sysout_name */
-
-
-  //
-  //
-  // End of command line arg processing
-  //
-  //
-
-  if ((rtdebug = getenv("LDERUNTIMEDEBUG")) != NULL) {
-      errno = 0;
-      runtime_debug_level = strtol(rtdebug, (char **)NULL, 10);
-      if (errno != 0) {
-        runtime_debug_level = 0; // default to OFF if erroneous value
-    }
-  }
-  
-
 /* Sanity checks. */
 #ifdef DOS
   probemouse(); /* See if the mouse is connected. */
@@ -728,12 +649,13 @@ int main(int argc, char *argv[])
   make_dsp_instance(currentdsp, 0, 0, 0, 1); /* All defaults the first time */
 #endif                                       /* DOS || XWINDOW */
 #if defined(SDL)
-  init_SDL(windowTitle, LispDisplayRequestedWidth, LispDisplayRequestedHeight, pixelScale);
+  init_SDL(windowtitle, width, height, pixelscale);
 #endif /* SDL */
   /* Load sysout to VM space and returns real sysout_size(not 0) */
   sysout_size = sysout_loader(sysout_name, sysout_size);
 
-  build_lisp_map(); /* build up map */
+  build_lisp_map(); /* built up map */
+
   init_ifpage(sysout_size); /* init interface page */
   init_iopage();
   init_miscstats();
@@ -843,7 +765,6 @@ void print_info_lines(void) {
 #endif /* RELEASE */
   printf("Compiled for %s (%s) (%d bit).\n", MAIKO_OS_NAME, MAIKO_ARCH_NAME, MAIKO_ARCH_WORD_BITS);
   printf("Creation date: %s", ctime(&MDate));
-  printf("%s\n", MaikoGitVersion);
 #ifdef LPSOLVE
   printf("Contains lp_solve LP solver.\n");
 #endif /* LPSOLVE */