Declares correct size for scratch version string storage

Replaces LispStringToCString macro with static inline procedure
Adds error returns for case where new file version would exceed MAXVERSION
2026-03-16 14:57:20 +00:00 · 2025-07-25 14:27:22 -07:00 · 2025-07-25 14:27:22 -07:00 · 2025-07-25 14:27:22 -07:00 · 2025-07-25 14:27:22 -07:00 · 2025-07-25 14:27:22 -07:00
71 changed files with 1208 additions and 988 deletions
--- a/.github/workflows/Dockerfile_builder
+++ b/.github/workflows/Dockerfile_builder
@@ -8,7 +8,7 @@
 #
 # ******************************************************************************

-FROM ubuntu:latest
+FROM ubuntu:22.04
 SHELL ["/bin/bash", "-c"]
 USER root:root
 # Install build tools
--- a/.github/workflows/Dockerfile_maiko
+++ b/.github/workflows/Dockerfile_maiko
@@ -18,8 +18,17 @@ COPY . ${INSTALL_LOCATION}
 # Build maiko
 RUN cd ${INSTALL_LOCATION}/bin \
    && ./makeright x cleanup \
-    && ./makeright x
-RUN cd ${INSTALL_LOCATION}/bin \
+    && ./makeright x \
    && if [ "$(./machinetype)" = "x86_64" ]; then \
           ./makeright init; \
       fi
+# Build specially for WSL1 by "fooling" a linux build
+RUN cd ${INSTALL_LOCATION}/bin \
+    && arch="$(./machinetype)" \
+    && if [ "$arch" = "x86_64" ] || [ "$arch" = "aarch64" ]; then \
+           export LDEARCH="${arch}-microsoft-wsl1" \
+           && ./makeright x cleanup \
+           && ./makeright x \
+           && ./makeright init \
+           ; \
+       fi
--- a/.github/workflows/buildRelease.yml
+++ b/.github/workflows/buildRelease.yml
@@ -152,7 +152,7 @@ jobs:
         || needs.inputs.outputs.force == 'true'
      )

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
      # Checkout the actions for this repo owner
@@ -224,7 +224,13 @@ jobs:
          RELEASE_TAG: ${{ steps.tag.outputs.release_tag }}
        run: |
          mkdir -p /tmp/release_tars
-          for OSARCH in "linux.x86_64:linux_amd64" "linux.aarch64:linux_arm64" "linux.armv7l:linux_arm_v7" ;    \
+          for OSARCH in                                                                \
+                        "linux.x86_64:linux_amd64"                                     \
+                        "linux.aarch64:linux_arm64"                                    \
+                        "linux.armv7l:linux_arm_v7"                                    \
+                        "wsl1.x86_64:linux_amd64"                                      \
+                        "wsl1.aarch64:linux_arm64"                                     \
+                        ;                                                              \
            do                                                                         \
              pushd /tmp/docker_images/${OSARCH##*:}/usr/local/interlisp >/dev/null ;  \
              /usr/bin/tar -c -z                                                       \
@@ -246,6 +252,8 @@ jobs:
          artifacts:
            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-linux.x86_64.tgz,
            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-linux.aarch64.tgz,
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-wsl1.x86_64.tgz,
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-wsl1.aarch64.tgz,
            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-linux.armv7l.tgz
          tag: ${{ steps.tag.outputs.release_tag }}
          draft: ${{ needs.inputs.outputs.draft }}
@@ -310,8 +318,8 @@ jobs:
        env:
          GH_TOKEN: ${{ github.token }}
        run: |
-          gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
-          hdiutil attach SDL2-2.26.5.dmg
+          gh release download release-2.30.11 --repo libsdl-org/SDL --pattern SDL2-2.30.11.dmg
+          hdiutil attach SDL2-2.30.11.dmg
          sudo ditto /Volumes/SDL2/SDL2.framework /Library/Frameworks/SDL2.framework
          hdiutil detach /Volumes/SDL2/

@@ -337,7 +345,7 @@ jobs:
          # -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12
          cmake .. \
            -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-            -DMAIKO_DISPLAY_SDL=ON \
+            -DMAIKO_DISPLAY_SDL=2 \
            -DMAIKO_DISPLAY_X11=ON \
            -DCMAKE_BUILD_TYPE=Release
          cmake --build . --config Release
@@ -503,6 +511,7 @@ 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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,18 +80,17 @@ 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")
-  FIND_PACKAGE(SDL2 REQUIRED)
+  FIND_PACKAGE(SDL2 REQUIRED CONFIG REQUIRED COMPONENTS SDL2)
  SET(MAIKO_DISPLAY_SDL_DEFINITIONS
          "-DSDL=2"
          )
-  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS "${SDL2_INCLUDE_DIRS}")
+  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS SDL2::Headers)
  SET(MAIKO_DISPLAY_SDL_LIBRARIES SDL2::SDL2)
  SET(MAIKO_DISPLAY_SDL_SRCS
          src/sdl.c
@@ -101,11 +100,11 @@ IF(MAIKO_DISPLAY_SDL STREQUAL "2")
          )
  MESSAGE("-- Configured for SDL2 display")
 ELSEIF(MAIKO_DISPLAY_SDL STREQUAL "3")
-  FIND_PACKAGE(SDL3 REQUIRED)
+  FIND_PACKAGE(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
  SET(MAIKO_DISPLAY_SDL_DEFINITIONS
          "-DSDL=3"
          )
-  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS "${SDL3_INCLUDE_DIRS}")
+  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS SDL3::Headers)
  SET(MAIKO_DISPLAY_SDL_LIBRARIES SDL3::SDL3)
  SET(MAIKO_DISPLAY_SDL_SRCS
          src/sdl.c
@@ -142,6 +141,9 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
  LIST(APPEND MAIKO_DEFINITIONS
    "-DOS5"
  )
+  LIST(APPEND MAIKO_INIT_DEFINITIONS
+    "-DOS5"
+  )
 ENDIF()

 IF(APPLE)
@@ -292,7 +294,7 @@ SET(MAIKO_HDRS
    inc/bindefs.h
    inc/bindsdefs.h
    inc/bitbltdefs.h
-    inc/bitblt.h
+    inc/bbtmacro.h
    inc/bltdefs.h
    inc/byteswapdefs.h
    inc/car-cdrdefs.h
@@ -317,7 +319,6 @@ 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
@@ -396,14 +397,14 @@ SET(MAIKO_HDRS
    inc/opcodes.h
    inc/os.h
    inc/osmsgdefs.h
-    inc/osmsg.h
+    inc/osmsgprint.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
@@ -421,7 +422,6 @@ 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,14 +437,13 @@ SET(MAIKO_HDRS
    inc/vars3defs.h
    inc/version.h
    inc/vmemsavedefs.h
-    inc/vmemsave.h
    inc/xcdefs.h
    inc/z2defs.h
 )

-ADD_CUSTOM_TARGET(gen-vdate
+ADD_CUSTOM_COMMAND(OUTPUT vdate.c
  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bin/mkvdate > vdate.c
-  BYPRODUCTS vdate.c
+  DEPENDS ${MAIKO_SRCS} ${MAIKO_HDRS} ${MAIKO_DISPLAY_X11_SRCS} ${MAIKO_DISPLAY_X11_HDRS} ${MAIKO_DISPLAY_SDL_SRCS} ${MAIKO_DISPLAY_SDL_HDRS} 
 )

 ADD_EXECUTABLE(lde src/ldeboot.c src/unixfork.c)
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
 # Maiko

-Maiko is the implementation of the Medley Interlisp virtual machine, for a
-byte-coded Lisp instruction set and some low-level functions for
-connecting with Lisp for access to display (via X11) and disk etc.
+Maiko is the implementation of the Medley Interlisp virtual machine for a
+byte-coded Lisp instruction set, and some low-level functions for
+connecting Lisp to a display (via X11 or SDL), the local filesystem,
+and a network subsystem.

 For an overview, see [Medley Interlisp Introduction](https://interlisp.org/medley/using/docs/medley/).

@@ -15,13 +16,14 @@ Bug reports, feature requests, fixes and improvements, support for additional pl

 ## Development Platforms

-We are developing on FreeBSD, Linux, macOS, and Solaris currently
-on arm7l, arm64, PowerPC, SPARC, i386, and x86_64 hardware.
+Development has been primarily on macOS, FreeBSD, and Linux, with testing on Solaris and Windows.
+Processor architectures i386, x86\_64, arm64, arm7l, and SPARC.


 ## Building Maiko

-Building requires `clang`, `make`, X11 client libraries (`libx11-dev`). For example, 
+### Building with make
+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
@@ -33,17 +35,21 @@ $ 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`.
-* 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).
+* 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`.
+
+### 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

-* Running on macOS requires an X server, and building on a Mac requires X client libraries.
+* Building/running on macOS requires either an X server and X client libraries or the SDL2 library.
 An X-server for macOS (and X11 client libraries) can be freely obtained at https://www.xquartz.org/releases
-
-### 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.
-
+The SDL library is freely available from https://libsdl.org
--- a/bin/makefile-dos
+++ b/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    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
+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



@@ -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 return.h debug.h
+main.o  :       lispemul.h address.h lsptypes.h adr68k.h stack.h lspglob.h lispmap.h ifpage.h iopage.h retmacro.h debug.h


 													
--- a/bin/makefile-init-wsl1.aarch64
+++ b/bin/makefile-init-wsl1.aarch64
@@ -0,0 +1,29 @@
+# Options for Windows System for Linux v1, aarch64 processor, X windows, for INIT processing
+
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+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 -D__wsl1__
+
+LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit
--- a/bin/makefile-init-wsl1.x86_64
+++ b/bin/makefile-init-wsl1.x86_64
@@ -0,0 +1,29 @@
+# Options for Windows System for Linux v1, Intel x86_64 processor, X windows, for INIT processing
+
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+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 -D__wsl1__
+
+LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit
--- a/bin/makefile-tail
+++ b/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)return.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
+	$(INCDIR)retmacro.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)bitblt.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
+	$(INCDIR)bbtmacro.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)return.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
+	$(INCDIR)stack.h $(INCDIR)retmacro.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)bitblt.h \
+	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bbtmacro.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)osmsg.h $(INCDIR)dbprint.h \
+	$(INCDIR)locfile.h $(INCDIR)lispver2.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)bitblt.h \
+	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bbtmacro.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)bitblt.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.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)bitblt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bbtmacro.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)return.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
+	$(INCDIR)retmacro.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)osmsg.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \
+	$(INCDIR)miscstat.h $(INCDIR)osmsgprint.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)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.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)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.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)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.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)osmsg.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.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)return.h $(INCDIR)hardrtndefs.h \
+	$(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.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)ether.h $(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.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)bitblt.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.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)bitblt.h $(INCDIR)pilotbbt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bbtmacro.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)return.h \
+	$(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.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)osmsg.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsgprint.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)return.h \
+	$(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h $(INCDIR)retmacro.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)osmsg.h \
+	$(INCDIR)lispemul.h $(INCDIR)osmsgprint.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)tty.h $(INCDIR)ttydefs.h
+	$(INCDIR)commondefs.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)bitblt.h \
+	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bbtmacro.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)vmemsave.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
+	$(INCDIR)miscstat.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)return.h \
+	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)retmacro.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)xscroll.h $(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
+	$(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
 	$(INCDIR)xlspwindefs.h $(INCDIR)xscrolldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)xwinman.c -o $(OBJECTDIR)xwinman.o

--- a/bin/makefile-wsl1.aarch64-sdl
+++ b/bin/makefile-wsl1.aarch64-sdl
@@ -0,0 +1,25 @@
+# Options for Windows System for Linux v1, ARM64 and SDL
+
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+#
+#  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) -D__wsl1__
+
+LDFLAGS = -lSDL2 -lm
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl
--- a/bin/makefile-wsl1.aarch64-x
+++ b/bin/makefile-wsl1.aarch64-x
@@ -0,0 +1,27 @@
+# Options for Windows System for Linux v1, aarch64 and X-Window
+
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+XFLAGS = -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g3
+DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
+
+LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
--- a/bin/makefile-wsl1.x86_64-sdl
+++ b/bin/makefile-wsl1.x86_64-sdl
@@ -0,0 +1,25 @@
+# Options for Windows System for Linux v1, Intel x86_64 and SDL
+
+CC = gcc -m64 $(GCC_CFLAGS)
+# CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+#
+#  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) -D__wsl1__
+
+LDFLAGS = -lm -lSDL2
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl
--- a/bin/makefile-wsl1.x86_64-x
+++ b/bin/makefile-wsl1.x86_64-x
@@ -0,0 +1,28 @@
+# Options for Windows System for Linux v1, Intel x86_64 and X-Window
+
+CC = gcc -m64 $(GCC_CFLAGS)
+# CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+XFLAGS = -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g3
+DFLAGS = $(XFLAGS) -DRELEASE=$(RELEASE) -D__wsl1__
+
+LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
--- a/bin/mkvdate
+++ b/bin/mkvdate
@@ -1,6 +1,22 @@
 #!/bin/sh
+if command -v "git" >/dev/null 2>&1; then
+    MAIKO_REV="$(git status --porcelain)"
+    if [ $? -eq 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
--- a/bin/osversion
+++ b/bin/osversion
@@ -8,11 +8,14 @@ case "$os" in
        *-*-solaris2*)	        echo sunos5 ;;
        alpha-dec-osf1)		echo osf1 ;;
 	*-apple-darwin*)	echo darwin ;;
-        *-*-linux*)		echo linux ;;
+        *-*-linux*)
+           if [ -n "${WSL_DISTRO_NAME}" ] && [ -z "${WSL_INTEROP}" ];
+           then echo wsl1; else echo linux; fi ;;
        *-*-openbsd*)		echo openbsd ;;
        *-*-freebsd*)		echo freebsd ;;
 	*-*-cygwin*)            echo cygwin ;;
 	*-*-haiku*)             echo haiku ;;
+        *-microsoft-wsl1)       echo wsl1 ;;
 esac
 ### Don't leave the variable set.
 unset os
--- a/inc/XKeymap.h
+++ b/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  */
--- a/inc/bbtmacro.h
+++ b/inc/bbtmacro.h
@@ -1,10 +1,10 @@
-#ifndef BITBLT_H
-#define BITBLT_H 1
+#ifndef BBTMACRO_H
+#define BBTMACRO_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 :  bitblt.h
+ *	File :  bbtmacro.h (was bitblt.h)
 *
 *	Author :  Osamu Nakamura
 *
@@ -85,4 +85,4 @@ extern DLword *EmCursorX68K,*EmCursorY68K;
 #define UNLOCKSCREEN ScreenLocked = NIL

 #endif /* DOS */
-#endif /* BITBLT_H */
+#endif /* BBTMACRO_H */
--- a/inc/ether.h
+++ b/inc/ether.h
@@ -1,120 +0,0 @@
-#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 */
--- a/inc/gcdata.h
+++ b/inc/gcdata.h
@@ -18,7 +18,7 @@
 */
 /**********************************************************************/
 #include "lispemul.h" /* for LispPTR, DLword */
-#include "version.h" /* for USHORT */
+#include "version.h" /* for BIGVM */

 #define ADDREF  0       /* for gclookup routine. */
 #define DELREF  1       /* for gclookup routine. */
@@ -131,10 +131,10 @@
 #ifdef BIGVM  
 struct   hashentry
  { /* GC hashtable entry */
-    unsigned short count        :15;
-    unsigned short stackref     :1;
-    unsigned short segnum       :15;
-    unsigned short collision    :1;
+    DLword count        :15;
+    DLword stackref     :1;
+    DLword segnum       :15;
+    DLword collision    :1;
  };

 struct  htlinkptr
@@ -162,10 +162,10 @@ struct  htoverflow
 #else
 struct   hashentry
  { /* GC hashtable entry */
-    USHORT count        :6;
-    USHORT stackref     :1;
-    USHORT segnum       :8;
-    USHORT collision    :1;
+    DLword count        :6;
+    DLword stackref     :1;
+    DLword segnum       :8;
+    DLword collision    :1;
  };

 struct  htlinkptr
@@ -200,10 +200,10 @@ struct  htoverflow
 #ifdef BIGVM
 struct   hashentry
  { /* GC hashtable entry */
-    USHORT collision    :1;
-    USHORT segnum       :15;
-    USHORT stackref     :1;
-    USHORT count        :15;
+    DLword collision    :1;
+    DLword segnum       :15;
+    DLword stackref     :1;
+    DLword count        :15;
  };

 struct  htlinkptr
@@ -231,10 +231,10 @@ struct  htoverflow
 #else
 struct   hashentry
  { /* GC hashtable entry */
-    USHORT collision    :1;
-    USHORT segnum       :8;
-    USHORT stackref     :1;
-    USHORT count        :6;
+    DLword collision    :1;
+    DLword segnum       :8;
+    DLword stackref     :1;
+    DLword count        :6;
  };

 struct  htlinkptr
--- a/inc/gcfinaldefs.h
+++ b/inc/gcfinaldefs.h
@@ -2,14 +2,10 @@
 #define GCFINALDEFS_H 1
 #include "lispemul.h" /* for LispPTR, DLword */
 void printarrayblock(LispPTR base);
