Update keyname map to account for changed key names in SDL3

2026-03-16 06:47:22 +00:00 · 2024-10-15 15:03:20 -07:00
57 changed files with 623 additions and 524 deletions
--- a/.github/workflows/Dockerfile_builder
+++ b/.github/workflows/Dockerfile_builder
@@ -8,7 +8,7 @@
 #
 # ******************************************************************************

-FROM ubuntu:22.04
+FROM ubuntu:latest
 SHELL ["/bin/bash", "-c"]
 USER root:root
 # Install build tools
--- a/.github/workflows/buildRelease.yml
+++ b/.github/workflows/buildRelease.yml
@@ -152,7 +152,7 @@ jobs:
         || needs.inputs.outputs.force == 'true'
      )

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

    steps:
      # Checkout the actions for this repo owner
@@ -310,8 +310,8 @@ jobs:
        env:
          GH_TOKEN: ${{ github.token }}
        run: |
-          gh release download release-2.30.11 --repo libsdl-org/SDL --pattern SDL2-2.30.11.dmg
-          hdiutil attach SDL2-2.30.11.dmg
+          gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
+          hdiutil attach SDL2-2.26.5.dmg
          sudo ditto /Volumes/SDL2/SDL2.framework /Library/Frameworks/SDL2.framework
          hdiutil detach /Volumes/SDL2/

@@ -337,7 +337,7 @@ jobs:
          # -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12
          cmake .. \
            -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-            -DMAIKO_DISPLAY_SDL=2 \
+            -DMAIKO_DISPLAY_SDL=ON \
            -DMAIKO_DISPLAY_X11=ON \
            -DCMAKE_BUILD_TYPE=Release
          cmake --build . --config Release
@@ -503,7 +503,6 @@ jobs:
      - name: Install SDL2
        run: |
          export DEBIAN_FRONTEND=noninteractive
-          sudo -E apt-get update
          sudo -E apt-get install -y libsdl2-dev libsdl2-2.0-0

      # Install Emscripten SDK
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,17 +80,18 @@ 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 CONFIG REQUIRED COMPONENTS SDL2)
+  FIND_PACKAGE(SDL2 REQUIRED)
  SET(MAIKO_DISPLAY_SDL_DEFINITIONS
          "-DSDL=2"
          )
-  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS SDL2::Headers)
+  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS "${SDL2_INCLUDE_DIRS}")
  SET(MAIKO_DISPLAY_SDL_LIBRARIES SDL2::SDL2)
  SET(MAIKO_DISPLAY_SDL_SRCS
          src/sdl.c
@@ -100,11 +101,11 @@ IF(MAIKO_DISPLAY_SDL STREQUAL "2")
          )
  MESSAGE("-- Configured for SDL2 display")
 ELSEIF(MAIKO_DISPLAY_SDL STREQUAL "3")
-  FIND_PACKAGE(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3)
+  FIND_PACKAGE(SDL3 REQUIRED)
  SET(MAIKO_DISPLAY_SDL_DEFINITIONS
          "-DSDL=3"
          )
-  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS SDL3::Headers)
+  SET(MAIKO_DISPLAY_SDL_INCLUDE_DIRS "${SDL3_INCLUDE_DIRS}")
  SET(MAIKO_DISPLAY_SDL_LIBRARIES SDL3::SDL3)
  SET(MAIKO_DISPLAY_SDL_SRCS
          src/sdl.c
@@ -141,9 +142,6 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
  LIST(APPEND MAIKO_DEFINITIONS
    "-DOS5"
  )
-  LIST(APPEND MAIKO_INIT_DEFINITIONS
-    "-DOS5"
-  )
 ENDIF()

 IF(APPLE)
@@ -294,7 +292,7 @@ SET(MAIKO_HDRS
    inc/bindefs.h
    inc/bindsdefs.h
    inc/bitbltdefs.h
-    inc/bbtmacro.h
+    inc/bitblt.h
    inc/bltdefs.h
    inc/byteswapdefs.h
    inc/car-cdrdefs.h
@@ -319,6 +317,7 @@ SET(MAIKO_HDRS
    inc/emlglob.h
    inc/eqfdefs.h
    inc/etherdefs.h
+    inc/ether.h
    inc/fast_dsp.h
    inc/findkeydefs.h
    inc/foreigndefs.h
@@ -397,14 +396,14 @@ SET(MAIKO_HDRS
    inc/opcodes.h
    inc/os.h
    inc/osmsgdefs.h
-    inc/osmsgprint.h
+    inc/osmsg.h
    inc/perrnodefs.h
    inc/picture.h
    inc/pilotbbt.h
    inc/print.h
    inc/rawrs232c.h
-    inc/retmacro.h
    inc/returndefs.h
+    inc/return.h
    inc/rpcdefs.h
    inc/rplconsdefs.h
    inc/rs232c.h
@@ -422,6 +421,7 @@ SET(MAIKO_HDRS
    inc/tos1defs.h
    inc/tosfns.h
    inc/tosret.h
+    inc/tty.h
    inc/typeofdefs.h
    inc/ubf1defs.h
    inc/ubf2defs.h
@@ -437,13 +437,14 @@ SET(MAIKO_HDRS
    inc/vars3defs.h
    inc/version.h
    inc/vmemsavedefs.h
+    inc/vmemsave.h
    inc/xcdefs.h
    inc/z2defs.h
 )

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

 ADD_EXECUTABLE(lde src/ldeboot.c src/unixfork.c)
--- a/README.md
+++ b/README.md
@@ -1,9 +1,8 @@
 # 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 Lisp to a display (via X11 or SDL), the local filesystem,
-and a network subsystem.
+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.

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

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

 ## Development Platforms

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


 ## Building Maiko

-### 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:
+Building requires `clang`, `make`, X11 client libraries (`libx11-dev`). For example, 

 ``` sh
 $ sudo apt update
@@ -35,21 +33,17 @@ $ cd maiko/bin
 $ ./makeright x
 ```

-* The build will (attempt to) detect the OS-type and cpu-type. It will build binaries `lde` and `ldex` in `../`_`ostype.cputype`_ (with .o files in `../`_`ostype.cputype-x`_. For example, Linux on a 64-bit x86 will use `linux.x86_64`, while macOS 11 on a (new M1) Mac will use `darwin.aarch64`.
-* 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.
+* 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).

 ### Building For macOS

-* Building/running on macOS requires either an X server and X client libraries or the SDL2 library.
+* Running on macOS requires an X server, and building on a Mac requires X client libraries.
 An X-server for macOS (and X11 client libraries) can be freely obtained at https://www.xquartz.org/releases
-The SDL library is freely available from https://libsdl.org
+
+### Building for Windows 10
+
+Windows 10 currently requires "Docker for Desktop" or WSL2 and a (Windows X-server).
+See [Medley's README](https://github.com/Interlisp/medley/blob/master/README.md) for more.
+
--- 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    bbtmacro.h debug.h devconf.h dspdata.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsgprint.h pilotbbt.h print.h retmacro.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h xdefs.h xbitmaps.h xkeymap.h
+HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h



@@ -35,7 +35,7 @@ emul.exe : $(OFILES)
 	del copts
 	@ echo "Executable is now named '$@'"
   
-main.o  :       lispemul.h address.h lsptypes.h adr68k.h stack.h lspglob.h lispmap.h ifpage.h iopage.h retmacro.h debug.h
+main.o  :       lispemul.h address.h lsptypes.h adr68k.h stack.h lspglob.h lispmap.h ifpage.h iopage.h return.h debug.h


 													
--- 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)retmacro.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
+	$(INCDIR)return.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)debug.h \
 	$(INCDIR)timeout.h $(INCDIR)maindefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)dirdefs.h $(INCDIR)dspifdefs.h $(INCDIR)devif.h \
@@ -292,7 +292,7 @@ $(OBJECTDIR)bitblt.o: $(SRCDIR)bitblt.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)pilotbbt.h $(INCDIR)display.h \
-	$(INCDIR)bbtmacro.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
+	$(INCDIR)bitblt.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)bitblt.c -o $(OBJECTDIR)bitblt.o

 $(OBJECTDIR)bbt68k.o: $(OBJECTDIR)bbt68k.i $(SRCDIR)bbt68k.s
@@ -308,10 +308,10 @@ $(OBJECTDIR)bbtsub.o: $(SRCDIR)bbtsub.c $(REQUIRED-INCS) \
 	$(INCDIR)xdefs.h $(INCDIR)lispemul.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h $(INCDIR)lsptypes.h \
 	$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)arith.h \
