Merge pull request #499 from Interlisp/fgh_buildRelease_MacOS_fix

In buildRelease workflow, MacOS job - fix issue with uninstall of casks that have not actually been installed
In buildRelease workflow, MacOS job - fix issue with uninstall of casks that have not actually been installed. result of changes to github runner in MacOS-lastest
2026-03-16 06:47:22 +00:00 · 2024-05-06 16:41:23 -07:00 · 2024-05-06 16:12:59 -07:00 · 2024-04-24 11:41:46 -07:00 · 2024-04-23 21:49:38 -07:00 · 2024-04-13 11:12:10 -07:00
58 changed files with 705 additions and 294 deletions
--- a/.github/workflows/buildRelease.yml
+++ b/.github/workflows/buildRelease.yml
@@ -107,7 +107,7 @@ jobs:
          echo "linux=true" >> $GITHUB_OUTPUT;
          echo "macos=true" >> $GITHUB_OUTPUT;
          echo "windows=true" >> $GITHUB_OUTPUT;
-          
+

 ######################################################################################

@@ -123,7 +123,7 @@ jobs:
    steps:
      # Checkout the actions for this repo owner
      - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          repository: ${{ github.repository_owner }}/.github
          path: ./Actions_${{ github.sha }}
@@ -157,7 +157,7 @@ jobs:
    steps:
      # Checkout the actions for this repo owner
      - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          repository: ${{ github.repository_owner }}/.github
          path: ./Actions_${{ github.sha }}
@@ -165,7 +165,7 @@ jobs:

      # Checkout the branch
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      # Setup release tag
      - name: Setup Release Tag
@@ -272,11 +272,11 @@ jobs:

      # Checkout the branch
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      # Checkout the actions for this repo owner
      - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          repository: ${{ github.repository_owner }}/.github
          path: ./Actions_${{ github.sha }}
@@ -290,13 +290,13 @@ jobs:
      # Uninstall exisitng X11 stuff preconfigured on runner then install correct X11 dependencies
      - name: Unistall X components already on the runner
        run: |
-          brew uninstall --ignore-dependencies libxft
-          brew uninstall --ignore-dependencies libxrender
-          brew uninstall --ignore-dependencies libxext
-          brew uninstall --ignore-dependencies libx11
-          brew uninstall --ignore-dependencies xorgproto
-          brew uninstall --ignore-dependencies libxdmcp
-          brew uninstall --ignore-dependencies libxau
+          brew uninstall --ignore-dependencies --force libxft
+          brew uninstall --ignore-dependencies --force libxrender
+          brew uninstall --ignore-dependencies --force libxext
+          brew uninstall --ignore-dependencies --force libx11
+          brew uninstall --ignore-dependencies --force xorgproto
+          brew uninstall --ignore-dependencies --force libxdmcp
+          brew uninstall --ignore-dependencies --force libxau

      - name: Install X11 dependencies on MacOS
        env:
@@ -324,7 +324,7 @@ jobs:
          export LDEARCH=aarch64-apple-darwin
          ./makeright init
          mkdir -p ../darwin.universal
-          exe=ldeinit 
+          exe=ldeinit
          lipo -create \
               -arch arm64 ../darwin.aarch64/${exe}  \
               -arch x86_64 ../darwin.x86_64/${exe} \
@@ -346,7 +346,7 @@ jobs:
            lipo ${exe} -output ../darwin.x86_64/${exe} -extract x86_64
            lipo ${exe} -output ../darwin.aarch64/${exe} -extract arm64
            cp -p ${exe} ../darwin.universal/${exe}
-          done  
+          done

      # Create release tar for github.
      - name: Make release tar(s)
@@ -369,7 +369,7 @@ jobs:
      # Push Release
      - name: Push the release
        uses: ncipollo/release-action@v1
-        with: 
+        with:
          allowUpdates: true
          artifacts:
            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-darwin.x86_64.tgz,
@@ -383,7 +383,7 @@ jobs:

  # Windows: build for Windows-Cygwin via Docker build and use results to
  # create and push release assets to github
-  
+
  windows:

    needs: [inputs, sentry]
@@ -418,7 +418,7 @@ jobs:
      # Retrieve SDL2 and install in cygwin
      - name: Install SDL2
        id: sdl2
-        env: 
+        env:
          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
          gh release download 2.26.5 --repo interlisp/cygwin-sdl --pattern *.tgz --output .\cygwin\sdl2.tar.gz
@@ -426,13 +426,13 @@ jobs:

      # Checkout the branch
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          path: cygwin\maiko

      # Checkout the actions for this repo owner
      - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          repository: ${{ github.repository_owner }}/.github
          path: ./Actions_${{ github.sha }}
@@ -473,6 +473,80 @@ jobs:



+######################################################################################
+
+  # Emscripten: build and push Maiko compiled for Emscripten (to run Maiko in browser)
+
+  emscripten:
+
+    needs: [inputs, sentry]
+    if: |
+      needs.inputs.outputs.linux == 'true'
+      && (
+         needs.sentry.outputs.release_not_built == 'true'
+         || needs.inputs.outputs.force == 'true'
+      )
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Install SDL2
+      - name: Install SDL2
+        run: |
+          export DEBIAN_FRONTEND=noninteractive
+          sudo -E apt-get install -y libsdl2-dev libsdl2-2.0-0
+
+      # Install Emscripten SDK
+      - name: Install Empscripten
+        working-directory: ../
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          ./emsdk install latest
+          ./emsdk activate latest
+          CWD="$(pwd)"
+          echo "${CWD}"  >> ${GITHUB_PATH}
+          echo "${CWD}/upstream/emscripten" >> ${GITHUB_PATH}
+          echo "${CWD}/upstream/emscripten/tools" >> ${GITHUB_PATH}
+          echo "${CWD}/node/$(ls -d node/*64bit | tail -1)/bin" >> ${GITHUB_PATH}
+
+      # Checkout the maiko branch
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Setup release tag
+      - name: Setup Release Tag
+        id: tag
+        uses: ./../actions/release-tag-action
+
+      # Compile maiko using Emscripten (no load build)
+      - name: Compile Maiko using Emscripten
+        working-directory: ./bin
+        run: |
+          ./makeright wasm_nl
+          cd ../emscripten.wasm_nl
+          tar -c -z -f ../${{ steps.tag.outputs.release_tag }}-emscripten.tgz *
+
+      # Push Release to github
+      - name: Push the release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts: ${{ steps.tag.outputs.release_tag }}-emscripten.tgz
+          tag: ${{ steps.tag.outputs.release_tag }}
+          draft: ${{ needs.inputs.outputs.draft }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+
 ######################################################################################

  # Use set-sentry-action to determine set the sentry that says this release has
@@ -485,12 +559,12 @@ jobs:
    outputs:
      build_successful: ${{ steps.output.outputs.build_successful }}

-    needs: [inputs, sentry, linux, macos, windows]
+    needs: [inputs, sentry, linux, macos, windows, emscripten]

    steps:
      # Checkout the actions for this repo owner
      - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          repository: ${{ github.repository_owner }}/.github
          path: ./Actions_${{ github.sha }}
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,10 @@ cmake-build-*/**
 *.x86_64-x/**
 *.x86_64-sdl/**
 *.x86_64/**
+*.wasm/**
+*.wasm-wasm/**
+*.wasm_nl/**
+*.wasm_nl-wasm_nl/**
 *.armv7l-x/**
 *.armv7l/**
 *.aarch64-x/**
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ ENDIF()

 find_program(
    CLANG_TIDY_EXE
-    NAMES "clang-tidy" "clang-tidy13" "clang-tidy12" "clang-tidy11" "clang-tidy10"
+    NAMES "clang-tidy" "clang-tidy16" "clang-tidy15" "clang-tidy14" "clang-tidy13" "clang-tidy12" "clang-tidy11" "clang-tidy10"
    DOC "Path to clang-tidy executable"
 )

@@ -41,6 +41,10 @@ SET(MAIKO_DEFINITIONS
    "-DRELEASE=351"
 )

+SET(MAIKO_INIT_DEFINITIONS
+    "-DRELEASE=351" "-DINIT" "-DNOVERSION"
+)
+
 OPTION(MAIKO_DISPLAY_X11 "Use X11 for display." ON)
 OPTION(MAIKO_DISPLAY_SDL "Use SDL for display." OFF)

@@ -454,6 +458,18 @@ IF(MAIKO_DISPLAY_X11)
  TARGET_COMPILE_DEFINITIONS(ldex PUBLIC ${MAIKO_DEFINITIONS} ${MAIKO_DISPLAY_X11_DEFINITIONS})
  TARGET_INCLUDE_DIRECTORIES(ldex PUBLIC inc)
  TARGET_LINK_LIBRARIES(ldex ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_X11_LIBRARIES})
+
+  ADD_EXECUTABLE(ldeinit
+    src/main.c
+    vdate.c
+    ${MAIKO_SRCS}
+    ${MAIKO_HDRS}
+    ${MAIKO_DISPLAY_X11_SRCS}
+    ${MAIKO_DISPLAY_X11_HDRS}
+  )
+  TARGET_COMPILE_DEFINITIONS(ldeinit PUBLIC ${MAIKO_INIT_DEFINITIONS} ${MAIKO_DISPLAY_X11_DEFINITIONS})
+  TARGET_INCLUDE_DIRECTORIES(ldeinit PUBLIC inc)
+  TARGET_LINK_LIBRARIES(ldeinit ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_X11_LIBRARIES})
 ENDIF()

 IF(MAIKO_DISPLAY_SDL)
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ 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://github.com/Interlisp/medley/wiki/Medley-Interlisp-Introduction).
+For an overview, see [Medley Interlisp Introduction](https://interlisp.org/medley/using/docs/medley/).

 See [the Medley repository](https://github.com/Interlisp/medley) for
 * [Issues](https://github.com/Interlisp/medley/issues) (note that maiko issues are there too)
--- a/bin/machinetype
+++ b/bin/machinetype
@@ -9,7 +9,8 @@
 #									#
 #########################################################################

-os=${LDEARCH:-`./config.guess`}
+SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+os=${LDEARCH:-`$SCRIPTPATH/config.guess`}
 # o/s switch block
 case "$os" in
        m68k-*)		      echo m68k ;;
--- a/bin/makefile-emscripten.wasm-wasm
+++ b/bin/makefile-emscripten.wasm-wasm
@@ -0,0 +1,34 @@
+# Options for Emscripten, WASM and SDL
+
+CC = emcc $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+XFLAGS = -DSDL -sUSE_SDL=2
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
+
+MEDLEY?=../../medley
+SYSOUT?=$(MEDLEY)/loadups/full.sysout
+
+LD = emcc
+LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 \
+	--preload-file $(SYSOUT)@medley/loadups/full.sysout \
+	--preload-file $(MEDLEY)/loadups/whereis.hash@medley/loadups/whereis.hash \
+	--preload-file $(MEDLEY)/greetfiles/MEDLEYDIR-INIT.LCOM@usr/local/lde/site-init.lisp \
+	--preload-file $(MEDLEY)/docs/@medley/docs \
+	--preload-file $(MEDLEY)/doctools/@medley/doctools \
+	--preload-file $(MEDLEY)/greetfiles/@medley/greetfiles \
+	--preload-file $(MEDLEY)/internal/@medley/internal \
+	--preload-file $(MEDLEY)/sources/@medley/sources \
+	--preload-file $(MEDLEY)/library/@medley/library \
+	--preload-file $(MEDLEY)/lispusers/@medley/lispusers \
+	--preload-file $(MEDLEY)/fonts/@medley/fonts
+
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldesdl.js
--- a/bin/makefile-emscripten.wasm_nl-wasm_nl
+++ b/bin/makefile-emscripten.wasm_nl-wasm_nl
@@ -0,0 +1,23 @@
+# Options for Emscripten, WASM and SDL
+
+CC = emcc $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+XFLAGS = -DSDL -sUSE_SDL=2
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
+
+MEDLEY?=../../medley
+SYSOUT?=$(MEDLEY)/loadups/full.sysout
+
+LD = emcc
+LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4
+
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldesdl.js
--- a/bin/makefile-haiku.x86_64-sdl
+++ b/bin/makefile-haiku.x86_64-sdl
@@ -0,0 +1,19 @@
+# Options for Haiku, Intel x86_64 and SDL
+
+CC = gcc -m64 $(GCC_CFLAGS)
+# CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+XFLAGS = -DSDL
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g3
+DFLAGS = $(XFLAGS) -DRELEASE=351
+
+LDFLAGS =  -lSDL2 -lnetwork
+LDELDFLAGS = -lnetwork -lbsd
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl
--- a/bin/makefile-init-linux.aarch64
+++ b/bin/makefile-init-linux.aarch64
@@ -0,0 +1,29 @@
+# Options for Linux, 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=351 -DNOVERSION -DINIT
+
+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-linux.x86_64
+++ b/bin/makefile-init-linux.x86_64
@@ -1,7 +1,7 @@
 # Options for Linux, x86 processor, X windows, for INIT processing

-#CC = gcc -m64 $(GCC_CFLAGS)
-CC = clang -m64 $(CLANG_CFLAGS)
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)

 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
--- a/bin/makefile-init-openbsd.x86_64
+++ b/bin/makefile-init-openbsd.x86_64
@@ -0,0 +1,27 @@
+# Options for OpenBSD, Intel x86_64 and X-Window
+
+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 = -I/usr/X11R6/include -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g3
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/usr/X11R6/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/X11R6/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit
--- a/bin/makefile-linux.aarch64-x
+++ b/bin/makefile-linux.aarch64-x
@@ -1,4 +1,4 @@
-# Options for Linux, ARMv7 and X-Window
+# Options for Linux, aarch64 and X-Window

 CC = gcc $(GCC_CFLAGS)
 #CC = clang $(CLANG_CFLAGS)
--- a/bin/makeright
+++ b/bin/makeright
@@ -74,6 +74,16 @@ case "$display" in
 	sdl)	releasename=${osversion}.${architecture}-${display}
 		ldename=ldesdl
 		;;
+	wasm)	osversion=emscripten
+		architecture=wasm
+		releasename=${osversion}.${architecture}-${display}
+		ldename=ldesdl.js
+		;;
+	wasm_nl) osversion=emscripten
+		architecture=wasm_nl
+		releasename=${osversion}.${architecture}-${display}
+		ldename=ldesdl.js
+		;;
 	*)	echo "display-option: $display is not supported."
 		exit
 		;;
--- a/bin/osversion
+++ b/bin/osversion
@@ -1,5 +1,6 @@
 #!/bin/sh
-os=${LDEARCH:-`./config.guess`}
+SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+os=${LDEARCH:-`$SCRIPTPATH/config.guess`}
 case "$os" in
        m68k-*-amigaos)		echo amigaos ;;
        sparc-sun-sunos*)	echo sunos4 ;;
@@ -11,6 +12,7 @@ case "$os" in
        *-*-openbsd*)		echo openbsd ;;
        *-*-freebsd*)		echo freebsd ;;
 	*-*-cygwin*)            echo cygwin ;;
+	*-*-haiku*)             echo haiku ;;
 esac
 ### Don't leave the variable set.
 unset os
--- a/inc/adr68k.h
+++ b/inc/adr68k.h
@@ -63,8 +63,8 @@ static inline DLword StackOffsetFromNative(void *SAddr)
 {
  /* Stack offsets are expressed as an offset in DLwords from the stack base */
  ptrdiff_t hoffset = (DLword *)SAddr - Stackspace;
-  if (hoffset > 0xffff) {
-    printf("Stack offset is too large: 0x%tx\n", hoffset);
+  if (hoffset > 0xffff || hoffset < 0) {
+    printf("Stack offset is out of range: 0x%tx\n", hoffset);
  }
  return (DLword)hoffset;
 }
--- a/inc/dbprint.h
+++ b/inc/dbprint.h
@@ -40,7 +40,7 @@ extern int flushing;
 #endif

 #ifdef DEBUG
-#define DBPRINT(X) do {printf X ; if (flushing) fflush(stdout); } while(0)
+#define DBPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X ; if (flushing) fflush(stdout); } while(0)
 #define DEBUGGER(X) X
 #else
 #define DBPRINT(X) if (0) do {printf X ; } while(0)
@@ -51,7 +51,7 @@ extern int flushing;
 	/* For trace print statements */

 #ifdef TRACE
-#define TPRINT(X) do {  printf X; if (flushing) fflush(stdout); } while (0)
+#define TPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X; if (flushing) fflush(stdout); } while (0)
 #define TRACER(X) X
 #else /* TRACE */

@@ -64,7 +64,7 @@ extern int flushing;
 	/* For tracing individual opcode executions */

 #ifdef OPTRACE
-#define OPTPRINT(X) do { printf X; if (flushing) fflush(stdout); } while (0)
+#define OPTPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X; if (flushing) fflush(stdout); } while (0)
 #define OPTRACER(X) X
 #else
 #define OPTPRINT(X) if (0) do {  printf X; } while (0)
@@ -75,7 +75,7 @@ extern int flushing;
 	/* For tracing function calls */

 #ifdef FNTRACE
-#define FNTPRINT(X) do { printf X; if (flushing) fflush(stdout); } while (0)
+#define FNTPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X; if (flushing) fflush(stdout); } while (0)
 #define FNTRACER(X)  X
 #else
 #define FNTPRINT(X) if (0) do {  printf X; } while (0)
@@ -86,7 +86,7 @@ extern int flushing;
 	/* For function-call & return stack checking */

 #ifdef FNSTKCHECK
-#define FNCHKPRINT(X) do { printf X ; if (flushing) fflush(stdout); } while (0)
+#define FNCHKPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X ; if (flushing) fflush(stdout); } while (0)
 #define FNCHECKER(X) X
 #else
 #define FNCHKPRINT(X) if (0) do {  printf X; } while (0)
--- a/inc/keyeventdefs.h
+++ b/inc/keyeventdefs.h
@@ -4,6 +4,7 @@
 void process_io_events(void);
 void kb_trans(u_short keycode, u_short upflg);
 void taking_mouse_down(void);
+void taking_mouse_up(int newx, int newy);
 void copy_cursor(int newx, int newy);
 void cursor_hidden_bitmap(int x, int y);
 #endif
--- a/inc/locfile.h
+++ b/inc/locfile.h
@@ -194,8 +194,9 @@ do  {				\
 #endif /* min */

 #define	LispNumToCInt(Lisp)					\
-	( (((Lisp) & SEGMASK) == S_POSITIVE) ?                  \
-          ((Lisp) & 0xFFFF) : (*((int *)(NativeAligned4FromLAddr(Lisp)))) )
+       ( (((Lisp) & SEGMASK) == S_POSITIVE) ? ((Lisp) & 0xFFFF) : \
+          (((Lisp) & SEGMASK) == S_NEGATIVE) ? ((Lisp) | 0xFFFF0000) : \
+          (*((int *)(NativeAligned4FromLAddr(Lisp)))) )

 #define	UPLOWDIFF	0x20

--- a/inc/maiko/platform.h
+++ b/inc/maiko/platform.h
@@ -83,6 +83,19 @@
 #  define MAIKO_OS_DETECTED 1
 #endif

+#ifdef __EMSCRIPTEN__
+#  define MAIKO_OS_LINUX 1
+#  define MAIKO_OS_EMSCRIPTEN 1
+#  define MAIKO_OS_NAME "Emscripten"
+#  define MAIKO_EMULATE_TIMER_INTERRUPTS 1
+#  define MAIKO_EMULATE_ASYNC_INTERRUPTS 1
+#  define MAIKO_OS_UNIX_LIKE 1
+#  define MAIKO_OS_DETECTED
+#  define MAIKO_ARCH_NAME "WebAssembly"
+#  define MAIKO_ARCH_WORD_BITS 32
+#  define MAIKO_ARCH_DETECTED 1
+#endif
+
 /* __x86_64__: GNU C, __x86_64: Sun Studio, _M_AMD64: Visual Studio */
 #if defined(__x86_64__) || defined(__x86_64) || defined(_M_AMD64)
 #  define MAIKO_ARCH_X86_64 1
@@ -153,6 +166,12 @@
 #  define MAIKO_ARCH_DETECTED 1
 #endif

+#ifdef __HAIKU__
+#  define MAIKO_OS_HAIKU 1
+#  define MAIKO_OS_NAME "Haiku"
+#  define MAIKO_OS_UNIX_LIKE 1
+#  define MAIKO_OS_DETECTED 1
+#endif
 /* Modern GNU C, Clang, Sun Studio  provide __BYTE_ORDER__
 * Older GNU C (ca. 4.0.1) provides __BIG_ENDIAN__/__LITTLE_ENDIAN__
 */
--- a/inc/return.h
+++ b/inc/return.h
@@ -37,7 +37,7 @@
 #define FastRetCALL							\
  do {									\
    /* Get IVar from Returnee's IVAR offset slot(BF) */ 			\
-    IVar = NativeAligned2FromLAddr(STK_OFFSET | GETWORD((DLword *)CURRENTFX -1)); \
+    IVar = NativeAligned2FromStackOffset(GETWORD((DLword *)CURRENTFX - 1)); \
    /* Get FuncObj from Returnee's FNHEAD slot in FX */ 			\
    FuncObj = (struct fnhead *)NativeAligned4FromLAddr(FX_FNHEADER);	        \
    /* Get PC from Returnee's pc slot in FX */ 				\
@@ -47,7 +47,7 @@
 #define FastRetCALL							\
  do {									\
    /* Get IVar from Returnee's IVAR offset slot(BF) */ 			\
-    IVar = NativeAligned2FromLAddr(STK_OFFSET | GETWORD((DLword *)CURRENTFX -1)); \
+    IVar = NativeAligned2FromStackOffset(GETWORD((DLword *)CURRENTFX - 1)); \
    /* Get FuncObj from Returnee's FNHEAD slot in FX */ 			\
    FuncObj = (struct fnhead *)NativeAligned4FromLAddr(FX_FNHEADER);	        \
    /* Get PC from Returnee's pc slot in FX */ 				\
--- a/inc/stack.h
+++ b/inc/stack.h
@@ -79,22 +79,22 @@ typedef struct fnhead {
 } FNHEAD;

 typedef struct frameex1 {
-  unsigned flags : 3;
-  unsigned fast : 1;
-  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
-  unsigned incall : 1;
-  unsigned 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 */
-  unsigned nopush : 1;
-  unsigned 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) */
-  unsigned hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
-  unsigned 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) */
-  unsigned hi1nametable : 8; /* ptr to NameTable of this FrameEx (Hi1 addr) */
-  unsigned 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 {
-  unsigned flags : 3;
-  unsigned fast : 1;
-  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
-  unsigned incall : 1;
-  unsigned 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 */
-  unsigned nopush : 1;
-  unsigned 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,11 +135,11 @@ typedef struct fxblock {
 } FXBLOCK;

 typedef struct basic_frame {
-  unsigned flags : 3;
-  unsigned nil : 3;
-  unsigned residual : 1;
-  unsigned padding : 1;
-  unsigned 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;
@@ -185,33 +185,33 @@ typedef struct fnhead {
  unsigned nil3 : 2;       /* not used */
  unsigned nil2 : 2;       /* not used */
 #endif /* BIGVM */
-  unsigned argtype : 2;     /* ?? */
-  unsigned byteswapped : 1; /* code was reswapped.	*/
-  unsigned nil4 : 1;        /* not used, prev: native translated? */
-  unsigned 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 */
-  unsigned 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) */
-  unsigned usecount : 8;
-  unsigned nopush : 1;
-  unsigned 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 */
-  unsigned incall : 1;
-  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
-  unsigned fast : 1;
-  unsigned 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
-  unsigned hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
-  unsigned 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
-  unsigned hi2nametable : 8; /* pointer to NameTable of this FX (Hi2 addr) */
-  unsigned 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) */
-  unsigned usecount : 8;
-  unsigned nopush : 1;
-  unsigned 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 */
-  unsigned incall : 1;
-  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
-  unsigned fast : 1;
-  unsigned 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,11 +261,11 @@ typedef struct fxblock {

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

 } Bframe;

--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -1664,7 +1664,7 @@ void ccfuncall(unsigned int atom_index, int argnum, int bytenum)
  CURRENTFX->nextblock = (LAddrFromNative(CurrentStackPTR) & 0x0ffff) - (argnum << 1) + 4 /* +3  */;

  /* Setup IVar */ /* XXX: is it really only 2-byte aligned? */
-  IVar = NativeAligned2FromLAddr((((LispPTR)(CURRENTFX->nextblock)) | STK_OFFSET));
+  IVar = NativeAligned2FromStackOffset(CURRENTFX->nextblock);

  /* Set PC to the Next Instruction and save into FX */
  CURRENTFX->pc = ((UNSIGNED)PC - (UNSIGNED)FuncObj) + bytenum;
@@ -1799,7 +1799,7 @@ void tedit_bltchar(LispPTR *args)

 } /* end tedit_bltchar */

-#if defined(REALCURSOR) || defined(SUNDISPLAY)
+#if defined(REALCURSOR)
 #ifndef COLOR
 /* Lisp addr hi-word, lo-word, ... */
 static int old_cursorin(DLword addrhi, DLword addrlo, int x, int w, int h, int y, int backward)
@@ -1866,4 +1866,4 @@ static int old_cursorin(DLword addrhi, DLword addrlo, int x, int w, int h, int y
  } /* COLOR case end */
 }
 #endif /* COLOR */
-#endif /* defined(REALCURSOR) || defined(SUNDISPLAY) */
+#endif /* defined(REALCURSOR) */
--- a/src/common.c
+++ b/src/common.c
@@ -64,14 +64,14 @@ LispPTR Uraid_mess = NIL;
 int error(const char *cp) {
  char *ptr;
  if (device_before_raid() < 0) {
-    fprintf(stderr, "Can't Enter URAID.\n");
+    (void)fprintf(stderr, "Can't Enter URAID.\n");
    exit(-1);
  }
  /* comm read */
  URaid_errmess = cp;
-  fprintf(stderr, "\n*Error* %s\n", cp);
+  (void)fprintf(stderr, "\n*Error* %s\n", cp);
  fflush(stdin);
-  fprintf(stderr, "Enter the URaid\n");
+  (void)fprintf(stderr, "Enter the URaid\n");
  print(Uraid_mess);
  putchar('\n');
  /* XXX: make sure output is flushed so we can see where we are */
--- a/src/dbgtool.c
+++ b/src/dbgtool.c
@@ -303,14 +303,14 @@ int sf(struct frameex1 *fx_addr68k) {
  if (((fx_addr68k)->alink & 1) == 0) { /* FAST */
    bf = (Bframe *)(((DLword *)fx_addr68k) - 2);
  } else { /* SLOW */
-    bf = (Bframe *)NativeAligned4FromLAddr(((fx_addr68k)->blink + STK_OFFSET));
+    bf = (Bframe *)NativeAligned4FromStackOffset((fx_addr68k)->blink);
  }

  /* Print IVARs */
  printf("IVAR -------\n");
  BT_morep;

-  ptr = NativeAligned2FromLAddr(STK_OFFSET + bf->ivar);
+  ptr = NativeAligned2FromStackOffset(bf->ivar);
  i = 0;
  while (ptr != (DLword *)bf) {
    ptrlo = ptr + 1;
@@ -475,7 +475,7 @@ int sf(struct frameex1 *fx_addr68k) {
      i++;
    }
    if (fx_addr68k->alink == 11) /* for contextsw */
-      next68k = (DLword *)NativeAligned2FromLAddr((fx_addr68k->nextblock + STK_OFFSET));
+      next68k = NativeAligned2FromStackOffset(fx_addr68k->nextblock);

    else
      next68k = CurrentStackPTR;
@@ -493,7 +493,7 @@ int sf(struct frameex1 *fx_addr68k) {
    return (-1);
  }

-  next68k = (DLword *)NativeAligned2FromLAddr((fx_addr68k->nextblock + STK_OFFSET));
+  next68k = NativeAligned2FromStackOffset(fx_addr68k->nextblock);
  ptr = (DLword *)(fx_addr68k + 1);

  i = 0;
--- a/src/dir.c
+++ b/src/dir.c
@@ -2150,7 +2150,8 @@ LispPTR COM_next_file(LispPTR *args)
  propp = gfsp->propp;

  dfp = &FinfoArray[finfoid];
-  if (dfp->head == (FINFO *)0 || (fp = dfp->next) == (FINFO *)0) return (SMALLP_MINUSONE);
+  fp = dfp->next;
+  if (dfp->head == NULL || fp == NULL) return (SMALLP_MINUSONE);
  dfp->next = fp->next;

  laddr = gfsp->name;
--- a/src/dlpi.c
+++ b/src/dlpi.c
@@ -188,7 +188,7 @@ int setup_dlpi_dev(char *device)
  dlbindreq(fd, 0x0600, 0, DL_CLDLS, 0, 0);

  if (dlbindack(fd, buf) < 0) {
-    fprintf(stderr, "%s: dlbindack failed.\n", pname);
+    (void)fprintf(stderr, "%s: dlbindack failed.\n", pname);
    return (-1);
  }

@@ -202,14 +202,14 @@ int setup_dlpi_dev(char *device)
  dlpromisconreq(fd, DL_PROMISC_SAP);

  if (dlokack(fd, buf) < 0) {
-    fprintf(stderr, "%s: DL_PROMISC_SAP failed.\n", pname);
+    (void)fprintf(stderr, "%s: DL_PROMISC_SAP failed.\n", pname);
    return (-1);
  }

  dlpromisconreq(fd, DL_PROMISC_MULTI);

  if (dlokack(fd, buf) < 0) {
-    fprintf(stderr, "%s: DL_PROMISC_MULTI failed.\n", pname);
+    (void)fprintf(stderr, "%s: DL_PROMISC_MULTI failed.\n", pname);
    return (-1);
  }

@@ -329,8 +329,8 @@ int dlpi_devtype(int fd)
    case DL_FDDI: return (DLT_FDDI);
 #endif
    default:
-      fprintf(stderr, "%s: DLPI MACtype %ld unknown, ", pname, (long)dlp->info_ack.dl_mac_type);
-      fprintf(stderr, "assuming ethernet.\n");
+      (void)fprintf(stderr, "%s: DLPI MACtype %ld unknown, ", pname, (long)dlp->info_ack.dl_mac_type);
+      (void)fprintf(stderr, "assuming ethernet.\n");
      return (DLT_EN10MB);
  }
 }
@@ -585,7 +585,7 @@ static int strgetmsg(int fd, struct strbuf *ctlp, struct strbuf *datap, int *fla
 /*
 * sigalrm - handle alarms.
 */
-static void sigalrm(int sig) { (void)fprintf(stderr, "dlpi: timeout\n"); }
+static void sigalrm(int sig) { (void)(void)fprintf(stderr, "dlpi: timeout\n"); }

 /*
 * savestr - save string in dynamic memory.
@@ -595,7 +595,7 @@ static char *savestr(char *s)
  char *t;

  if ((t = malloc(strlen(s) + 1)) == NULL) {
-    (void)fprintf(stderr, "%s: out of memory.\n", pname);
+    (void)(void)fprintf(stderr, "%s: out of memory.\n", pname);
    (void)exit(1);
  }

--- a/src/dsk.c
+++ b/src/dsk.c
@@ -3053,10 +3053,8 @@ static int get_version_array(char *dir, char *file, FileName *varray, CurrentVAr
  FileName *svarray;
  DIR *dirp;
  struct dirent *dp;
-  /* Used in commented out code below:
  int rval;
  struct stat sbuf;
-  */

  /*
   * First of all, prepare a lower cased file name for the case insensitive
@@ -3066,20 +3064,14 @@ static int get_version_array(char *dir, char *file, FileName *varray, CurrentVAr
  separate_version(lcased_file, ver, 1);
  DOWNCASE(lcased_file);

-  /*
-          TIMEOUT(rval = stat(dir, &sbuf));
-          if (rval == -1) {
-                  *Lisp_errno = errno;
-                  return(0);
-          }
-  */
+  TIMEOUT(rval = stat(dir, &sbuf));
+  if (rval == -1) {
+    *Lisp_errno = errno;
+    return(0);
+  }

  /*
-   * If the cached version array is still valid, we can return immediately.
-   */
-
-  /*
-   * Cache mechanism is not used now, because of the bug of Sun OS.
+   * Cache mechanism was not used because of a bug in Sun OS.
   * Sometimes just after unlinking a file on a directory, the st_mtime
   * of the directory does not change.  This will make Maiko believe
   * cached version array is still valid, although it is already invalid.
@@ -3087,9 +3079,15 @@ static int get_version_array(char *dir, char *file, FileName *varray, CurrentVAr
   */

  /*
-          if ((sbuf.st_mtime == cache->mtime) && strcmp(dir, cache->path) == 0
-              && strcmp(lcased_file, cache->file) == 0) return(1);
-  */
+   * If the cached version array is still valid, we can return immediately.
+   */
+
+#if 0
+  /* there is a (different?) problem (#1661) with the caching - disable until it's solved */
+  if ((sbuf.st_mtime == cache->mtime) && strcmp(dir, cache->path) == 0
+      && strcmp(lcased_file, cache->file) == 0) return(1);
+#endif
+
  errno = 0;
  TIMEOUT0(dirp = opendir(dir));
  if (dirp == NULL) {
@@ -3140,11 +3138,9 @@ static int get_version_array(char *dir, char *file, FileName *varray, CurrentVAr
  /*
   * Update cache information.
   */
-  /*
-          strcpy(cache->path, dir);
-          strcpy(cache->file, lcased_file);
-          cache->mtime = sbuf.st_mtime;
-  */
+  strcpy(cache->path, dir);
+  strcpy(cache->file, lcased_file);
+  cache->mtime = sbuf.st_mtime;
  TIMEOUT(closedir(dirp));
  return (1);
 #endif /* DOS */
--- a/src/dspif.c
+++ b/src/dspif.c
@@ -59,8 +59,8 @@ void make_dsp_instance(DspInterface dsp, char *lispbitmap, int width_hint, int h
      } else if (VGA_p()) {
        VGA_init(dsp, 0, 0, 0, depth_hint);
      } else { /* Can't set *ANY* video mode! */
-        (void)fprintf(stderr, "No portable graphics mode supported by this host.\n");
-        (void)fprintf(stderr, "\n-Expected VESA or VGA.\n");
+        (void)(void)fprintf(stderr, "No portable graphics mode supported by this host.\n");
+        (void)(void)fprintf(stderr, "\n-Expected VESA or VGA.\n");
        exit(1);
      }
      break;
@@ -69,7 +69,7 @@ void make_dsp_instance(DspInterface dsp, char *lispbitmap, int width_hint, int h
 #elif XWINDOW
  /* lispbitmap is 0 when we call X_init the first time. */
  if (X_init(dsp, 0, LispDisplayRequestedWidth, LispDisplayRequestedHeight, depth_hint) == NULL) {
-    fprintf(stderr, "Can't open display.");
+    (void)fprintf(stderr, "Can't open display.");
    exit(-1);
  }
 #endif /* DOS | XWINDOW */
@@ -87,7 +87,7 @@ void GenericReturnVoid(void *d) {(void)d; return; }
 void GenericPanic(void *d) {
  (void)d;
  TPRINT(("Enter GenericPanic\n"));
-  fprintf(stderr, "Panic! Call to uninitialized display slot!");
+  (void)fprintf(stderr, "Panic! Call to uninitialized display slot!");
  exit(0);
 }

--- a/src/findkey.c
+++ b/src/findkey.c
@@ -45,7 +45,7 @@ LispPTR N_OP_findkey(LispPTR tos, int byte) {
 #endif

  if (CURRENTFX->alink & 1) { /* slow case */
-    find_end = (DLword *)NativeAligned2FromLAddr(STK_OFFSET | (CURRENTFX->blink - 4));
+    find_end = NativeAligned2FromStackOffset(CURRENTFX->blink - 4);
  } else { /*  Fast cae */
    find_end = ((DLword *)CURRENTFX) - 2 - 4;
  }
--- a/src/gcfinal.c
+++ b/src/gcfinal.c
@@ -97,6 +97,18 @@ struct buf {
 };
 #endif /* BIGVM */
 #else
+#ifdef BIGVM
+struct buf {
+  LispPTR filepage;
+  LispPTR vmempage;
+  LispPTR buffernext;
+  unsigned sysnext : 28;
+  unsigned unused : 1;
+  unsigned iodirty : 1;
+  unsigned usermapped : 1;
+  unsigned noreference : 1;
+};
+#else
 struct buf {
  LispPTR filepage;
  LispPTR vmempage;
@@ -107,6 +119,7 @@ struct buf {
  unsigned usermapped : 1;
  unsigned noreference : 1;
 };
+#endif /* BIGVM */
 #endif /* BYTESWAP */

 /************* The following procedure is common !! **************************/
@@ -192,8 +205,6 @@ LispPTR checkarrayblock(LispPTR base, LispPTR free, LispPTR onfreelist) {
  {
    bbase = (struct arrayblock *)NativeAligned4FromLAddr(base);
    btrailer = (struct arrayblock *)NativeAligned4FromLAddr(Trailer(base, bbase));
-    bfwd = (struct arrayblock *)NativeAligned4FromLAddr(bbase->fwd);
-    bbwd = (struct arrayblock *)NativeAligned4FromLAddr(bbase->bkwd);
    if (bbase->password != ARRAYBLOCKPASSWORD) {
      printarrayblock(base);
      error("ARRAYBLOCK password wrong\n");
@@ -213,9 +224,11 @@ LispPTR checkarrayblock(LispPTR base, LispPTR free, LispPTR onfreelist) {
      printarrayblock(base);
      error("ARRAYBLOCK Trailer INUSE bit set wrong\n");
    } else if (!onfreelist || (bbase->arlen < MINARRAYBLOCKSIZE))
-      /* Remaining tests only for free list. */
      return (NIL);
-    else if ((bbwd->fwd != base) || (bfwd->bkwd != base)) {
+    /* 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)) {
      error("ARRAYBLOCK links fouled\n");
    } else {
      fbl = FreeBlockChainN(bbase->arlen);
@@ -337,7 +350,6 @@ LispPTR makefreearrayblock(LispPTR block, DLword length) {
 /*									*/
 /*									*/
 /************************************************************************/
-
 LispPTR arrayblockmerger(LispPTR base, LispPTR nbase) {
  DLword arlens, narlens, secondbite, minblocksize, shaveback;
  struct arrayblock *bbase, *bnbase;
@@ -346,12 +358,23 @@ LispPTR arrayblockmerger(LispPTR base, LispPTR nbase) {
  arlens = bbase->arlen;
  narlens = bnbase->arlen;
  secondbite = MAXARRAYBLOCKSIZE - arlens;
-  if (narlens > secondbite) {
+  /* There are three cases for merging the blocks
+   * (1) the total size of the two blocks is less than max:
+   *     merge into a single block
+   * (2) creating a max size block leaves a viable leftover block:
+   *     move the boundary to make a max block and a leftover block
+   * (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) {
+    error("Attempt to merge non-adjacent blocks in array space\n");
+  }
+  if (narlens > secondbite) { /* (2) or (3) */
    arlens = MAXARRAYBLOCKSIZE;
    narlens = narlens - secondbite;
    minblocksize =
        ((*Hunk_word == ATOM_T) ? (ARRAYBLOCKOVERHEADCELLS + MAXCELLSPERHUNK) : MINARRAYBLOCKSIZE);
-    if (narlens < minblocksize) {
+    if (narlens < minblocksize) { /* (3) */
      shaveback = narlens - minblocksize;
      narlens = minblocksize;
      arlens += shaveback;
@@ -375,10 +398,10 @@ LispPTR mergebackward(LispPTR base) {
  LispPTR pbase;
  struct arrayblock *ptrailer;

-  ptrailer = (struct arrayblock *)NativeAligned4FromLAddr(base - ARRAYBLOCKTRAILERWORDS);
  if (base == NIL)
    return (NIL);
-  else if ((*ArrayMerging_word == NIL) ||
+  ptrailer = (struct arrayblock *)NativeAligned4FromLAddr(base - ARRAYBLOCKTRAILERWORDS);
+  if ((*ArrayMerging_word == NIL) ||
           ((base == *ArraySpace_word) || ((base == *ArraySpace2_word) || (ptrailer->inuse == T))))
    return (linkblock(base));
  pbase = base - 2 * ptrailer->arlen;
@@ -398,16 +421,18 @@ LispPTR mergebackward(LispPTR base) {
 LispPTR mergeforward(LispPTR base) {
  LispPTR nbase, nbinuse;
  struct arrayblock *bbase, *bnbase;
+  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);
+  if (nbase == *ArrayFrLst_word || nbase == *ArrayFrLst2_word) return NIL;
+
  bnbase = (struct arrayblock *)NativeAligned4FromLAddr(nbase);
-  if ((*ArrayMerging_word == NIL) ||
-      ((base == NIL) ||
-       (checkarrayblock(base, T, T) ||
-        ((nbase == *ArrayFrLst_word) ||
-         ((nbase == *ArrayFrLst2_word) ||
-          (checkarrayblock(nbase, (!(nbinuse = bnbase->inuse)), NIL) || nbinuse))))))
-    return (NIL);
+  nbinuse = bnbase->inuse;
+  if (checkarrayblock(nbase, !nbinuse, NIL)) return NIL;
+  if (nbinuse) return (NIL);
  deleteblock(nbase);
  deleteblock(base);
  return (arrayblockmerger(base, nbase));
--- a/src/inet.c
+++ b/src/inet.c
@@ -107,8 +107,14 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
      addr_class = LispNumToCInt(nameConn);
      protocol = LispNumToCInt(proto);
      result = socket(addr_class, protocol, 0);
+#ifndef MAIKO_OS_HAIKU
      fcntl(result, F_SETFL, fcntl(result, F_GETFL, 0) | O_ASYNC | O_NONBLOCK);
+#else
+      fcntl(result, F_SETFL, fcntl(result, F_GETFL, 0) | O_NONBLOCK);
+#endif
+#ifdef F_SETOWN
      fcntl(result, F_SETOWN, getpid());
+#endif

      return (GetSmallp(result));
    case TCPconnect: /* args: hostname or (fixp)address, socket# */
@@ -131,7 +137,9 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
        return (NIL);
      }
      fcntl(result, F_SETFL, fcntl(result, F_GETFL, 0) | O_NONBLOCK);
+#ifdef F_SETOWN
      fcntl(result, F_SETOWN, getpid());
+#endif

      return (GetSmallp(result));

@@ -197,13 +205,20 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
        sigset_t signals;

        sigemptyset(&signals);
+#ifndef MAIKO_OS_HAIKU
        sigaddset(&signals, SIGIO);
-
+#endif
        sigprocmask(SIG_BLOCK, &signals, NULL);

+#ifndef MAIKO_OS_HAIKU
        fcntl(result, F_SETFL, fcntl(result, F_GETFL, 0) | O_ASYNC | O_NONBLOCK);
-        fcntl(result, F_SETOWN, getpid());
+#else
+        fcntl(result, F_SETFL, fcntl(result, F_GETFL, 0) | O_NONBLOCK);
+#endif

+#ifdef F_SETOWN
+	fcntl(result, F_SETOWN, getpid());
+#endif
        if (listen(result, 5) == -1) {
          perror("TCP Listen");
          close(result);
@@ -225,8 +240,9 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
        return (NIL);
      }
      fcntl(result, F_SETFL, fcntl(result, F_GETFL, 0) | O_NONBLOCK);
+#ifdef F_SETOWN
      fcntl(result, F_SETOWN, getpid());
-
+#endif
      return (GetSmallp(result));

    case INETpeername: /* socket#, buffer for name string */
@@ -259,9 +275,14 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
        close(result);
        return (NIL);
      }
+#ifndef MAIKO_OS_HAIKU
      fcntl(result, F_SETFL, fcntl(result, F_GETFL, 0) | O_ASYNC | O_NONBLOCK);
+#else
+      fcntl(result, F_SETFL, fcntl(result, F_GETFL, 0) | O_NONBLOCK);
+#endif
+#ifdef F_SETOWN
      fcntl(result, F_SETOWN, getpid());
-
+#endif
      FD_SET(result, &LispIOFds);  /* so we get interrupts */
      FD_SET(result, &LispReadFds);
      DBPRINT(("LispIOFds = %p\n", (void *)&LispIOFds));
--- a/src/initkbd.c
+++ b/src/initkbd.c
@@ -375,8 +375,6 @@ static u_char *make_X_keymap(void) {
    table[xcode - 7] = code;
  }

-  XFree(mapping); /* No locking required? */
-
 #ifdef DEBUG
  printf("\n\n\tXGetKeyboardMapping table\n\n");
  for (i = 0; i < codecount * symspercode; i += symspercode) {
@@ -394,6 +392,8 @@ static u_char *make_X_keymap(void) {
  }
 #endif /* DEBUG */

+  XFree(mapping); /* No locking required? */
+
  return (table);
 }

--- a/src/initsout.c
+++ b/src/initsout.c
@@ -37,7 +37,7 @@
 #include "ifpage.h"        // for IFPAGE, MACHINETYPE_MAIKO
 #include "initsoutdefs.h"  // for build_lisp_map, fixp_value, init_for_bitblt
 #include "iopage.h"        // for IOPAGE
-#include "lispemul.h"      // for LispPTR, DLword, NIL, BYTESPER_DLWORD
+#include "lispemul.h"      // for LispPTR, DLword, NIL, BYTESPER_DLWORD, POINTERMASK
 #include "lispmap.h"       // for ATMHT_OFFSET, ATOMS_OFFSET, DEFS_OFFSET
 #include "lspglob.h"       // for InterfacePage, IOPage, AtomHT, Closure_Cac...
 #include "lsptypes.h"      // for GetDTD, TYPE_FIXP, TYPE_LISTP
@@ -124,7 +124,7 @@ void init_ifpage(unsigned sysout_size) {
  new_lastvmem = (sysout_size * PAGES_IN_MBYTE) - 1;

  if ((!Storage_expanded) && (InterfacePage->dllastvmempage != new_lastvmem)) {
-    fprintf(stderr, "You can't expand VMEM\n");
+    (void)fprintf(stderr, "You can't expand VMEM\n");
    exit(-1);
  } else { /* Set value which will be set to \\LASTVMEMFILEPAGE in LISP */
    InterfacePage->dllastvmempage = new_lastvmem;
@@ -140,9 +140,9 @@ void init_ifpage(unsigned sysout_size) {
 #endif /* BIGVM */

  /* unfortunately, Lisp only looks at a 16 bit serial number */
-#ifndef DOS
+#if !defined(DOS) && !defined(MAIKO_OS_HAIKU)
  InterfacePage->serialnumber = 0xffff & gethostid();
-#endif /* DOS */
+#endif /* DOS MAIKO_OS_HAIKU */

 /* get user name and stuff into vmem; this is the VMEM buffer;
 This is a BCPL string -- it starts with a length count. C strings
@@ -405,7 +405,9 @@ void init_for_keyhandle(void) {
  MOUSECHORDTICKS68k = MakeAtom68k("\\MOUSECHORDTICKS");
  LASTUSERACTION68k = MakeAtom68k("\\LASTUSERACTION");

-  CLastUserActionCell68k = (LispPTR *)NativeAligned4FromLAddr(*LASTUSERACTION68k & 0xffffff);
+#ifndef INIT
+  CLastUserActionCell68k = (LispPTR *)NativeAligned4FromLAddr(*LASTUSERACTION68k & POINTERMASK);
+#endif

  DOBUFFEREDTRANSITION_index = MAKEATOM("\\DOBUFFEREDTRANSITIONS");
  INTERRUPTFRAME_index = MAKEATOM("\\INTERRUPTFRAME");
--- a/src/lde.html
+++ b/src/lde.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<!-- Based on https://github.com/timhutton/sdl-canvas-wasm/blob/main/index.html -->
+<!-- html to set up WebAssembly module for Medley running in a browser -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  </head>
+  <body>
+    <div style="text-align: center;">
+      <canvas id="canvas" oncontextmenu="event.preventDefault()"></canvas>
+    </div>
+    <script type="text/javascript">
+      var width = 32*Math.trunc(Math.min(Math.max(window.innerWidth, 512), 1664)/32);
+      var height = Math.min(Math.max(window.innerHeight, 512), 1260);
+      var Module = {
+          preRun: [ function() {ENV.MEDLEYDIR = "{DSK}<medley>";} ],
+          arguments: ["medley/loadups/full.sysout","-sc", width+"x"+height, "-nh-host", "127.0.0.1"],
+          canvas: (function() { return document.getElementById('canvas'); })()
+      };
+    </script>
+    <script src="ldesdl.js"></script>
+  </body>
+</html>
--- a/src/ldeboot.c
+++ b/src/ldeboot.c
@@ -93,7 +93,7 @@ int main(int argc, char *argv[]) {
  for (i = 1; i < argc; i++) {
    if ((strcmp(argv[i], "-d") == 0) || (strcmp(argv[i], "-display") == 0)) {
      if (i == argc - 1) {
-        fprintf(stderr, "Missing argument to -display option.\n");
+        (void)fprintf(stderr, "Missing argument to -display option.\n");
        exit(1);
      }
      displayName = argv[++i];
@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
      filetorun = LDEX;
      goto run;
    } else {
-      fprintf(stderr, "Unable to open X11 display %s\n",
+      (void)fprintf(stderr, "Unable to open X11 display %s\n",
              displayName ? displayName : "from DISPLAY");
      exit(1);
    }
@@ -147,7 +147,7 @@ int main(int argc, char *argv[]) {

 #ifdef USESUNSCREEN
  if ((FrameBufferFd = open("/dev/fb", O_RDWR)) < 0) {
-    fprintf(stderr, "lde: can't open FrameBuffer\n");
+    (void)fprintf(stderr, "lde: can't open FrameBuffer\n");
    exit(1);
  }
  if (ioctl(FrameBufferFd, FBIOGTYPE, &my_screen) < 0) {
@@ -187,7 +187,7 @@ int main(int argc, char *argv[]) {

  run:
  if (filetorun == NULL) {
-    fprintf(stderr, "Unable to determine what display program to run.\n");
+    (void)fprintf(stderr, "Unable to determine what display program to run.\n");
    exit(1);
  }

@@ -201,6 +201,7 @@ int main(int argc, char *argv[]) {
  } else {
    /* copy up to and including the final "/" in the path */
    dirsepp = stpncpy(filetorunpath, argv[0], dirsepp + 1 - argv[0]);
+
    /* dirsepp now points to the trailing null in the copy */
    strncpy(dirsepp, filetorun, PATH_MAX - (dirsepp - filetorunpath));
    argv[0] = filetorunpath;
--- a/src/ldsout.c
+++ b/src/ldsout.c
@@ -121,14 +121,14 @@ unsigned sysout_loader(const char *sysout_file_name, unsigned sys_size) {
 */
 #ifndef NOVERSION
  if (ifpage.lversion < LVERSION) {
-    fprintf(stderr, "Lisp VM is too old for this emulator.\n");
-    fprintf(stderr, "(version is %d, must be at least %d.)\n", ifpage.lversion, LVERSION);
+    (void)fprintf(stderr, "Lisp VM is too old for this emulator.\n");
+    (void)fprintf(stderr, "(version is %d, must be at least %d.)\n", ifpage.lversion, LVERSION);
    exit(-1);
  }

  if (ifpage.minbversion > MINBVERSION) {
-    fprintf(stderr, "Emulator is too old for this Lisp VM.\n");
-    fprintf(stderr, "(version is %d, must be at least %d.)\n", MINBVERSION, ifpage.minbversion);
+    (void)fprintf(stderr, "Emulator is too old for this Lisp VM.\n");
+    (void)fprintf(stderr, "(version is %d, must be at least %d.)\n", MINBVERSION, ifpage.minbversion);
    exit(-1);
  }
 #endif /* NOVERSION */
@@ -157,9 +157,9 @@ unsigned sysout_loader(const char *sysout_file_name, unsigned sys_size) {
      /* Hence we have to observe the display protocol. */
      VESA_errorexit(tmp);
 #else
-      fprintf(stderr, "sysout_loader: You can't specify the process size.\n");
-      fprintf(stderr, "Because, secondary space is already used.\n");
-      fprintf(stderr, "(size is %d, you specified %d.)\n", ifpage.process_size, sys_size);
+      (void)fprintf(stderr, "sysout_loader: You can't specify the process size.\n");
+      (void)fprintf(stderr, "Because, secondary space is already used.\n");
+      (void)fprintf(stderr, "(size is %d, you specified %d.)\n", ifpage.process_size, sys_size);
      exit(-1);
 #endif /* DOS */
    }
@@ -176,7 +176,7 @@ unsigned sysout_loader(const char *sysout_file_name, unsigned sys_size) {

  lispworld_scratch = mmap(0, sys_size * MBYTE, PROT_READ|PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
  if (lispworld_scratch == MAP_FAILED) {
-    fprintf(stderr, "sysout_loader: can't allocate Lisp %dMBytes VM \n", sys_size);
+    (void)fprintf(stderr, "sysout_loader: can't allocate Lisp %dMBytes VM \n", sys_size);
    exit(-1);
  }

--- a/src/loopsops.c
+++ b/src/loopsops.c
@@ -26,7 +26,7 @@
 #include "gcarraydefs.h"   // for get_package_atom
 #include "gcdata.h"        // for FRPLPTR
 #include "lispemul.h"      // for LispPTR, state, CurrentStackPTR, NIL_PTR, NIL
-#include "lispmap.h"       // for S_POSITIVE, STK_OFFSET
+#include "lispmap.h"       // for S_POSITIVE
 #include "loopsopsdefs.h"  // for lcfuncall, LCFetchMethod, LCFetchMethodOrHelp
 #include "lspglob.h"
 #include "lsptypes.h"      // for GetDTD, GetTypeNumber, dtd, Listp, GETWORD
@@ -358,7 +358,7 @@ LispPTR lcfuncall(unsigned int atom_index, int argnum, int bytenum)
  CURRENTFX->nextblock = (LAddrFromNative(CurrentStackPTR) & 0x0ffff) - (argnum << 1) + 4 /* +3  */;

  /* Setup IVar */
-  IVar = NativeAligned2FromLAddr((((LispPTR)(CURRENTFX->nextblock)) | STK_OFFSET));
+  IVar = NativeAligned2FromStackOffset(CURRENTFX->nextblock);

  /* Set PC to the Next Instruction and save into FX */
  CURRENTFX->pc = ((UNSIGNED)PC - (UNSIGNED)FuncObj) + bytenum;
--- a/src/main.c
+++ b/src/main.c
@@ -364,7 +364,7 @@ int main(int argc, char *argv[])
  }

  if (argv[i] && ((strcmp(argv[i], "-help") == 0) || (strcmp(argv[i], "-HELP") == 0))) {
-    fprintf(stderr, "%s%s", helpstring, nethubHelpstring);
+    (void)fprintf(stderr, "%s%s", helpstring, nethubHelpstring);
    exit(0);
  }

@@ -387,7 +387,7 @@ int main(int argc, char *argv[])
  }
  if (access(sysout_name, R_OK)) {
    perror("Couldn't find a sysout to run");
-    fprintf(stderr, "%s%s", helpstring, nethubHelpstring);
+    (void)fprintf(stderr, "%s%s", helpstring, nethubHelpstring);
    exit(1);
  }
  /* OK, sysout name is now in sysout_name, and i is moved past a supplied name */
@@ -403,11 +403,11 @@ int main(int argc, char *argv[])
        if (errno == 0 && tmpint > 0) {
          TIMER_INTERVAL = tmpint;
        } else {
-          fprintf(stderr, "Bad value for -t (integer > 0)\n");
+          (void)fprintf(stderr, "Bad value for -t (integer > 0)\n");
          exit(1);
        }
      } else {
-        fprintf(stderr, "Missing argument after -t\n");
+        (void)fprintf(stderr, "Missing argument after -t\n");
        exit(1);
      }
    }
@@ -419,11 +419,11 @@ int main(int argc, char *argv[])
        if (errno == 0 && tmpint > 0) {
          sysout_size = (unsigned)tmpint;
        } else {
-          fprintf(stderr, "Bad value for -m (integer > 0)\n");
+          (void)fprintf(stderr, "Bad value for -m (integer > 0)\n");
          exit(1);
        }
      } else {
-        fprintf(stderr, "Missing argument after -m\n");
+        (void)fprintf(stderr, "Missing argument after -m\n");
        exit(1);
      }
    }
@@ -462,22 +462,22 @@ int main(int argc, char *argv[])
      if (argc > ++i) {
        int read = sscanf(argv[i], "%dx%d", &width, &height);
        if(read != 2) {
-          fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]);
+          (void)fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]);
          exit(1);
        }
      } else {
-        fprintf(stderr, "Missing argument after -sc\n");
+        (void)fprintf(stderr, "Missing argument after -sc\n");
        exit(1);
      }
    } else if ((strcmp(argv[i], "-pixelscale") == 0) || (strcmp(argv[i], "-PIXELSCALE") == 0)) {
      if (argc > ++i) {
        int read = sscanf(argv[i], "%d", &pixelscale);
        if(read != 1) {
-          fprintf(stderr, "Could not parse -pixelscale argument %s\n", argv[i]);
+          (void)fprintf(stderr, "Could not parse -pixelscale argument %s\n", argv[i]);
          exit(1);
        }
      } else {
-        fprintf(stderr, "Missing argument after -pixelscale\n");
+        (void)fprintf(stderr, "Missing argument after -pixelscale\n");
        exit(1);
      }
    } else if ((strcmp(argv[i], "-t") == 0) || (strcmp(argv[i], "-T") == 0)
@@ -485,7 +485,7 @@ int main(int argc, char *argv[])
      if (argc > ++i) {
        windowtitle = argv[i];
      } else {
-        fprintf(stderr, "Missing argument after -title\n");
+        (void)fprintf(stderr, "Missing argument after -title\n");
        exit(1);
      }
    }
@@ -511,7 +511,7 @@ int main(int argc, char *argv[])
        ether_host[4] = b4;
        ether_host[5] = b5;
      } else {
-        fprintf(stderr, "Missing or bogus -E argument\n");
+        (void)fprintf(stderr, "Missing or bogus -E argument\n");
        ether_fd = -1;
        exit(1);
      }
@@ -524,7 +524,7 @@ int main(int argc, char *argv[])
      if (argc > ++i) {
        setNethubHost(argv[i]);
      } else {
-        fprintf(stderr, "Missing argument after -nh-host\n");
+        (void)fprintf(stderr, "Missing argument after -nh-host\n");
        exit(1);
      }
    }
@@ -535,11 +535,11 @@ int main(int argc, char *argv[])
        if (errno == 0 && tmpint > 0) {
          setNethubPort(tmpint);
        } else {
-          fprintf(stderr, "Bad value for -nh-port\n");
+          (void)fprintf(stderr, "Bad value for -nh-port\n");
          exit(1);
        }
      } else {
-        fprintf(stderr, "Missing argument after -nh-port\n");
+        (void)fprintf(stderr, "Missing argument after -nh-port\n");
        exit(1);
      }
    }
@@ -549,11 +549,11 @@ int main(int argc, char *argv[])
        if (sscanf(argv[i], "%x-%x-%x-%x-%x-%x",  &b0, &b1, &b2, &b3, &b4, &b5) == 6) {
          setNethubMac(b0, b1, b2, b3, b4, b5);
        } else {
-          fprintf(stderr, "Invalid argument for -nh-mac\n");
+          (void)fprintf(stderr, "Invalid argument for -nh-mac\n");
          exit(1);
        }
      } else {
-        fprintf(stderr, "Missing argument after -nh-mac\n");
+        (void)fprintf(stderr, "Missing argument after -nh-mac\n");
        exit(1);
      }
    }
@@ -564,11 +564,11 @@ int main(int argc, char *argv[])
        if (errno == 0 && tmpint >= 0) {
          setNethubLogLevel(tmpint);
        } else {
-          fprintf(stderr, "Bad value for -nh-loglevel\n");
+          (void)fprintf(stderr, "Bad value for -nh-loglevel\n");
          exit(1);
        }
      } else {
-        fprintf(stderr, "Missing argument after -nh-loglevel\n");
+        (void)fprintf(stderr, "Missing argument after -nh-loglevel\n");
        exit(1);
      }
    }
@@ -582,11 +582,11 @@ int main(int argc, char *argv[])
        if (errno == 0 && tmpint > 1000) {
          insnsCountdownForTimerAsyncEmulation = tmpint;
        } else {
-          fprintf(stderr, "Bad value for -intr-emu-insns (integer > 1000)\n");
+          (void)fprintf(stderr, "Bad value for -intr-emu-insns (integer > 1000)\n");
          exit(1);
        }
      } else {
-        fprintf(stderr, "Missing argument after -intr-emu-insns\n");
+        (void)fprintf(stderr, "Missing argument after -intr-emu-insns\n");
        exit(1);
      }
    }
@@ -600,11 +600,11 @@ int main(int argc, char *argv[])
        if (errno == 0 && tmpint > 0) {
          maxpages = (unsigned)tmpint;
        } else {
-          fprintf(stderr, "Bad value for -xpages (integer > 0)\n");
+          (void)fprintf(stderr, "Bad value for -xpages (integer > 0)\n");
          exit(1);
        }
      } else {
-        fprintf(stderr, "Missing argument after -xpages\n");
+        (void)fprintf(stderr, "Missing argument after -xpages\n");
        exit(1);
      }
    }
@@ -615,9 +615,9 @@ int main(int argc, char *argv[])
  probemouse(); /* See if the mouse is connected. */
 #else
  if (getuid() != geteuid()) {
-    fprintf(stderr, "Effective user is not real user.  Resetting uid\n");
+    (void)fprintf(stderr, "Effective user is not real user.  Resetting uid\n");
    if (setuid(getuid()) == -1) {
-      fprintf(stderr, "Unable to reset user id to real user id\n");
+      (void)fprintf(stderr, "Unable to reset user id to real user id\n");
      exit(1);
    }
  }
@@ -641,7 +641,7 @@ int main(int argc, char *argv[])

  if (FindUnixPipes()) /* must call the routine to allocate storage, */
  {                    /* in case we're re-starting a savevm w/open ptys */
-    if (please_fork) fprintf(stderr, "Failed to find UNIXCOMM file handles; no processes\n");
+    if (please_fork) (void)fprintf(stderr, "Failed to find UNIXCOMM file handles; no processes\n");
  }
 #endif /* DOS */

@@ -665,7 +665,7 @@ int main(int argc, char *argv[])

  /* file system directory enumeration stuff */
  if (!init_finfo()) {
-    fprintf(stderr, "Cannot allocate internal data.\n");
+    (void)fprintf(stderr, "Cannot allocate internal data.\n");
    exit(1);
  }
 #ifdef RS232
@@ -727,9 +727,9 @@ void start_lisp(void) {
  TopOfStack = 0;
  Error_Exit = 0;

-  PVar = (DLword *)NativeAligned2FromLAddr(STK_OFFSET | InterfacePage->currentfxp) + FRAMESIZE;
+  PVar = NativeAligned2FromStackOffset(InterfacePage->currentfxp) + FRAMESIZE;

-  freeptr = next68k = NativeAligned2FromLAddr(STK_OFFSET | CURRENTFX->nextblock);
+  freeptr = next68k = NativeAligned2FromStackOffset(CURRENTFX->nextblock);

  if (GETWORD(next68k) != STK_FSB_WORD) error("Starting Lisp: Next stack block isn't free!");

--- a/src/perrno.c
+++ b/src/perrno.c
@@ -25,8 +25,8 @@
 /************************************************************************/

 void perrorn(char *s, int n) {
-  if (s != NULL && *s != '\0') { fprintf(stderr, "%s: ", s); }
-  fprintf(stderr, "%s\n", strerror(n));
+  if (s != NULL && *s != '\0') { (void)fprintf(stderr, "%s: ", s); }
+  (void)fprintf(stderr, "%s\n", strerror(n));
 }

 /************************************************************************/
@@ -42,7 +42,7 @@ void err_mess(char *from, int no) {
  int save_errno = errno; /* Save errno around OSMESSAGE_PRINT */

  OSMESSAGE_PRINT({
-    fprintf(stderr, "System call error: %s errno=%d ", from, no);
+    (void)fprintf(stderr, "System call error: %s errno=%d ", from, no);
    perror("");
  });

--- a/src/rawcolor.c
+++ b/src/rawcolor.c
@@ -37,9 +37,11 @@

 #include "gcarraydefs.h"
 #include "testtooldefs.h"
+#include "lineblt8defs.h"
 #include "lsthandldefs.h"
 #include "car-cdrdefs.h"
 #include "keyeventdefs.h"
+#include "rawcolordefs.h"

 #define IMIN(x, y) (((x) > (y)) ? (y) : (x))
 #define IMAX(x, y) (((x) > (y)) ? (x) : (y))
@@ -72,6 +74,15 @@ LispPTR SLOWBLTCHAR_index;
    return;                                                                                \
  }

+static void ColorizeFont8(BITMAP *sBM, DLword sXOffset, DLword sYOffset,
+                          BITMAP *dBM, DLword dXOffset, DLword dYOffset,
+                          DLword width, DLword height, u_char col0, u_char col1,
+                          LispPTR sourcetype, LispPTR operation);
+static void ColorizeFont8_BIGBM(BITMAP *sBM, DLword sXOffset, DLword sYOffset,
+                                BIGBM *dBM, DLword dXOffset, DLword dYOffset,
+                                DLword width, DLword height, u_char col0, u_char col1,
+                                LispPTR sourcetype, LispPTR operation);
+
 /***********************************************************/
 /*
                C_slowbltchar
@@ -302,7 +313,7 @@ void C_slowbltchar(LispPTR *args)

 u_int ColorizedFont8CACHE[MAXFONTHEIGHT / BITSPERNIBBLE * MAXFONTWIDTH / BITSPERNIBBLE];

-void ColorizeFont8(BITMAP *sBM, DLword sXOffset, DLword sYOffset, BITMAP *dBM, DLword dXOffset, DLword dYOffset, DLword width, DLword height, u_char col0, u_char col1,
+static void ColorizeFont8(BITMAP *sBM, DLword sXOffset, DLword sYOffset, BITMAP *dBM, DLword dXOffset, DLword dYOffset, DLword width, DLword height, u_char col0, u_char col1,
              LispPTR sourcetype, LispPTR operation)
 {
  DLword *nbase;
@@ -312,10 +323,10 @@ void ColorizeFont8(BITMAP *sBM, DLword sXOffset, DLword sYOffset, BITMAP *dBM, D
  sYOffset = sBM->bmheight - (sYOffset + height);
  dYOffset = dBM->bmheight - (dYOffset + height);

-  nbase = (DLword *)NativeAligned2FromLAddr(sBM->bmbase) + (sBM->bmrasterwidth * sYOffset);
-  (DLword *)dbase = (DLword *)NativeAligned2FromLAddr(dBM->bmbase) + (dBM->bmrasterwidth * dYOffset);
+  nbase = NativeAligned2FromLAddr(sBM->bmbase) + (sBM->bmrasterwidth * sYOffset);
+  dbase = (u_char *)NativeAligned2FromLAddr(dBM->bmbase) + (dBM->bmrasterwidth * dYOffset);
  for (i = 0, dbase += dXOffset; /* 8bpp */
-       i < height; i++, nbase += sBM->bmrasterwidth, ((DLword *)dbase) += dBM->bmrasterwidth) {
+       i < height; i++, nbase += sBM->bmrasterwidth, dbase += dBM->bmrasterwidth * BYTESPER_DLWORD) {
    lineBlt8(nbase, (int)sXOffset, dbase, (int)width, col0, col1, sourcetype, operation);
  } /* for end */

@@ -332,7 +343,7 @@ void ColorizeFont8(BITMAP *sBM, DLword sXOffset, DLword sYOffset, BITMAP *dBM, D
 /*									*/
 /************************************************************************/

-void ColorizeFont8_BIGBM(BITMAP *sBM, DLword sXOffset, DLword sYOffset, BIGBM *dBM, DLword dXOffset, DLword dYOffset, DLword width, DLword height, u_char col0, u_char col1,
+static void ColorizeFont8_BIGBM(BITMAP *sBM, DLword sXOffset, DLword sYOffset, BIGBM *dBM, DLword dXOffset, DLword dYOffset, DLword width, DLword height, u_char col0, u_char col1,
              LispPTR sourcetype, LispPTR operation)
 {
  DLword *nbase;
@@ -375,14 +386,13 @@ loop:
    dest_h = dest_fragbottom - (dest_fragtop + dest_yoffset);
  } /* end if */

-  dbase =
-      (DLword *)NativeAligned2FromLAddr(dest_frag->bmbase) + (dest_frag->bmrasterwidth * dest_yoffset);
-  nbase = (DLword *)NativeAligned2FromLAddr(sBM->bmbase) + (sBM->bmrasterwidth * sYOffset);
+  dbase = (u_char *)NativeAligned2FromLAddr(dest_frag->bmbase) + (dest_frag->bmrasterwidth * dest_yoffset);
+  nbase = NativeAligned2FromLAddr(sBM->bmbase) + (sBM->bmrasterwidth * sYOffset);

  sYOffset += (DLword)dest_h; /* next src yoffset */

  for (i = 0, dbase += dXOffset; i < dest_h;
-       i++, nbase += sBM->bmrasterwidth, ((DLword *)dbase) += dest_frag->bmrasterwidth) {
+       i++, nbase += sBM->bmrasterwidth, dbase += dest_frag->bmrasterwidth * BYTESPER_DLWORD) {
    lineBlt8(nbase, (int)sXOffset, dbase, (int)width, col0, col1, sourcetype, operation);
  }

@@ -415,8 +425,8 @@ void newColorizeFont8(PILOTBBT *pbt, u_char backcolor, u_char forecolor, LispPTR
  u_char *dbase;
  int i;

-  nbase = (DLword *)NativeAligned2FromLAddr((pbt->pbtsourcehi << 16) | (pbt->pbtsourcelo));
-  (DLword *)dbase = (DLword *)NativeAligned2FromLAddr((pbt->pbtdesthi << 16) | (pbt->pbtdestlo));
+  nbase = NativeAligned2FromLAddr((pbt->pbtsourcehi << 16) | (pbt->pbtsourcelo));
+  dbase = (u_char *)NativeAligned2FromLAddr((pbt->pbtdesthi << 16) | (pbt->pbtdestlo));
  dbase += pbt->pbtdestbit;
  for (i = 0; i < pbt->pbtheight;
       i++, nbase += pbt->pbtsourcebpl / 16, dbase += pbt->pbtdestbpl / 8) {
@@ -494,7 +504,7 @@ void Uncolorize_Bitmap(LispPTR args[])

    if ((x & 0xF) != 0) *(d_base++) = word;

-    if (y != (s_height - 1)) { (DLword *)s_base += s_rasterwidth; } /* end if( y ) */
+    if (y != (s_height - 1)) { s_base += s_rasterwidth * BYTESPER_DLWORD; } /* end if( y ) */

  } /* end for( y ) */

@@ -532,11 +542,11 @@ LispPTR Colorize_Bitmap(LispPTR args[])

  s_base = (DLword *)NativeAligned2FromLAddr(s_bitmap->bmbase) +
           s_bitmap->bmrasterwidth * (s_bitmap->bmheight - (s_bottom + height));
-  (DLword *)d_base = (DLword *)NativeAligned2FromLAddr(d_bitmap->bmbase) +
+  d_base = (u_char *)NativeAligned2FromLAddr(d_bitmap->bmbase) +
                     d_bitmap->bmrasterwidth * (d_bitmap->bmheight - (d_bottom + height));

  for (i = 0, d_base += d_left; i < height;
-       i++, s_base += s_bitmap->bmrasterwidth, (DLword *)d_base += d_bitmap->bmrasterwidth) {
+       i++, s_base += s_bitmap->bmrasterwidth, d_base += d_bitmap->bmrasterwidth * BYTESPER_DLWORD) {
    lineBlt8(s_base, s_left, d_base, width, (u_char)color0, (u_char)color1, INPUT_atom,
             REPLACE_atom);

--- a/src/return.c
+++ b/src/return.c
@@ -129,7 +129,7 @@ void contextsw(DLword fxnum, DLword bytenum, DLword flags)

  Midpunt(fxnum); /* exchanging FX */

-  next68k = (DLword *)NativeAligned2FromLAddr(STK_OFFSET | CURRENTFX->nextblock);
+  next68k = NativeAligned2FromStackOffset(CURRENTFX->nextblock);

  if (GETWORD(next68k) != STK_FSB_WORD) error("contextsw(): MP9316");
  freeptr = next68k;
--- a/src/testtool.c
+++ b/src/testtool.c
@@ -57,7 +57,7 @@
 #include "gcarraydefs.h"   // for aref1
 #include "kprintdefs.h"    // for print, prindatum
 #include "lispemul.h"      // for DLword, LispPTR, DLbyte, state, T, ConsCell
-#include "lispmap.h"       // for STK_OFFSET, ATOMS_HI
+#include "lispmap.h"       // for ATOMS_HI
 #include "lspglob.h"       // for Package_from_Index_word, Stackspace
 #include "lsptypes.h"      // for GETWORD, dtd, GETBYTE, NEWSTRINGP, GetType...
 #include "mkatomdefs.h"    // for compare_chars, make_atom
@@ -852,7 +852,7 @@ void dump_bf(Bframe *bf) {

  if (BFRAMEPTR(bf)->residual) { goto printflags; }

-  ptr = NativeAligned2FromLAddr(STK_OFFSET + bf->ivar);
+  ptr = NativeAligned2FromStackOffset(bf->ivar);
  if ((((DLword *)bf - ptr) > 512) || (((UNSIGNED)ptr & 1) != 0)) {
    printf("\nInvalid basic frame");
    return;
@@ -910,7 +910,7 @@ void dump_fx(struct frameex1 *fx_addr68k) {

  /* should pay attention to the name table like RAID does */

-  next68k = (DLword *)NativeAligned2FromLAddr((fx_addr68k->nextblock + STK_OFFSET));
+  next68k = NativeAligned2FromStackOffset(fx_addr68k->nextblock);
  if (fx_addr68k == CURRENTFX) { next68k = CurrentStackPTR + 2; }

  if ((next68k < ptr) || (((UNSIGNED)next68k & 1) != 0)) {
@@ -937,7 +937,7 @@ void dump_stackframe(struct frameex1 *fx_addr68k) {
  if ((fx_addr68k->alink & 1) == 0) { /* FAST */
    bf = (Bframe *)(((DLword *)fx_addr68k) - 2);
  } else { /* SLOW */
-    bf = (Bframe *)NativeAligned4FromLAddr((fx_addr68k->blink + STK_OFFSET));
+    bf = (Bframe *)NativeAligned4FromStackOffset(fx_addr68k->blink);
  }
  dump_bf(bf);
  dump_fx((struct frameex1 *)fx_addr68k);
@@ -1104,12 +1104,12 @@ void all_stack_dump(DLword start, DLword end, DLword silent)
  if (start == 0)
    start68k = Stackspace + InterfacePage->stackbase;
  else
-    start68k = NativeAligned2FromLAddr(STK_OFFSET | start);
+    start68k = NativeAligned2FromStackOffset(start);

  if (end == 0)
    end68k = Stackspace + InterfacePage->endofstack;
  else
-    end68k = NativeAligned2FromLAddr(STK_OFFSET | end);
+    end68k = NativeAligned2FromStackOffset(end);

  stkptr = (STKH *)start68k;

@@ -1156,7 +1156,7 @@ void all_stack_dump(DLword start, DLword end, DLword silent)
          printf(" <-***current***");
          size = EndSTKP - (DLword *)stkptr;
        } else {
-          size = NativeAligned2FromLAddr(STK_OFFSET | ((FX *)stkptr)->nextblock) - (DLword *)stkptr;
+          size = NativeAligned2FromStackOffset(((FX *)stkptr)->nextblock) - (DLword *)stkptr;
        }
        goto checksize;
      default:
--- a/src/timer.c
+++ b/src/timer.c
@@ -47,6 +47,10 @@ unsigned long tick_count = 0; /* approx 18 ticks per sec            */
 #include <sys/time.h>
 #endif /* DOS */

+#ifdef MAIKO_OS_HAIKU
+#include <OS.h>
+#endif
+
 #if defined(USE_DLPI)
 #include <stropts.h>
 extern int ether_fd;
@@ -118,6 +122,19 @@ void update_miscstats(void) {
  MiscStats->diskiotime = 0; /* ?? not available ?? */
  MiscStats->diskops = 0;
  MiscStats->secondstmp = MiscStats->secondsclock = (time(0) + UNIX_ALTO_TIME_DIFF);
+#elif defined(MAIKO_OS_EMSCRIPTEN)
+  /* Emscripten does not provide getrusage() functionality */
+  struct timeval timev;
+
+  MiscStats->totaltime = gettime(0) - MiscStats->starttime;
+  MiscStats->swapwaittime = 0;
+  MiscStats->pagefaults = 0;
+  MiscStats->swapwrites = 0;
+  MiscStats->diskiotime = 0;
+  MiscStats->diskops = 0;
+
+  gettimeofday(&timev, NULL);
+  MiscStats->secondstmp = MiscStats->secondsclock = (timev.tv_sec + UNIX_ALTO_TIME_DIFF);
 #else
  struct timeval timev;
  struct rusage ru;
@@ -288,6 +305,10 @@ void subr_settime(LispPTR args[])
  dosday.year = uxtime.tm_year;
  dosday.dayofweek = uxtime.tm_wday;
  _dos_setdate(&dosday);
+#elif defined(MAIKO_OS_HAIKU)
+  (void)args[0];
+#elif defined(MAIKO_OS_EMSCRIPTEN)
+  (void)args[0];
 #else
  struct timeval timev;
  timev.tv_sec = *((int *)NativeAligned4FromLAddr(args[0])) - UNIX_ALTO_TIME_DIFF;
@@ -541,17 +562,19 @@ static void int_io_service(int sig)
 /************************************************************************/

 static void int_io_init(void) {
-#ifndef DOS
+#if !defined(DOS) || !defined(MAIKO_OS_HAIKU)
  struct sigaction io_action;
  io_action.sa_handler = int_io_service;
  sigemptyset(&io_action.sa_mask);
  io_action.sa_flags = 0;

+#ifndef MAIKO_OS_HAIKU
  if (sigaction(SIGIO, &io_action, NULL) == -1) {
    perror("sigaction: SIGIO");
  } else {
    DBPRINT(("I/O interrupts enabled\n"));
  }
+#endif

 #if defined(USE_DLPI)
  DBPRINT(("INIT ETHER:  Doing I_SETSIG.\n"));
@@ -563,7 +586,7 @@ static void int_io_init(void) {
      return;
    }
 #endif /* USE_DLPI */
-#endif /* DOS */
+#endif /* DOS MAIKO_OS_HAIKU */
 }

 /************************************************************************/
@@ -585,7 +608,9 @@ void int_block(void) {
  sigset_t signals;
  sigemptyset(&signals);
  sigaddset(&signals, SIGVTALRM);
+#ifndef MAIKO_OS_HAIKU
  sigaddset(&signals, SIGIO);
+#endif
  sigaddset(&signals, SIGALRM);
  sigaddset(&signals, SIGXFSZ);
 #ifdef FLTINT
@@ -613,7 +638,9 @@ void int_unblock(void) {
  sigset_t signals;
  sigemptyset(&signals);
  sigaddset(&signals, SIGVTALRM);
+#ifndef MAIKO_OS_HAIKU
  sigaddset(&signals, SIGIO);
+#endif
  sigaddset(&signals, SIGALRM);
  sigaddset(&signals, SIGXFSZ);
 #ifdef FLTINT
--- a/src/tstsout.c
+++ b/src/tstsout.c
@@ -73,7 +73,7 @@ void check_sysout(char *sysout_file_name, int verbose) {
 }

 void usage(char *prog) {
-    fprintf(stderr, "Usage: %s [-v] sysout-filename\n", prog);
+    (void)fprintf(stderr, "Usage: %s [-v] sysout-filename\n", prog);
    exit(-1);
 }

--- a/src/tty.c
+++ b/src/tty.c
@@ -51,7 +51,11 @@ void tty_open(void)
  if (TTY_Fd < 0) {
    if ((TTY_Fd = open(TTY_Dev, O_RDWR)) >= 0) {
      tcgetattr(TTY_Fd, &options);
+#ifndef MAIKO_OS_HAIKU
      options.c_iflag &= ~(IMAXBEL|IXOFF|INPCK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON|IGNPAR);
+#else
+      options.c_iflag &= ~(IXOFF|INPCK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON|IGNPAR);
+#endif
      options.c_iflag |= IGNBRK;
      options.c_oflag &= ~OPOST;
      options.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN|NOFLSH|TOSTOP);
--- a/src/ufn.c
+++ b/src/ufn.c
@@ -107,7 +107,7 @@ void ufn(DLword bytecode)
      (LAddrFromNative(CurrentStackPTR) & 0x0ffff) - (entry68k->arg_num << 1) + 2 /** +1 **/;

  /* Setup IVar */
-  IVar = NativeAligned2FromLAddr((((LispPTR)(CURRENTFX->nextblock)) | STK_OFFSET));
+  IVar = NativeAligned2FromStackOffset(CURRENTFX->nextblock);

 #ifdef LISPTRACE
  print(entry68k->atom_name);
--- a/src/unixcomm.c
+++ b/src/unixcomm.c
@@ -518,6 +518,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
      DBPRINT(("Terminating process in slot %d.\n", slot));
      if (!valid_slot(slot)) return (ATOM_T);
      /* in all cases we need to close() the file descriptor */
+      if (slot == 0) DBPRINT(("ZERO SLOT\n"));
      close(slot);
      switch (UJ[slot].type) {
      case UJSHELL:
@@ -699,7 +700,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
        if (!valid_slot(slot)) return (NIL); /* No fd open; punt the read */

        bufp = (NativeAligned2FromLAddr(args[2])); /* User buffer */
-        DBPRINT(("Read buffer slot %d, type is %d\n", slot, UJ[slot].type));
+        DBPRINT(("Read buffer slot %d, type is %d buffer LAddr 0x%x (native %p)\n", slot, UJ[slot].type, args[2], bufp));

        switch (UJ[slot].type) {
          case UJSHELL:
--- a/src/unixfork.c
+++ b/src/unixfork.c
@@ -98,7 +98,7 @@ static int ForkUnixShell(int slot, char *PtySlave, char *termtype, char *shellar
  if (SlaveFD == -1) {
    perror("Slave Open");
    perror(PtySlave);
-    exit(0);
+    exit(1);
  }

 #ifdef OS5
@@ -132,7 +132,7 @@ static int ForkUnixShell(int slot, char *PtySlave, char *termtype, char *shellar
  for (userShell = getusershell(); userShell != NULL && strcmp(shell, userShell) != 0; userShell = getusershell());
  if (userShell == NULL) {
    perror("$(SHELL) not found in /etc/shells");
-    exit(0);
+    exit(1);
  }

  /* argvec entries initialized to NULL */
@@ -146,7 +146,7 @@ static int ForkUnixShell(int slot, char *PtySlave, char *termtype, char *shellar

  /* Should never get here */
  perror("execv");
-  exit(0);
+  exit(1);
 }

 /* fork_Unix is the secondary process spawned right after LISP is
@@ -219,7 +219,9 @@ int fork_Unix(void) {
  /* interrupts need to be blocked here so subprocess won't see them */
  sigemptyset(&signals);
  sigaddset(&signals, SIGVTALRM);
+#ifndef MAIKO_OS_HAIKU
  sigaddset(&signals, SIGIO);
+#endif
  sigaddset(&signals, SIGALRM);
  sigaddset(&signals, SIGXFSZ);
  sigaddset(&signals, SIGFPE);
@@ -234,19 +236,23 @@ int fork_Unix(void) {
    /* JRB - fork_Unix is now called in ldeboot; leave UnixPipe{In,Out} open
       and put their numbers in the environment so parent can find them */
    /* JDS - NB that sprintf doesn't always return a string! */
-
+    /* NHB - if the return value of snprintf() is greater than or equal to the
+     * size argument, the string was too short and some of the printed
+     * characters were discarded. However we're printing numbers, so we know
+     * that the buffer is big enough
+     */
    char tempstring[30];

-    snprintf(tempstring, sizeof(tempstring), "%d", UnixToLisp[0]);
+    (void)snprintf(tempstring, sizeof(tempstring), "%d", UnixToLisp[0]);
    setenv("LDEPIPEIN", tempstring, 1);

-    snprintf(tempstring, sizeof(tempstring), "%d", LispToUnix[1]);
+    (void)snprintf(tempstring, sizeof(tempstring), "%d", LispToUnix[1]);
    setenv("LDEPIPEOUT", tempstring, 1);

-    snprintf(tempstring, sizeof(tempstring), "%ld", StartTime);
+    (void)snprintf(tempstring, sizeof(tempstring), "%ld", StartTime);
    setenv("LDESTARTTIME", tempstring, 1);

-    snprintf(tempstring, sizeof(tempstring), "%d", UnixPID);
+    (void)snprintf(tempstring, sizeof(tempstring), "%d", UnixPID);
    setenv("LDEUNIXPID", tempstring, 1);

    close(LispToUnix[0]);
@@ -264,14 +270,16 @@ int fork_Unix(void) {
  while (1) {
    ssize_t len;
    len = SAFEREAD(LispPipeIn, IOBuf, 6);
+    if (len == 0)
+      exit(0);
    if (len < 0) {
      perror("Error reading packet by slave");
-      exit(0);
+      exit(1);
    } else if (len != 6) {
      DBPRINT(("Input packet wrong length: %zd", len));
-      exit(0);
+      exit(1);
    }
-    slot = IOBuf[3];
+    slot = (int)IOBuf[3];
    IOBuf[3] = 1; /* Start by signalling success in return-code */

    switch (IOBuf[0]) {
@@ -345,9 +353,9 @@ int fork_Unix(void) {
            sock = socket(AF_UNIX, SOCK_STREAM, 0);
            if (sock < 0) {
              perror("slave socket");
-              exit(0);
+              exit(1);
            }
-            sprintf(PipeName, "/tmp/LPU%ld-%d", StartTime, slot);
+            (void)snprintf(PipeName, sizeof(PipeName), "/tmp/LPU%ld-%d", StartTime, slot);
            memset(&addr, 0, sizeof(struct sockaddr_un));
            addr.sun_family = AF_UNIX;
            strcpy(addr.sun_path, PipeName);
@@ -357,7 +365,7 @@ int fork_Unix(void) {
              perror("slave connect");
              printf("Name = %s.\n", PipeName);
              fflush(stdout);
-              exit(0);
+              exit(1);
            } else {
              DBPRINT(("Slave connected on %s.\n", PipeName));
            }
--- a/src/uraid.c
+++ b/src/uraid.c
@@ -776,7 +776,7 @@ LispPTR uraid_commands(void) {
      break;
    case 's': /* SHELL */
      switch (vfork()) {
-        case -1: (void)fprintf(stderr, "uraid: Fork failed.\n"); exit(1);
+        case -1: (void)(void)fprintf(stderr, "uraid: Fork failed.\n"); exit(1);

        case 0: (void)execl("/bin/sh", "sh", "-i", NULL); exit(1);

@@ -864,7 +864,9 @@ int device_before_raid(void) {
 #ifdef XWINDOW
  /* So X events still get recognized. */
  sigemptyset(&signals);
+#ifndef MAIKO_OS_HAIKU
  sigaddset(&signals, SIGIO);
+#endif
  sigprocmask(SIG_UNBLOCK, &signals, NULL);
 #endif

@@ -901,7 +903,7 @@ char *alloc_hideDISP(int size)
  {
        case SFS_NOTSWITCHABLE :
                if((retaddr =malloc(size)) ==0){
-                        fprintf(stderr,"can't alloc hide space\n");
+                        (void)fprintf(stderr,"can't alloc hide space\n");
                 }
                break;
        case 0 :
@@ -925,7 +927,7 @@ char *alloc_hideDISP(int size)
                        printf("Hidespace inside Lisp(4)\n");
                 }
                else if((retaddr=malloc(size)) ==0){
-                        fprintf(stderr,"can't alloc hide disp\n");
+                        (void)fprintf(stderr,"can't alloc hide disp\n");
                         }
                        printf("Hidespace new\n");
                break;
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -204,18 +204,10 @@ LispPTR unix_getparm(LispPTR *args) {
 #else
    envvalue = "mc68020";
 #endif
-
+  } else if (strcmp(envname, "OSNAME") == 0) {
+    envvalue = MAIKO_OS_NAME;
  } else if (strcmp(envname, "ARCH") == 0) {
-#if defined(sparc)
-    envvalue = "sun4";
-#elif defined(DOS)
-    envvalue = "dos";
-#elif defined(MAIKO_OS_MACOS)
-    envvalue = "i386";
-#else
-    envvalue = "sun3";
-#endif
-
+    envvalue = MAIKO_ARCH_NAME;
  } else if (strcmp(envname, "DISPLAY") == 0) {
 #if defined(XWINDOW)
    envvalue = "X";
@@ -239,10 +231,13 @@ LispPTR unix_getparm(LispPTR *args) {
    struct passwd *pwd;
    if ((pwd = getpwuid(getuid())) == NULL) return NIL;
    envvalue = pwd->pw_gecos;
-  } else if (strcmp(envname, "HOSTID") == 0) {
+  } 
+#ifndef MAIKO_OS_HAIKU
+  else if (strcmp(envname, "HOSTID") == 0) {
    snprintf(result, sizeof(result), "%lx", gethostid());
    envvalue = result;
  }
+#endif /* MAIKO_OS_HAIKU */
 #endif /* DOS */
  else
    return NIL;
--- a/src/vesainit.c
+++ b/src/vesainit.c
@@ -235,7 +235,7 @@ void VESA_enter(DspInterface dsp)
  if (VESA_describemode(dsp->graphicsmode) != 0) {
    _setvideomode(_DEFAULTMODE);
    _clearscreen(_GCLEARSCREEN);
-    fprintf(stderr, "Can't set VESA mode %o.\n", dsp->graphicsmode);
+    (void)fprintf(stderr, "Can't set VESA mode %o.\n", dsp->graphicsmode);
    exit(0);
  }
  /* Get the segaddr. An addr. is a seg shifted 4 bits! */
@@ -326,7 +326,7 @@ VESA_errorexit(char *s, int errno)
 {
  _setvideomode(_DEFAULTMODE);
  _clearscreen(_GCLEARSCREEN);
-  fprintf(stderr, s);
+  (void)fprintf(stderr, s);
  fflush(stderr);
  exit(errno);
 }
--- a/src/vgainit.c
+++ b/src/vgainit.c
@@ -34,7 +34,7 @@ void VGA_setmax(DspInterface dsp)
  struct videoconfig vc;

  if (!_setvideomode(_MAXRESMODE)) {
-    fprintf(stderr, "Can't set graphics mode.\n");
+    (void)fprintf(stderr, "Can't set graphics mode.\n");
    exit(1);
  }
  _getvideoconfig(&vc);
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -354,7 +354,7 @@ LispPTR vmem_save(char *sysout_file_name)
  TIMEOUT(sysout = open(sysout_file_name, O_WRONLY, 0666));
  if (sysout == -1) {
    /* No file error skip return. */
-    if (errno != 2) return (FILECANNOTOPEN); /* No such file error.*/
+    if (errno != ENOENT) return (FILECANNOTOPEN); /* No such file error.*/
  } else
    TIMEOUT(rval = close(sysout));

@@ -481,13 +481,13 @@ LispPTR vmem_save(char *sysout_file_name)
  TIMEOUT(rval = unlink(sysout_file_name));
  if (rval == -1) {
    /* No file error skip return. */
-    if (errno != 2) /* No such file error.*/
+    if (errno != ENOENT) /* No such file error.*/
      return (FILECANNOTOPEN);
  }

  TIMEOUT(rval = rename(tempname, sysout_file_name));
  if (rval == -1) {
-    fprintf(stderr, "sysout is saved to temp file, %s.", tempname);
+    (void)fprintf(stderr, "sysout is saved to temp file, %s.", tempname);
    return (FILECANNOTWRITE);
  }

@@ -531,5 +531,5 @@ void lisp_finish(void) {
 #ifdef DOS
  exit_host_filesystem();
 #endif /* DOS */
-  exit(1);
+  exit(0);
 }
--- a/src/xc.c
+++ b/src/xc.c
@@ -20,6 +20,9 @@
 /*									*/
 /************************************************************************/

+#ifdef MAIKO_OS_EMSCRIPTEN
+#include <emscripten.h>
+#endif
 #include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -286,6 +289,9 @@ nextopcode:
 	  Irq_Stk_End = 0;
 #if defined(MAIKO_EMULATE_ASYNC_INTERRUPTS)
 	  IO_Signalled = TRUE;
+#endif
+#ifdef MAIKO_OS_EMSCRIPTEN
+	  emscripten_sleep(1);
 #endif
 	  pseudoTimerAsyncCountdown = insnsCountdownForTimerAsyncEmulation;
  }
--- a/src/xinit.c
+++ b/src/xinit.c
@@ -16,6 +16,7 @@
 #include <signal.h>       // for sig_atomic_t
 #include <stdbool.h>      // for false, bool, true
 #include <stdio.h>        // for NULL
+#include <stdlib.h>       // for exit
 #include "adr68k.h"       // for NativeAligned4FromLAddr
 #include "dbprint.h"      // for TPRINT
 #include "devif.h"        // for (anonymous), MRegion, DspInterface, OUTER_S...
@@ -200,6 +201,27 @@ void Open_Display(DspInterface dsp)
  init_Xevent(dsp); /* Turn on the event reporting */
 } /* end OpenDisplay */

+int X_FatalErrorHandler(Display *display)
+{
+  /* when the fatal error handler gets called it can do cleanup
+   * and either exit, or return.  If it returns, the
+   * FatalErrorExitHandler will be called
+   */
+  /* If we could do a SAVEVM in the interrupt context we would mark it
+   * as needed here.  Returning will cause the FatalErrorExitHandler
+   * hook to be called.
+   */
+  return 0;
+}
+
+void X_FatalErrorExitHandler(Display *display, void *userdata)
+{
+  /* If we were invoking a SAVEVM/LOGOUT in the interrupt context we
+   * would not exit here, as the Lisp VM needs to continue to run
+   */
+  exit(1);
+}
+
 /*********************************************************************/
 /*                                                                   */
 /*			  X _ i n i t                                */
@@ -236,6 +258,10 @@ DspInterface X_init(DspInterface dsp, LispPTR lispbitmap, unsigned width_hint, u
  /* Try to open the X display. If this isn't possible, we just */
  /* return FALSE. */
  if ((dsp->display_id = XOpenDisplay(dsp->identifier)) == NULL) return (NULL);
+
+  XSetIOErrorHandler(X_FatalErrorHandler);
+  XSetIOErrorExitHandler(dsp->display_id, X_FatalErrorExitHandler, NULL);
+
  /* Load the dsp structure */

  Xscreen = ScreenOfDisplay(dsp->display_id, DefaultScreen(dsp->display_id));
--- a/src/xmkicon.c
+++ b/src/xmkicon.c
@@ -136,8 +136,8 @@ Pixmap make_Xicon(DspInterface dsp)
              Lisp_icon_height);

  } else if (value == BitmapFileInvalid)
-    fprintf(stderr, "Iconpixmapfile %s contains invalid bitmap data\n", iconpixmapfile);
+    (void)fprintf(stderr, "Iconpixmapfile %s contains invalid bitmap data\n", iconpixmapfile);
  else if (value == BitmapNoMemory)
-    fprintf(stderr, "Not enough memory to allocate icon pixmap\n");
+    (void)fprintf(stderr, "Not enough memory to allocate icon pixmap\n");
  return (IconPixmap);
 } /* end make_Xicon */
--- a/src/xrdopt.c
+++ b/src/xrdopt.c
@@ -110,30 +110,30 @@ extern struct sockaddr_nit snit;

 void print_Xusage(const char *prog)
 {
-  fprintf(stderr, " %s options:\n", prog);
-  fprintf(stderr, " [-sysout] [<sysout>]                 -path to the Medley image\n");
-  fprintf(stderr, " -h[elp]                              -prints this text\n");
-  fprintf(stderr, " -info                                -prints configuration info\n");
-  fprintf(stderr, " -d[isplay] <host>:<display>.<screen>\n");
-  fprintf(stderr,
+  (void)fprintf(stderr, " %s options:\n", prog);
+  (void)fprintf(stderr, " [-sysout] [<sysout>]                 -path to the Medley image\n");
+  (void)fprintf(stderr, " -h[elp]                              -prints this text\n");
+  (void)fprintf(stderr, " -info                                -prints configuration info\n");
+  (void)fprintf(stderr, " -d[isplay] <host>:<display>.<screen>\n");
+  (void)fprintf(stderr,
          " -g[eometry] <geom>                   -size & placement for the medley window on your X "
          "screen\n");
-  fprintf(stderr,
+  (void)fprintf(stderr,
          " -sc[reen] <geom>                     -size & placement for the medley display\n");
-  fprintf(stderr, " -t[itle] <string>                    -titlebar text for the window manager\n");
-  fprintf(stderr, " -icontitle <string> | -it <string>   -text for the medley icon\n");
-  fprintf(stderr, " -iconbitmap <path> | -ibm <path>     -bitmap for the medley icon\n");
-  fprintf(stderr,
+  (void)fprintf(stderr, " -t[itle] <string>                    -titlebar text for the window manager\n");
+  (void)fprintf(stderr, " -icontitle <string> | -it <string>   -text for the medley icon\n");
+  (void)fprintf(stderr, " -iconbitmap <path> | -ibm <path>     -bitmap for the medley icon\n");
+  (void)fprintf(stderr,
          " -xsync                               -turn  XSynchronize on. (default is off)\n\n");
 #if defined(MAIKO_ENABLE_NETHUB)
-  fprintf(stderr,"\
+  (void)fprintf(stderr,"\
 -nh-host dodo-host        Hostname for Dodo Nethub (no networking if missing)\n\
 -nh-port port-number      Port for Dodo Nethub (optional, default: 3333)\n\
 -nh-mac XX-XX-XX-XX-XX-XX Machine-ID for Maiko-VM (optional, default: CA-FF-EE-12-34-56) \n\
 -nh-loglevel level        Loglevel for Dodo networking (0..2, optional, default: 0)\n\n");
 #endif
-  fprintf(stderr, "Please refer to the manual for further information.\n\n");
-  exit(0);
+  (void)fprintf(stderr, "Please refer to the manual for further information.\n\n");
+  exit(EXIT_FAILURE);
 } /* end print_Xusage() */

 /************************************************************************/
@@ -206,9 +206,9 @@ void read_Xoption(int *argc, char *argv[])
  if (XrmGetResource(commandlineDB, "ldex.display", "Ldex.Display", str_type, &value) == True) {
    (void)strncpy(Display_Name, value.addr, value.size);
  } else if (getenv("DISPLAY") == (char *)NULL) {
-    fprintf(stderr, "Can't find a display. Either set the shell\n");
-    fprintf(stderr, "variable DISPLAY to an appropriate display\n");
-    fprintf(stderr, "or provide a -display argument.\n");
+    (void)fprintf(stderr, "Can't find a display. Either set the shell\n");
+    (void)fprintf(stderr, "variable DISPLAY to an appropriate display\n");
+    (void)fprintf(stderr, "or provide a -display argument.\n");
    print_Xusage(argv[0]);
  } else {
    envname = getenv("DISPLAY");
@@ -228,7 +228,7 @@ void read_Xoption(int *argc, char *argv[])
    }
    XCloseDisplay(xdisplay);
  } else {
-    fprintf(stderr, "Open_Display: cannot connect to display %s.", XDisplayName(Display_Name));
+    (void)fprintf(stderr, "Open_Display: cannot connect to display %s.", XDisplayName(Display_Name));
    exit(-1);
  }

@@ -248,7 +248,7 @@ void read_Xoption(int *argc, char *argv[])
    (void)strncpy(sysout_name, value.addr, value.size);
  }
  if (sysout_name[0] == '\0') {
-    fprintf(stderr, "Couldn't find a sysout to run;\n");
+    (void)fprintf(stderr, "Couldn't find a sysout to run;\n");
    print_Xusage(argv[0]);
  }

@@ -329,7 +329,7 @@ void read_Xoption(int *argc, char *argv[])
      ether_host[4] = b4;
      ether_host[5] = b5;
    } else {
-      fprintf(stderr, "Missing or bogus -E argument\n");
+      (void)fprintf(stderr, "Missing or bogus -E argument\n");
      ether_fd = -1;
      exit(1);
    }
--- a/src/xwinman.c
+++ b/src/xwinman.c
@@ -188,6 +188,7 @@ void process_Xevents(DspInterface dsp)
    XNextEvent(dsp->display_id, &report);
    if (report.xany.window == dsp->DisplayWindow) /* Try the most important window first. */
      switch (report.type) {
+#ifndef INIT
        case MotionNotify:
          *CLastUserActionCell68k = MiscStats->secondstmp;
          *EmCursorX68K = (*((DLword *)EmMouseX68K)) =
@@ -235,6 +236,7 @@ void process_Xevents(DspInterface dsp)
          break;
        case EnterNotify: Mouse_Included = TRUE; break;
        case LeaveNotify: Mouse_Included = FALSE; break;
+#endif
        case Expose:
          (dsp->bitblt_to_screen)(dsp, 0, report.xexpose.x + dsp->Visible.x,
                                  report.xexpose.y + dsp->Visible.y, report.xexpose.width,
Author	SHA1	Message	Date
Frank Halasz	6c6b01f99c	Merge pull request #499 from Interlisp/fgh_buildRelease_MacOS_fix In buildRelease workflow, MacOS job - fix issue with uninstall of casks that have not actually been installed	2024-05-06 16:41:23 -07:00
Frank Halasz	143c0f67cf	In buildRelease workflow, MacOS job - fix issue with uninstall of casks that have not actually been installed. result of changes to github runner in MacOS-lastest	2024-05-06 16:12:59 -07:00
Nick Briggs	c391641691	Eliminate warnings for ignored fprintf() result when printing messages to stderr	2024-04-24 11:41:46 -07:00
Nick Briggs	38862ddb08	Ignore snprintf() result where OK to do so, convert sprintf() to snprintf()	2024-04-23 21:49:38 -07:00
Nick Briggs	8d34f0869a	Problem with directory caching, #1661 , disable until it is solved.	2024-04-13 11:12:10 -07:00
Anarchos	e2e2c7e394	Haiku OS port (#485 ) * Haiku OS port * haiku with X11 backend * haiku has stpncpy * Haiku is not Linux. * X not stable enough on Haiku * Haiku : settimeofday is a no-op * Haiku : no need to define settimeofday at all (pointed by nbriggs) --------- Signed-off-by: Anarchos <sylvain_kerjean@hotmail.com>	2024-04-10 20:14:46 -07:00
Nick Briggs	2e86450fad	Improve the file lookup performance for {DSK} files (#498 ) The directory caching for file lookup on {DSK} was disabled due to a bug in SunOS - this is no longer relevant, so the cache can be reenabled.	2024-04-03 21:10:54 -07:00
Nick Briggs	400ccab637	exit with non-zero status if unable to open sysout or... (#496 )	2024-03-31 09:55:26 -07:00
Nick Briggs	95f4ac8167	Update UNIX-GETPARM to return values for OSNAME and ARCH (#495 ) Calls to UNIX-GETPARM with argument "OSNAME" or "ARCH" now return values derived from the compile-time settings in inc/maiko/platform.h The current return values are OSNAME: "macOS" "Cygwin" "DragonFly BSD" "FreeBSD" "Linux" "NetBSD" "OpenBSD" "AmigaOS 3" "Solaris" "Windows" "Emscripten" ARCH: "WebAssembly" "x86_64" "arm" "arm64" "x86" "PowerPC" "RISC-V" "SPARC" "Motorola68K"	2024-03-25 15:26:31 -07:00
Nick Briggs	40f6488ee4	Merge pull request #494 from Interlisp/color-code-cleanup Color code cleanup	2024-03-19 21:09:44 -07:00
Nick Briggs	3c3fc94246	Clean up rawcolor code so it at least compiles without error	2024-03-19 09:10:29 -07:00
Nick Briggs	559ba779b2	Missing definition for taking_mouse_up()	2024-03-19 09:09:36 -07:00
Nick Briggs	afd6cf4b80	Merge pull request #493 from Interlisp/stack-debug-01 Cleanup of stack-related code	2024-03-18 16:30:06 -07:00
Nick Briggs	68baf6fb30	Use ...FromStackOffset functions where appropriate Rather than adding/or-ing the STK_OFFSET constant into a stack offset to convert it to a pointer in general Lisp memory and then converting from that to a native address... use the functions specifically present to do those conversions with embedded checks on stack offset validity.	2024-03-07 10:45:38 -08:00
Nick Briggs	939c23c03b	Additional check for bad stack offset calculation Pointer difference calculations on an inappropriate stack pointer could result in a negative offset, not just an offset that is too large to fit in 16 bits. Complain if either case occurs.	2024-03-07 10:01:19 -08:00
Nick Briggs	55591557b6	Clarify the expected size/packing of bit fields in stack structures While packing is not guaranteed, and most compilers will combine adjacent bit fields regardless of the alignment requirements of the datatype that is being divided, here we can be clearer that we expect packing into 16-bit fields and we do not require (and must not have) 32-bit alignment of the collections of bitfields.	2024-03-07 09:30:59 -08:00
Frank Halasz	fb579a2ab5	Merge pull request #491 from Interlisp/fgh_emscripten-vmem_save Fix Issue#1541: IL:LOGOUT does not work running Medley on emscripten maiko	2024-02-16 12:03:31 -08:00
Frank Halasz	258f70a82b	Fix Issue#1541: IL:LOGOUT does not work running Medley on emscripten maiko	2024-02-16 00:03:39 -08:00
Nick Briggs	895f765105	Merge pull request #490 from Interlisp/nhb-no-wasm-getrusage Emscripten/wasm does not support getrusage() system call	2024-02-13 16:08:40 -08:00
Nick Briggs	9f02ce0590	Emscripten/wasm does not support getrusage() system call Updating the MiscStats data can at best provide the time of day and attribute all elapsed time to total CPU time. Closes issue #1537	2024-02-12 09:30:46 -08:00
Frank Halasz	ce20accae3	Merge pull request #489 from Interlisp/fgh_em-build-01 Add Emscripten build to buildRelease workflow	2024-02-11 14:28:57 -08:00
Frank Halasz	ce7deadad3	Added LZ4 compression to wasm_nl	2024-02-10 00:40:20 -08:00
Frank Halasz	0b0c82ce18	Returning buildRelease to full builds	2024-02-07 18:37:47 -08:00
Frank Halasz	3ae25f81f8	update actions to later versions to account for githiubs move from node16 to node20	2024-02-07 18:29:22 -08:00
Frank Halasz	52a3512379	additional fix to tar of emscripten files	2024-02-07 18:09:39 -08:00
Frank Halasz	df6dd883a6	fix tar of emscripten files	2024-02-07 18:01:36 -08:00
Frank Halasz	3d341e3bbd	5 Debugging emscripten install PATH updates	2024-02-07 17:53:53 -08:00
Frank Halasz	ebe4babbe1	4 Debugging emscripten install PATH updates	2024-02-07 17:23:40 -08:00
Frank Halasz	587ce1983a	3 Debugging emscripten install PATH updates	2024-02-07 17:14:16 -08:00
Frank Halasz	b841a44427	2 Debugging emscripten install PATH updates	2024-02-07 17:10:01 -08:00
Frank Halasz	efd200dbf7	Debugging emscripten install PATH updates	2024-02-07 17:02:21 -08:00
Frank Halasz	640f69877f	More on fixing emscripten install PATH updates	2024-02-07 16:57:04 -08:00
Frank Halasz	400f3b7835	Fix emscripten install PATH updates	2024-02-07 16:49:26 -08:00
Frank Halasz	e657b2e1dc	Debugging emscriten build	2024-02-07 13:21:01 -08:00
Frank Halasz	75c815f585	Fix typo in emscripten install	2024-02-07 13:13:04 -08:00
Frank Halasz	696ac9a675	Fix install of SDL2	2024-02-07 13:08:39 -08:00
Frank Halasz	8c54c0fbe0	First pass at workflow to build maiko for emscripten	2024-02-07 12:55:49 -08:00
Nick Briggs	586a3206c2	Merge pull request #488 from Interlisp/incorporate-wasm-changes Incorporate wasm changes	2024-01-26 08:42:15 -08:00
Nick Briggs	e93e3c895e	Update preloaded directories, allow Emscripten runtime to exit, set MAIKO_ENABLE_NETHUB Compiling with -DMAIKO_ENABLE_NETHUB makes it possible to test out having a WebSocket server that could pass packets back and forth to the Dodo NetHub. Setting Emscripten link-time option for EXIT_RUNTIME allows the runtime code to shutdown when you exit Medley via a (LOGOUT) Set up preloads for all the parts of the Medley directory that MEDLEYDIR-INIT expects to be there. The resulting ldesdl.data is (at this time) 128 MB. It can be installed gzipped if using nginx or some other web server that supports pre-zipped static files. It would be better to have these as lazy-loading files, but the setup for that is complicated. Another alternative to embedding all the data would be if a WebSocket to XNS/Nethub gateway were written and deployed.	2024-01-01 17:30:01 -08:00
Nick Briggs	29fdf4c40b	Adapt to window geometry, set up a fake environment variable MEDLEYDIR Passes the window width/height as the requested geometry to lde at startup. Since we control the directory structure of the file-system, we can pass the known fixed location of the Medley directories in the MEDLEYDIR environment variable. Sets up the NetHub host as localhost - not currenty functional, but a WebSocket server could be added to communicate with the NetHub gateway to enable local networking from the browser version of Medley.	2024-01-01 16:58:23 -08:00
Nick Briggs	7bb2393637	Adjustments to WAsm file system layout and compilation options Moves the full.sysout from the root of tle system to /medley/loadups/full.sysout, adds /medley/lispusers/BACKGROUND-YIELD.LCOM and an Emscripten/WAsm specific site init file at /usr/local/lde/site-init.lisp Adjusts options so that the options are in the correct place for the compiler and loader.	2023-12-27 17:20:11 -08:00
Nick Briggs	7c1d2081c8	Ignore all wasm generated directories, lde[sdl].html has moved to src directory	2023-12-22 19:21:59 -08:00
Nick Briggs	acffcb74aa	Merge remote-tracking branch 'wasm-updates/master' into incorporate-wasm-changes	2023-12-22 19:18:56 -08:00
Nick Briggs	ad71e1e830	Merge remote-tracking branch 'no-defun-allowed/master' into incorporate-wasm-changes	2023-12-22 19:15:28 -08:00
Nick Briggs	4b0032e1b6	Piggyback on existing async timer emulation instruction countdown for periodic emscripten_sleep() call. There is no need for an additional Emscripten-specific counter to periodically call emscripten_sleep(). Make test for Emscripten environment check MAIKO_OS_EMSCRIPTEN rather than checking __EMSCRIPTEN__, which is localized in the maiko/platform.h include.	2023-12-22 18:17:02 -08:00
Nick Briggs	b21fbcbcb1	subr_settime should avoid settimeofday() completely in Emscripten environment	2023-12-22 18:15:18 -08:00
Nick Briggs	0cc8e4d71c	Revert/update unixfork.c since it is no longer used in emscripten based builds	2023-12-22 13:35:33 -08:00
Nick Briggs	bee6a2f33e	amend! Give emcc link-time flags only to the link phase not the compile phase Give emcc link-time flags only to the link phase not the compile phase Remove target "lde" which is not used in the emscripten configuration.	2023-12-22 13:27:05 -08:00
Nick Briggs	f208fd3302	Rename/move ldesdl.html out of emscripten.wasm (which gets cleared on rebuild) to src/lde.html	2023-12-22 13:18:20 -08:00
Nick Briggs	e82b47a9e7	Give emcc link-time flags only to the link phase not the compile phase	2023-12-22 13:13:32 -08:00
Nick Briggs	b666b1b2de	Add stubs for X11 IOErrorHandler and IOErrorExitHandler (#487 ) Adds stub procedures and hooks them in to the X11 error handlers as an example of how we may be able to handle lost X connections and gracefully terminate the session.	2023-12-22 10:36:13 -08:00
Matt Heffron	d933ba88b7	XFree(mapping) was called before mapping was referenced in DEBUG conditional code. (#486 ) This is only a potential issue in DEBUG build. A problem hasn't occurred, that I know of, but it seemed best just to be safe. Moved the DEBUG code to precede the XFree(mapping) call. (Equivalent to moving the XFree down.)	2023-12-16 15:14:02 -08:00
Nick Briggs	56e7591ada	Although an unlikely case, LispNumToCInt() should handle negative SmallP numbers correctly	2023-11-17 13:11:11 -08:00
Nick Briggs	28d7d5ec00	improve debug output in interprocess communication code	2023-11-17 12:11:10 -08:00
Nick Briggs	1e0264416f	Error exits in forked process code should exit with failure status rather than success	2023-11-17 12:07:23 -08:00
Nick Briggs	15966ccf34	If SUNDISPLAY is defined REALCURSOR will be defined so remove redundant defined(SUNDISPLAY)	2023-11-17 09:46:22 -08:00
Nick Briggs	09fae0a3f5	Add file name and line number to debug print output.	2023-11-17 09:41:37 -08:00
Nick Briggs	2caa2269a9	Avoid initializing CLastUserActionCell68k in INIT mode as \LASTUSERACTION will not have been set.	2023-11-13 13:23:41 -08:00
Hayley Patton	7b2cf44c7c	Add ldesdl.html	2023-11-13 15:30:19 +11:00
Hayley Patton	79a788279b	Add Emscripten/WASM support	2023-11-13 15:18:49 +11:00
Nick Briggs	42477318b5	Assignments embedded in if-condition are not a good idea.	2023-11-12 17:37:34 -08:00
Nick Briggs	6cea8c69b0	Switch makefile slice for building ldeinit on Linux x86_64 from clang to gcc	2023-11-12 15:46:30 -08:00
Nick Briggs	eb3b382ac6	Correct comment about processor type in makefile slice	2023-11-12 15:44:29 -08:00
Nick Briggs	c9b4164d89	Add makefile slice for building ldeinit on Linux aarch64 systems	2023-11-12 15:43:07 -08:00
Nick Briggs	562f4c30ee	Fix typo	2023-11-09 16:48:48 -08:00
Nick Briggs	98569d10b4	Reduce false positives for misaligned pointer access when checking array blocks The forward and backward pointers in an array block only contain valid pointer values when the block is free therefore avoid producing native addresses from these fields if the block is in use. Add comments regarding the operation of the array block merging code Array block merging will produce a single block if possible, otherwise it will produce two blocks with one as large as possible and the other no less than the minimum block size. Rewrite the checks in array block merge forward to minimize unnecessary field accesses	2023-11-09 15:43:11 -08:00
Bill Stumbo	3207df6e24	Update README fixing location of Medley Introduction. (#484 )	2023-09-13 07:49:27 -07:00
Nick Briggs	7fce08f92c	More Lisp variables to avoid in INIT mode - turn off X11 input handling (#482 )	2023-08-09 14:04:51 -07:00
Nick Briggs	2c55f7923c	Add makefile slice for OpenBSD init on x86_64. (#478 ) * Add makefile slice for OpenBSD init on x86_64. * Correct flags for init.	2023-08-03 11:55:22 -07:00
Nick Briggs	b441a28c34	Teach CMake to build ldeinit, update clang-tidy names (#474 ) Have CMake build ldeinit when configured for X11 display, and update the ever-growing list of names under which clang-tidy may be found (now up to version 16)	2023-08-03 10:20:15 -07:00
Nick Briggs	09e73d4153	Update machinetype and osversion scripts to invoke config.guess from same directory (#479 ) If machinetype or osversion are executed from other than the current working directory they will fail to execute the config.guess script because it was invoked with "./config.guess". This update attempts to determine the directory where machinetype or osversion were found and uses the same path to invoke config.guess.	2023-08-03 10:18:02 -07:00
Nick Briggs	8e43a393bd	Avoid setting Lisp variables whose locations are unknown when in INIT mode (#481 ) * Avoid setting Lisp variables whose locations are unknown when in INIT mode. * Exit with a success (0) status for normal lisp_finish.	2023-08-01 11:16:42 -07:00
Nick Briggs	4a9f5500c4	struct buf is missing definition for byte-swapped bigvm case (#477 ) While there was a definition for the pre-bigvm case, with 24-bit pointers, for byteswapped (little-endian) systems, there was no structure definition for the bigvm case, with 28-bit pointers.	2023-07-24 20:43:25 -07:00