-int integerlength(unsigned int n);
-LispPTR findptrsbuffer(LispPTR ptr);
+void printfreeblockchainn(int arlen);
 LispPTR releasingvmempage(LispPTR ptr);
 LispPTR checkarrayblock(LispPTR base, LispPTR free, LispPTR onfreelist);
-LispPTR deleteblock(LispPTR base);
-LispPTR linkblock(LispPTR base);
 LispPTR makefreearrayblock(LispPTR block, DLword length);
-LispPTR arrayblockmerger(LispPTR base, LispPTR nbase);
 LispPTR mergebackward(LispPTR base);
 LispPTR mergeforward(LispPTR base);
 LispPTR reclaimarrayblock(LispPTR ptr);
--- a/inc/inlineC.h
+++ b/inc/inlineC.h
@@ -217,7 +217,7 @@

 #define FJUMPMACRO(x)                         \
  do {                                        \
-    if (TOPOFSTACK != 0) { goto PopNextop1; } \
+    if (TOPOFSTACK != 0) { POP; nextop1; }    \
    {                                         \
      CHECK_INTERRUPT;                        \
      POP;                                    \
@@ -227,7 +227,7 @@
  } while (0)
 #define TJUMPMACRO(x)                         \
  do {                                        \
-    if (TOPOFSTACK == 0) { goto PopNextop1; } \
+    if (TOPOFSTACK == 0) { POP; nextop1; }    \
    {                                         \
      CHECK_INTERRUPT;                        \
      POP;                                    \
--- a/inc/lispemul.h
+++ b/inc/lispemul.h
@@ -267,22 +267,22 @@ struct state {

 /* For bit test */
 typedef struct wbits {
-  USHORT LSB : 1;
-  USHORT B14 : 1;
-  USHORT B13 : 1;
-  USHORT B12 : 1;
-  USHORT B11 : 1;
-  USHORT B10 : 1;
-  USHORT B9 : 1;
-  USHORT B8 : 1;
-  USHORT B7 : 1;
-  USHORT B6 : 1;
-  USHORT B5 : 1;
-  USHORT B4 : 1;
-  USHORT B3 : 1;
-  USHORT B2 : 1;
-  USHORT B1 : 1;
-  USHORT xMSB : 1;
+  DLword LSB : 1;
+  DLword B14 : 1;
+  DLword B13 : 1;
+  DLword B12 : 1;
+  DLword B11 : 1;
+  DLword B10 : 1;
+  DLword B9 : 1;
+  DLword B8 : 1;
+  DLword B7 : 1;
+  DLword B6 : 1;
+  DLword B5 : 1;
+  DLword B4 : 1;
+  DLword B3 : 1;
+  DLword B2 : 1;
+  DLword B1 : 1;
+  DLword xMSB : 1;
 } WBITS;

 #define PUTBASEBIT68K(base68k, offset, bitvalue)                                             \
--- a/inc/lispver2.h
+++ b/inc/lispver2.h
@@ -9,7 +9,7 @@
 	char	*lv_cp;						\
 	char	*lv_vp;						\
 	unsigned lv_ver;					\
-	char		lv_ver_buf[VERSIONLEN];				\
+	char		lv_ver_buf[VERSIONLEN + 3];			\
 									\
 	lv_cp = pathname;						\
 	lv_vp = NULL;							\
--- a/inc/locfile.h
+++ b/inc/locfile.h
@@ -8,10 +8,14 @@
 /*	Manufactured in the United States of America.			*/
 /*									*/
 /************************************************************************/
+#include <ctype.h>     /* for isdigit */
 #include <errno.h>
 #include <limits.h>   /* for NAME_MAX */
+#include <string.h>   /* for strlen */
+#include <sys/param.h> /* for MAXPATHLEN */
 #include <dirent.h>   /* for MAXNAMLEN */
 #include "lispemul.h" /* for DLword */
+#include "commondefs.h" /* for error */

 #define	FDEV_PAGE_SIZE		512	/* 1 page == 512 byte */

@@ -63,6 +67,9 @@
        else if(((ptr) & SEGMASK)== S_NEGATIVE) {(place) = (int)((ptr)| 0xffff0000);}\
        else {return(NIL);}} while (0)

+#ifndef min
+#define min(a, b) (((a) <= (b))?(a):(b))
+#endif /* min */

 /************************************************************************/
 /*									*/
@@ -79,65 +86,65 @@
 /*									*/
 /************************************************************************/
 #ifndef BYTESWAP
-#define	LispStringToCString(Lisp, C, MaxLen)				\
-  do {									\
-    OneDArray	*lf_arrayp;						\
-    char	*lf_base, *lf_dp;						\
-    short	*lf_sbase;							\
-    size_t		 lf_length;						\
-    lf_arrayp = (OneDArray *)NativeAligned4FromLAddr(Lisp);		\
-    lf_length = min(MaxLen, lf_arrayp->fillpointer);			\
-    switch(lf_arrayp->typenumber)						\
-      {									\
-	case THIN_CHAR_TYPENUMBER:					\
-		lf_base = ((char *)(NativeAligned2FromLAddr(lf_arrayp->base)))  	\
-		       + ((int)(lf_arrayp->offset));			\
-		strncpy(C, lf_base, lf_length);				\
-		(C)[lf_length] = '\0';					\
-		break;							\
-									\
-	case FAT_CHAR_TYPENUMBER:					\
-		lf_sbase = ((short *)(NativeAligned2FromLAddr(lf_arrayp->base)))	\
-		       + ((int)(lf_arrayp->offset));			\
-                lf_dp = C;						\
-		for(size_t lf_i=0;lf_i<(lf_length);lf_i++)		\
-		  *lf_dp++ = (char)(*lf_sbase++);			\
-		*lf_dp = '\0';						\
-		break;							\
-	default:							\
-		error("LispStringToCString: Not a character array.\n");	\
-      }									\
- } while (0)
+static inline void LispStringToCString(LispPTR Lisp, char *C, size_t MaxLen)
+{
+    OneDArray	*lf_arrayp;
+    char	*lf_base, *lf_dp;
+    short	*lf_sbase;
+    size_t		 lf_length;
+    lf_arrayp = (OneDArray *)NativeAligned4FromLAddr(Lisp);
+    lf_length = min(MaxLen, lf_arrayp->fillpointer);
+    switch(lf_arrayp->typenumber)
+      {
+	case THIN_CHAR_TYPENUMBER:
+		lf_base = ((char *)(NativeAligned2FromLAddr(lf_arrayp->base)))
+		       + ((int)(lf_arrayp->offset));
+		strncpy(C, lf_base, lf_length);
+		(C)[lf_length] = '\0';
+		break;
+
+	case FAT_CHAR_TYPENUMBER:
+		lf_sbase = ((short *)(NativeAligned2FromLAddr(lf_arrayp->base)))
+		       + ((int)(lf_arrayp->offset));
+                lf_dp = C;
+		for(size_t lf_i=0;lf_i<(lf_length);lf_i++)
+		  *lf_dp++ = (char)(*lf_sbase++);
+		*lf_dp = '\0';
+		break;
+	default:
+		error("LispStringToCString: Not a character array.\n");
+      }
+}
 #else  /* BYTESWAP == T CHANGED-BY-TAKE */
-#define	LispStringToCString(Lisp, C, MaxLen)				\
-  do {									\
-    OneDArray	*lf_arrayp;						\
-    char	*lf_base, *lf_dp;						\
-    short	*lf_sbase;							\
-    size_t 	lf_length;						\
-    lf_arrayp = (OneDArray *)(NativeAligned4FromLAddr(Lisp));			\
-    lf_length = min(MaxLen, lf_arrayp->fillpointer);			\
-    switch(lf_arrayp->typenumber)						\
-      {									\
-	case THIN_CHAR_TYPENUMBER:					\
-		lf_base = ((char *)(NativeAligned2FromLAddr(lf_arrayp->base)))  	\
-		       + ((int)(lf_arrayp->offset));			\
-		StrNCpyFromLispToC(C , lf_base , lf_length );		\
-		(C)[lf_length] = '\0';					\
-		break;							\
-									\
-	case FAT_CHAR_TYPENUMBER:					\
-		lf_sbase = ((short *)(NativeAligned2FromLAddr(lf_arrayp->base)))	\
-		       + ((int)(lf_arrayp->offset));			\
-                lf_dp = C;						\
-		for(size_t lf_ii=0;lf_ii<(lf_length);lf_ii++,lf_sbase++)  \
-                    *lf_dp++ = (char)(GETWORD(lf_sbase));               \
-		*lf_dp = '\0';						\
-		break;							\
-	default:							\
-		error("LispStringToCString: Not a character array.\n");	\
-      }									\
-  } while (0)
+static inline void LispStringToCString(LispPTR Lisp, char *C, size_t MaxLen)
+{
+    OneDArray	*lf_arrayp;
+    char	*lf_base, *lf_dp;
+    short	*lf_sbase;
+    size_t 	lf_length;
+    lf_arrayp = (OneDArray *)(NativeAligned4FromLAddr(Lisp));
+    lf_length = min(MaxLen, lf_arrayp->fillpointer);
+    switch(lf_arrayp->typenumber)
+      {
+	case THIN_CHAR_TYPENUMBER:
+		lf_base = ((char *)(NativeAligned2FromLAddr(lf_arrayp->base)))
+		       + ((int)(lf_arrayp->offset));
+		StrNCpyFromLispToC(C , lf_base , lf_length );
+		(C)[lf_length] = '\0';
+		break;
+
+	case FAT_CHAR_TYPENUMBER:
+		lf_sbase = ((short *)(NativeAligned2FromLAddr(lf_arrayp->base)))
+		       + ((int)(lf_arrayp->offset));
+                lf_dp = C;
+		for(size_t lf_ii=0;lf_ii<(lf_length);lf_ii++,lf_sbase++)
+                    *lf_dp++ = (char)(GETWORD(lf_sbase));
+		*lf_dp = '\0';
+		break;
+	default:
+		error("LispStringToCString: Not a character array.\n");
+      }
+}

 #endif /* BYTESWAP */

@@ -189,10 +196,6 @@ do  {				\
 	(cstringp) = (char *)(NativeAligned2FromLAddr(((OneDArray *)lf_naddress)->base)); \
 } while (0)

-#ifndef min
-#define min(a, b) (((a) <= (b))?(a):(b))
-#endif /* min */
-
 #define	LispNumToCInt(Lisp)					\
       ( (((Lisp) & SEGMASK) == S_POSITIVE) ? ((Lisp) & 0xFFFF) : \
          (((Lisp) & SEGMASK) == S_NEGATIVE) ? ((Lisp) | 0xFFFF0000) : \
@@ -293,7 +296,7 @@ do  {				\
 	goto truetag;	/* NOLINT(bugprone-macro-parentheses) */	\
  } while (0)

-/*		
+/*
 * Name:	LispVersionToUnixVersion
 *
 * Argument:	char	*pathname
@@ -328,17 +331,13 @@ do  {				\
 #endif /* DOS */


-/*		
+/*
 * Name:	UnixVersionToLispVersion
 *
- * Argument:	char	*pathname
- *				UNIX syntax pathname.
- *		int	vlessp
- *				If 0, versionless file is converted to version 1.
+ * Argument:	char *pathname  UNIX syntax pathname.
+ *		int vlessp      If 0, versionless file is converted to version 1.
 *				Otherwise, remains as versionless.
 *
- * Value:	If succeed, returns 1, otherwise 0.
- *
 * Side Effect:	The version part of pathname is destructively modified.
 *
 * Description:
@@ -350,67 +349,25 @@ do  {				\
 * version field will append a semicolon and it might make the routine be
 * confused.
 * The file which has not a valid version field, that is ".~##~" form, is
- * dealt with as version 1. 
+ * dealt with as version 1.
 */

-#define UnixVersionToLispVersion(pathname, vlessp) do {				\
-										\
-	char	*start;							\
-	char	*end;							\
-	char	*lf_cp;							\
-	int	ver_no;								\
-	size_t	len;								\
-	char		ver_buf[VERSIONLEN];					\
-										\
-	if ((start = strchr(pathname, '~')) != NULL) {				\
-		/* First of all, find the version field in pathname. */		\
-		end = start;							\
-		lf_cp = start + 1;							\
-		while (*lf_cp) {							\
-			if (*lf_cp == '~') {					\
-				start = end;					\
-				end = lf_cp;					\
-				lf_cp++;						\
-			} else {						\
-				lf_cp++;						\
-			}							\
-		}								\
-										\
-		if (start != end && *(start - 1) == '.' && end == (lf_cp - 1)) {	\
-			/*							\
-			 * pathname ends in the form ".~###~".  But we		\
-			 * check ### is a valid number or not.			\
-			 */							\
-			len = (end - start) - 1;			\
-			strncpy(ver_buf, start + 1, len);			\
-			ver_buf[len] = '\0';					\
-			NumericStringP(ver_buf, YES, NO);			\
-		      YES:							\
-			*(start - 1) = ';';					\
-			*start = '\0';						\
-			*end = '\0';						\
-			/* call strtoul() to eliminate leading 0s. */		\
-			ver_no = strtoul(start + 1, (char **)NULL, 10);		\
-			sprintf(ver_buf, "%u", ver_no);				\
-			strcat(pathname, ver_buf);				\
-			goto CONT;						\
-										\
-		      NO:							\
-			/* Dealt with as version 1 unless vlessp */		\
-			if (!(vlessp)) strcat(pathname, ";1");                  \
-		      CONT:							\
-			lf_cp--;	/* Just for label */			\
-		} else {							\
-			/* Dealt with as version 1 unless vlessp. */		\
-                        if (!(vlessp)) strcat(pathname, ";1");                  \
-		}								\
-	} else {								\
-		/* Dealt with as version 1 unless vlessp. */			\
-                if (!(vlessp)) strcat(pathname, ";1");                          \
-	}									\
-  } while (0)
+#define UnixVersionToLispVersion(pathname, vlessp)                      \
+  do {                                                                  \
+    char *n_end;                                                        \
+    char *v_start;                                                      \
+    int	v_len;                                                          \
+                                                                        \
+    if (!parse_file_version(pathname, 1, &n_end, &v_start, &v_len)) {   \
+      if (!vlessp) strcat(pathname, ";1");                              \
+    } else {                                                            \
+      *n_end++ = ';';                                                   \
+      while (v_len-- > 0) *n_end++ = *v_start++;                        \
+      *n_end = '\0';                                                    \
+    }                                                                   \
+  }  while (0)

-/*		
+/*
 * Name:	ConcDirAndName
 *
 * Argument:	char	*dir	The name of the directory.
@@ -428,45 +385,45 @@ do  {				\
 *
 */

-#define ConcDirAndName(dir, name, fname) do {					\
-									\
-	char	*lf_cp1, *lf_cp2;					\
-									\
-	lf_cp1 = dir;							\
-	lf_cp2 = dir;							\
-									\
-	while (*lf_cp2 != '\0') {						\
-		switch (*lf_cp2) {						\
-									\
-		      case '/':						\
-			lf_cp1 = lf_cp2;					\
-			lf_cp2++;						\
-			break;						\
-									\
-		      default:						\
-			lf_cp2++;						\
-			break;						\
-		}							\
-	}								\
-	if (lf_cp1 == (lf_cp2 - 1)) {						\
-                if (lf_cp1 == (dir)) {					\
-			/* dir is a root directory. */			\
-			strcpy(fname, "/");				\
-			strcat(fname, name);				\
-		} else {						\
-			/* The trail directory is included. */		\
-			strcpy(fname, dir);				\
-			strcat(fname, name);				\
-		}							\
-	} else {							\
-		/* The trail directory is not included */		\
-		strcpy(fname, dir);					\
-		strcat(fname, "/");					\
-		strcat(fname, name);					\
-	}								\
-  } while (0)
+static inline void ConcDirAndName(char *dir, char *name, char *fname)
+{
+  char	*lf_cp1, *lf_cp2;

-/*		
+  lf_cp1 = dir;
+  lf_cp2 = dir;
+
+  while (*lf_cp2 != '\0') {
+    switch (*lf_cp2) {
+
+    case '/':
+      lf_cp1 = lf_cp2;
+      lf_cp2++;
+      break;
+
+    default:
+      lf_cp2++;
+      break;
+    }
+  }
+  if (lf_cp1 == (lf_cp2 - 1)) {
+    if (lf_cp1 == (dir)) {
+      /* dir is a root directory. */
+      strcpy(fname, "/");
+      strcat(fname, name);
+    } else {
+      /* The trail directory is included. */
+      strcpy(fname, dir);
+      strcat(fname, name);
+    }
+  } else {
+    /* The trail directory is not included */
+    strcpy(fname, dir);
+    strcat(fname, "/");
+    strcat(fname, name);
+  }
+}
+
+/*
 * Name:	ConcNameAndVersion
 *
 * Argument:	char	*name	The root file name.
@@ -481,20 +438,24 @@ do  {				\
 *
 * Concatenate the root file name and its version in UNIX format.
 *
+ * XXX: this code is unsafe and could result in memory smashes if the
+ * sizes of the arguments are not correctly specified
+ *
 */