-	$(INCDIR)stack.h $(INCDIR)retmacro.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
+	$(INCDIR)stack.h $(INCDIR)return.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
 	$(INCDIR)bbtsubdefs.h $(INCDIR)car-cdrdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)kprintdefs.h \
-	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dspdata.h $(INCDIR)display.h $(INCDIR)dbprint.h \
 	$(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)bbtsub.c -o $(OBJECTDIR)bbtsub.o
@@ -340,7 +340,7 @@ $(OBJECTDIR)car-cdr.o: $(SRCDIR)car-cdr.c $(REQUIRED-INCS) \
 $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)timeout.h \
-	$(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \
+	$(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h \
 	$(INCDIR)chardevdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)perrnodefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)chardev.c -o $(OBJECTDIR)chardev.o
@@ -348,7 +348,7 @@ $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \
 $(OBJECTDIR)rawcolor.o: $(SRCDIR)rawcolor.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 	$(INCDIR)lspglob.h $(INCDIR)lispmap.h $(INCDIR)lsptypes.h \
 	$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h \
-	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bitblt.h \
 	$(INCDIR)arith.h $(INCDIR)cell.h $(INCDIR)dspdata.h $(INCDIR)debug.h \
 	$(INCDIR)stream.h $(INCDIR)bbtsubdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)rawcolor.c -o $(OBJECTDIR)rawcolor.o
@@ -357,7 +357,7 @@ $(OBJECTDIR)llcolor.o: $(SRCDIR)llcolor.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)llcolordefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)llcolor.c -o $(OBJECTDIR)llcolor.o

@@ -391,7 +391,7 @@ $(OBJECTDIR)mkcell.o: $(SRCDIR)mkcell.c $(REQUIRED-INCS) \
 $(OBJECTDIR)draw.o: $(SRCDIR)draw.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
-	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bitblt.h \
 	$(INCDIR)display.h $(INCDIR)drawdefs.h $(INCDIR)bbtsubdefs.h \
 	$(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)draw.c -o $(OBJECTDIR)draw.o
@@ -423,7 +423,7 @@ $(OBJECTDIR)fp.o: $(SRCDIR)fp.c $(REQUIRED-INCS) \
 $(OBJECTDIR)intcall.o: $(SRCDIR)intcall.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)address.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \
-	$(INCDIR)retmacro.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
+	$(INCDIR)return.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h \
 	$(INCDIR)tosfns.h $(INCDIR)intcalldefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h
@@ -450,7 +450,7 @@ $(OBJECTDIR)ubf3.o: $(SRCDIR)ubf3.c $(REQUIRED-INCS) \
 $(OBJECTDIR)uutils.o: $(SRCDIR)uutils.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)adr68k.h \
 	$(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)osmsgprint.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \
+	$(INCDIR)miscstat.h $(INCDIR)osmsg.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \
 	$(INCDIR)osmsgdefs.h $(INCDIR)uraiddefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)uutils.c -o $(OBJECTDIR)uutils.o

@@ -478,21 +478,21 @@ $(OBJECTDIR)ether_common.o: $(SRCDIR)ether_common.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_common.c -o $(OBJECTDIR)ether_common.o

 $(OBJECTDIR)ether_sunos.o: $(SRCDIR)ether_sunos.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_sunos.c -o $(OBJECTDIR)ether_sunos.o

 $(OBJECTDIR)ether_nethub.o: $(SRCDIR)ether_nethub.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_nethub.c -o $(OBJECTDIR)ether_nethub.o

 $(OBJECTDIR)findkey.o: $(SRCDIR)findkey.c $(REQUIRED-INCS) \
@@ -505,7 +505,7 @@ $(OBJECTDIR)dsk.o: $(SRCDIR)dsk.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)arith.h $(INCDIR)stream.h \
-	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \
 	$(INCDIR)dbprint.h $(INCDIR)dskdefs.h $(INCDIR)byteswapdefs.h \
 	$(INCDIR)car-cdrdefs.h $(INCDIR)cell.h $(INCDIR)commondefs.h \
 	$(INCDIR)ufsdefs.h
@@ -632,7 +632,7 @@ $(OBJECTDIR)hardrtn.o: $(SRCDIR)hardrtn.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.h $(INCDIR)hardrtndefs.h \
+	$(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h $(INCDIR)hardrtndefs.h \
 	$(INCDIR)commondefs.h $(INCDIR)llstkdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)hardrtn.c -o $(OBJECTDIR)hardrtn.o