-#define ConcNameAndVersion(name, ver, rname) do {				\
-	if (*(ver) != '\0') {						\
-		strcpy(rname, name);					\
-		strcat(rname, ".~");					\
-		strcat(rname, ver);					\
-		strcat(rname, "~");					\
-	} else {							\
-		strcpy(rname, name);					\
-	}								\
-} while (0)
+static inline void ConcNameAndVersion(char *name, char *ver, char *rname)
+{
+	if (*ver != '\0') {
+		strcpy(rname, name);
+		strcat(rname, ".~");
+		strcat(rname, ver);
+		strcat(rname, "~");
+	} else {
+		strcpy(rname, name);
+	}
+}

-#define	 VERSIONLEN		16
+#define	 VERSIONLEN		10

 #define	MAXVERSION		999999999

@@ -542,7 +503,7 @@ do  {				\
 			*(lf_cp-1) = '\0';					\
 		}							\
  } while (0)
-		
+
 #define	ChangeToVersionless(pathname) do {			\
 		char	*lf_cp;			\
 		if( (lf_cp=strrchr(pathname, ';')) != 0)	\
@@ -576,9 +537,9 @@ do  {				\
 		TIMEOUT(lf_rval=rename(x, y));		\
 		if(lf_rval == -1){				\
 			switch(errno){			\
-			case 2:				\
+			case ENOENT:				\
 				return(1);		\
-			case 18:			\
+			case EXDEV:			\
 				*Lisp_errno = errno;	\
 				return(0);		\
 			default:			\
@@ -601,20 +562,78 @@ do  {				\
 /*
 * For file name length check
 */
-#define FNAMETOOLONG	200

-#define FileNameTooLong(val) do {				\
-	*Lisp_errno = FNAMETOOLONG;			\
+#define FileNameTooLong(val) do {			\
+	*Lisp_errno = ENAMETOOLONG;                     \
 	return((val));					\
  } while (0)

+static inline int parse_file_version(char *name, int digitsonly, char **n_end,
+                                      char **v_start, int *v_length)
+{
+  char *sp, *ep;
+  size_t name_len;

+  name_len = strlen(name);
+  ep = &name[name_len - 1];

+  /* handle special case of Alto/IFS names with !nnn version.
+     To be considered for this case the name MUST end with ![0-9]+, however
+     version 0 is not valid.
+   */
+  sp = strrchr(name, '!');
+  if (sp != NULL) {
+    sp++;         /* "!nnn" => "nnn" or "!" => ""  */
+    if (*sp != '\0' && sp[strspn(sp, "0123456789")] == '\0') {
+      /* it was all digits after the '!', so go with it */
+      *n_end = sp - 1; /* name ends at '!'  */
+      while (*sp == '0' && sp < ep) sp++; /* skip leading zeroes */
+      if (*sp == '0') return (0); /* version 0 is not valid */
+      *v_start = sp;   /* version start after '!' */
+      *v_length = (ep - sp) + 1;
+      return ((*v_length >= VERSIONLEN) ? 0 : 1); /* fail on version too long */
+    }
+  }

+  /* if the name is too short to have a name and a version number
+     ".~#~" or doesn't end with "~" then there is no version number
+  */
+  if (name_len < 4 || *ep != '~')
+    return (0);

+  /* The name ends with a "~" so scan back in the filename looking for
+     another "~" terminating early if we need only digits and find
+     something else
+  */
+  sp = ep - 1;
+  while (sp > name && *sp != '~') {
+    if (digitsonly && !isdigit(*sp)) return (0);
+    --sp;
+  }

+  /* test for no initial "~" or no "." before "~", or
+   * version number length not at least 1
+   */
+  if (sp == name || *(sp - 1) != '.' || (ep - sp) - 1 < 1)
+    return (0);

+  /* After this point we have a version number in the form .~#~ with sp
+     pointing at the starting "~", ep pointing at the last "~",
+     and there must be at least one digit. Scan past any leading
+     zeros in the version, taking care not to remove the last digit.
+  */

+  *n_end = sp - 1;    /* save location of "." */
+
+  sp++;                  /* skip over the "." */
+  while (*sp == '0' && sp < (ep - 1)) {
+    sp++;
+  }
+  if (*sp == '0') return (0);  /* version 0 is not valid */
+  *v_start = sp;           /* save location of first significant digit in version */
+  *v_length = (ep - sp);   /* save length of version */
+  return ((*v_length >= VERSIONLEN) ? 0 : 1); /* fail on version too long */
+}

 /********************************************************/
 /*  file-system-specific defns                */
--- a/inc/lsptypes.h
+++ b/inc/lsptypes.h
@@ -699,4 +699,111 @@ 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 */
--- a/inc/maiko/platform.h
+++ b/inc/maiko/platform.h
@@ -38,13 +38,23 @@
 #  define MAIKO_OS_DETECTED 1
 #endif

-#ifdef __linux__
+#if defined(__linux__) && !defined(__wsl1__)
 #  define MAIKO_OS_LINUX 1
 #  define MAIKO_OS_NAME "Linux"
 #  define MAIKO_OS_UNIX_LIKE 1
 #  define MAIKO_OS_DETECTED 1
 #endif

+#if defined(__linux__) && defined(__wsl1__)
+#  define MAIKO_OS_LINUX 1
+#  define MAIKO_OS_WSL1 1
+#  define MAIKO_OS_NAME "Windows System for Linux v1"
+#  define MAIKO_OS_UNIX_LIKE 1
+#  define MAIKO_EMULATE_TIMER_INTERRUPTS 1
+#  define MAIKO_EMULATE_ASYNC_INTERRUPTS 1
+#  define MAIKO_OS_DETECTED 1
+#endif
+
 #ifdef __NetBSD__
 #  define MAIKO_OS_NETBSD 1
 #  define MAIKO_OS_NAME "NetBSD"
--- a/inc/osmsgprint.h
+++ b/inc/osmsgprint.h
@@ -1,5 +1,5 @@
-#ifndef OSMSG_H
-#define OSMSG_H 1
+#ifndef OSMSGPRINT_H
+#define OSMSGPRINT_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 /* OSMSG_H */
+#endif /* OSMSGPRINT_H */
--- a/inc/rawcolordefs.h
+++ b/inc/rawcolordefs.h
@@ -0,0 +1,8 @@
+#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
--- a/inc/retmacro.h
+++ b/inc/retmacro.h
@@ -1,12 +1,12 @@
-#ifndef RETURN_H
-#define RETURN_H 1
+#ifndef RETMACRO_H
+#define RETMACRO_H 1
 /* $Id: return.h,v 1.2 1999/01/03 02:06:22 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */


 /**************************************************************/
 /*

-	File Name : 	return.h
+	File Name : 	retmacro.h (was 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 /* RETURN_H */
+#endif /* RETMACRO_H */
--- a/inc/stack.h
+++ b/inc/stack.h
@@ -79,22 +79,22 @@ typedef struct fnhead {
 } FNHEAD;

 typedef struct frameex1 {
-  unsigned short flags : 3;
-  unsigned short fast : 1;
-  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
-  unsigned short incall : 1;
-  unsigned short validnametable : 1;
+  DLword flags : 3;
+  DLword fast : 1;
+  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
+  DLword incall : 1;
+  DLword validnametable : 1;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  unsigned short nopush : 1;
-  unsigned short usecount : 8;
+  DLword nopush : 1;
+  DLword 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) */
-  unsigned short hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
-  unsigned short hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
+  DLword hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
+  DLword 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) */
-  unsigned short hi1nametable : 8; /* ptr to NameTable of this FrameEx (Hi1 addr) */
-  unsigned short hi2nametable : 8; /* ptr to NameTable of this FrameEx (Hi2 addr) */
+  DLword hi1nametable : 8; /* ptr to NameTable of this FrameEx (Hi1 addr) */
+  DLword 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 {
-  unsigned short flags : 3;
-  unsigned short fast : 1;
-  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
-  unsigned short incall : 1;
-  unsigned short validnametable : 1;
+  DLword flags : 3;
+  DLword fast : 1;
+  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
+  DLword incall : 1;
+  DLword validnametable : 1;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  unsigned short nopush : 1;
-  unsigned short usecount : 8;
+  DLword nopush : 1;
+  DLword 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 {
-  unsigned short flags : 3;
-  unsigned short nil : 3;
-  unsigned short residual : 1;
-  unsigned short padding : 1;
-  unsigned short usecnt : 8;
+  DLword flags : 3;
+  DLword nil : 3;
+  DLword residual : 1;
+  DLword padding : 1;
+  DLword usecnt : 8;
  DLword ivar; /* stk offset of IVARs for this frame ?? */

 } Bframe;

 typedef struct stkword {
-  unsigned short flags : 3;
-  unsigned short nil : 5;
-  unsigned short usecount : 8;
+  DLword flags : 3;
+  DLword nil : 5;
+  DLword 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 */
-  unsigned short argtype : 2;     /* ?? */
-  unsigned short byteswapped : 1; /* code was reswapped.	*/
-  unsigned short nil4 : 1;        /* not used, prev: native translated? */
-  unsigned short fvaroffset : 8;
+  DLword argtype : 2;     /* ?? */
+  DLword byteswapped : 1; /* code was reswapped.	*/
+  DLword nil4 : 1;        /* not used, prev: native translated? */
+  DLword fvaroffset : 8;
  /* DLword offset from head of NameTable */
-  unsigned short nlocals : 8; /* ?? */
+  DLword 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) */
-  unsigned short usecount : 8;
-  unsigned short nopush : 1;
-  unsigned short validnametable : 1;
+  DLword usecount : 8;
+  DLword nopush : 1;
+  DLword validnametable : 1;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  unsigned short incall : 1;
-  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
-  unsigned short fast : 1;
-  unsigned short flags : 3; /* hi word */
+  DLword incall : 1;
+  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
+  DLword fast : 1;
+  DLword flags : 3; /* hi word */

 #ifdef BIGVM
  LispPTR fnheader; /* pointer to FunctionHeader (Hi2 addr) */
 #else
-  unsigned short hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
-  unsigned short hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
+  DLword hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
+  DLword 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
-  unsigned short hi2nametable : 8; /* pointer to NameTable of this FX (Hi2 addr) */
-  unsigned short hi1nametable : 8; /* pointer to NameTable of this FX (Hi1 addr) */
+  DLword hi2nametable : 8; /* pointer to NameTable of this FX (Hi2 addr) */
+  DLword 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) */
-  unsigned short usecount : 8;
-  unsigned short nopush : 1;
-  unsigned short validnametable : 1;
+  DLword usecount : 8;
+  DLword nopush : 1;
+  DLword validnametable : 1;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  unsigned short incall : 1;
-  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
-  unsigned short fast : 1;
-  unsigned short flags : 3;
+  DLword incall : 1;
+  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
+  DLword fast : 1;
+  DLword flags : 3;

  LispPTR fnheader; /* pointer to FunctionHeader (swapped) */

@@ -261,18 +261,18 @@ typedef struct fxblock {

 typedef struct basic_frame {
  DLword ivar;
-  unsigned short usecnt : 8;
-  unsigned short padding : 1;
-  unsigned short residual : 1;
-  unsigned short nil : 3;
-  unsigned short flags : 3;
+  DLword usecnt : 8;
+  DLword padding : 1;
+  DLword residual : 1;
+  DLword nil : 3;
+  DLword flags : 3;

 } Bframe;

 typedef struct stkword {
-  USHORT usecount : 8;
-  USHORT nil : 5;
-  USHORT flags : 3;
+  DLword usecount : 8;
+  DLword nil : 5;
+  DLword flags : 3;
 } StackWord;

 typedef struct stack_block {
--- a/inc/tty.h
+++ b/inc/tty.h
@@ -1,67 +0,0 @@
-#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 */
--- a/inc/uraidextdefs.h
+++ b/inc/uraidextdefs.h
@@ -4,7 +4,7 @@
 #include "stack.h" /* for FX */
 #include "lispemul.h" /* for LispPTR */

-#define URMAXFXNUM 2000
+#define URMAXFXNUM 4096
 #define URMAXCOMM 512
 #define URSCAN_ALINK 0
 #define URSCAN_CLINK 1
--- a/inc/uutilsdefs.h
+++ b/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(LispPTR *args);
+LispPTR suspend_lisp(void);
 #endif
--- a/inc/version.h
+++ b/inc/version.h
@@ -227,9 +227,6 @@ 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 */

 	/****************************************************************/
--- a/inc/vmemsave.h
+++ b/inc/vmemsave.h
@@ -1,25 +0,0 @@
-#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 */
--- a/inc/vmemsavedefs.h
+++ b/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(void);
+void lisp_finish(int exit_status);
 #endif
--- a/inc/xscroll.h
+++ b/inc/xscroll.h
@@ -1,18 +0,0 @@
-#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 */
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -47,7 +47,7 @@
 #include "address.h"
 #include "arith.h"
 #include "stack.h"
-#include "return.h"
+#include "retmacro.h"
 #include "cell.h"

 #include "bbtsubdefs.h"
@@ -60,7 +60,7 @@
 #include "returndefs.h"

 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 #include "dspdata.h"
 #include "display.h"
--- a/src/bitblt.c
+++ b/src/bitblt.c
@@ -25,7 +25,7 @@

 #include "pilotbbt.h"
 #include "display.h"
-#include "bitblt.h"
+#include "bbtmacro.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 */

-#ifdef XWINDOW
+#if defined(XWINDOW) || defined(SDL)
  flush_display_lineregion(dx, dstbase, w, h);
 #endif /* XWINDOW */

--- a/src/chardev.c
+++ b/src/chardev.c
@@ -43,7 +43,6 @@
 #include "arith.h"
 #include "timeout.h"
 #include "locfile.h"
-#include "osmsg.h"
 #include "dbprint.h"

 #include "chardevdefs.h"
--- a/src/dbgtool.c
+++ b/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,more than 100 stacks */
-      printf("***There are more than 100 stack frames.\n");
+      /* Internal buf overflow, too many stack frames */
+      printf("***There are more than %d stack frames.\n", URMAXFXNUM);
      printf(
          "If you want to continue, Uraid will smash its internal table for FX pointer. Do you "
          "accept?(Y or N)\n");
--- a/src/draw.c
+++ b/src/draw.c
@@ -20,7 +20,7 @@
 #include <stddef.h>       // for ptrdiff_t
 #include <stdlib.h>       // for abs
 #include "adr68k.h"       // for NativeAligned2FromLAddr
-#include "bitblt.h"       // for MOUSEXR, MOUSEYH
+#include "bbtmacro.h"       // for MOUSEXR, MOUSEYH
 #include "display.h"      // for DISPLAYBUFFER, DisplayRegion68k, in_display...
 #include "drawdefs.h"     // for N_OP_drawline
 #include "emlglob.h"
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -66,6 +66,7 @@ typedef struct filename_entry {
 */
 static struct {
  char name[MAXPATHLEN];     /* lowercase unversioned file name */
+  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 */
@@ -3055,11 +3056,13 @@ static int get_version_array(char *dir, char *file)
    *Lisp_errno = errno;
    return(0);
  }
-  if (0 == strcmp(lcased_file, VA.name) &&
+  if (sbuf.st_ino == VA.dir_ino &&
+      0 == strcmp(lcased_file, VA.name) &&
      sbuf.st_mtim.tv_sec == VA.lastMTime.tv_sec &&
      sbuf.st_mtim.tv_nsec == VA.lastMTime.tv_nsec) {
    return (1);
  } else {
+    VA.dir_ino = sbuf.st_ino;
    VA.lastMTime = sbuf.st_mtim;
    strcpy(VA.name, lcased_file);
  }
@@ -3243,6 +3246,7 @@ static int maintain_version(char *file, int forcep)
     * is versioned one higher than the existing highest version.
     */
    FindHighestVersion(VA.files, entry, max_no);
+    if (max_no >= MAXVERSION) {*Lisp_errno = EIO; return (0);}
    sprintf(ver, "%u", max_no + 1);
 /*
 * The old file should have the same case name as the versionless
@@ -3567,6 +3571,7 @@ static int get_old(char *dir, FileName *varray, char *afile, char *vfile)
         * link missing versionless file.
         */
        FindHighestVersion(varray, entry, max_no);
+        if (max_no >= MAXVERSION) {*Lisp_errno = EIO; return (0);}
        sprintf(vbuf, "%u", max_no + 1);
        ConcNameAndVersion(vless, vbuf, vfile);
        strcpy(afile, vless);
@@ -3575,6 +3580,7 @@ static int get_old(char *dir, FileName *varray, char *afile, char *vfile)
        /* A version is specified. */
        ver_no = strtoul(ver, (char **)NULL, 10);
        FindHighestVersion(varray, entry, max_no);
+        if (max_no >= MAXVERSION) {*Lisp_errno = EIO; return (0);}
        if (ver_no == max_no + 1) {
          /*
           * If the version is one higher than the
@@ -3923,6 +3929,7 @@ static int get_new(char *dir, FileName *varray, char *afile, char *vfile)
       * the existing highest version.
       */
      FindHighestVersion(varray, entry, max_no);
+      if (max_no + 1 >= MAXVERSION) {*Lisp_errno = EIO; return (0);}
      sprintf(vbuf, "%u", max_no + 1);
      /*
       * We will use the file name of the existing highest
@@ -4015,6 +4022,7 @@ static int get_new(char *dir, FileName *varray, char *afile, char *vfile)
         * missing versionless file.
         */
        FindHighestVersion(varray, entry, max_no);
+        if (max_no + 1 >= MAXVERSION) {*Lisp_errno = EIO; return (0);}
        sprintf(vbuf, "%u", max_no + 2);
        ConcNameAndVersion(vless, vbuf, vfile);
        strcpy(afile, vfile);
@@ -4078,6 +4086,7 @@ static int get_new(char *dir, FileName *varray, char *afile, char *vfile)
         * new file.
         */
        FindHighestVersion(varray, entry, max_no);
+        if (max_no >= MAXVERSION) {*Lisp_errno = EIO; return (0);}
        sprintf(vbuf, "%u", max_no + 1);
        /*
         * We will use the name of the highest versioned file
@@ -4294,6 +4303,7 @@ static int get_old_new(char *dir, FileName *varray, char *afile, char *vfile)
         * link missing versionless file.
         */
        FindHighestVersion(varray, entry, max_no);
+        if (max_no >= MAXVERSION) {*Lisp_errno = EIO; return (0);}
        sprintf(vbuf, "%u", max_no + 1);
        ConcNameAndVersion(vless, vbuf, vfile);
        strcpy(afile, vless);
--- a/src/dspsubrs.c
+++ b/src/dspsubrs.c
@@ -40,7 +40,12 @@ 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);
+}

 /****************************************************
 *
@@ -52,7 +57,16 @@ 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;
+  }
+}

 /****************************************************
 *
--- a/src/ether_nethub.c
+++ b/src/ether_nethub.c
@@ -31,7 +31,6 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
-#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"
--- a/src/ether_sunos.c
+++ b/src/ether_sunos.c
@@ -71,7 +71,6 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
-#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"
--- a/src/gcarray.c
+++ b/src/gcarray.c
@@ -99,35 +99,35 @@ struct hashtable {
 LispPTR aref1(LispPTR array, int index) {
  LispPTR retval = 0;
  LispPTR base;
-  short typenumber;
-  struct arrayheader *actarray;
+  struct arrayheader *array_np;

-  actarray = (struct arrayheader *)NativeAligned4FromLAddr(array);
-  if (index >= actarray->totalsize) {
+  array_np = (struct arrayheader *)NativeAligned4FromLAddr(array);
+  if (index >= array_np->totalsize) {
    printf("Invalid index in GC's AREF1:  0x%x\n", index);
-    printf(" Array size limit:  0x%x\n", actarray->totalsize);
+    printf(" Array size limit:  0x%x\n", array_np->totalsize);
    printf(" Array ptr: 0x%x\n", array);
-    printf(" Array 68K ptr: %p\n", (void *)actarray);
-    printf("base:     0x%x\n", actarray->base);
-    printf("offset:   0x%x\n", actarray->offset);
-    printf("type #:   0x%x\n", actarray->typenumber);
-    printf("fill ptr: 0x%x\n", actarray->fillpointer);
+    printf(" Array native ptr: %p\n", (void *)array_np);
+    printf("base:     0x%x\n", array_np->base);
+    printf("offset:   0x%x\n", array_np->offset);
+    printf("type #:   0x%x\n", array_np->typenumber);
+    printf("fill ptr: 0x%x\n", array_np->fillpointer);
    error("index out of range in GC's AREF1.");
  }
-  index += actarray->offset;
-  typenumber = actarray->typenumber;
-  base = actarray->base;
-  switch (typenumber) {
-    case 3: /* unsigned 8bits */
-      retval = (GETBYTE(((char *)NativeAligned2FromLAddr(base)) + index)) & 0x0ff;
-      retval |= S_POSITIVE;
-      break;
-    case 4: /* unsigned 16bits */
-      retval = (GETWORD(((DLword *)NativeAligned2FromLAddr(base)) + index)) & 0x0ffff;
-      retval |= S_POSITIVE;
-      break;
-    case 38: retval = (*(((LispPTR *)NativeAligned4FromLAddr(base)) + index)); break;
-    default: error("Not Implemented in gc's aref1 (other types)");
+  index += array_np->offset;
+  base = array_np->base;
+  switch (array_np->typenumber) {
+  case 3: /* unsigned 8 bits */
+    retval = (GETBYTE(((char *)NativeAligned2FromLAddr(base)) + index)) & 0x0ff;
+    retval |= S_POSITIVE;
+    break;
+  case 4: /* unsigned 16 bits */
+    retval = (GETWORD(((DLword *)NativeAligned2FromLAddr(base)) + index)) & 0x0ffff;
+    retval |= S_POSITIVE;
+    break;
+  case 38: /* pointer 32 bits */
+    retval = (*(((LispPTR *)NativeAligned4FromLAddr(base)) + index));
+    break;
+  default: error("Not Implemented in gc's aref1 (other types)");
  }
  return (retval);
 }
--- a/src/gcfinal.c
+++ b/src/gcfinal.c
@@ -50,7 +50,7 @@
 #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 "gcfinaldefs.h"  // for checkarrayblock
 #include "lispemul.h"     // for LispPTR, NIL, T, POINTERMASK, DLword, ATOM_T
 #include "llstkdefs.h"    // for decusecount68k
 #include "lspglob.h"      // for FreeBlockBuckets_word, ArrayMerging_word
@@ -69,13 +69,16 @@
 #endif /* NEVER */

 #define min(a, b) (((a) > (b)) ? (b) : (a))
-#define Trailer(ldatum, datum68) ((ldatum) + 2 * ((datum68)->arlen - ARRAYBLOCKTRAILERCELLS))
+#define Trailer(ldatum, datum68) ((ldatum) + DLWORDSPER_CELL * ((datum68)->arlen - ARRAYBLOCKTRAILERCELLS))
 #define BucketIndex(n) min(integerlength(n), MAXBUCKETINDEX)
 #define FreeBlockChainN(n) ((POINTERMASK & *FreeBlockBuckets_word) + 2 * BucketIndex(n))

+/*
+ * Declaration of buffer must be identical layout to Lisp BUFFER datatype in PMAP.
+ */
 #ifndef BYTESWAP
 #ifdef BIGVM
-struct buf {
+struct buffer {
  LispPTR filepage;
  LispPTR vmempage;
  LispPTR buffernext;
@@ -86,7 +89,7 @@ struct buf {
  unsigned sysnext : 28;
 };
 #else
-struct buf {
+struct buffer {
  LispPTR filepage;
  LispPTR vmempage;
  LispPTR buffernext;
@@ -99,7 +102,7 @@ struct buf {
 #endif /* BIGVM */
 #else
 #ifdef BIGVM
-struct buf {
+struct buffer {
  LispPTR filepage;
  LispPTR vmempage;
  LispPTR buffernext;
@@ -110,7 +113,7 @@ struct buf {
  unsigned noreference : 1;
 };
 #else
-struct buf {
+struct buffer {
  LispPTR filepage;
  LispPTR vmempage;
  LispPTR buffernext;
@@ -123,24 +126,32 @@ struct buf {
 #endif /* BIGVM */
 #endif /* BYTESWAP */

-/************* The following procedure is common !! **************************/
+static int integerlength(unsigned int n) {
+  int p = 0;

-int integerlength(unsigned int n) {
-  int cnt;
-  if (n <= 2)
-    return (n);
-  else {
-    cnt = 1;
-    do {
-      cnt++;
-      n = (n >> 1);
-    } while (n != 1);
-    return (cnt);
+  if (n <= 2) return (n); /* easy case */
+  if (n >= 65536) {
+    n >>= 16;
+    p += 16;
  }
+  if (n >= 256) {
+    n >>= 8;
+    p += 8;
+  }
+  if (n >= 16) {
+    n >>= 4;
+    p += 4;
+  }
+  if (n >= 4) {
+    n >>= 2;
+    p += 2;
+  }
+  if (n >= 2) {
+    p += 1;
+  }
+  return (p + 1);
 }

-/************* The above procedure is common !! **************************/
-
 /************************************************************************/
 /*									*/
 /*			f i n d p t r s b u f f e r			*/
@@ -151,14 +162,16 @@ int integerlength(unsigned int n) {
 /*									*/
 /************************************************************************/

-LispPTR findptrsbuffer(LispPTR ptr) {
-  struct buf *bptr;
-  bptr = (struct buf *)NativeAligned4FromLAddr(*System_Buffer_List_word);
-  while (LAddrFromNative(bptr) != NIL) {
-    if (ptr == bptr->vmempage)
-      return (LAddrFromNative(bptr));
-    else
-      bptr = (struct buf *)NativeAligned4FromLAddr(bptr->sysnext);
+static LispPTR findptrsbuffer(LispPTR ptr) {
+  LispPTR buf;
+  struct buffer *buf_np;
+  buf = *System_Buffer_List_word;
+  while (buf != NIL) {
+    buf_np = (struct buffer *)NativeAligned4FromLAddr(buf);
+    if (ptr == buf_np->vmempage) {
+      return (buf);
+    }
+    buf = buf_np->sysnext;
  }
  return (NIL);
 }
@@ -175,13 +188,13 @@ LispPTR findptrsbuffer(LispPTR ptr) {
 /************************************************************************/

 LispPTR releasingvmempage(LispPTR ptr) {
-  struct buf *bptr;
-  LispPTR bufferptr = findptrsbuffer(ptr);
+  LispPTR buffer = findptrsbuffer(ptr);
+  struct buffer *buffer_np;

-  if (bufferptr == NIL) return (NIL); /* Not in use, OK to reclaim it */
+  if (buffer == NIL) return (NIL); /* Not in use, OK to reclaim it */

-  bptr = (struct buf *)NativeAligned4FromLAddr(bufferptr);
-  bptr->noreference = T; /* Mark the buffer free to use ?? */
+  buffer_np = (struct buffer *)NativeAligned4FromLAddr(buffer);
+  buffer_np->noreference = T; /* Mark the buffer free to use ?? */
  return (ATOM_T);
 }

@@ -192,10 +205,9 @@ LispPTR releasingvmempage(LispPTR ptr) {
 /*	Given an array block, do consistency checks on it.		*/
 /*									*/
 /************************************************************************/
-
 LispPTR checkarrayblock(LispPTR base, LispPTR free, LispPTR onfreelist) {
-  struct arrayblock *bbase, *btrailer;
-  struct arrayblock *bfwd, *bbwd, *rbase;
+  struct arrayblock *base_np, *trailer_np;
+  struct arrayblock *fwd_np, *bkwd_np, *rbase;
  LispPTR fbl;
  LispPTR *rover, *tmprover;
 #ifdef ARRAYCHECK
@@ -204,38 +216,51 @@ LispPTR checkarrayblock(LispPTR base, LispPTR free, LispPTR onfreelist) {
  if (*Array_Block_Checking_word != NIL)
 #endif
  {
-    bbase = (struct arrayblock *)NativeAligned4FromLAddr(base);
-    btrailer = (struct arrayblock *)NativeAligned4FromLAddr(Trailer(base, bbase));
-    if (bbase->password != ARRAYBLOCKPASSWORD) {
+    base_np = (struct arrayblock *)NativeAligned4FromLAddr(base);
+    trailer_np = (struct arrayblock *)NativeAligned4FromLAddr(Trailer(base, base_np));
+#if 0
+    printf("cblock: 0x%x free: %x onfreelist: %x pw: %x arlen %d\n",
+           base, free, onfreelist, base_np->password, base_np->arlen);
+#endif
+    if (base_np->password != ARRAYBLOCKPASSWORD) {
      printarrayblock(base);
      error("ARRAYBLOCK password wrong\n");
-    } else if (bbase->inuse == free) {
+      return(T);
+    } else if (base_np->inuse == free) {
      printarrayblock(base);
      error("ARRAYBLOCK INUSE bit set wrong\n");
-    } else if (btrailer->password != ARRAYBLOCKPASSWORD) {
+      return(T);
+    } else if (trailer_np->password != ARRAYBLOCKPASSWORD) {
      printarrayblock(base);
      error("ARRAYBLOCK trailer password wrong\n");
-    } else if (bbase->arlen != btrailer->arlen) {
+      return(T);
+    } else if (base_np->arlen != trailer_np->arlen) {
      printarrayblock(base);
      error("ARRAYBLOCK Header and Trailer length don't match\n");
-    } else if (btrailer->inuse == free)
+      return(T);
+    } else if (trailer_np->inuse == free)
    /* This is not original source.(in original,
-       btrailer -> bbase) maybe, this is correction. */
+       trailer_np -> base_np) maybe, this is correction. */
    {
      printarrayblock(base);
      error("ARRAYBLOCK Trailer INUSE bit set wrong\n");
-    } else if (!onfreelist || (bbase->arlen < MINARRAYBLOCKSIZE))
+      return(T);
+    } else if (!onfreelist || (base_np->arlen < MINARRAYBLOCKSIZE))
      return (NIL);
    /* Remaining tests only for free list. */
-    bfwd = (struct arrayblock *)NativeAligned4FromLAddr(bbase->fwd);
-    bbwd = (struct arrayblock *)NativeAligned4FromLAddr(bbase->bkwd);
-    if ((bbwd->fwd != base) || (bfwd->bkwd != base)) {
+    fwd_np = (struct arrayblock *)NativeAligned4FromLAddr(base_np->fwd);
+    bkwd_np = (struct arrayblock *)NativeAligned4FromLAddr(base_np->bkwd);
+    if ((bkwd_np->fwd != base) || (fwd_np->bkwd != base)) {
      error("ARRAYBLOCK links fouled\n");
+      return(T);
    } else {
-      fbl = FreeBlockChainN(bbase->arlen);
+      fbl = FreeBlockChainN(base_np->arlen);
      rover = tmprover = (LispPTR *)NativeAligned4FromLAddr(fbl);
      /* GETBASEPTR */
-      if ((*rover & POINTERMASK) == NIL) error("Free Block's bucket empty\n");
+      if ((*rover & POINTERMASK) == NIL) {
+        error("Free Block's bucket empty\n");
+        return(T);
+      }
      do {
        if ((*rover & POINTERMASK) == base) return (NIL);
        checkarrayblock((*rover & POINTERMASK), T, NIL);
@@ -254,32 +279,38 @@ LispPTR checkarrayblock(LispPTR base, LispPTR free, LispPTR onfreelist) {
 /*									*/
 /*									*/
 /************************************************************************/
-
-LispPTR deleteblock(LispPTR base) {
-  struct arrayblock *bbase, *fbbase, *bbbase;
-  LispPTR fwd, bkwd, fbl, freeblocklsp;
-  LispPTR *freeblock;
-  bbase = (struct arrayblock *)NativeAligned4FromLAddr(base);
-  if ((bbase->arlen >= MINARRAYBLOCKSIZE) && (bbase->fwd != NIL)) {
-    fwd = bbase->fwd;
-    fbbase = (struct arrayblock *)NativeAligned4FromLAddr(fwd);
-    bkwd = bbase->bkwd;
-    bbbase = (struct arrayblock *)NativeAligned4FromLAddr(bkwd);
-    fbl = FreeBlockChainN(bbase->arlen);
-    freeblock = (LispPTR *)NativeAligned4FromLAddr(fbl);
-    freeblocklsp = POINTERMASK & *freeblock;
-    if (base == fwd) {
-      if (base == freeblocklsp)
-        *freeblock = NIL;
+/*
+ * Removes "base", a block from the free list and
+ * adjusts the forward and backward pointers of the blocks behind and
+ * ahead of the deleted block.
+ * The forward and backward pointers of this deleted block are left
+ * dangling - as in the Lisp implementation. Also does not affect the
+ * inuse bit in header and trailer.
+ */
+static void deleteblock(LispPTR base) {
+  struct arrayblock *base_np, *f_np, *b_np;
+  LispPTR f, b, fbl, freeblock;
+  LispPTR *fbl_np;
+  base_np = (struct arrayblock *)NativeAligned4FromLAddr(base);
+  if ((base_np->arlen >= MINARRAYBLOCKSIZE) && (base_np->fwd != NIL)) {
+    f = base_np->fwd;
+    f_np = (struct arrayblock *)NativeAligned4FromLAddr(f);
+    b = base_np->bkwd;
+    b_np = (struct arrayblock *)NativeAligned4FromLAddr(b);
+    fbl = FreeBlockChainN(base_np->arlen);
+    fbl_np = (LispPTR *)NativeAligned4FromLAddr(fbl);
+    freeblock = POINTERMASK & *fbl_np;
+    if (base == f) {
+      if (base == freeblock)
+        *fbl_np = NIL;
      else
        error("GC error:deleting last list # FREEBLOCKLIST\n");
-      return (NIL);
-    } else if (base == freeblocklsp)
-      *freeblock = fwd;
-    fbbase->bkwd = bkwd;
-    bbbase->fwd = fwd;
+      return;
+    } else if (base == freeblock)
+      *fbl_np = f;
+    f_np->bkwd = b;
+    b_np->fwd = f;
  }
-  return (NIL);
 }

 /************************************************************************/
@@ -289,34 +320,53 @@ LispPTR deleteblock(LispPTR base) {
 /*									*/
 /*									*/
 /************************************************************************/
+/*
+ * Links a block onto the free list for a particular size range.
+ * The free list is maintained as a doubly linked circular list accessed
+ * from the block pointed to by the free list bucket for the size.
+ * If there are no blocks in the free list bucket then the forward and
+ * backward pointers of the newly added block point to the block itself.
+ */
+static LispPTR linkblock(LispPTR base) {
+  struct arrayblock *base_np, *freeblock_np, *tail_np;
+  LispPTR fbl, freeblock;
+  LispPTR *fbl_np;

-LispPTR linkblock(LispPTR base) {
-  struct arrayblock *bbase, *fbbase, *tmpbase;
-  LispPTR fbl, freeblocklsp;
-  LispPTR *freeblock;
-  if (*FreeBlockBuckets_word != NIL) {
-    bbase = (struct arrayblock *)NativeAligned4FromLAddr(base);
-    if (bbase->arlen < MINARRAYBLOCKSIZE)
-      checkarrayblock(base, T, NIL);
-    else {
-      fbl = FreeBlockChainN(bbase->arlen);
-      freeblock = (LispPTR *)NativeAligned4FromLAddr(POINTERMASK & fbl);
-      freeblocklsp = POINTERMASK & (*freeblock);
-      if (freeblocklsp == NIL) {
-        bbase->fwd = base;
-        bbase->bkwd = base;
-      } else {
-        fbbase = (struct arrayblock *)NativeAligned4FromLAddr(freeblocklsp);
-        bbase->fwd = freeblocklsp;
-        bbase->bkwd = fbbase->bkwd;
-        tmpbase = (struct arrayblock *)NativeAligned4FromLAddr(fbbase->bkwd);
-        tmpbase->fwd = base;
-        fbbase->bkwd = base;
-      }
-      *freeblock = base;
-      checkarrayblock(base, T, T);
-    }
+  if (*FreeBlockBuckets_word == NIL)
+    return (base);
+
+  base_np = (struct arrayblock *)NativeAligned4FromLAddr(base);
+  if (base_np->arlen < MINARRAYBLOCKSIZE) {
+    checkarrayblock(base, T, NIL);
+    return (base);
  }
+
+  /* lisp pointer to bucket for size */
+  fbl = FreeBlockChainN(base_np->arlen);
+  /* native pointer to bucket */
+  fbl_np = (LispPTR *)NativeAligned4FromLAddr(POINTERMASK & fbl);
+  /* lisp pointer to first free block on chain */
+  freeblock = POINTERMASK & (*fbl_np);
+  if (freeblock == NIL) { /* no blocks already in chain */
+    base_np->fwd = base;
+    base_np->bkwd = base;
+  } else {
+    /* set up new block to be first free block on the chain */
+    freeblock_np = (struct arrayblock *)NativeAligned4FromLAddr(freeblock);
+    /* link new block forward to free block */
+    base_np->fwd = freeblock;
+    /* new block's backward link becomes free block's backward link  */
+    base_np->bkwd = freeblock_np->bkwd;
+    /* get the tail location (backward pointer of freelist head) */
+    tail_np = (struct arrayblock *)NativeAligned4FromLAddr(freeblock_np->bkwd);
+    /* set its forward pointer to new block */
+    tail_np->fwd = base;
+    /* and the update the free block's backward link to new block */
+    freeblock_np->bkwd = base;
+  }
+  /* new block becomes the head of the free list */
+  *fbl_np = base;
+  checkarrayblock(base, T, T); /* free, and on free list */
  return (base);
 }

@@ -330,17 +380,26 @@ LispPTR linkblock(LispPTR base) {

 LispPTR makefreearrayblock(LispPTR block, DLword length) {
  LispPTR trailer;
-  struct arrayblock *bbase;
-  struct abdum *dbase;
-  bbase = (struct arrayblock *)NativeAligned4FromLAddr(block);
-  dbase = (struct abdum *)WORDPTR(bbase);
-  dbase->abflags = FREEARRAYFLAGWORD;
-  bbase->arlen = length;
-  trailer = Trailer(block, bbase);
-  bbase = (struct arrayblock *)NativeAligned4FromLAddr(trailer);
-  dbase = (struct abdum *)WORDPTR(bbase);
-  dbase->abflags = FREEARRAYFLAGWORD;
-  bbase->arlen = length;
+  struct arrayblock *block_np, *trailer_np;
+  struct abdum *flags_np;
+  block_np = (struct arrayblock *)NativeAligned4FromLAddr(block);
+  /* this is an appropriate place to test whether the block that
+     is about to be freed contains words that look like valid
+     array header/trailer pairs as data.  This may result in
+     false positives, but could help if there's a real smash happening.
+  */
+  /* struct abdum's abflags is a DLword and does not account for
+     the BYTESWAP setup (as arrayblock does), so use WORDPTR to
+     pick the correct word of the cell
+  */
+  flags_np = (struct abdum *)WORDPTR(block_np);
+  flags_np->abflags = FREEARRAYFLAGWORD;
+  block_np->arlen = length;
+  trailer = Trailer(block, block_np);
+  trailer_np = (struct arrayblock *)NativeAligned4FromLAddr(trailer);
+  flags_np = (struct abdum *)WORDPTR(trailer_np);
+  flags_np->abflags = FREEARRAYFLAGWORD;
+  trailer_np->arlen = length;
  return (block);
 }

@@ -351,13 +410,13 @@ LispPTR makefreearrayblock(LispPTR block, DLword length) {
 /*									*/
 /*									*/
 /************************************************************************/
-LispPTR arrayblockmerger(LispPTR base, LispPTR nbase) {
+static LispPTR arrayblockmerger(LispPTR base, LispPTR nbase) {
  DLword arlens, narlens, secondbite, minblocksize, shaveback;
-  struct arrayblock *bbase, *bnbase;
-  bbase = (struct arrayblock *)NativeAligned4FromLAddr(base);
-  bnbase = (struct arrayblock *)NativeAligned4FromLAddr(nbase);
-  arlens = bbase->arlen;
-  narlens = bnbase->arlen;
+  struct arrayblock *base_np, *nbase_np;
+  base_np = (struct arrayblock *)NativeAligned4FromLAddr(base);
+  nbase_np = (struct arrayblock *)NativeAligned4FromLAddr(nbase);
+  arlens = base_np->arlen;
+  narlens = nbase_np->arlen;
  secondbite = MAXARRAYBLOCKSIZE - arlens;
  /* There are three cases for merging the blocks
   * (1) the total size of the two blocks is less than max:
@@ -367,7 +426,7 @@ LispPTR arrayblockmerger(LispPTR base, LispPTR nbase) {
   * (3) creating a max size block leaves a non-viable leftover block
   *     move the boundary to make a big block and a minimum size leftover block
   */
-  if (base + (2 * arlens) != nbase) {
+  if (base + (DLWORDSPER_CELL * arlens) != nbase) {
    error("Attempt to merge non-adjacent blocks in array space\n");
  }
  if (narlens > secondbite) { /* (2) or (3) */
@@ -381,7 +440,7 @@ LispPTR arrayblockmerger(LispPTR base, LispPTR nbase) {
      arlens += shaveback;
      secondbite += shaveback;
    }
-    linkblock(makefreearrayblock(nbase + 2 * secondbite, narlens));
+    linkblock(makefreearrayblock(nbase + DLWORDSPER_CELL * secondbite, narlens));
    narlens = 0;
  }
  return (linkblock(makefreearrayblock(base, arlens + narlens)));
@@ -395,18 +454,34 @@ LispPTR arrayblockmerger(LispPTR base, LispPTR nbase) {
 /*									*/
 /************************************************************************/

+/*
+ * merges this block into the block behind it, unless there are
+ * disqualifying conditions:
+ *     merging is turned off or
+ *     this is the first block in array space or
+ *     this is the first block in the 2nd array space or
+ *     the block behind it is in use
+ * in which case it is linked onto the freelist (fwd and backward pointers)
+ * and added to the free block chain by size.
+ * If it can be merged, 
+ */
 LispPTR mergebackward(LispPTR base) {
  LispPTR pbase;
-  struct arrayblock *ptrailer;
+  struct arrayblock *ptrailer_np;

  if (base == NIL)
    return (NIL);
-  ptrailer = (struct arrayblock *)NativeAligned4FromLAddr(base - ARRAYBLOCKTRAILERWORDS);
+  /* back up to get the trailer of the previous block */
+  ptrailer_np = (struct arrayblock *)NativeAligned4FromLAddr(base - ARRAYBLOCKTRAILERWORDS);
+  /* check that there are no disqualifying conditions for merging with previous block */
  if ((*ArrayMerging_word == NIL) ||
-           ((base == *ArraySpace_word) || ((base == *ArraySpace2_word) || (ptrailer->inuse == T))))
+           ((base == *ArraySpace_word) || ((base == *ArraySpace2_word) || (ptrailer_np->inuse == T))))
    return (linkblock(base));
-  pbase = base - 2 * ptrailer->arlen;
+  /* back up to the header of the previous block */
+  pbase = base - DLWORDSPER_CELL * ptrailer_np->arlen;
+  /* check that it is free, but skip free list checks */
  checkarrayblock(pbase, T, NIL);
+  /* remove it from the free list */
  deleteblock(pbase);
  return (arrayblockmerger(pbase, base));
 }
@@ -421,17 +496,17 @@ LispPTR mergebackward(LispPTR base) {

 LispPTR mergeforward(LispPTR base) {
  LispPTR nbase, nbinuse;
-  struct arrayblock *bbase, *bnbase;
+  struct arrayblock *base_np, *nbase_np;
  if (*ArrayMerging_word == NIL) return NIL;
  if (base == NIL) return NIL;
  if (checkarrayblock(base, T, T)) return NIL;

-  bbase = (struct arrayblock *)NativeAligned4FromLAddr(base);
-  nbase = base + 2 * (bbase->arlen);
+  base_np = (struct arrayblock *)NativeAligned4FromLAddr(base);
+  nbase = base + DLWORDSPER_CELL * (base_np->arlen);
  if (nbase == *ArrayFrLst_word || nbase == *ArrayFrLst2_word) return NIL;

-  bnbase = (struct arrayblock *)NativeAligned4FromLAddr(nbase);
-  nbinuse = bnbase->inuse;
+  nbase_np = (struct arrayblock *)NativeAligned4FromLAddr(nbase);
+  nbinuse = nbase_np->inuse;
  if (checkarrayblock(nbase, !nbinuse, NIL)) return NIL;
  if (nbinuse) return (NIL);
  deleteblock(nbase);
@@ -446,10 +521,13 @@ LispPTR mergeforward(LispPTR base) {
 /*	Reclaim a block of storage in the array-space heap.		*/
 /*									*/
 /************************************************************************/
-
+/*
+ * The pointer passed is to the data of the block, not the array block
+ * header.
+ */
 LispPTR reclaimarrayblock(LispPTR ptr) {
  LispPTR tmpptr, btrailer;
-  struct arrayblock *base;
+  struct arrayblock *base_np;
  LispPTR *tmpp;
  int reclaim_p;

@@ -458,7 +536,7 @@ LispPTR reclaimarrayblock(LispPTR ptr) {
  checkarrayblock(ptr - ARRAYBLOCKHEADERWORDS, NIL, NIL);
 #endif /* ARRAYCHECK */

-  base = (struct arrayblock *)NativeAligned4FromLAddr(ptr - ARRAYBLOCKHEADERWORDS);
+  base_np = (struct arrayblock *)NativeAligned4FromLAddr(ptr - ARRAYBLOCKHEADERWORDS);
 #ifdef ARRAYCHECK
  if (HILOC(ptr) < FIRSTARRAYSEGMENT) {
    printarrayblock(ptr - ARRAYBLOCKHEADERWORDS);
@@ -466,11 +544,11 @@ LispPTR reclaimarrayblock(LispPTR ptr) {
        "Bad array block reclaimed [not in array space].\nContinue with 'q' but save state ASAP. "
        "\n");
    return (T);
-  } else if (ARRAYBLOCKPASSWORD != base->password) {
+  } else if (ARRAYBLOCKPASSWORD != base_np->password) {
    printarrayblock(ptr - ARRAYBLOCKHEADERWORDS);
    error("Bad array block reclaimed [password wrong].\nContinue with 'q' but save state ASAP. \n");
    return (T);
-  } else if (base->inuse == NIL) {
+  } else if (base_np->inuse == NIL) {
    printarrayblock(ptr - ARRAYBLOCKHEADERWORDS);
    error(
        "Bad array block reclaimed [block not in use].\nContinue with 'q' but save state ASAP. \n");
@@ -479,15 +557,15 @@ LispPTR reclaimarrayblock(LispPTR ptr) {
 #else
  /* Normal case, just tell the guy something's wrong: */
  if ((HILOC(ptr) < FIRSTARRAYSEGMENT) ||
-      ((ARRAYBLOCKPASSWORD != base->password) || (base->inuse == NIL))) {
+      ((ARRAYBLOCKPASSWORD != base_np->password) || (base_np->inuse == NIL))) {
    error("Bad array block reclaimed--continue with 'q' but save state ASAP. \n");
    return (T);
  }
 #endif /* ARRAYCHECK */

-  switch (base->gctype) {
+  switch (base_np->gctype) {
    case PTRBLOCK_GCT: {
-      btrailer = (ptr - 2) + 2 * (base->arlen - ARRAYBLOCKTRAILERCELLS);
+      btrailer = (ptr - 2) + DLWORDSPER_CELL * (base_np->arlen - ARRAYBLOCKTRAILERCELLS);
      tmpptr = ptr;
      do {
        tmpp = (LispPTR *)NativeAligned4FromLAddr(tmpptr);
@@ -504,7 +582,7 @@ LispPTR reclaimarrayblock(LispPTR ptr) {
      /* default:   No Action */
  }
  if (reclaim_p == T)
-    mergeforward(mergebackward(makefreearrayblock(ptr - ARRAYBLOCKHEADERWORDS, base->arlen)));
+    mergeforward(mergebackward(makefreearrayblock(ptr - ARRAYBLOCKHEADERWORDS, base_np->arlen)));
  return (T);
 }

@@ -536,31 +614,62 @@ LispPTR reclaimstackp(LispPTR ptr) /* This is the entry function */
 /************************************************************************/

 void printarrayblock(LispPTR base) {
-  struct arrayblock *bbase, *btrailer, *ptrailer;
+  struct arrayblock *base_np, *trailer_np, *ptrailer_np;
  LispPTR *addr;
-
  LispPTR pbase, nbase;

-  bbase = (struct arrayblock *)NativeAligned4FromLAddr(base);
-  btrailer = (struct arrayblock *)NativeAligned4FromLAddr(Trailer(base, bbase));
-  ptrailer = (struct arrayblock *)NativeAligned4FromLAddr(base - ARRAYBLOCKTRAILERWORDS);
+  base_np = (struct arrayblock *)NativeAligned4FromLAddr(base);
+  trailer_np = (struct arrayblock *)NativeAligned4FromLAddr(Trailer(base, base_np));
+  ptrailer_np = (struct arrayblock *)NativeAligned4FromLAddr(base - ARRAYBLOCKTRAILERWORDS);

-  nbase = base + 2 * bbase->arlen;
-  pbase = base - 2 * ptrailer->arlen;
+  nbase = base + DLWORDSPER_CELL * base_np->arlen;
+  pbase = base - DLWORDSPER_CELL * ptrailer_np->arlen;

  printf("This array block: 0x%x.  Previous: 0x%x.  Next: 0x%x.\n", base, pbase, nbase);
-  printf("          Length: %d cells.\n\n", bbase->arlen);
+  printf("        password: 0x%x     gctype: 0x%x   in use: %d\n", base_np->password,
+         base_np->gctype, base_np->inuse);
+  if (!base_np->inuse)
+    printf("      Free list: fwd 0x%x bkwd 0x%x\n", base_np->fwd, base_np->bkwd);
+  printf("  Header  Length: %d cells.\n\n", base_np->arlen);
+  printf(" Trailer  Length: %d cells.\n\n", trailer_np->arlen);

-  addr = ((LispPTR *)bbase) - 20;
-  for (; addr < (LispPTR *)bbase; addr++) printf("%p	%8x\n", (void *)addr, *addr);
-  printf("%p	%8x <- array header\n", (void *)addr, *addr);
+  addr = ((LispPTR *)base_np) - 20;
+  for (; addr < (LispPTR *)base_np; addr++) printf("%16p (0x%8x) %8x\n", (void *)addr, LAddrFromNative(addr), *addr);
+  printf("%16p (0x%8x) %8x <- array header\n", (void *)addr, LAddrFromNative(addr), *addr);
  addr++;
-  for (; addr < (LispPTR *)bbase + 20; addr++) printf("%p	%8x\n", (void *)addr, *addr);
+  for (; addr < (LispPTR *)base_np + 20; addr++) printf("%16p (0x%8x) %8x\n", (void *)addr, LAddrFromNative(addr), *addr);
  printf(". . .\n");

-  addr = ((LispPTR *)btrailer) - 20;
-  for (; addr < (LispPTR *)btrailer; addr++) printf("%p	%8x\n", (void *)addr, *addr);
-  printf("%p	%8x <- array trailer\n", (void *)addr, *addr);
+  addr = ((LispPTR *)trailer_np) - 20;
+  for (; addr < (LispPTR *)trailer_np; addr++) printf("%16p (0x%8x) %8x\n", (void *)addr, LAddrFromNative(addr), *addr);
+  printf("%16p (0x%8x) %8x <- array trailer\n", (void *)addr, LAddrFromNative(addr), *addr);
  addr++;
-  for (; addr < (LispPTR *)btrailer + 20; addr++) printf("%p	%8x\n", (void *)addr, *addr);
+  for (; addr < (LispPTR *)trailer_np + 20; addr++) printf("%16p (0x%8x) %8x\n", (void *)addr, LAddrFromNative(addr), *addr);
+}
+
+static void printfreeblockchainhead(int index)
+{
+  LispPTR fbl, freeblock;
+  LispPTR *fbl_np;
+
+  fbl = POINTERMASK & ((*FreeBlockBuckets_word) + (DLWORDSPER_CELL * index));
+  fbl_np = (LispPTR *)NativeAligned4FromLAddr(fbl);
+  /* lisp pointer to free block on chain */
+  freeblock = POINTERMASK & (*fbl_np);
+  if (freeblock == NIL) { /* no blocks in chain */
+    printf("Free block chain (bucket %d): NIL\n", index);
+  } else {
+    printf("Free block chain(bucket %d): 0x%x\n", index, freeblock);
+  }
+}
+
+void printfreeblockchainn(int arlen)
+{
+  if (arlen >= 0) {
+    printfreeblockchainhead(BucketIndex(arlen));
+    return;
+  } else
+    for (int i = 0; i <= MAXBUCKETINDEX; i++) {
+      printfreeblockchainhead(i);
+    }
 }
--- a/src/hardrtn.c
+++ b/src/hardrtn.c
@@ -32,7 +32,7 @@
 #include "llstkdefs.h"    // for decusecount68k, freestackblock, blt, stack_...
 #include "lspglob.h"
 #include "lsptypes.h"     // for GETWORD
-#include "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
+#include "retmacro.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
 #include "stack.h"        // for FX, frameex1, Bframe, CHECK_FX, StackWord

 #define MAKE_FXCOPY(fx68k)                                                                   \
--- a/src/inet.c
+++ b/src/inet.c
@@ -41,7 +41,6 @@
 #include "emlglob.h"
 #include "lspglob.h"
 #include "adr68k.h"
-#include "ether.h"
 #include "dbprint.h"
 #include "locfile.h"

--- a/src/initdsp.c
+++ b/src/initdsp.c
@@ -98,6 +98,11 @@ 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
+   */
 }

 /************************************************************************/
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -51,7 +51,7 @@ void Mouse_hndlr(void); /* Fields mouse events from driver        */
 #include "lsptypes.h"

 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"

 #include "keyeventdefs.h"
--- a/src/llcolor.c
+++ b/src/llcolor.c
@@ -28,7 +28,7 @@
 #include "devconf.h"

 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 #include "dbprint.h"

--- a/src/llstk.c
+++ b/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 "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW
+#include "retmacro.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
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,7 @@
 #include "emlglob.h"
 #include "adr68k.h"
 #include "stack.h"
-#include "return.h"
+#include "retmacro.h"

 #include "lispemul.h"
 #include "lspglob.h"
@@ -243,9 +243,10 @@ int flushing = FALSE; /* see dbprint.h if set, all debug/trace printing will cal
 extern DspInterface currentdsp;
 #endif /* DOS || XWINDOW */
 #ifdef SDL
-extern int init_SDL(char*, int, int, int);
+#include "sdldefs.h"	/* for init_SDL */
 #endif
 extern const time_t MDate;
+extern const char *MaikoGitVersion;
 extern int nokbdflag;
 extern int nomouseflag;
 #ifdef DOS
@@ -324,6 +325,15 @@ 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			*/
@@ -338,9 +348,6 @@ int main(int argc, char *argv[])
  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) {
@@ -365,7 +372,6 @@ int main(int argc, char *argv[])
  // arg processing changes argc/argv
  if (argc > 1 && argv[1][0] != '-') {
    strncpy(sysout_name_first_arg, argv[1], MAXPATHLEN);
-    i++;
  }


@@ -402,20 +408,20 @@ int main(int argc, char *argv[])
      }
    }

-    /* -t and -m are undocumented and somewhat dangerous... */
+    /* -timer and -m are undocumented and somewhat dangerous... */

-    else if (!strcmp(argv[i], "-t")) { /**** timer interval	****/
+    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 -t (integer > 0)\n");
+          (void)fprintf(stderr, "Bad value for -timer (integer > 0)\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -t\n");
+        (void)fprintf(stderr, "Missing argument after -timer\n");
        exit(1);
      }
    }
@@ -468,7 +474,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", &width, &height);
+        int read = sscanf(argv[i], "%dx%d", &LispDisplayRequestedWidth, &LispDisplayRequestedHeight);
        if(read != 2) {
          (void)fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]);
          exit(1);
@@ -479,7 +485,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);
@@ -491,7 +497,7 @@ 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) {
-        windowtitle = argv[i];
+        strncpy(windowTitle, argv[i], sizeof(windowTitle) - 1);
      } else {
        (void)fprintf(stderr, "Missing argument after -title\n");
        exit(1);
@@ -711,13 +717,12 @@ 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, width, height, pixelscale);
+  init_SDL(windowTitle, LispDisplayRequestedWidth, LispDisplayRequestedHeight, 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(); /* built up map */
-
+  build_lisp_map(); /* build up map */
  init_ifpage(sysout_size); /* init interface page */
  init_iopage();
  init_miscstats();
@@ -827,6 +832,7 @@ 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 */
--- a/src/misc7.c
+++ b/src/misc7.c
@@ -43,7 +43,9 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP
  int offset;
  DLword bmdata;
  DLword bmmask;
+#ifdef REALCURSOR
  int displayflg;
+#endif

  DBPRINT(("MISC7 op with alpha byte %d.\n", alpha));

@@ -58,7 +60,11 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP

  DBPRINT(("MISC7 args OK.\n"));

+#ifdef REALCURSOR
  displayflg = n_new_cursorin(base, x, (heightminus1 - y), 1, 1);
+  if (displayflg)
+    HideCursor();
+#endif

 /* Bitmaps use a positive integer coordinate system with the lower left
   corner pixel at coordinate (0, 0). Storage is allocated in 16-bit words
@@ -79,12 +85,12 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP
  }


-#ifdef XWINDOW
+#if defined(XWINDOW) || defined(SDL)
  if (in_display_segment(base)) {
    /* NB: base + offset doesn't need WORDPTR() wrapper */
    flush_display_ptrregion(base + offset, 0, 16, 1);
  }
-#endif /* XWINDOW */
+#endif /* XWINDOW || SDL */

  ScreenLocked = NIL;
  DBPRINT(("FBITMAPBIT old bit = 0x%x.\n", oldbit));
--- a/src/osmsg.c
+++ b/src/osmsg.c
@@ -44,7 +44,7 @@
 #include "lspglob.h"
 #include "timeout.h"
 #include "locfile.h"
-#include "osmsg.h"
+#include "osmsgprint.h"
 #include "dbprint.h"

 #include "commondefs.h"
--- a/src/perrno.c
+++ b/src/perrno.c
@@ -13,7 +13,7 @@
 #include <errno.h>       // for errno
 #include <stdio.h>       // for fprintf, perror, stderr, NULL
 #include <string.h>      // for strerror
-#include "osmsg.h"       // for OSMESSAGE_PRINT
+#include "osmsgprint.h"  // for OSMESSAGE_PRINT
 #include "perrnodefs.h"  // for err_mess, perrorn

 /************************************************************************/
--- a/src/rawcolor.c
+++ b/src/rawcolor.c
@@ -31,7 +31,7 @@
 #include "pilotbbt.h"
 #include "debug.h"
 #include "arith.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "lldsp.h"
 #include "bbtsubdefs.h"

@@ -419,7 +419,7 @@ loop:
 /*									*/
 /************************************************************************/

-void newColorizeFont8(PILOTBBT *pbt, u_char backcolor, u_char forecolor, LispPTR srctype, LispPTR ope)
+static void newColorizeFont8(PILOTBBT *pbt, u_char backcolor, u_char forecolor, LispPTR srctype, LispPTR ope)
 {
  DLword *nbase;
  u_char *dbase;
--- a/src/return.c
+++ b/src/return.c
@@ -38,7 +38,7 @@
 #include "lspglob.h"
 #include "initatms.h"
 #include "cell.h"
-#include "return.h"
+#include "retmacro.h"
 #include "testtooldefs.h"
 #include "returndefs.h"
 #include "commondefs.h"
--- a/src/sdl.c
+++ b/src/sdl.c
@@ -52,7 +52,6 @@ extern int error(const char *s);

 extern int KBDEventFlg;
 /* clang-format off */
-#if SDL_MAJOR_VERSION == 2
 int keymap[] = {
  0, SDLK_5,                                     /* (5 %% FIVE) */
  1, SDLK_4,                                     /* (4 $ FOUR) */
@@ -168,123 +167,6 @@ int keymap[] = {
  // 111,                                        /* (K5F SUN-OPEN) */
  -1, -1
 };
-#elif SDL_MAJOR_VERSION == 3
-int keymap[] = {
-  0, SDLK_5,                                     /* (5 %% FIVE) */
-  1, SDLK_4,                                     /* (4 $ FOUR) */
-  2, SDLK_6,                                     /* (6 ~ SIX) */
-  3, SDLK_E,                                     /* (e E) */
-  4, SDLK_7,                                     /* (7 & SEVEN) */
-  5, SDLK_D,                                     /* (d D) */
-  6, SDLK_U,                                     /* (u U) */
-  7, SDLK_V,                                     /* (v V) */
-  8, SDLK_RIGHTPAREN, 8, SDLK_0,                 /* (0 %) ZERO) */
-  9, SDLK_K,                                     /* (k K) */
-  10, SDLK_MINUS,                                /* (- %^X) */
-  11, SDLK_P,                                    /* (p P) */
-  12, SDLK_SLASH,                                /* (/ ?) */
-  13, SDLK_KP_PERIOD,                            /* (\ %| FONT LOOKS) */
-  14, SDLK_SCROLLLOCK,                           /* (LF SAME) */
-  15, SDLK_BACKSPACE,                            /* (BS <-) */
-  16, SDLK_3,                                    /* (3 %# THREE) */
-  17, SDLK_2,                                    /* (2 @ TWO) */
-  18, SDLK_W,                                    /* (w W) */
-  19, SDLK_Q,                                    /* (q Q) */
-  20, SDLK_S,                                    /* (s S) */
-  21, SDLK_A,                                    /* (a A) */
-  22, SDLK_LEFTPAREN,  22, SDLK_9,               /* (9 %( NINE) */
-  23, SDLK_I,                                    /* (i I) */
-  24, SDLK_X,                                    /* (x X) */
-  25, SDLK_O,                                    /* (o O) */
-  26, SDLK_L,                                    /* (l L) */
-  27, SDLK_COMMA,                                /* (%, <) */
-  28, SDLK_APOSTROPHE,                           /* (%' %") */
-  29, SDLK_RIGHTBRACKET,                         /* (%] }) */
-  // 30,                                         /* (BLANK-MIDDLE OPEN DBK-HELP) */
-  31, SDLK_LALT, /* Meta, Sun-4 usual key */     /* (BLANK-TOP KEYBOARD DBK-META) */
-  32, SDLK_1,                                    /* (1 ! ONE) */
-  33, SDLK_ESCAPE,                               /* (ESC ESCAPE ->) */
-  34, SDLK_TAB,                                  /* (TAB =>) */
-  35, SDLK_F,                                    /* (f F) */
-  36, SDLK_LCTRL,                                /* (CTRL PROP'S EDIT) */
-  37, SDLK_C,                                    /* (c C) */
-  38, SDLK_J,                                    /* (j J) */
-  39, SDLK_B,                                    /* (b B) */
-  40, SDLK_Z,                                    /* (z Z) */
-  41, SDLK_LSHIFT,                               /* (LSHIFT) */
-  42, SDLK_PERIOD,                               /* (%. >) */
-  43, SDLK_SEMICOLON,  43, SDLK_COLON,           /* (; %:) */
-  44, SDLK_RETURN,                               /* (CR <-%|) */
-  45, SDLK_GRAVE,                                /* (_ ^) */
-  // 46,                                         /* (DEL DELETE) */
-  47, SDLK_RCTRL,                                /* (SKIP NEXT) */
-  48, SDLK_R,                                    /* (r R) */
-  49, SDLK_T,                                    /* (t T) */
-  50, SDLK_G,                                    /* (g G) */
-  51, SDLK_Y,                                    /* (y Y) */
-  52, SDLK_H,                                    /* (h H) */
-  53, SDLK_8,                                    /* (8 * EIGHT) */
-  54, SDLK_N,                                    /* (n N) */
-  55, SDLK_M,                                    /* (m M) */
-  56, SDLK_CAPSLOCK,                             /* (LOCK) */
-  57, SDLK_SPACE,                                /* (SPACE) */
-  58, SDLK_LEFTBRACKET,                          /* (%[ {) */
-  59, SDLK_EQUALS,                               /* (= +) */
-  60, SDLK_RSHIFT,                               /* (RSHIFT) */
-  61, SDLK_F11,  61, SDLK_PAUSE,                 /* (BLANK-BOTTOM STOP) */
-  62, SDLK_HOME,                                 /* (MOVE) */
-  63, SDLK_PAGEUP,                               /* (UNDO) */
-  64, SDLK_KP_EQUALS,                            /* (UTIL0 SUN-KEYPAD=) */
-  65, SDLK_KP_DIVIDE,                            /* (UTIL1 SUN-KEYPAD/) */
-  66, SDLK_F7,                                   /* (UTIL2 SUPER/SUB) */
-  67, SDLK_F4,                                   /* (UTIL3 CASE) */
-  68, SDLK_F5,                                   /* (UTIL4 STRIKEOUT) */
-  69, SDLK_KP_2,                                 /* (UTIL5 KEYPAD2) */
-  70, SDLK_KP_3,                                 /* (UTIL6 KEYPAD3 PGDN) */
-  // 71, XK_Linefeed,                            /* (UTIL7 SUN-LF) */
-  // 72,                                         /* (PAD1 LEFTKEY CAPSLOCK KEYPAD+) */
-  // 73, XK_Numlock,                             /* (PAD2 LEFTMIDDLEKEY NUMLOCK KEYPAD-) */
-  // 74,                                         /* (PAD3 MIDDLEKEY SCROLLLOCK KEYPAD*) */
-  // 75,                                         /* (PAD4 RIGHTMIDDLEKEY BREAK KEYPAD/ SUN-PAUSE) */
-  76, SDLK_KP_ENTER,                             /* (PAD5 RIGHTKEY DOIT PRTSC) */
-  // 77,                                         /* (LEFT RED MOUSERED) */
-  // 78,                                         /* (RIGHT BLUE MOUSEBLUE) */
-  // 79,                                         /* (MIDDLE YELLOW MOUSEYELLOW) */
-  80, SDLK_F9,                                   /* (MARGINS) */
-  81, SDLK_KP_7,                                 /* (K41 KEYPAD7 HOME) */
-  82, SDLK_KP_8,                                 /* (K42 KEYPAD8) */
-  83, SDLK_KP_9,                                 /* (K43 KEYPAD9 PGUP) */
-  84, SDLK_KP_4,                                 /* (K44 KEYPAD4) */
-  85, SDLK_KP_5,                                 /* (K45 KEYPAD5) */
-  86, SDLK_LALT, /* (sun left-diamond key) */    /* (K46 SUN-LEFT-SPACE) */
-  87, SDLK_KP_6,                                 /* (K47 KEYPAD6) */
-  // 88,                                         /* (K48 RIGHT-COMMAND SUN-RIGHT-SPACE) */
-  89, SDLK_INSERT,                               /* (COPY) */
-  90, SDLK_END,                                  /* (FIND) */
-  91, SDLK_F12,                                  /* (AGAIN) */
-  92, SDLK_PRINTSCREEN, // is this XK_Print??    /* (HELP) */
-  93, SDLK_MODE, // is this XK_Mode_switch       /* (DEF'N EXPAND) */
-  94, SDLK_KP_1,                                 /* (K4E KEYPAD1 END) */
-  95, SDLK_KP_MULTIPLY,                          /* (ALWAYS-ON-1) */
-  96, SDLK_KP_MINUS,                             /* (ALWAYS-ON-2) */
-  97, SDLK_HELP,                                 /* (CENTER) */
-  98, SDLK_KP_0,                                 /* (K52 KEYPAD0 INS) */
-  99, SDLK_F2,                                   /* (BOLD) */
-  100, SDLK_F3,                                  /* (ITALICS) */
-  101, SDLK_F6,                                  /* (UNDERLINE) */
-  102, SDLK_KP_PLUS,                             /* (SUPERSCRIPT) */
-  //  103,                                       /* (SUBSCRIPT) */
-  104, SDLK_F8,                                  /* (LARGER SMALLER) */
-  105, SDLK_BACKSLASH,                           /* (K59 KEYPAD%| KEYPAD.) */
-  106, SDLK_F10,                                 /* (K5A KEYPAD\ KEYPAD, SUN-F10) */
-  107, SDLK_F11,                                 /* (K5B SUN-F11) */
-  108, SDLK_F12,                                 /* (K5C SUN-F12) */
-  // 109,                                        /* (DEFAULTS SUN-PROP) */
-  // 110,                                        /* (K5E SUN-PRTSC) */
-  // 111,                                        /* (K5F SUN-OPEN) */
-  -1, -1
-};
-#endif

 const struct ColorNameToRGB {
  char * name; uint8_t red; uint8_t green; uint8_t blue;
@@ -1683,9 +1565,7 @@ int init_SDL(char *windowtitle, int w, int h, int s) {
  sdl_displayheight = h;
  sdl_windowwidth = w * s;
  sdl_windowheight = h * s;
-  int width = sdl_displaywidth;
-  int height = sdl_displayheight;
-  printf("requested width: %d, height: %d\n", width, height);
+  printf("requested width: %d, height: %d\n", sdl_displaywidth, sdl_displayheight);
  if (SDL_Init(SDL_INIT_VIDEO) < 0) {
    printf("SDL could not be initialized. SDL_Error: %s\n", SDL_GetError());
    return 1;
@@ -1726,7 +1606,8 @@ int init_SDL(char *windowtitle, int w, int h, int s) {
 #endif
  printf("Creating texture...\n");
  sdl_texture = SDL_CreateTexture(sdl_renderer, sdl_pixelformat->format,
-                                  SDL_TEXTUREACCESS_STREAMING, width, height);
+                                  SDL_TEXTUREACCESS_STREAMING,
+                                  sdl_displaywidth, sdl_displayheight);
  sdl_foreground_color = sdl_MapColorName(sdl_pixelformat,
                                          foregroundColorName[0] ? foregroundColorName : "black");
  sdl_background_color = sdl_MapColorName(sdl_pixelformat,
--- a/src/subr.c
+++ b/src/subr.c
@@ -29,6 +29,7 @@
 /***********************************************************/

 #include <stdio.h>         // for printf, sprintf, NULL
+#include <stdlib.h>        // for EXIT_FAILURE, EXIT_SUCCESS
 #include <time.h>          // for nanosleep, timespec
 #include "adr68k.h"        // for NativeAligned2FromLAddr, NativeAligned4FromLAddr
 #include "arith.h"         // for N_GETNUMBER, ARITH_SWITCH
@@ -64,6 +65,11 @@
 #include "uutilsdefs.h"    // for suspend_lisp, check_unix_password, unix_fu...
 #include "vmemsavedefs.h"  // for lisp_finish, vmem_save0

+#ifdef COLOR
+#include "rawcolordefs.h"
+#include "llcolordefs.h"
+#endif
+
 extern LispPTR *PENDINGINTERRUPT68k;

 /***********************************************************/
@@ -407,16 +413,17 @@ void OP_subrcall(int subr_no, int argnum) {
      break;

    case sb_LISPFINISH:
-    case sb_LISP_FINISH:
+    case sb_LISP_FINISH: {
+      int status;
      POP_SUBR_ARGS;
-      if ((argnum > 0) && (args[0] == S_POSITIVE))
-      /* 8/03/88 This branch impossible to take, subr has no args */
-      {
-        TopOfStack = suspend_lisp(args);
-      } else
-        lisp_finish();
+      if (argnum == 0 || argnum == 1 || (argnum == 2 && args[1] == NIL)) lisp_finish(EXIT_SUCCESS);
+      if (argnum > 2) lisp_finish(EXIT_FAILURE);
+      N_GETNUMBER(args[1], status, exit_fail);
+      lisp_finish(status);
+    exit_fail:
+      lisp_finish(EXIT_FAILURE);
      break;
-
+    }
    case sb_NEWPAGE:
      POP_SUBR_ARGS;
      TopOfStack = newpage(args[0]);
@@ -584,7 +591,7 @@ void OP_subrcall(int subr_no, int argnum) {
    case sb_SUSPEND_LISP:
      POP_SUBR_ARGS;
      /* Suspend Maiko */
-      TopOfStack = suspend_lisp(args);
+      TopOfStack = suspend_lisp();
      break;

    case sb_MONITOR_CONTROL:
--- a/src/testtool.c
+++ b/src/testtool.c
@@ -683,9 +683,10 @@ int print_opcode(int pc, DLbyte *addr, struct fnhead *fnobj) {
  extern unsigned int oplength[256];
  int len = oplength[op] + 1;

-  printf(" 0%o (0x%x)	", pc, pc);
-  for (i = 0; i < len; i++) printf("%o ", 0xFF & GETBYTE(addr + i));
-  printf("	%s", opcode_table[op]);
+  printf(" 0%04o (0x%04x)    ", pc, pc);
+  for (i = 0; i < len; i++) printf("%4o", 0xFF & GETBYTE(addr + i));
+  for (; i < 9; i++) printf("    ");
+  printf("%s", opcode_table[op]);

  switch (op) {
    case 0:
--- a/src/tty.c
+++ b/src/tty.c
@@ -22,9 +22,60 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "commondefs.h"
-#include "tty.h"
 #include "ttydefs.h"

+/* TTY Commands and structures for communicating with Lisp */
+
+#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;
+
 static DLTTY_OUT_COMMAND *DLTTYPortCmd;
 static DLTTY_IN_CSB *DLTTYIn;
 static DLTTY_OUT_CSB *DLTTYOut;
--- a/src/uraid.c
+++ b/src/uraid.c
@@ -168,6 +168,7 @@ static const char *URaid_summary2 =
    "\n-- Memory display commands\n\
 a litatom\t\tDisplays the top-level value of the litatom\n\
 B Xaddress\t\tPrint the contents of the arrayblock at that address.\n\
+F [size]\t\tPrint the head of the array free list chain for given size, or all\n\
 d litatom\t\tDisplays the definition cell for the litatom\n\
 M\t\t\tDisplays TOS,CSP,PVAR,IVAR,PC\n\
 m func1 func2\t\tMOVD func1 to func2\n\
@@ -201,6 +202,7 @@ l [type]\t\tDisplays backtrace for specified type of stack. (k|m|r|g|p|u|<null>)
 \n-- Memory display commands\n\
 a litatom\t\tDisplays the top-level value of the litatom\n\
 B Xaddress\t\tDisplays the contents of the arrayblock at that address.\n\
+F [size]\t\tPrint the head of the array free list chain for given size, or all\n\
 d litatom\t\tDisplays the definition cell of the litatom\n\
 M\t\t\tDisplays TOS,CSP,PVAR,IVAR,PC\n\
 m func1 func2\t\tMoves definition of func1 to func2 (MOVD)\n\
@@ -467,6 +469,26 @@ LispPTR uraid_commands(void) {
    }
    break;

+    case 'F': { /* print array block free list head(s) */
+      long size;
+      if (URaid_argnum != 1 && URaid_argnum != 2) {
+        printf("FREE-BLOCK-CHAIN: F [block-size (cells)]\n");
+        return (T);
+      }
+      if (URaid_argnum == 1) {
+        size = -1;
+      } else {
+        errno = 0;
+        size = (LispPTR)strtol(URaid_arg1, &endpointer, 0);
+        if (errno != 0 || *endpointer != '\0') {
+          printf("Arg not number\n");
+          return (T);
+        }
+      }
+      printfreeblockchainn(size);
+    }
+    break;
+
    case 'd': /* DEFCELL */
      if (URaid_argnum != 2) {
        printf("GETD: d litatom\n");
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -32,7 +32,7 @@
 #include "lispemul.h"    // for LispPTR, DLword, NIL, ATOM_T
 #include "lspglob.h"
 #include "lsptypes.h"    // for GETWORD, OneDArray, GetTypeNumber, THIN_CHAR...
-#include "osmsg.h"       // for OSMESSAGE_PRINT
+#include "osmsgprint.h"  // for OSMESSAGE_PRINT
 #include "uraiddefs.h"   // for device_after_raid, device_before_raid
 #include "uutilsdefs.h"  // for c_string_to_lisp_string, check_unix_password

@@ -292,7 +292,7 @@ LispPTR unix_fullname(LispPTR *args) {
 extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K, *EmUtilin68K;
 extern DLword *EmKbdAd168K, *EmKbdAd268K, *EmKbdAd368K, *EmKbdAd468K, *EmKbdAd568K;

-LispPTR suspend_lisp(LispPTR *args) {
+LispPTR suspend_lisp(void) {
 #ifndef DOS
  extern DLword *CTopKeyevent;
  extern LispPTR *KEYBUFFERING68k;
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -41,7 +41,6 @@
 #include "lispemul.h"
 #include "lispmap.h"
 #include "lspglob.h"
-#include "vmemsave.h"
 #include "timeout.h"
 #include "adr68k.h"
 #include "lsptypes.h"
@@ -58,6 +57,12 @@
 #include "perrnodefs.h"
 #include "ufsdefs.h"

+/* Definitions incorporated from vmemsave.h (removed) */
+#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. */

 /* Error return values from VMEMSAVE */
 #define COMPLETESYSOUT NIL
@@ -513,7 +518,7 @@ LispPTR vmem_save(char *sysout_file_name)

 /* Make sure that we kill off any Unix subprocesses before we go away */

-void lisp_finish(void) {
+void lisp_finish(int exit_status) {
  char d[4];

  DBPRINT(("finish lisp_finish\n"));
@@ -531,5 +536,5 @@ void lisp_finish(void) {
 #ifdef DOS
  exit_host_filesystem();
 #endif /* DOS */
-  exit(0);
+  exit(exit_status);
 }
--- a/src/xc.c
+++ b/src/xc.c
@@ -41,7 +41,7 @@
 #include "address.h"
 #include "adr68k.h"
 #include "stack.h"
-#include "return.h"
+#include "retmacro.h"
 #include "dbprint.h"

 #include "lspglob.h"
@@ -814,7 +814,7 @@ nextopcode:
    /******* FJumpx *******/
    case 0262:
    case262 : {
-      if (TOPOFSTACK != 0) { goto PopNextop2; }
+      if (TOPOFSTACK != 0) { POP; nextop2; }
      CHECK_INTERRUPT;
      POP;
      PCMACL += Get_SBYTE_PCMAC1;
@@ -825,7 +825,7 @@ nextopcode:

    case 0263:
    case263 : {
-      if (TOPOFSTACK == 0) { goto PopNextop2; }
+      if (TOPOFSTACK == 0) { POP; nextop2; }
      CHECK_INTERRUPT;
      POP;
      PCMACL += Get_SBYTE_PCMAC1;
@@ -836,7 +836,7 @@ nextopcode:

    case 0264:
    case264 : {
-      if (TOPOFSTACK != 0) { goto PopNextop2; }
+      if (TOPOFSTACK != 0) { POP; nextop2; }
      CHECK_INTERRUPT;
      PCMACL += Get_SBYTE_PCMAC1;
      nextop0;
@@ -846,7 +846,7 @@ nextopcode:

    case 0265:
    case265 : {
-      if (TOPOFSTACK == 0) { goto PopNextop2; }
+      if (TOPOFSTACK == 0) { POP; nextop2; }
      CHECK_INTERRUPT;
      PCMACL += Get_SBYTE_PCMAC1;
      nextop0;
@@ -1261,19 +1261,7 @@ check_interrupt:
      }
    }
  }
-
  nextop0;
-
-/************************************************************************/
-/* Common Jump Tails (they have to jump anyway, so use common Tail) */
-/************************************************************************/
-PopNextop1:
-  POP;
-  nextop1;
-
-PopNextop2:
-  POP;
-  nextop2;
 }

 void do_brk(void) {}
--- a/src/xinit.c
+++ b/src/xinit.c
@@ -50,8 +50,6 @@ unsigned LispWindowRequestedHeight = DEF_WIN_HEIGHT;

 extern int LispDisplayRequestedX, LispDisplayRequestedY;
 extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
-int LispDisplayRequestedX, LispDisplayRequestedY;
-unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;

 extern Colormap Colors;
 Colormap Colors;
--- a/src/xlspwin.c
+++ b/src/xlspwin.c
@@ -39,8 +39,8 @@ extern DLword *DisplayRegion68k;

 extern int Current_Hot_X, Current_Hot_Y; /* X Cursor hotspots */

-extern char Window_Title[255];
-extern char Icon_Title[255];
+extern char windowTitle[255];
+extern char iconTitle[255];

 extern int save_argc;
 extern char **save_argv;
@@ -91,8 +91,8 @@ void Create_LispWindow(DspInterface dsp)
  unsigned int GravSize;
  char *WT, *IT;

-  WT = Window_Title;
-  IT = Icon_Title;
+  WT = windowTitle;
+  IT = iconTitle;

  GravSize = (dsp->ScrollBarWidth / 2) - dsp->InternalBorderWidth;
  Col2 = dsp->Visible.width;
--- a/src/xrdopt.c
+++ b/src/xrdopt.c
@@ -36,6 +36,7 @@ extern int LispDisplayRequestedX, LispDisplayRequestedY;
 extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;

 extern int xsync;
+extern int TIMER_INTERVAL;

 static XrmOptionDescRec opTable[] = {
    {"-help", "*help", XrmoptionIsArg, (XPointer)NULL},
@@ -81,14 +82,14 @@ extern char Display_Name[128];
 char Display_Name[128];
 extern char iconpixmapfile[1024];
 char iconpixmapfile[1024];
-extern char Window_Title[255];
-char Window_Title[255];
-extern char Icon_Title[255];
-char Icon_Title[255];
+extern char iconTitle[255];
+char iconTitle[255];
 extern char cursorColor[255];
 char cursorColor[255] = {0};
 extern char foregroundColorName[64];
 extern char backgroundColorName[64];
+extern char windowTitle[255];
+

 extern char sysout_name_cl[];
 extern char sysout_name_xrm[];
@@ -247,14 +248,14 @@ void read_Xoption(int *argc, char *argv[])
  }

  if (XrmGetResource(rDB, "ldex.title", "Ldex.Title", str_type, &value) == True) {
-    (void)strncpy(Window_Title, value.addr, value.size);
+    (void)strncpy(windowTitle, value.addr, sizeof(windowTitle) - 1);
  } else {
-    (void)strcpy(Window_Title, WINDOW_NAME);
+    (void)strncpy(windowTitle, WINDOW_NAME, sizeof(windowTitle) - 1);
  }
  if (XrmGetResource(rDB, "ldex.icontitle", "Ldex.icontitle", str_type, &value) == True) {
-    (void)strncpy(Icon_Title, value.addr, value.size);
+    (void)strncpy(iconTitle, value.addr, value.size);
  } else {
-    (void)strcpy(Icon_Title, "Medley");
+    (void)strcpy(iconTitle, "Medley");
  }

  if (XrmGetResource(rDB, "ldex.iconbitmap", "Ldex.Iconbitmap", str_type, &value) == True) {
@@ -297,6 +298,14 @@ void read_Xoption(int *argc, char *argv[])
    noscroll = 1;
  }

+  if (XrmGetResource(rDB, "ldex.timer", "Ldex.timer", str_type, &value) == True) {
+    (void)strncpy(tmp, value.addr, value.size);
+    errno = 0;
+    i = (int)strtol(tmp, (char **)NULL, 10);
+    if (errno == 0 && i > 0)
+      TIMER_INTERVAL = i;
+  }
+
  /*    if (XrmGetResource(rDB,
                         "ldex.maxpages",
                         "Ldex.maxpages",
Author	SHA1	Message	Date
Nick Briggs	06399b0cf8	Declares correct size for scratch version string storage	2025-07-25 14:27:22 -07:00
Nick Briggs	88dea29837	Replaces LispStringToCString macro with static inline procedure	2025-07-25 14:27:22 -07:00
Nick Briggs	feac148fb4	Adds error returns for case where new file version would exceed MAXVERSION	2025-07-25 14:27:22 -07:00
Nick Briggs	a8f968f32d	Replaces ConcDirAndName and ConcNameAndVersion macros with static inline procedures. These are used in many places so code bloat can be reduced by using procedures.	2025-07-25 14:27:22 -07:00
Nick Briggs	5060cae998	Improves parsing of Unix format file names, updates comments * Adds a (static inline) helper, parse_file_version() to version parsing code. - Removes handling of "filename%" as version 0 (version 0 is not valid) - Adds handling of Alto/IFS version "filename!nnn" - Improves robustness of version parsing (no integer overflow errors) * Replaces private FNAMETOOLONG error code with ENAMETOOLONG standard error. * Replaces tests for "magic numbers" with standard ERRNO values (ENOENT, EXDEV) in error case for rename() operations. * Reduces storage requirement for versions from 16 bytes to 10 bytes to match the maximum acceptable version number, "999999999". * Updates various code comments to be correct and clearer.	2025-07-25 14:27:22 -07:00
Nick Briggs	428e7cf1a2	Merge pull request #539 from Interlisp/nhb-gc-cleanup Minor cleanup of code style in gcfinal.c and additional array free list debugging from URaid	2025-07-25 14:02:13 -07:00
Nick Briggs	01d21b0a44	Revert integerlength() to pure (but more efficient) C as glibc does not provide fls()	2025-07-22 09:43:49 -07:00
Nick Briggs	3569e54524	Uses consistent naming (_np) for native pointer equivalents of Lisp addresses in GC aref1	2025-07-20 10:48:20 -07:00
Nick Briggs	b75e66d91c	Renames struct buf to struct buffer to match corresponding Lisp datatype name	2025-07-19 23:19:19 -07:00
Nick Briggs	0e2cda2328	Cleans up releasingvmempage implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses	2025-07-19 22:44:27 -07:00
Nick Briggs	c58336f813	Cleans up checkarrayblock implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses Ensures non-zero return value if arrayblock fails check	2025-07-19 18:11:43 -07:00
Nick Briggs	f2bf026b07	Adds URaid F command to print array block free list heads	2025-07-19 17:50:55 -07:00
Nick Briggs	3fad090a6c	Cleans up printarrayblock implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses	2025-07-19 17:34:52 -07:00
Nick Briggs	812e296fe8	Cleans up reclaimarrayblock implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses Adds comments regarding the parameter passed to reclaimarrayblock	2025-07-19 15:41:50 -07:00
Nick Briggs	7c7da4cd0c	Cleans up mergeforward implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses	2025-07-19 13:19:27 -07:00
Nick Briggs	f375519dbc	Cleans up mergebackward implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses Adds comments with a little explanation of what the code is doing	2025-07-19 12:35:02 -07:00
Nick Briggs	2c46a9473a	Cleans up and makes static arrayblockmerger implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses	2025-07-19 12:29:33 -07:00
Nick Briggs	93b3a709c9	Cleans up makefreearrayblock implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses Adds comments regarding use of WORDPTR macro to hide BYTESWAP setting	2025-07-19 12:11:11 -07:00
Nick Briggs	31fcfb36ca	Cleans up linkblock implementation to increase clarity Procedure can be static as it is only used within this file Uses consistent naming (_np) for native pointer equivalents of Lisp addresses, and better matches Lisp implementation naming of variables. Improve readability by reducing if/else nesting with early outs in exceptional cases. Still equivalent to the original Lisp version. Adds comments with a little explanation of what the code is doing.	2025-07-19 11:49:30 -07:00
Nick Briggs	1f18779eb8	Cleans up deleteblock implementation to increase clarity Procedure can be static void as there was only an unused constant result. Uses consistent naming (_np) for native pointer equivalents of Lisp addresses, and better matches Lisp implementation naming of variables. Adds comments with a little explanation of what the code is doing.	2025-07-18 10:09:41 -07:00
Nick Briggs	357336b5f1	Rewrites (and makes static) findptrsbuffer to avoid multiple conversions between Lisp and native pointers	2025-07-18 09:12:43 -07:00
Nick Briggs	1ffd1ba7cb	Replaces integerlength(n) implementation with call to fls(n) and makes it static	2025-07-17 18:52:15 -07:00
Nick Briggs	0a6f8ac72b	Replaces scaling factor 2 for array length offsets by DLWORDSPER_CELL as that is what it represents.	2025-07-17 18:46:57 -07:00
Nick Briggs	fc90838ad8	Increases number of stack frames that can be displayed by URaid 'l' command (#538 )	2025-07-10 18:36:55 -07:00
Frank Halasz	de1fafba7e	Merge pull request #536 from Interlisp/fgh_fix-2164-WSL1-try2 To fix Issue#2164, create infrastructure to compile Maiko for Windows System for Linux v1 as a separate OS from Linux Created makefile-wsl1-* files as well as makefile-init-wsl1-* files. Modified bin/osversion to detect wsl1 as a special case of linux so that the wsl1 makefiles would be selected appropriately by makeright. Did not make CMAKE changes for WSL1. Changed Build Release workflow (via changes to Dockerfile-maiko) to build wsl1 versions of lde, ldex, ldesdl and ldeinit for x86_64 and aarch64. These are now included in the release tars.	2025-06-16 00:30:06 -07:00
Frank Halasz	6f42b353b2	In Dockerfile_maiko, for wsl1 case called makeright XX clean twice. Eliminated second call, which was deleting first run of makefile x	2025-06-16 00:00:54 -07:00
Frank Halasz	8e17c0747d	Fix typo in Dockerfile_maiko	2025-06-15 23:32:27 -07:00
Frank Halasz	6aafbbcb05	Enable using LDEARCH to set wsl1 as the osversion. Set LDEARCH to get a WSL1 compile on a standard Linux system in Dockerfile_maiko (and hence in the workflow buildRelease.yml).	2025-06-15 22:56:36 -07:00
Frank Halasz	5dc9233aef	One more typo in Dockerfile_maiko	2025-06-03 23:31:46 -07:00
Frank Halasz	b029b98fca	Fix Dockerfile_maiko to set execute permissions on osversion while building wsl1 versions of maiko	2025-06-03 23:25:35 -07:00
Frank Halasz	7dd3c90a77	Fix up various makefile-wsl (and -cygwin) errors pointed out by gemini-code-assist!	2025-06-03 22:40:11 -07:00
Frank Halasz	389ecf7874	Fix Dockerfile_maiko so osversion is restored after building the wsl1 lde executables.	2025-06-03 22:27:16 -07:00
Frank Halasz	5d3639a905	Fix another error is Dockerfile_maiko for wsl1	2025-06-03 19:19:08 -07:00
Frank Halasz	59953c2629	Fix error is Dockerfile_maiko for wsl1	2025-06-03 19:01:14 -07:00
Frank Halasz	6d171bff1d	Create/update additional makefiles for building maiko for WSL1. Update buildRelease workflow and assicated Dockerfile to build the WSL1 variants along wih standard linux variants.	2025-06-03 18:54:15 -07:00
Frank Halasz	834a6084c3	WIP. Moving to WSL1 environment	2025-05-28 14:03:13 -07:00
Frank Halasz	9343f58b17	Fix typo in bin/mkvdate that was preventing it from executing correctly (#534 )	2025-05-27 22:24:10 -07:00
Matt Heffron	4994982a90	Adds the non-keypad arrow keys to be detected. With additional Medley calls to KEYACTION (below), they should work in TTYIN (i.e., XCL and Interlisp EXECs). I didn't try TEDIT. They are unrecognized in SEDIT. (In any case, their use there probably is pretty restricted by the nature of SEDIT.) (KEYACTION 'KEYPAD8 '(("Meta,^" 56 NOLOCKSHIFT) . IGNORE)) (KEYACTION 'KEYPAD6 '(("Meta,>" 54 NOLOCKSHIFT) . IGNORE)) (KEYACTION 'KEYPAD4 '(("Meta,<" 52 NOLOCKSHIFT) . IGNORE)) (KEYACTION 'KEYPAD2 '(("Meta,^J" 50 NOLOCKSHIFT) . IGNORE))	2025-02-12 11:22:08 -08:00
Frank Halasz	40d4fca8cc	Merge pull request #530 from Interlisp/fgh_use-22.04-build-builder Specify Ubuntu22.04 instead of Ubuntu-latest in various github action scripts to solve libc version issue crashing online	2025-02-03 12:19:50 -08:00
Nick Briggs	c8dc63d418	Clean up display related variable names differing only in case (#529 ) Unify the LispDisplayRequested... and lispDisplayRequested... variables from the SDL and X11 display modules. Move the storage definitions for LispDisplayRequested... to main.c leaving external references in the modules that utilize them.	2025-02-02 16:31:43 -08:00
Frank Halasz	7fe0f70640	In buildRelease.yml moving to ubuntu-22.04 instead of latest to see if it fixes these random linux arm64 build failures - crashes inside gcc compiler!	2025-02-01 19:10:38 -08:00
Frank Halasz	55e20ea993	In buildRelease.yml added apt update to emscriptem build since it was failing to find some of the packages called for by apt-get install sdl2	2025-02-01 18:48:38 -08:00
Frank Halasz	7d85a59e6f	Change ubuntu version from latest to 22.04 in Dockerfile_builder to handle issue where the Medley-online docker image was failing to find the lastest versions of libc and libm when loading maiko	2025-02-01 17:53:01 -08:00
Nick Briggs	511a1b523e	Eliminate extra gotos in common branch tail code (#528 ) The implementation of various JUMP opcodes tried to use a common tail that did a POP and branched to the next opcode. While the extra gotos probably aren't harmful, neither are they beneficial to code size or speed.	2025-01-30 11:07:29 -08:00
Frank Halasz	04f9905ca0	Fix MacOS SDL build in buildRelease github workflow (#527 ) * Update buildRelease workflow to use sdl2-2.30.11 on MacOS * In buildRelease workflow, update Macos build for SDL to use -DMAIKO_DISPLAY_SDL=2 instead of =ON	2025-01-29 08:51:47 -08:00
Nick Briggs	e61d0f2e6c	Correct {DSK} versioned file cache failures (#526 ) A missing check for the applicability of a versioned file cache caused loadups to fail in the case where the modification timestamp of a directory and its parent were identical, and the file being looked up had the same name (when lowercased) as the directory it was contained within. E.g., looking up TEDIT in library/tedit/ where the modification times of library and library/tedit were identical. The inode number of the directory containing the file must be the same as the inode number of the directory the cache was built from.	2025-01-26 18:38:25 -08:00
Nick Briggs	3c4d9f5393	Modifies LISPFINISH subr to use 2nd argument, if present, for exit status (#525 ) Redesign of exit status handling, instead of overloading the FAST flag of (LOGOUT fast), add an optional 2nd argument, EXITSTATUS. Retains compatability, with behavior unchanged, between new emulator and older sysouts which do not pass the second argument to LISPFINISH. Newer sysouts, which pass the 2nd argument, will continue to work with older emulators though will not get the exit status set.	2025-01-20 12:24:44 -08:00
Nick Briggs	31bb14b9d7	Modifies Lisp exit subr to permit passing an exit status code (#524 ) These changes add (LOGOUT <number>) to the traditional (LOGOUT) and (LOGOUT T) calls. If an integer <number> is provided it will be used as the exit status code, while NIL and T result in an EXIT_SUCCESS. If the argument passed is none of NIL, T, or a number, the exit status code will be a generic EXIT_FAILURE (typically 1). (LOGOUT) and (LOGOUT T) virtual memory behavior is unaffected. When a <number> is passed Lisp will exit without saving the virtual memory state, as is the case for (LOGOUT T), although this behavior is determined by Lisp rather than the Maiko emulator.	2025-01-16 09:57:01 -08:00
Nick Briggs	f23a43f1a0	Merge pull request #522 from Interlisp/nhb-dspbout-and-showdisplay Improves behavior of display subrs DSPBOUT and SHOWDISPLAY	2024-12-22 14:10:37 -08:00
Nick Briggs	e251f26816	Improves behavior of display subrs DSPBOUT and SHOWDISPLAY DSPBOUT is called to output a single character to the "BCPL display", which is the system text output rather than the bitmapped display. Under maiko, this is mapped to "stdout". Interlisp-D uses CR as the EOL character, but that is not appropriate for output to standard output so CR is translated to LF here. Standard output is buffered, but there is no indication of when the output should be flushed, so flush on every character, since this is a low frequency operation. SHOWDISPLAY is called to switch between the "BCPL display" and the bitmapped display. The current display subsystems are not hooked up to this subr, but this is a potential place to hook display size changes in the future, so the code is updated to indicate the parameters passed in and to set/reset the display initialization state variable.	2024-12-18 12:40:29 -08:00
Nick Briggs	51045b402f	Merge pull request #521 from Interlisp/nhb-print-maiko-git-version Adds MaikoGitVersion to information printed with -info option	2024-12-17 11:22:43 -08:00
Nick Briggs	e6c972a62a	Merge pull request #520 from Interlisp/nhb-shadowed-timer-option Replaces shadowed "-t <interval>" with "-timer <interval>"	2024-12-17 11:22:20 -08:00
Nick Briggs	31ad2f2169	Adds MaikoGitVersion to information printed with -info option	2024-12-16 20:13:05 -08:00
Nick Briggs	66721ccc1c	Replaces shadowed "-t <interval>" with "-timer <interval>" At some point option "-t" was introduced as an abbreviation for "-title" but "-t" was already in use, though undocumented, for overriding the timer interval. This commit changes the command line timer option to "-timer" and adds "timer" to the options that are processed from the X11 resources.	2024-12-16 19:59:03 -08:00
Nick Briggs	b13a35e16e	Merge pull request #519 from Interlisp/nhb-fix-sdl-display-bitmap-flushing Fix display bitmap flushing on modification when using SDL display subsystem	2024-12-15 09:25:29 -08:00
Nick Briggs	55d8504060	Corrects interaction of BITMAPBIT with buffered display bitmap Two problems fixed: * only in the case of a software cursor is it necessary to check if the bit being altered is within the region of the display covered by the cursor, and if it is, the cursor must be hidden before operating on the screen bitmap * SDL as well as X requires modifications to the screen bitmap be flushed to the actual display.	2024-12-14 13:22:44 -08:00
Nick Briggs	ecdab720f2	Missing call to flush_display_lineregion() for SDL in PILOTBITBLT When the target for a PILOTBITBLT operation is the display bitmap, and the display bitmap is not memory-mapped from the actual display, the display subsystem needs to be notified to flush the Lisp display bitmap to the display so that changes are immediately visible. The mechanism was present for X11 displays but needed to be implemented for SDL displays.	2024-12-14 12:57:24 -08:00
Nick Briggs	249efce565	Adds comments regarding init_cursor() purpose in initdsp.c	2024-12-03 15:40:37 -08:00
Nick Briggs	1de2e3e954	Update README.md to be slightly more accurate.	2024-12-02 13:57:24 -08:00
Nick Briggs	a2f62159e9	Merge pull request #518 from Interlisp/cmakelists-ldeinit-solaris Updates CMakeLists.txt to add Solaris specific OS5 define to ldeint build	2024-11-24 08:08:49 -08:00
Nick Briggs	b2a22a8ac8	Updates CMakeLists.txt to add Solaris specific define to ldeint build	2024-11-24 02:45:50 -05:00
Nick Briggs	89b2b4f866	Merge pull request #517 from Interlisp/improve-cmake-vdate-depends Improve cmake vdate depends	2024-11-20 12:14:09 -08:00
Nick Briggs	96046c01f0	Adds MaikoGitVersion string to vdate.o The variable MaikoGitVersion will contain a git revision from the head of the source tree along with an indication if the status was "dirty". If git is not present on the system or the directory that the build happened in was not under git control the version will be "none".	2024-11-20 11:18:41 -08:00
Nick Briggs	578b26547a	Updates CMakeLists.txt to avoid recreating vdate.c if nothing has changed Creating vdate.c/vdate.o should not be done unconditionally. It is only necessary to recreate it if one of the input files has changed.	2024-11-19 15:20:44 -08:00
Nick Briggs	13cbc33da3	Merge pull request #516 from Interlisp/include-file-reorganization Include file reorganization (part 1)	2024-11-11 10:26:05 -08:00
Nick Briggs	baeec1b957	Renames bitblt.h to bbtmacro.h and updates all uses	2024-11-07 12:39:55 -08:00
Nick Briggs	99550aaa7c	Renames return.h to retmacro.h and updates all uses	2024-11-06 13:31:46 -08:00
Nick Briggs	99601ede75	Removes incorrect dependency on osmsg.h and renames it to osmsgprint.h	2024-11-05 14:57:00 -08:00
Nick Briggs	4f3cb4d326	Removes ether.h and merges Lisp interface structs into lsptypes.h	2024-11-05 14:24:36 -08:00
Nick Briggs	b98e1612d1	Removes tty.h and merges #defines (all local) and Lisp interface structs into tty.c	2024-11-05 14:07:16 -08:00
Nick Briggs	fe71946f82	Removes vmemsave.h and merges #defines (all local, mostly unused) into vmemsave.c	2024-11-05 14:02:27 -08:00
Nick Briggs	c332c71a3e	Removes unreferenced xscroll.h (dup of xscrolldefs.h)	2024-11-05 13:56:08 -08:00
Nick Briggs	cea720feb2	Remove tabs embedded in strings used for formatting output (#515 ) Files gcfinal.c and testool.c both contain literal TAB characters embedded in printf() format strings in an attempt to align output. The output formatting depends on the user's simulated tab settings and therefore may not produce the expected results. The output formatting is rewritten to make tab characters unnecessary.	2024-10-31 13:36:31 -07:00
Nick Briggs	a3f3775c0a	Add missing includes and include file if compiling with COLOR defined. File rawcolordefs.h was completely missing. Both llcolordefs.h and rawcolordefs.h must be included in subr.c if -DCOLOR Make newColorizeFont8() local to rawcolor.c	2024-10-22 10:13:00 -07:00
Nick Briggs	d2d4f18ade	Correct error message when debug frame extension limit exceeded	2024-10-22 09:56:06 -07:00
Nick Briggs	c3b7d1707d	Switch X11 options to use shared windowTitle and cleanup icon title variable name	2024-10-18 16:21:58 -07:00
Nick Briggs	532731b716	Cleanup options variables, spelling errors, declarations Options for requested width, height, and pixel scaling and window title can be shared between display subsystems. Include correct header for local sdl function definitions rather than manually duplicating a reference for init_SDL(). Correct a typo in comments on build_lisp_map().	2024-10-18 16:07:46 -07:00
Nick Briggs	29e5b374fe	Update CMakeLists.txt to suggested syntax for SDL projects.	2024-10-17 14:26:16 -07:00
Nick Briggs	0c7b1cccd4	Merge pull request #514 from Interlisp/cleanup-USHORT-bitfields Remove USHORT and direct "unsigned short" uses in struct bitfields	2024-10-15 19:27:13 -07:00
Nick Briggs	86ba485c3e	Replace "unsigned short" use for bit-fields with DLword Where bit-fields are defined in a structure that represents a Lisp DLword object the DLword type is now used as the base type instead of "unsigned short".	2024-10-14 13:17:26 -07:00
Nick Briggs	b88ea87fa8	Remove USHORT definition and replace uses with DLword USHORT unnecessarily duplicates the DLword type that represents a single Lisp 16-bit word.	2024-10-14 12:57:02 -07:00