@@ -640,7 +640,7 @@ $(OBJECTDIR)inet.o: $(SRCDIR)inet.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
 	$(INCDIR)inetdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)mkcelldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)inet.c -o $(OBJECTDIR)inet.o
@@ -649,7 +649,7 @@ $(OBJECTDIR)initdsp.o: $(SRCDIR)initdsp.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)initdspdefs.h \
 	$(INCDIR)byteswapdefs.h $(INCDIR)xcursordefs.h $(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)initdsp.c -o $(OBJECTDIR)initdsp.o
@@ -682,7 +682,7 @@ $(OBJECTDIR)keyevent.o: $(SRCDIR)keyevent.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
 	$(INCDIR)address.h $(INCDIR)stack.h $(INCDIR)keyboard.h $(INCDIR)display.h \
-	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h $(INCDIR)pilotbbt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bitblt.h $(INCDIR)pilotbbt.h \
 	$(INCDIR)keyeventdefs.h $(INCDIR)osmsgdefs.h $(INCDIR)xwinmandefs.h \
 	$(INCDIR)devif.h $(INCDIR)dbprint.h
 	$(CC) $(RFLAGS) $(SRCDIR)keyevent.c -o $(OBJECTDIR)keyevent.o
@@ -698,7 +698,7 @@ $(OBJECTDIR)llstk.o: $(SRCDIR)llstk.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)lsptypes.h $(INCDIR)initatms.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.h \
+	$(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h \
 	$(INCDIR)llstkdefs.h $(INCDIR)commondefs.h $(INCDIR)dbgtooldefs.h \
 	$(INCDIR)testtooldefs.h $(INCDIR)kprintdefs.h $(INCDIR)storagedefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)llstk.c -o $(OBJECTDIR)llstk.o
@@ -758,7 +758,7 @@ $(OBJECTDIR)osmsg.o: $(SRCDIR)osmsg.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsgprint.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \
 	$(INCDIR)dbprint.h $(INCDIR)commondefs.h $(INCDIR)osmsgdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)osmsg.c -o $(OBJECTDIR)osmsg.o

@@ -766,7 +766,7 @@ $(OBJECTDIR)return.o: $(SRCDIR)return.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)address.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \
 	$(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h $(INCDIR)retmacro.h \
+	$(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h $(INCDIR)return.h \
 	$(INCDIR)returndefs.h $(INCDIR)commondefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)return.c -o $(OBJECTDIR)return.o

@@ -828,7 +828,7 @@ $(OBJECTDIR)subr0374.o: $(SRCDIR)subr0374.c $(REQUIRED-INCS) \
 	$(CC) $(RFLAGS) $(SRCDIR)subr0374.c -o $(OBJECTDIR)subr0374.o

 $(OBJECTDIR)perrno.o: $(SRCDIR)perrno.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)osmsgprint.h \
+	$(INCDIR)lispemul.h $(INCDIR)osmsg.h \
 	$(INCDIR)perrnodefs.h $(INCDIR)osmsgdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)perrno.c -o $(OBJECTDIR)perrno.o

@@ -843,7 +843,7 @@ $(OBJECTDIR)timer.o: $(SRCDIR)timer.c $(REQUIRED-INCS) \
 $(OBJECTDIR)tty.o: $(SRCDIR)tty.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
-	$(INCDIR)commondefs.h $(INCDIR)ttydefs.h
+	$(INCDIR)commondefs.h $(INCDIR)tty.h $(INCDIR)ttydefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)tty.c -o $(OBJECTDIR)tty.o

 $(OBJECTDIR)typeof.o: $(SRCDIR)typeof.c $(REQUIRED-INCS) \
@@ -876,7 +876,7 @@ $(OBJECTDIR)uraid.o: $(SRCDIR)uraid.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h $(INCDIR)cell.h \
-	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
+	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bitblt.h \
 	$(INCDIR)uraiddefs.h $(INCDIR)dbgtooldefs.h $(INCDIR)stack.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)initkbddefs.h \
 	$(INCDIR)kprintdefs.h $(INCDIR)llstkdefs.h $(INCDIR)mkatomdefs.h \
@@ -908,7 +908,7 @@ $(OBJECTDIR)vars3.o: $(SRCDIR)vars3.c $(REQUIRED-INCS) \
 $(OBJECTDIR)vmemsave.o: $(SRCDIR)vmemsave.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
+	$(INCDIR)miscstat.h $(INCDIR)vmemsave.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
 	$(INCDIR)lsptypes.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \
 	$(INCDIR)devif.h $(INCDIR)vmemsavedefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)dskdefs.h $(INCDIR)initkbddefs.h $(INCDIR)perrnodefs.h \
@@ -929,7 +929,7 @@ $(OBJECTDIR)usrsubr.o: $(SRCDIR)usrsubr.c $(REQUIRED-INCS) \

 $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)emlglob.h \
-	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)retmacro.h \
+	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)return.h \
 	$(INCDIR)dbprint.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \
 	$(INCDIR)initatms.h $(INCDIR)gcdata.h $(INCDIR)arith.h $(INCDIR)stream.h \
@@ -992,7 +992,7 @@ $(OBJECTDIR)xcursor.o: $(SRCDIR)xcursor.c $(REQUIRED-INCS) \

 $(OBJECTDIR)xwinman.o: $(SRCDIR)xwinman.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)miscstat.h $(INCDIR)devif.h $(INCDIR)xdefs.h \
-	$(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
+	$(INCDIR)xscroll.h $(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
 	$(INCDIR)xlspwindefs.h $(INCDIR)xscrolldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)xwinman.c -o $(OBJECTDIR)xwinman.o

--- a/bin/mkvdate
+++ b/bin/mkvdate
@@ -1,22 +1,6 @@
 #!/bin/sh
-if command -v "git" >/dev/null 2>&1; then
-    MAIKO_REV="$(git status --porcelain)"
-    if [ $? == 0 ]; then
-	if [ ! -z "$(git status --porcelain)" ]; then
-            MAIKO_REV="$(git rev-parse --short HEAD)-dirty"
-	else
-	    MAIKO_REV="$(git rev-parse --short HEAD)"
-	fi
-    else
-	MAIKO_REV="none"
-    fi
-else
-    MAIKO_REV = "none"
-fi
 cat <<EOF
 #include <time.h>
 extern const time_t MDate;
 const time_t MDate = $(date +%s);
-extern const char *MaikoGitVersion;
-const char *MaikoGitVersion = "maiko git version: $MAIKO_REV";
 EOF
--- 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 BBTMACRO_H
-#define BBTMACRO_H 1
+#ifndef BITBLT_H
+#define BITBLT_H 1
 /* $Id: bitblt.h,v 1.2 1999/01/03 02:05:54 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
 /*
 *	Copyright (C) 1988 by Fuji Xerox Co., Ltd. All rights reserved.
 *
- *	File :  bbtmacro.h (was bitblt.h)
+ *	File :  bitblt.h
 *
 *	Author :  Osamu Nakamura
 *
@@ -85,4 +85,4 @@ extern DLword *EmCursorX68K,*EmCursorY68K;
 #define UNLOCKSCREEN ScreenLocked = NIL

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

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

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

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

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

 struct  htlinkptr
--- a/inc/inlineC.h
+++ b/inc/inlineC.h
@@ -217,7 +217,7 @@

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

 /* For bit test */
 typedef struct wbits {
-  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;
+  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;
 } WBITS;

 #define PUTBASEBIT68K(base68k, offset, bitvalue)                                             \
--- a/inc/lsptypes.h
+++ b/inc/lsptypes.h
@@ -699,111 +699,4 @@ typedef
 			/* low-order 12 bits first.            */
    } BIGNUM;

-
-/* Ethernet records */
-
-#ifndef BYTESWAP
-typedef struct { 
-	DLword	DLLOCALHOST0;
-	DLword	DLLOCALHOST1;
-	DLword	DLLOCALHOST2;
-	DLword	DLFIRSTICB;
-	DLword	DLINPUTMASK;
-	DLword	DLFIRSTOCB;
-	DLword	DLOUTPUTMASK;
-	DLword	DLMISSEDPACKETS;
-	DLword	DLLASTICB;
-	DLword	DLLASTOCB;
-} DLETHERCSB;
-
-typedef struct{ 
-	DLword	DLIOCBLENGTH;
-	DLword	DLIOCBBUFFERLO;
-	DLword	DLIOCBBUFFERHI;
-	DLword	DLRETRANSMISSIONMASK;
-	DLword	DLIOCBBYTESUSED;
-	DLword	DLIOCBSTATUS;
-	DLword	DLNEXTIOCB;
-	DLword	DLFOROUTPUTUSE;
-} DLETHERIOCB;
-
-typedef struct { 
-	unsigned int	NETTYPE : 8;
-	unsigned int	NDBNEXT : 24;
-	unsigned int	NDBPUPNET : 8;
-	unsigned int	NDBNSNET : 24;
-	unsigned int	NDBTASK : 8;
-	unsigned int	NDBBROADCASTP : 24;
-	unsigned int	NDBPUPHOST : 8;
-	unsigned int	NDBTRANSMITTER : 24;
-	unsigned int	nil1: 8;
-	unsigned int	NDBENCAPSULATOR : 24;
-	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
-	unsigned int	NDBCSB : 24; /* DATATYPE */
-	LispPTR		NDBIQ;
-	LispPTR		NDBTQ;
-	LispPTR		NDBTRANSLATIONS;
-	LispPTR		NDBETHERFLUSHER;
-	LispPTR		NDBWATCHER;
-	LispPTR		NDBCANHEARSELF;
-	LispPTR		NDBIPNET;
-	LispPTR		NDBIPHOST;
-	DLword		NDBPUPTYPE;
-	DLword		nil2;
-	LispPTR		nil3;
-} NDB;
-#else
-	/***********************************************/
-	/* Byte-swapped definitions, for e.g., 80386's */
-	/***********************************************/
-typedef struct { 
-	DLword	DLLOCALHOST1;
-	DLword	DLLOCALHOST0;
-	DLword	DLFIRSTICB;
-	DLword	DLLOCALHOST2;
-	DLword	DLFIRSTOCB;
-	DLword	DLINPUTMASK;
-	DLword	DLMISSEDPACKETS;
-	DLword	DLOUTPUTMASK;
-	DLword	DLLASTOCB;
-	DLword	DLLASTICB;
-} DLETHERCSB;
-
-typedef struct{ 
-	DLword	DLIOCBBUFFERLO;
-	DLword	DLIOCBLENGTH;
-	DLword	DLRETRANSMISSIONMASK;
-	DLword	DLIOCBBUFFERHI;
-	DLword	DLIOCBSTATUS;
-	DLword	DLIOCBBYTESUSED;
-	DLword	DLFOROUTPUTUSE;
-	DLword	DLNEXTIOCB;
-} DLETHERIOCB;
-
-typedef struct { 
-	unsigned int	NDBNEXT : 24;
-	unsigned int	NETTYPE : 8;
-	unsigned int	NDBNSNET : 24;
-	unsigned int	NDBPUPNET : 8;
-	unsigned int	NDBBROADCASTP : 24;
-	unsigned int	NDBTASK : 8;
-	unsigned int	NDBTRANSMITTER : 24;
-	unsigned int	NDBPUPHOST : 8;
-	unsigned int	NDBENCAPSULATOR : 24;
-	unsigned int	nil1: 8;
-	unsigned int	NDBCSB : 24; /* DATATYPE */
-	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
-	LispPTR		NDBIQ;
-	LispPTR		NDBTQ;
-	LispPTR		NDBTRANSLATIONS;
-	LispPTR		NDBETHERFLUSHER;
-	LispPTR		NDBWATCHER;
-	LispPTR		NDBCANHEARSELF;
-	LispPTR		NDBIPNET;
-	LispPTR		NDBIPHOST;
-	DLword		nil2;
-	DLword		NDBPUPTYPE;
-	LispPTR		nil3;
-} NDB;
-#endif /* BYTESWAP */
 #endif /* LSPTYPES_H */
--- a/inc/osmsgprint.h
+++ b/inc/osmsgprint.h
@@ -1,5 +1,5 @@
-#ifndef OSMSGPRINT_H
-#define OSMSGPRINT_H 1
+#ifndef OSMSG_H
+#define OSMSG_H 1
 /* $Id: osmsg.h,v 1.2 1999/01/03 02:06:20 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */


@@ -23,4 +23,4 @@
    print_exp;					\
  } while (0)

-#endif /* OSMSGPRINT_H */
+#endif /* OSMSG_H */
--- a/inc/rawcolordefs.h
+++ b/inc/rawcolordefs.h
@@ -1,8 +0,0 @@
-#ifndef RAWCOLORDEFS_H
-#define RAWCOLORDEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-void C_slowbltchar(LispPTR *args);
-LispPTR Colorize_Bitmap(LispPTR args[]);
-void Draw_8BppColorLine(LispPTR *args);
-void Uncolorize_Bitmap(LispPTR args[]);
-#endif
--- a/inc/retmacro.h
+++ b/inc/retmacro.h
@@ -1,12 +1,12 @@
-#ifndef RETMACRO_H
-#define RETMACRO_H 1
+#ifndef RETURN_H
+#define RETURN_H 1
 /* $Id: return.h,v 1.2 1999/01/03 02:06:22 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */


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

-	File Name : 	retmacro.h (was return.h)
+	File Name : 	return.h
 	Desc. :		Macros for return,contextsw

 	Written by :	Takeshi Shimizu
@@ -111,4 +111,4 @@
    S_CHECK( EndSTKP > CurrentStackPTR, 				\
 		"End of stack isn't beyond current stk pointer."); 	\
  } while (0)
-#endif /* RETMACRO_H */
+#endif /* RETURN_H */
--- a/inc/stack.h
+++ b/inc/stack.h
@@ -79,22 +79,22 @@ typedef struct fnhead {
 } FNHEAD;

 typedef struct frameex1 {
-  DLword flags : 3;
-  DLword fast : 1;
-  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
-  DLword incall : 1;
-  DLword validnametable : 1;
+  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;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  DLword nopush : 1;
-  DLword usecount : 8;
+  unsigned short nopush : 1;
+  unsigned short usecount : 8;
  DLword alink; /* alink pointer (Low addr) */
 #ifdef BIGVM
  LispPTR fnheader; /* pointer to FunctionHeader (Hi2 addr) */
 #else
  DLword lofnheader;        /* pointer to FunctionHeader (Low addr) */
-  DLword hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
-  DLword hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
+  unsigned short hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
+  unsigned short hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
 #endif /* BIGVM */
  DLword nextblock; /* pointer to FreeStackBlock */
  DLword pc;        /* Program counter */
@@ -102,23 +102,23 @@ typedef struct frameex1 {
  LispPTR nametable; /* ptr to NameTable of this FrameEx (Hi2 addr) */
 #else
  DLword lonametable;        /* ptr to NameTable of this FrameEx (Low addr) */
-  DLword hi1nametable : 8; /* ptr to NameTable of this FrameEx (Hi1 addr) */
-  DLword hi2nametable : 8; /* ptr to NameTable of this FrameEx (Hi2 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) */
 #endif /* BIGVM */
  DLword blink; /* blink pointer (Low addr) */
  DLword clink; /* clink pointer (Low addr) */
 } FX;

 typedef struct frameex2 {
-  DLword flags : 3;
-  DLword fast : 1;
-  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
-  DLword incall : 1;
-  DLword validnametable : 1;
+  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;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  DLword nopush : 1;
-  DLword usecount : 8;
+  unsigned short nopush : 1;
+  unsigned short usecount : 8;
  DLword alink;      /* alink pointer (Low addr) */
  LispPTR fnheader;  /* pointer to FunctionHeader */
  DLword nextblock;  /* pointer to FreeStackBlock */
@@ -135,19 +135,19 @@ typedef struct fxblock {
 } FXBLOCK;

 typedef struct basic_frame {
-  DLword flags : 3;
-  DLword nil : 3;
-  DLword residual : 1;
-  DLword padding : 1;
-  DLword usecnt : 8;
+  unsigned short flags : 3;
+  unsigned short nil : 3;
+  unsigned short residual : 1;
+  unsigned short padding : 1;
+  unsigned short usecnt : 8;
  DLword ivar; /* stk offset of IVARs for this frame ?? */

 } Bframe;

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

 typedef struct stack_block {
@@ -185,33 +185,33 @@ typedef struct fnhead {
  unsigned nil3 : 2;       /* not used */
  unsigned nil2 : 2;       /* not used */
 #endif /* BIGVM */
-  DLword argtype : 2;     /* ?? */
-  DLword byteswapped : 1; /* code was reswapped.	*/
-  DLword nil4 : 1;        /* not used, prev: native translated? */
-  DLword fvaroffset : 8;
+  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 offset from head of NameTable */
-  DLword nlocals : 8; /* ?? */
+  unsigned short nlocals : 8; /* ?? */
  DLword ntsize;        /* size of NameTable */
                        /* NameTable of variable length is following with this structure. */
 } FNHEAD;

 typedef struct frameex1 {
  DLword alink; /* alink pointer (Low addr) */
-  DLword usecount : 8;
-  DLword nopush : 1;
-  DLword validnametable : 1;
+  unsigned short usecount : 8;
+  unsigned short nopush : 1;
+  unsigned short validnametable : 1;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  DLword incall : 1;
-  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
-  DLword fast : 1;
-  DLword flags : 3; /* hi word */
+  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 */

 #ifdef BIGVM
  LispPTR fnheader; /* pointer to FunctionHeader (Hi2 addr) */
 #else
-  DLword hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
-  DLword hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
+  unsigned short hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
+  unsigned short hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
  DLword lofnheader;        /* pointer to FunctionHeader (Low addr) */
 #endif /* BIGVM */

@@ -221,8 +221,8 @@ typedef struct frameex1 {
 #ifdef BIGVM
  LispPTR nametable; /* pointer to NameTable of this FX (Hi2 addr) */
 #else
-  DLword hi2nametable : 8; /* pointer to NameTable of this FX (Hi2 addr) */
-  DLword hi1nametable : 8; /* pointer to NameTable of this FX (Hi1 addr) */
+  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 lonametable;        /* pointer to NameTable of this FX (Low addr) */
 #endif /* BIGVM */

@@ -232,15 +232,15 @@ typedef struct frameex1 {

 typedef struct frameex2 {
  DLword alink; /* alink pointer (Low addr) */
-  DLword usecount : 8;
-  DLword nopush : 1;
-  DLword validnametable : 1;
+  unsigned short usecount : 8;
+  unsigned short nopush : 1;
+  unsigned short validnametable : 1;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  DLword incall : 1;
-  DLword nil2 : 1; /* not used, prev: This frame treats N-func */
-  DLword fast : 1;
-  DLword flags : 3;
+  unsigned short incall : 1;
+  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned short fast : 1;
+  unsigned short flags : 3;

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

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

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

 } Bframe;

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

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

 	/****************************************************************/
--- a/inc/vmemsave.h
+++ b/inc/vmemsave.h
@@ -0,0 +1,25 @@
+#ifndef VMEMSAVE_H
+#define VMEMSAVE_H 1
+/* $Id: vmemsave.h,v 1.2 1999/01/03 02:06:29 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
+
+
+
+/************************************************************************/
+/*									*/
+/*	(C) Copyright 1989-96 Venue. All Rights Reserved.		*/
+/*	Manufactured in the United States of America.			*/
+/*									*/
+/************************************************************************/
+
+
+/*
+	File Name : vmemsave.h
+	DEfinition for vmemsave
+*/
+
+#define	FP_IFPAGE  512			/* IFPAGE address in sysoutfile by Byte */
+#define	DOMINOPAGES  301		/* skip dominopages  in  fptovp */
+#define	SKIPPAGES  301			/* save first filepage  */
+#define	SKIP_DOMINOPAGES  153600	/* Byte size in sysoutfile for dominocode */
+#define	SAVE_IFPAGE	223		/* Virtual address for IFPAGES's buffer page. This value is \EMUSWAPBUFFERS in lisp. */
+#endif /* VMEMSAVE_H */
--- 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(int exit_status);
+void lisp_finish(void);
 #endif
--- a/inc/xscroll.h
+++ b/inc/xscroll.h
@@ -0,0 +1,18 @@
+#ifndef XSCROLL_H
+#define XSCROLL_H 1
+/************************************************************************/
+/*									*/
+/*			xscroll.h					*/
+/*									*/
+/* Scrolling functions implemented in xscroll.c				*/
+/*									*/
+/************************************************************************/
+#include "devif.h" /* for DspInterface */
+void Scroll(DspInterface dsp, int newX, int newY);
+void JumpScrollVer(DspInterface dsp, int y);
+void JumpScrollHor(DspInterface dsp, int x);
+void ScrollLeft(DspInterface dsp);
+void ScrollRight(DspInterface dsp);
+void ScrollUp(DspInterface dsp);
+void ScrollDown(DspInterface dsp);
+#endif /* XSCROLL_H */
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -47,7 +47,7 @@
 #include "address.h"
 #include "arith.h"
 #include "stack.h"
-#include "retmacro.h"
+#include "return.h"
 #include "cell.h"

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

 #include "bb.h"
-#include "bbtmacro.h"
+#include "bitblt.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 "bbtmacro.h"
+#include "bitblt.h"
 #include "bb.h"

 #include "bitbltdefs.h"
@@ -126,7 +126,7 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl, LispPTR tos)
  if (displayflg) (currentdsp->mouse_visible)(IOPage->dlmousex, IOPage->dlmousey);
 #endif /* SUNDISPLAY / DOS */

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

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

 #include "chardevdefs.h"
--- 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, too many stack frames */
-      printf("***There are more than %d stack frames.\n", URMAXFXNUM);
+      /* Internal buf overflow,more than 100 stacks */
+      printf("***There are more than 100 stack frames.\n");
      printf(
          "If you want to continue, Uraid will smash its internal table for FX pointer. Do you "
          "accept?(Y or N)\n");
--- 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 "bbtmacro.h"       // for MOUSEXR, MOUSEYH
+#include "bitblt.h"       // for MOUSEXR, MOUSEYH
 #include "display.h"      // for DISPLAYBUFFER, DisplayRegion68k, in_display...
 #include "drawdefs.h"     // for N_OP_drawline
 #include "emlglob.h"
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -66,7 +66,6 @@ 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 */
@@ -3056,13 +3055,11 @@ static int get_version_array(char *dir, char *file)
    *Lisp_errno = errno;
    return(0);
  }
-  if (sbuf.st_ino == VA.dir_ino &&
-      0 == strcmp(lcased_file, VA.name) &&
+  if (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);
  }
--- a/src/dspsubrs.c
+++ b/src/dspsubrs.c
@@ -40,12 +40,7 @@ extern int Mouse_Included;
 ****************************************************/

 void DSP_dspbout(LispPTR *args) /* args[0] :	charcode	*/
-{
-  int charcode = (args[0] & 0x7F);
-  /* Interlisp-D uses CR as EOL which isn't useful here */
-  putc((charcode == '\r') ? '\n' : charcode, BCPLDISPLAY);
-  fflush(BCPLDISPLAY);
-}
+{ putc((args[0] & 0xFFFF) & 0x7f, BCPLDISPLAY); }

 /****************************************************
 *
@@ -57,16 +52,7 @@ void DSP_dspbout(LispPTR *args) /* args[0] :	charcode	*/
 extern int DisplayInitialized;

 void DSP_showdisplay(LispPTR *args)
-{
-  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;
-  }
-}
+{ DisplayInitialized = 1; }

 /****************************************************
 *
--- a/src/ether_nethub.c
+++ b/src/ether_nethub.c
@@ -31,6 +31,7 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
+#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"
--- a/src/ether_sunos.c
+++ b/src/ether_sunos.c
@@ -71,6 +71,7 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
+#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"
--- a/src/gcfinal.c
+++ b/src/gcfinal.c
@@ -552,15 +552,15 @@ void printarrayblock(LispPTR base) {
  printf("          Length: %d cells.\n\n", bbase->arlen);

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

  addr = ((LispPTR *)btrailer) - 20;
-  for (; addr < (LispPTR *)btrailer; addr++) printf("%16p %8x\n", (void *)addr, *addr);
-  printf("%16p %8x <- array trailer\n", (void *)addr, *addr);
+  for (; addr < (LispPTR *)btrailer; addr++) printf("%p	%8x\n", (void *)addr, *addr);
+  printf("%p	%8x <- array trailer\n", (void *)addr, *addr);
  addr++;
-  for (; addr < (LispPTR *)btrailer + 20; addr++) printf("%16p %8x\n", (void *)addr, *addr);
+  for (; addr < (LispPTR *)btrailer + 20; addr++) printf("%p	%8x\n", (void *)addr, *addr);
 }
--- 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 "retmacro.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
+#include "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
 #include "stack.h"        // for FX, frameex1, Bframe, CHECK_FX, StackWord

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

--- a/src/initdsp.c
+++ b/src/initdsp.c
@@ -98,11 +98,6 @@ extern int *Xdisplay; /* DAANGER -jarl nilsson 27-apr-92 */
 /************************************************************************/

 void init_cursor(void) {
-  /* init_cursor sets up any OS/hardware that is necessary
-   * for the rest of the display system to get a cursor displayed.
-   * For display subsystems like X11 or SDL there's nothing to do
-   * Originally this did work for memory mapped Sun display boards
-   */
 }

 /************************************************************************/
--- a/src/initkbd.c
+++ b/src/initkbd.c
@@ -71,8 +71,6 @@ extern DspInterface currentdsp;
 extern int LispKbdFd;
 int LispKbdFd = -1;

-extern int runtime_debug_level;
-
 extern fd_set LispReadFds;

 extern DLword *EmMouseX68K;
@@ -377,20 +375,6 @@ static u_char *make_X_keymap(void) {
    table[xcode - 7] = code;
  }

-  if (runtime_debug_level > 0) {
-    printf("*********************************************************************\n");
-    printf("(DEFINE-FILE-INFO \036PACKAGE \"INTERLISP\" \036READTABLE \"XCL\" \036 BASE 10)\n");
-    printf("(SETQ XGetKeyboardMappingTable '(\n");
-    for (i = 0; i < codecount * symspercode; i += symspercode) {
-      printf("(%d (", minkey + (i / symspercode));
-      for (int j = 0; j < symspercode; j++) {
-        printf("    #X%lx", (unsigned long)mapping[i+j]);
-      }
-      printf(" ))\n");
-    }
-    printf("\n))\nSTOP\n");
-    printf("*********************************************************************\n");
-  }
 #ifdef DEBUG
  printf("\n\n\tXGetKeyboardMapping table\n\n");
  for (i = 0; i < codecount * symspercode; i += symspercode) {
--- 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 "bbtmacro.h"
+#include "bitblt.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 "bbtmacro.h"
+#include "bitblt.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 "retmacro.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW
+#include "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW
 #include "stack.h"        // for StackWord, Bframe, FX, frameex1, STKWORD
 #include "storagedefs.h"  // for newpage
 // #include "testtooldefs.h" // for print_atomname
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,7 @@
 #include "emlglob.h"
 #include "adr68k.h"
 #include "stack.h"
-#include "retmacro.h"
+#include "return.h"

 #include "lispemul.h"
 #include "lspglob.h"
@@ -226,8 +226,6 @@ int save_argc;
 char **save_argv;
 int display_max = 65536 * 16 * 2;

-long runtime_debug_level = 0;
-
 /* diagnostic flag for sysout dumping */
 extern unsigned maxpages;

@@ -245,10 +243,9 @@ int flushing = FALSE; /* see dbprint.h if set, all debug/trace printing will cal
 extern DspInterface currentdsp;
 #endif /* DOS || XWINDOW */
 #ifdef SDL
-#include "sdldefs.h"	/* for init_SDL */
+extern int init_SDL(char*, int, int, int);
 #endif
 extern const time_t MDate;
-extern const char *MaikoGitVersion;
 extern int nokbdflag;
 extern int nomouseflag;
 #ifdef DOS
@@ -327,15 +324,6 @@ extern char foregroundColorName[64];
 char backgroundColorName[64] = {0};
 extern char backgroundColorName[64];
 #endif
-char windowTitle[255] = "Medley";
-extern char windowTitle[255];
-unsigned LispDisplayRequestedWidth = 1024, LispDisplayRequestedHeight = 768;
-extern unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;
-int LispDisplayRequestedX = 0, LispDisplayRequestedY = 0;
-extern int LispDisplayRequestedX, LispDisplayRequestedY;
-int pixelScale = 1;
-extern int pixelScale;
-
 /************************************************************************/
 /*									*/
 /*		     M A I N   E N T R Y   P O I N T			*/
@@ -347,10 +335,12 @@ int main(int argc, char *argv[])
 {
  int i;
  char *envname;
-  char *rtdebug;
  extern int TIMER_INTERVAL;
  extern fd_set LispReadFds;
  long tmpint;
+  int width = 1024, height = 768;
+  int pixelscale = 1;
+  char *windowtitle = "Medley";

 #ifdef MAIKO_ENABLE_FOREIGN_FUNCTION_INTERFACE
  if (dld_find_executable(argv[0]) == 0) {
@@ -375,6 +365,7 @@ 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++;
  }


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

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

-    else if (!strcmp(argv[i], "-timer")) { /**** timer interval	****/
+    else if (!strcmp(argv[i], "-t")) { /**** timer interval	****/
      if (argc > ++i) {
        errno = 0;
        tmpint = strtol(argv[i], (char **)NULL, 10);
        if (errno == 0 && tmpint > 0) {
          TIMER_INTERVAL = tmpint;
        } else {
-          (void)fprintf(stderr, "Bad value for -timer (integer > 0)\n");
+          (void)fprintf(stderr, "Bad value for -t (integer > 0)\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -timer\n");
+        (void)fprintf(stderr, "Missing argument after -t\n");
        exit(1);
      }
    }
@@ -477,7 +468,7 @@ int main(int argc, char *argv[])
 #ifdef SDL
    else if ((strcmp(argv[i], "-sc") == 0) || (strcmp(argv[i], "-SC") == 0)) {
      if (argc > ++i) {
-        int read = sscanf(argv[i], "%dx%d", &LispDisplayRequestedWidth, &LispDisplayRequestedHeight);
+        int read = sscanf(argv[i], "%dx%d", &width, &height);
        if(read != 2) {
          (void)fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]);
          exit(1);
@@ -488,7 +479,7 @@ int main(int argc, char *argv[])
      }
    } else if ((strcmp(argv[i], "-pixelscale") == 0) || (strcmp(argv[i], "-PIXELSCALE") == 0)) {
      if (argc > ++i) {
-        int read = sscanf(argv[i], "%d", &pixelScale);
+        int read = sscanf(argv[i], "%d", &pixelscale);
        if(read != 1) {
          (void)fprintf(stderr, "Could not parse -pixelscale argument %s\n", argv[i]);
          exit(1);
@@ -500,7 +491,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) {
-        strncpy(windowTitle, argv[i], sizeof(windowTitle) - 1);
+        windowtitle = argv[i];
      } else {
        (void)fprintf(stderr, "Missing argument after -title\n");
        exit(1);
@@ -680,14 +671,6 @@ int main(int argc, char *argv[])
  //
  //

-  if ((rtdebug = getenv("LDERUNTIMEDEBUG")) != NULL) {
-      errno = 0;
-      runtime_debug_level = strtol(rtdebug, (char **)NULL, 10);
-      if (errno != 0) {
-        runtime_debug_level = 0; // default to OFF if erroneous value
-    }
-  }
-  

 /* Sanity checks. */
 #ifdef DOS
@@ -728,12 +711,13 @@ int main(int argc, char *argv[])
  make_dsp_instance(currentdsp, 0, 0, 0, 1); /* All defaults the first time */
 #endif                                       /* DOS || XWINDOW */
 #if defined(SDL)
-  init_SDL(windowTitle, LispDisplayRequestedWidth, LispDisplayRequestedHeight, pixelScale);
+  init_SDL(windowtitle, width, height, pixelscale);
 #endif /* SDL */
  /* Load sysout to VM space and returns real sysout_size(not 0) */
  sysout_size = sysout_loader(sysout_name, sysout_size);

-  build_lisp_map(); /* build up map */
+  build_lisp_map(); /* built up map */
+
  init_ifpage(sysout_size); /* init interface page */
  init_iopage();
  init_miscstats();
@@ -843,7 +827,6 @@ void print_info_lines(void) {
 #endif /* RELEASE */
  printf("Compiled for %s (%s) (%d bit).\n", MAIKO_OS_NAME, MAIKO_ARCH_NAME, MAIKO_ARCH_WORD_BITS);
  printf("Creation date: %s", ctime(&MDate));
-  printf("%s\n", MaikoGitVersion);
 #ifdef LPSOLVE
  printf("Contains lp_solve LP solver.\n");
 #endif /* LPSOLVE */
--- a/src/misc7.c
+++ b/src/misc7.c
@@ -43,9 +43,7 @@ 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));

@@ -60,11 +58,7 @@ 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
@@ -85,12 +79,12 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP
  }


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

  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 "osmsgprint.h"
+#include "osmsg.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 "osmsgprint.h"  // for OSMESSAGE_PRINT
+#include "osmsg.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 "bbtmacro.h"
+#include "bitblt.h"
 #include "lldsp.h"
 #include "bbtsubdefs.h"

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

-static void newColorizeFont8(PILOTBBT *pbt, u_char backcolor, u_char forecolor, LispPTR srctype, LispPTR ope)
+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 "retmacro.h"
+#include "return.h"
 #include "testtooldefs.h"
 #include "returndefs.h"
 #include "commondefs.h"
--- a/src/sdl.c
+++ b/src/sdl.c
@@ -52,6 +52,7 @@ 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) */
@@ -167,6 +168,123 @@ 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;
@@ -1565,7 +1683,9 @@ int init_SDL(char *windowtitle, int w, int h, int s) {
  sdl_displayheight = h;
  sdl_windowwidth = w * s;
  sdl_windowheight = h * s;
-  printf("requested width: %d, height: %d\n", sdl_displaywidth, sdl_displayheight);
+  int width = sdl_displaywidth;
+  int height = sdl_displayheight;
+  printf("requested width: %d, height: %d\n", width, height);
  if (SDL_Init(SDL_INIT_VIDEO) < 0) {
    printf("SDL could not be initialized. SDL_Error: %s\n", SDL_GetError());
    return 1;
@@ -1606,8 +1726,7 @@ 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,
-                                  sdl_displaywidth, sdl_displayheight);
+                                  SDL_TEXTUREACCESS_STREAMING, width, height);
  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,7 +29,6 @@
 /***********************************************************/

 #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
@@ -65,11 +64,6 @@
 #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;

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

    case sb_LISPFINISH:
-    case sb_LISP_FINISH: {
-      int status;
+    case sb_LISP_FINISH:
      POP_SUBR_ARGS;
-      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);
+      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();
      break;
-    }
+
    case sb_NEWPAGE:
      POP_SUBR_ARGS;
      TopOfStack = newpage(args[0]);
@@ -591,7 +584,7 @@ void OP_subrcall(int subr_no, int argnum) {
    case sb_SUSPEND_LISP:
      POP_SUBR_ARGS;
      /* Suspend Maiko */
-      TopOfStack = suspend_lisp();
+      TopOfStack = suspend_lisp(args);
      break;

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

-  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]);
+  printf(" 0%o (0x%x)	", pc, pc);
+  for (i = 0; i < len; i++) printf("%o ", 0xFF & GETBYTE(addr + i));
+  printf("	%s", opcode_table[op]);

  switch (op) {
    case 0:
--- a/src/tty.c
+++ b/src/tty.c
@@ -22,60 +22,9 @@
 #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/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 "osmsgprint.h"  // for OSMESSAGE_PRINT
+#include "osmsg.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(void) {
+LispPTR suspend_lisp(LispPTR *args) {
 #ifndef DOS
  extern DLword *CTopKeyevent;
  extern LispPTR *KEYBUFFERING68k;
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -41,6 +41,7 @@
 #include "lispemul.h"
 #include "lispmap.h"
 #include "lspglob.h"
+#include "vmemsave.h"
 #include "timeout.h"
 #include "adr68k.h"
 #include "lsptypes.h"
@@ -57,12 +58,6 @@
 #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
@@ -518,7 +513,7 @@ LispPTR vmem_save(char *sysout_file_name)

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

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

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

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

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

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

    case 0265:
    case265 : {
-      if (TOPOFSTACK == 0) { POP; nextop2; }
+      if (TOPOFSTACK == 0) { goto PopNextop2; }
      CHECK_INTERRUPT;
      PCMACL += Get_SBYTE_PCMAC1;
      nextop0;
@@ -1261,7 +1261,19 @@ 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,6 +50,8 @@ 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 windowTitle[255];
-extern char iconTitle[255];
+extern char Window_Title[255];
+extern char Icon_Title[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 = windowTitle;
-  IT = iconTitle;
+  WT = Window_Title;
+  IT = Icon_Title;

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

 extern int xsync;
-extern int TIMER_INTERVAL;

 static XrmOptionDescRec opTable[] = {
    {"-help", "*help", XrmoptionIsArg, (XPointer)NULL},
@@ -82,14 +81,14 @@ extern char Display_Name[128];
 char Display_Name[128];
 extern char iconpixmapfile[1024];
 char iconpixmapfile[1024];
-extern char iconTitle[255];
-char iconTitle[255];
+extern char Window_Title[255];
+char Window_Title[255];
+extern char Icon_Title[255];
+char Icon_Title[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[];
@@ -248,14 +247,14 @@ void read_Xoption(int *argc, char *argv[])
  }

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

  if (XrmGetResource(rDB, "ldex.iconbitmap", "Ldex.Iconbitmap", str_type, &value) == True) {
@@ -298,14 +297,6 @@ 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",