Update install of sdl2 for emscripten in buildRelease workflow.

1. Replace wasm build with wasm_nl builds and get rid of wasm_nl flag. Update buildRelease.yml and makeright accordingly. 2. Add -lidbfs.js flag to LDFLAGS in makefile-emscripten-wasm.wasm. 3. Update buildRelease.yml docker action versions to accomdate github moving from node 16 to node 20.
2026-03-16 06:47:22 +00:00 · 2024-02-16 12:45:30 -08:00 · 2024-02-16 12:32:15 -08:00
43 changed files with 898 additions and 1280 deletions
--- a/.github/workflows/Dockerfile_maiko
+++ b/.github/workflows/Dockerfile_maiko
@@ -18,7 +18,7 @@ COPY . ${INSTALL_LOCATION}
 # Build maiko
 RUN cd ${INSTALL_LOCATION}/bin \
    && ./makeright x cleanup \
-    && ./makeright x nethub
+    && ./makeright x
 RUN cd ${INSTALL_LOCATION}/bin \
    && if [ "$(./machinetype)" = "x86_64" ]; then \
           ./makeright init; \
--- a/.github/workflows/buildRelease.yml
+++ b/.github/workflows/buildRelease.yml
@@ -185,14 +185,14 @@ jobs:

      # Setup the Docker Machine Emulation environment.
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
        with:
          platforms: linux/amd64,linux/arm64,linux/arm/v7

      # Setup the Docker Buildx funtion
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3

      # Do the Docker Build using the Dockerfile in the repository we
      # checked out.  Save the results in a directory under /tmp to be used
@@ -204,7 +204,7 @@ jobs:
      #       Dockerfile, NOT HERE IN THE WORKFLOW.
      #
      - name: Build Docker Image and Save It Locally
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
        with:
          builder: ${{ steps.buildx.outputs.name }}
          build-args: |
@@ -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 --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
+          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

      - name: Install X11 dependencies on MacOS
        env:
@@ -339,7 +339,6 @@ jobs:
            -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
            -DMAIKO_DISPLAY_SDL=ON \
            -DMAIKO_DISPLAY_X11=ON \
-            -DMAIKO_ENABLE_NETHUB=true \
            -DCMAKE_BUILD_TYPE=Release
          cmake --build . --config Release
          for exe in lde ldex ldesdl
@@ -504,6 +503,7 @@ jobs:
      - name: Install SDL2
        run: |
          export DEBIAN_FRONTEND=noninteractive
+          sudo -E apt-get update
          sudo -E apt-get install -y libsdl2-dev libsdl2-2.0-0

      # Install Emscripten SDK
@@ -533,8 +533,8 @@ jobs:
      - name: Compile Maiko using Emscripten
        working-directory: ./bin
        run: |
-          ./makeright wasm_nl
-          cd ../emscripten.wasm_nl
+          ./makeright wasm
+          cd ../emscripten.wasm
          tar -c -z -f ../${{ steps.tag.outputs.release_tag }}-emscripten.tgz *

      # Push Release to github
--- a/bin/config.guess
+++ b/bin/config.guess
--- a/bin/config.sub
+++ b/bin/config.sub
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2024 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.

-# shellcheck disable=SC2006,SC2268 # see below for rationale
-
-timestamp='2024-01-01'
+timestamp='2020-08-17'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -35,7 +33,7 @@ timestamp='2024-01-01'
 # Otherwise, we print the canonical config type on stdout and succeed.

 # You can get the latest version of this script from:
-# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub

 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -52,13 +50,6 @@ timestamp='2024-01-01'
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.

-# The "shellcheck disable" line above the timestamp inhibits complaints
-# about features and limitations of the classic Bourne shell that were
-# superseded or lifted in POSIX.  However, this script identifies a wide
-# variety of pre-POSIX systems that do not have POSIX shells at all, and
-# even some reasonably current systems (Solaris 10 as case-in-point) still
-# have a pre-POSIX /bin/sh.
-
 me=`echo "$0" | sed -e 's,.*/,,'`

 usage="\
@@ -76,13 +67,13 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

 help="
-Try '$me --help' for more information."
+Try \`$me --help' for more information."

 # Parse command line
 while test $# -gt 0 ; do
@@ -121,16 +112,14 @@ esac

 # Split fields of configuration type
 # shellcheck disable=SC2162
-saved_IFS=$IFS
 IFS="-" read field1 field2 field3 field4 <<EOF
 $1
 EOF
-IFS=$saved_IFS

 # Separate into logical components for further validation
 case $1 in
 	*-*-*-*-*)
-		echo "Invalid configuration '$1': more than four components" >&2
+		echo Invalid configuration \`"$1"\': more than four components >&2
 		exit 1
 		;;
 	*-*-*-*)
@@ -145,8 +134,7 @@ case $1 in
 			nto-qnx* | linux-* | uclinux-uclibc* \
 			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
 			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
-			| windows-* )
+			| storm-chaos* | os2-emx* | rtmk-nova*)
 				basic_machine=$field1
 				basic_os=$maybe_os
 				;;
@@ -175,10 +163,6 @@ case $1 in
 						basic_machine=$field1
 						basic_os=$field2
 						;;
-					zephyr*)
-						basic_machine=$field1-unknown
-						basic_os=$field2
-						;;
 					# Manufacturers
 					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
 					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
@@ -938,13 +922,11 @@ case $basic_machine in

 	*-*)
 		# shellcheck disable=SC2162
-		saved_IFS=$IFS
 		IFS="-" read cpu vendor <<EOF
 $basic_machine
 EOF
-		IFS=$saved_IFS
 		;;
-	# We use 'pc' rather than 'unknown'
+	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
@@ -1021,11 +1003,6 @@ case $cpu-$vendor in
 		;;

 	# Here we normalize CPU types with a missing or matching vendor
-	armh-unknown | armh-alt)
-		cpu=armv7l
-		vendor=alt
-		basic_os=${basic_os:-linux-gnueabihf}
-		;;
 	dpx20-unknown | dpx20-bull)
 		cpu=rs6000
 		vendor=bull
@@ -1076,7 +1053,7 @@ case $cpu-$vendor in
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		cpu=i586
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
 		cpu=i686
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1127,7 +1104,7 @@ case $cpu-$vendor in
 	xscale-* | xscalee[bl]-*)
 		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
-	arm64-* | aarch64le-*)
+	arm64-*)
 		cpu=aarch64
 		;;

@@ -1181,14 +1158,14 @@ case $cpu-$vendor in
 		case $cpu in
 			1750a | 580 \
 			| a29k \
-			| aarch64 | aarch64_be | aarch64c | arm64ec \
+			| aarch64 | aarch64_be \
 			| abacus \
 			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
 			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
 			| alphapca5[67] | alpha64pca5[67] \
 			| am33_2.0 \
 			| amdgcn \
-			| arc | arceb | arc32 | arc64 \
+			| arc | arceb \
 			| arm | arm[lb]e | arme[lb] | armv* \
 			| avr | avr32 \
 			| asmjs \
@@ -1200,29 +1177,45 @@ case $cpu-$vendor in
 			| d10v | d30v | dlx | dsp16xx \
 			| e2k | elxsi | epiphany \
 			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
-			| javascript \
 			| h8300 | h8500 \
 			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 			| hexagon \
 			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
 			| ip2k | iq2000 \
 			| k1om \
-			| kvx \
 			| le32 | le64 \
 			| lm32 \
-			| loongarch32 | loongarch64 \
 			| m32c | m32r | m32rle \
 			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
 			| m88110 | m88k | maxq | mb | mcore | mep | metag \
 			| microblaze | microblazeel \
-			| mips* \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64eb | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
 			| mmix \
 			| mn10200 | mn10300 \
 			| moxie \
 			| mt \
 			| msp430 \
-			| nanomips* \
 			| nds32 | nds32le | nds32be \
 			| nfp \
 			| nios | nios2 | nios2eb | nios2el \
@@ -1236,7 +1229,7 @@ case $cpu-$vendor in
 			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
 			| pru \
 			| pyramid \
-			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+			| riscv | riscv32 | riscv64 \
 			| rl78 | romp | rs6000 | rx \
 			| s390 | s390x \
 			| score \
@@ -1248,13 +1241,11 @@ case $cpu-$vendor in
 			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
 			| spu \
 			| tahoe \
-			| thumbv7* \
 			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
 			| tron \
 			| ubicom32 \
 			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
 			| vax \
-			| vc4 \
 			| visium \
 			| w65 \
 			| wasm32 | wasm64 \
@@ -1266,7 +1257,7 @@ case $cpu-$vendor in
 				;;

 			*)
-				echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
 				exit 1
 				;;
 		esac
@@ -1287,45 +1278,34 @@ esac

 # Decode manufacturer-specific aliases for certain operating systems.

-if test x"$basic_os" != x
+if test x$basic_os != x
 then

-# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
+# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just
 # set os.
-obj=
 case $basic_os in
 	gnu/linux*)
 		kernel=linux
-		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
-		;;
-	os2-emx)
-		kernel=os2
-		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
+		os=`echo $basic_os | sed -e 's|gnu/linux|gnu|'`
 		;;
 	nto-qnx*)
 		kernel=nto
-		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+		os=`echo $basic_os | sed -e 's|nto-qnx|qnx|'`
 		;;
 	*-*)
 		# shellcheck disable=SC2162
-		saved_IFS=$IFS
 		IFS="-" read kernel os <<EOF
 $basic_os
 EOF
-		IFS=$saved_IFS
 		;;
 	# Default OS when just kernel was specified
 	nto*)
 		kernel=nto
-		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
+		os=`echo $basic_os | sed -e 's|nto|qnx|'`
 		;;
 	linux*)
 		kernel=linux
-		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
-		;;
-	managarm*)
-		kernel=managarm
-		os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
+		os=`echo $basic_os | sed -e 's|linux|gnu|'`
 		;;
 	*)
 		kernel=
@@ -1346,7 +1326,7 @@ case $os in
 		os=cnk
 		;;
 	solaris1 | solaris1.*)
-		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
 	solaris)
 		os=solaris2
@@ -1375,7 +1355,7 @@ case $os in
 		os=sco3.2v4
 		;;
 	sco3.2.[4-9]*)
-		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
 		;;
 	sco*v* | scout)
 		# Don't match below
@@ -1387,7 +1367,13 @@ case $os in
 		os=psos
 		;;
 	qnx*)
-		os=qnx
+		case $cpu in
+		    x86 | i*86)
+			;;
+		    *)
+			os=nto-$os
+			;;
+		esac
 		;;
 	hiux*)
 		os=hiuxwe2
@@ -1451,7 +1437,7 @@ case $os in
 		;;
 	# Preserve the version number of sinix5.
 	sinix5.*)
-		os=`echo "$os" | sed -e 's|sinix|sysv|'`
+		os=`echo $os | sed -e 's|sinix|sysv|'`
 		;;
 	sinix*)
 		os=sysv4
@@ -1492,16 +1478,10 @@ case $os in
 			os=eabi
 			;;
 		    *)
-			os=
-			obj=elf
+			os=elf
 			;;
 		esac
 		;;
-	aout* | coff* | elf* | pe*)
-		# These are machine code file formats, not OSes
-		obj=$os
-		os=
-		;;
 	*)
 		# No normalization, but not necessarily accepted, that comes below.
 		;;
@@ -1520,15 +1500,12 @@ else
 # system, and we'll never get to this point.

 kernel=
-obj=
 case $cpu-$vendor in
 	score-*)
-		os=
-		obj=elf
+		os=elf
 		;;
 	spu-*)
-		os=
-		obj=elf
+		os=elf
 		;;
 	*-acorn)
 		os=riscix1.2
@@ -1538,35 +1515,28 @@ case $cpu-$vendor in
 		os=gnu
 		;;
 	arm*-semi)
-		os=
-		obj=aout
+		os=aout
 		;;
 	c4x-* | tic4x-*)
-		os=
-		obj=coff
+		os=coff
 		;;
 	c8051-*)
-		os=
-		obj=elf
+		os=elf
 		;;
 	clipper-intergraph)
 		os=clix
 		;;
 	hexagon-*)
-		os=
-		obj=elf
+		os=elf
 		;;
 	tic54x-*)
-		os=
-		obj=coff
+		os=coff
 		;;
 	tic55x-*)
-		os=
-		obj=coff
+		os=coff
 		;;
 	tic6x-*)
-		os=
-		obj=coff
+		os=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1588,24 +1558,19 @@ case $cpu-$vendor in
 		os=sunos3
 		;;
 	m68*-cisco)
-		os=
-		obj=aout
+		os=aout
 		;;
 	mep-*)
-		os=
-		obj=elf
+		os=elf
 		;;
 	mips*-cisco)
-		os=
-		obj=elf
+		os=elf
 		;;
-	mips*-*|nanomips*-*)
-		os=
-		obj=elf
+	mips*-*)
+		os=elf
 		;;
 	or32-*)
-		os=
-		obj=coff
+		os=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=sysv3
@@ -1614,8 +1579,7 @@ case $cpu-$vendor in
 		os=sunos4.1.1
 		;;
 	pru-*)
-		os=
-		obj=elf
+		os=elf
 		;;
 	*-be)
 		os=beos
@@ -1696,12 +1660,10 @@ case $cpu-$vendor in
 		os=uxpv
 		;;
 	*-rom68k)
-		os=
-		obj=coff
+		os=coff
 		;;
 	*-*bug)
-		os=
-		obj=coff
+		os=coff
 		;;
 	*-apple)
 		os=macos
@@ -1719,20 +1681,13 @@ esac

 fi

-# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
-
+# Now, validate our (potentially fixed-up) OS.
 case $os in
-	# Sometimes we do "kernel-libc", so those need to count as OSes.
-	llvm* | musl* | newlib* | relibc* | uclibc*)
+	# Sometimes we do "kernel-abi", so those need to count as OSes.
+	musl* | newlib* | uclibc*)
 		;;
-	# Likewise for "kernel-abi"
-	eabi* | gnueabi*)
-		;;
-	# VxWorks passes extra cpu info in the 4th filed.
-	simlinux | simwindows | spe)
-		;;
-	# See `case $cpu-$os` validation below
-	ghcjs)
+	# Likewise for "kernel-libc"
+	eabi | eabihf | gnueabi | gnueabihf)
 		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
@@ -1742,20 +1697,20 @@ case $os in
 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
 	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
+	     | os9* | macos* | osx* | ios* \
 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
 	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
 	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
 	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
-	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+	     | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
 	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | oabi* \
-	     | ptx* | ecoff* | winnt* | domain* | vsta* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
 	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | moss* | proelf* | rtems* \
+	     | chorusrdb* | cegcc* | glidix* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
 	     | midipix* | mingw32* | mingw64* | mint* \
 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
 	     | interix* | uwin* | mks* | rhapsody* | darwin* \
@@ -1767,117 +1722,42 @@ case $os in
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
+	     | nsk* | powerunix* | genode* | zvmoe* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
 		;;
-	# This refers to builds using the UEFI calling convention
-	# (which depends on the architecture) and PE file format.
-	# Note that this is both a different calling convention and
-	# different file format than that of GNU-EFI
-	# (x86_64-w64-mingw32).
-	uefi)
-		;;
 	none)
 		;;
-	kernel* | msvc* )
-		# Restricted further below
-		;;
-	'')
-		if test x"$obj" = x
-		then
-			echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
-		fi
-		;;
 	*)
-		echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
-		exit 1
-		;;
-esac
-
-case $obj in
-	aout* | coff* | elf* | pe*)
-		;;
-	'')
-		# empty is fine
-		;;
-	*)
-		echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
-		exit 1
-		;;
-esac
-
-# Here we handle the constraint that a (synthetic) cpu and os are
-# valid only in combination with each other and nowhere else.
-case $cpu-$os in
-	# The "javascript-unknown-ghcjs" triple is used by GHC; we
-	# accept it here in order to tolerate that, but reject any
-	# variations.
-	javascript-ghcjs)
-		;;
-	javascript-* | *-ghcjs)
-		echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
+		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
 		exit 1
 		;;
 esac

 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
-case $kernel-$os-$obj in
-	linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
-		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
-		    | linux-relibc*- | linux-uclibc*- )
+case $kernel-$os in
+	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* )
 		;;
-	uclinux-uclibc*- )
-		;;
-	managarm-mlibc*- | managarm-kernel*- )
-		;;
-	windows*-msvc*-)
-		;;
-	-dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
-		    | -uclibc*- )
+	-dietlibc* | -newlib* | -musl* | -uclibc* )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
-		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
+		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	-kernel*- )
-		echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
-		exit 1
+	kfreebsd*-gnu* | kopensolaris*-gnu*)
 		;;
-	*-kernel*- )
-		echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
-		exit 1
+	nto-qnx*)
 		;;
-	*-msvc*- )
-		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
-		exit 1
+	*-eabi* | *-gnueabi*)
 		;;
-	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
-		;;
-	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
-		;;
-	nto-qnx*-)
-		;;
-	os2-emx-)
-		;;
-	*-eabi*- | *-gnueabi*-)
-		;;
-	none--*)
-		# None (no kernel, i.e. freestanding / bare metal),
-		# can be paired with an machine code file format
-		;;
-	-*-)
+	-*)
 		# Blank kernel with real OS is always fine.
 		;;
-	--*)
-		# Blank kernel and OS with real machine code file format is always fine.
-		;;
-	*-*-*)
-		echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
+	*-*)
+		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
 		exit 1
 		;;
 esac
@@ -1960,7 +1840,7 @@ case $vendor in
 		;;
 esac

-echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
 exit

 # Local variables:
--- a/bin/makefile-emscripten.wasm-wasm
+++ b/bin/makefile-emscripten.wasm-wasm
@@ -10,22 +10,8 @@ XFLAGS = -DSDL -sUSE_SDL=2
 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
+LDFLAGS = -lidbfs.js -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4

 LDELDFLAGS =

--- a/bin/makefile-emscripten.wasm_nl-wasm_nl
+++ b/bin/makefile-emscripten.wasm_nl-wasm_nl
@@ -1,23 +0,0 @@
-# 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
@@ -1,19 +0,0 @@
-# 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/makeright
+++ b/bin/makeright
@@ -33,41 +33,27 @@
 #
 # makeright init  requires directory "maiko/init.${architecture}
 #
-# Note: X11R4 environment link shared libraries.
-#	lde need X library. If lde links shared libraries,
+# Note: X11R4 environment link shared libraries. 
+#	lde need X library. If lde links shared libraries, 
 #	X shared libraries are needed at run time.
 #
 # Hide X shared libraries from link libraries search path.
-LD_LIBRARY_PATH=/usr/local/lib
+LD_LIBRARY_PATH=/usr/local/lib 

 export PATH=".:$PATH"

-noshift="false"
 if test "$1" = ""
   then
 	display="single"
-        noshift="true"
-elif test "$1" = "nethub"
-    then
-        display="single"
-        noshift="true"
 else
    display="$1"
-    noshift="false"
 fi

-if test "$noshift" = "false"
+if test $# -gt 0
    then
 	shift
 fi

-nethub="false"
-if test "$1" = "nethub"
-    then
-        nethub="true"
-        shift
-fi
-
 architecture=`machinetype`
 osversion=`osversion`
 echo "making so far for ${osversion} on ${architecture}."
@@ -93,11 +79,6 @@ case "$display" in
 		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
 		;;
@@ -125,12 +106,7 @@ echo start making lde for ${releasename}.
 # then finally do the make, including the right stuff
 # With makefile-tail merged, this should only take ONE make command....

-cp -p makefile-${releasename} /tmp/makefile-${releasename}-$$
-if test "$nethub" = "true"
-    then
-        sed -e "/^DFLAGS = /s/$/ -DMAIKO_ENABLE_NETHUB/" -i /tmp/makefile-${releasename}-$$
-fi
 make RELEASENAME=${releasename} LDENAME=${ldename} \
 			OSARCHNAME=${osversion}.${architecture} \
-			-f makefile-header -f /tmp/makefile-${releasename}-$$ \
+			-f makefile-header -f makefile-${releasename} \
 			-f makefile-tail $*
--- a/bin/osversion
+++ b/bin/osversion
@@ -12,7 +12,6 @@ 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 || hoffset < 0) {
-    printf("Stack offset is out of range: 0x%tx\n", hoffset);
+  if (hoffset > 0xffff) {
+    printf("Stack offset is too large: 0x%tx\n", hoffset);
  }
  return (DLword)hoffset;
 }
--- a/inc/keyeventdefs.h
+++ b/inc/keyeventdefs.h
@@ -4,7 +4,6 @@
 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/maiko/platform.h
+++ b/inc/maiko/platform.h
@@ -166,12 +166,6 @@
 #  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 = NativeAligned2FromStackOffset(GETWORD((DLword *)CURRENTFX - 1)); \
+    IVar = NativeAligned2FromLAddr(STK_OFFSET | 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 = NativeAligned2FromStackOffset(GETWORD((DLword *)CURRENTFX - 1)); \
+    IVar = NativeAligned2FromLAddr(STK_OFFSET | 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 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;
+  unsigned flags : 3;
+  unsigned fast : 1;
+  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned incall : 1;
+  unsigned validnametable : 1;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  unsigned short nopush : 1;
-  unsigned short usecount : 8;
+  unsigned nopush : 1;
+  unsigned usecount : 8;
  DLword alink; /* alink pointer (Low addr) */
 #ifdef BIGVM
  LispPTR fnheader; /* pointer to FunctionHeader (Hi2 addr) */
 #else
  DLword lofnheader;        /* pointer to FunctionHeader (Low addr) */
-  unsigned short hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
-  unsigned short hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
+  unsigned hi1fnheader : 8; /* pointer to FunctionHeader (Hi1 addr) */
+  unsigned hi2fnheader : 8; /* pointer to FunctionHeader (Hi2 addr) */
 #endif /* BIGVM */
  DLword nextblock; /* pointer to FreeStackBlock */
  DLword pc;        /* Program counter */
@@ -102,23 +102,23 @@ typedef struct frameex1 {
  LispPTR nametable; /* ptr to NameTable of this FrameEx (Hi2 addr) */
 #else
  DLword lonametable;        /* ptr to NameTable of this FrameEx (Low addr) */
-  unsigned short hi1nametable : 8; /* ptr to NameTable of this FrameEx (Hi1 addr) */
-  unsigned short hi2nametable : 8; /* ptr to NameTable of this FrameEx (Hi2 addr) */
+  unsigned hi1nametable : 8; /* ptr to NameTable of this FrameEx (Hi1 addr) */
+  unsigned hi2nametable : 8; /* ptr to NameTable of this FrameEx (Hi2 addr) */
 #endif /* BIGVM */
  DLword blink; /* blink pointer (Low addr) */
  DLword clink; /* clink pointer (Low addr) */
 } FX;

 typedef struct frameex2 {
-  unsigned short flags : 3;
-  unsigned short fast : 1;
-  unsigned short nil2 : 1; /* not used, prev: This frame treats N-func */
-  unsigned short incall : 1;
-  unsigned short validnametable : 1;
+  unsigned flags : 3;
+  unsigned fast : 1;
+  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned incall : 1;
+  unsigned validnametable : 1;
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
-  unsigned short nopush : 1;
-  unsigned short usecount : 8;
+  unsigned nopush : 1;
+  unsigned 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 short flags : 3;
-  unsigned short nil : 3;
-  unsigned short residual : 1;
-  unsigned short padding : 1;
-  unsigned short usecnt : 8;
+  unsigned flags : 3;
+  unsigned nil : 3;
+  unsigned residual : 1;
+  unsigned padding : 1;
+  unsigned 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 short argtype : 2;     /* ?? */
-  unsigned short byteswapped : 1; /* code was reswapped.	*/
-  unsigned short nil4 : 1;        /* not used, prev: native translated? */
-  unsigned short fvaroffset : 8;
+  unsigned argtype : 2;     /* ?? */
+  unsigned byteswapped : 1; /* code was reswapped.	*/
+  unsigned nil4 : 1;        /* not used, prev: native translated? */
+  unsigned fvaroffset : 8;
  /* DLword offset from head of NameTable */
-  unsigned short nlocals : 8; /* ?? */
+  unsigned nlocals : 8; /* ?? */
  DLword ntsize;        /* size of NameTable */
                        /* NameTable of variable length is following with this structure. */
 } FNHEAD;

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

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

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

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

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

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

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

 typedef struct basic_frame {
  DLword ivar;
-  unsigned short usecnt : 8;
-  unsigned short padding : 1;
-  unsigned short residual : 1;
-  unsigned short nil : 3;
-  unsigned short flags : 3;
+  unsigned usecnt : 8;
+  unsigned padding : 1;
+  unsigned residual : 1;
+  unsigned nil : 3;
+  unsigned 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 = NativeAligned2FromStackOffset(CURRENTFX->nextblock);
+  IVar = NativeAligned2FromLAddr((((LispPTR)(CURRENTFX->nextblock)) | STK_OFFSET));

  /* Set PC to the Next Instruction and save into FX */
  CURRENTFX->pc = ((UNSIGNED)PC - (UNSIGNED)FuncObj) + bytenum;
--- 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) {
-    (void)fprintf(stderr, "Can't Enter URAID.\n");
+    fprintf(stderr, "Can't Enter URAID.\n");
    exit(-1);
  }
  /* comm read */
  URaid_errmess = cp;
-  (void)fprintf(stderr, "\n*Error* %s\n", cp);
+  fprintf(stderr, "\n*Error* %s\n", cp);
  fflush(stdin);
-  (void)fprintf(stderr, "Enter the URaid\n");
+  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 *)NativeAligned4FromStackOffset((fx_addr68k)->blink);
+    bf = (Bframe *)NativeAligned4FromLAddr(((fx_addr68k)->blink + STK_OFFSET));
  }

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

-  ptr = NativeAligned2FromStackOffset(bf->ivar);
+  ptr = NativeAligned2FromLAddr(STK_OFFSET + 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 = NativeAligned2FromStackOffset(fx_addr68k->nextblock);
+      next68k = (DLword *)NativeAligned2FromLAddr((fx_addr68k->nextblock + STK_OFFSET));

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

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

  i = 0;
--- 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) {
-    (void)fprintf(stderr, "%s: dlbindack failed.\n", pname);
+    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) {
-    (void)fprintf(stderr, "%s: DL_PROMISC_SAP failed.\n", pname);
+    fprintf(stderr, "%s: DL_PROMISC_SAP failed.\n", pname);
    return (-1);
  }

  dlpromisconreq(fd, DL_PROMISC_MULTI);

  if (dlokack(fd, buf) < 0) {
-    (void)fprintf(stderr, "%s: DL_PROMISC_MULTI failed.\n", pname);
+    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:
-      (void)fprintf(stderr, "%s: DLPI MACtype %ld unknown, ", pname, (long)dlp->info_ack.dl_mac_type);
-      (void)fprintf(stderr, "assuming ethernet.\n");
+      fprintf(stderr, "%s: DLPI MACtype %ld unknown, ", pname, (long)dlp->info_ack.dl_mac_type);
+      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)(void)fprintf(stderr, "dlpi: timeout\n"); }
+static void sigalrm(int sig) { (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)(void)fprintf(stderr, "%s: out of memory.\n", pname);
+    (void)fprintf(stderr, "%s: out of memory.\n", pname);
    (void)exit(1);
  }

--- a/src/dsk.c
+++ b/src/dsk.c
@@ -3053,8 +3053,10 @@ 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
@@ -3064,14 +3066,20 @@ 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);
+          }
+  */

  /*
-   * Cache mechanism was not used because of a bug in Sun OS.
+   * 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.
   * 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.
@@ -3079,15 +3087,9 @@ static int get_version_array(char *dir, char *file, FileName *varray, CurrentVAr
   */

  /*
-   * 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
-
+          if ((sbuf.st_mtime == cache->mtime) && strcmp(dir, cache->path) == 0
+              && strcmp(lcased_file, cache->file) == 0) return(1);
+  */
  errno = 0;
  TIMEOUT0(dirp = opendir(dir));
  if (dirp == NULL) {
@@ -3138,9 +3140,11 @@ 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)(void)fprintf(stderr, "No portable graphics mode supported by this host.\n");
-        (void)(void)fprintf(stderr, "\n-Expected VESA or VGA.\n");
+        (void)fprintf(stderr, "No portable graphics mode supported by this host.\n");
+        (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) {
-    (void)fprintf(stderr, "Can't open display.");
+    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"));
-  (void)fprintf(stderr, "Panic! Call to uninitialized display slot!");
+  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 = NativeAligned2FromStackOffset(CURRENTFX->blink - 4);
+    find_end = (DLword *)NativeAligned2FromLAddr(STK_OFFSET | (CURRENTFX->blink - 4));
  } else { /*  Fast cae */
    find_end = ((DLword *)CURRENTFX) - 2 - 4;
  }
--- a/src/inet.c
+++ b/src/inet.c
@@ -26,7 +26,6 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
-/* if using inet_ntop you must #include <arpa/inet.h> */
 #endif /* DOS */

 #if (defined(OS5) || defined(__CYGWIN__)) && !defined(O_ASYNC)
@@ -94,8 +93,7 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
      LispStringToCString(nameConn, namestring, 100);
      host = gethostbyname(namestring);
      if (!host) return (NIL);
-      res = ntohl(*(in_addr_t *)host->h_addr);
-      N_ARITH_SWITCH(res);
+      N_ARITH_SWITCH(ntohl(*(long *)host->h_addr));
      break;

    case TCPservicelookup:
@@ -109,20 +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# */
      memset(&farend, 0, sizeof farend);
      N_GETNUMBER(nameConn, res, string_host);
-      farend.sin_addr.s_addr = htonl(res);
+      farend.sin_addr.s_addr = htons(res);
      goto host_ok;
    string_host:
      LispStringToCString(nameConn, namestring, 100);
@@ -139,9 +131,7 @@ 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));

@@ -207,20 +197,13 @@ 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);
-#else
-        fcntl(result, F_SETFL, fcntl(result, F_GETFL, 0) | O_NONBLOCK);
-#endif
+        fcntl(result, F_SETOWN, getpid());

-#ifdef F_SETOWN
-	fcntl(result, F_SETOWN, getpid());
-#endif
        if (listen(result, 5) == -1) {
          perror("TCP Listen");
          close(result);
@@ -242,9 +225,8 @@ 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 */
@@ -277,14 +259,9 @@ 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/initsout.c
+++ b/src/initsout.c
@@ -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)) {
-    (void)fprintf(stderr, "You can't expand VMEM\n");
+    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 */
-#if !defined(DOS) && !defined(MAIKO_OS_HAIKU)
+#ifndef DOS
  InterfacePage->serialnumber = 0xffff & gethostid();
-#endif /* DOS MAIKO_OS_HAIKU */
+#endif /* DOS */

 /* 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
--- 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) {
-        (void)fprintf(stderr, "Missing argument to -display option.\n");
+        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 {
-      (void)fprintf(stderr, "Unable to open X11 display %s\n",
+      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) {
-    (void)fprintf(stderr, "lde: can't open FrameBuffer\n");
+    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) {
-    (void)fprintf(stderr, "Unable to determine what display program to run.\n");
+    fprintf(stderr, "Unable to determine what display program to run.\n");
    exit(1);
  }

@@ -201,7 +201,6 @@ 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) {
-    (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);
+    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);
    exit(-1);
  }

  if (ifpage.minbversion > 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);
+    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);
    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
-      (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);
+      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);
      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) {
-    (void)fprintf(stderr, "sysout_loader: can't allocate Lisp %dMBytes VM \n", sys_size);
+    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
+#include "lispmap.h"       // for S_POSITIVE, STK_OFFSET
 #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 = NativeAligned2FromStackOffset(CURRENTFX->nextblock);
+  IVar = NativeAligned2FromLAddr((((LispPTR)(CURRENTFX->nextblock)) | STK_OFFSET));

  /* 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))) {
-    (void)fprintf(stderr, "%s%s", helpstring, nethubHelpstring);
+    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");
-    (void)fprintf(stderr, "%s%s", helpstring, nethubHelpstring);
+    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 {
-          (void)fprintf(stderr, "Bad value for -t (integer > 0)\n");
+          fprintf(stderr, "Bad value for -t (integer > 0)\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -t\n");
+        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 {
-          (void)fprintf(stderr, "Bad value for -m (integer > 0)\n");
+          fprintf(stderr, "Bad value for -m (integer > 0)\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -m\n");
+        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) {
-          (void)fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]);
+          fprintf(stderr, "Could not parse -sc argument %s\n", argv[i]);
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -sc\n");
+        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) {
-          (void)fprintf(stderr, "Could not parse -pixelscale argument %s\n", argv[i]);
+          fprintf(stderr, "Could not parse -pixelscale argument %s\n", argv[i]);
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -pixelscale\n");
+        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 {
-        (void)fprintf(stderr, "Missing argument after -title\n");
+        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 {
-        (void)fprintf(stderr, "Missing or bogus -E argument\n");
+        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 {
-        (void)fprintf(stderr, "Missing argument after -nh-host\n");
+        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 {
-          (void)fprintf(stderr, "Bad value for -nh-port\n");
+          fprintf(stderr, "Bad value for -nh-port\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -nh-port\n");
+        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 {
-          (void)fprintf(stderr, "Invalid argument for -nh-mac\n");
+          fprintf(stderr, "Invalid argument for -nh-mac\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -nh-mac\n");
+        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 {
-          (void)fprintf(stderr, "Bad value for -nh-loglevel\n");
+          fprintf(stderr, "Bad value for -nh-loglevel\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -nh-loglevel\n");
+        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 {
-          (void)fprintf(stderr, "Bad value for -intr-emu-insns (integer > 1000)\n");
+          fprintf(stderr, "Bad value for -intr-emu-insns (integer > 1000)\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -intr-emu-insns\n");
+        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 {
-          (void)fprintf(stderr, "Bad value for -xpages (integer > 0)\n");
+          fprintf(stderr, "Bad value for -xpages (integer > 0)\n");
          exit(1);
        }
      } else {
-        (void)fprintf(stderr, "Missing argument after -xpages\n");
+        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()) {
-    (void)fprintf(stderr, "Effective user is not real user.  Resetting uid\n");
+    fprintf(stderr, "Effective user is not real user.  Resetting uid\n");
    if (setuid(getuid()) == -1) {
-      (void)fprintf(stderr, "Unable to reset user id to real user id\n");
+      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) (void)fprintf(stderr, "Failed to find UNIXCOMM file handles; no processes\n");
+    if (please_fork) 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()) {
-    (void)fprintf(stderr, "Cannot allocate internal data.\n");
+    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 = NativeAligned2FromStackOffset(InterfacePage->currentfxp) + FRAMESIZE;
+  PVar = (DLword *)NativeAligned2FromLAddr(STK_OFFSET | InterfacePage->currentfxp) + FRAMESIZE;

-  freeptr = next68k = NativeAligned2FromStackOffset(CURRENTFX->nextblock);
+  freeptr = next68k = NativeAligned2FromLAddr(STK_OFFSET | 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') { (void)fprintf(stderr, "%s: ", s); }
-  (void)fprintf(stderr, "%s\n", strerror(n));
+  if (s != NULL && *s != '\0') { fprintf(stderr, "%s: ", s); }
+  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({
-    (void)fprintf(stderr, "System call error: %s errno=%d ", from, no);
+    fprintf(stderr, "System call error: %s errno=%d ", from, no);
    perror("");
  });

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

 #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))
@@ -74,15 +72,6 @@ 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
@@ -313,7 +302,7 @@ void C_slowbltchar(LispPTR *args)

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

-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,
+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;
@@ -323,10 +312,10 @@ static void ColorizeFont8(BITMAP *sBM, DLword sXOffset, DLword sYOffset, BITMAP
  sYOffset = sBM->bmheight - (sYOffset + height);
  dYOffset = dBM->bmheight - (dYOffset + height);

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

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

-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,
+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;
@@ -386,13 +375,14 @@ loop:
    dest_h = dest_fragbottom - (dest_fragtop + dest_yoffset);
  } /* end if */

-  dbase = (u_char *)NativeAligned2FromLAddr(dest_frag->bmbase) + (dest_frag->bmrasterwidth * dest_yoffset);
-  nbase = NativeAligned2FromLAddr(sBM->bmbase) + (sBM->bmrasterwidth * sYOffset);
+  dbase =
+      (DLword *)NativeAligned2FromLAddr(dest_frag->bmbase) + (dest_frag->bmrasterwidth * dest_yoffset);
+  nbase = (DLword *)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, dbase += dest_frag->bmrasterwidth * BYTESPER_DLWORD) {
+       i++, nbase += sBM->bmrasterwidth, ((DLword *)dbase) += dest_frag->bmrasterwidth) {
    lineBlt8(nbase, (int)sXOffset, dbase, (int)width, col0, col1, sourcetype, operation);
  }

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

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

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

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

  } /* end for( y ) */

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

  s_base = (DLword *)NativeAligned2FromLAddr(s_bitmap->bmbase) +
           s_bitmap->bmrasterwidth * (s_bitmap->bmheight - (s_bottom + height));
-  d_base = (u_char *)NativeAligned2FromLAddr(d_bitmap->bmbase) +
+  (DLword *)d_base = (DLword *)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, d_base += d_bitmap->bmrasterwidth * BYTESPER_DLWORD) {
+       i++, s_base += s_bitmap->bmrasterwidth, (DLword *)d_base += d_bitmap->bmrasterwidth) {
    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 = NativeAligned2FromStackOffset(CURRENTFX->nextblock);
+  next68k = (DLword *)NativeAligned2FromLAddr(STK_OFFSET | 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 ATOMS_HI
+#include "lispmap.h"       // for STK_OFFSET, 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 = NativeAligned2FromStackOffset(bf->ivar);
+  ptr = NativeAligned2FromLAddr(STK_OFFSET + 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 = NativeAligned2FromStackOffset(fx_addr68k->nextblock);
+  next68k = (DLword *)NativeAligned2FromLAddr((fx_addr68k->nextblock + STK_OFFSET));
  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 *)NativeAligned4FromStackOffset(fx_addr68k->blink);
+    bf = (Bframe *)NativeAligned4FromLAddr((fx_addr68k->blink + STK_OFFSET));
  }
  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 = NativeAligned2FromStackOffset(start);
+    start68k = NativeAligned2FromLAddr(STK_OFFSET | start);

  if (end == 0)
    end68k = Stackspace + InterfacePage->endofstack;
  else
-    end68k = NativeAligned2FromStackOffset(end);
+    end68k = NativeAligned2FromLAddr(STK_OFFSET | 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 = NativeAligned2FromStackOffset(((FX *)stkptr)->nextblock) - (DLword *)stkptr;
+          size = NativeAligned2FromLAddr(STK_OFFSET | ((FX *)stkptr)->nextblock) - (DLword *)stkptr;
        }
        goto checksize;
      default:
--- a/src/timer.c
+++ b/src/timer.c
@@ -47,10 +47,6 @@ 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;
@@ -305,8 +301,6 @@ 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
@@ -562,19 +556,17 @@ static void int_io_service(int sig)
 /************************************************************************/

 static void int_io_init(void) {
-#if !defined(DOS) || !defined(MAIKO_OS_HAIKU)
+#ifndef DOS
  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"));
@@ -586,7 +578,7 @@ static void int_io_init(void) {
      return;
    }
 #endif /* USE_DLPI */
-#endif /* DOS MAIKO_OS_HAIKU */
+#endif /* DOS */
 }

 /************************************************************************/
@@ -608,9 +600,7 @@ 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
@@ -638,9 +628,7 @@ 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) {
-    (void)fprintf(stderr, "Usage: %s [-v] sysout-filename\n", prog);
+    fprintf(stderr, "Usage: %s [-v] sysout-filename\n", prog);
    exit(-1);
 }

--- a/src/tty.c
+++ b/src/tty.c
@@ -51,11 +51,7 @@ 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 = NativeAligned2FromStackOffset(CURRENTFX->nextblock);
+  IVar = NativeAligned2FromLAddr((((LispPTR)(CURRENTFX->nextblock)) | STK_OFFSET));

 #ifdef LISPTRACE
  print(entry68k->atom_name);
--- a/src/unixfork.c
+++ b/src/unixfork.c
@@ -219,9 +219,7 @@ 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);
@@ -236,23 +234,19 @@ 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];

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

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

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

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

    close(LispToUnix[0]);
@@ -279,7 +273,7 @@ int fork_Unix(void) {
      DBPRINT(("Input packet wrong length: %zd", len));
      exit(1);
    }
-    slot = (int)IOBuf[3];
+    slot = IOBuf[3];
    IOBuf[3] = 1; /* Start by signalling success in return-code */

    switch (IOBuf[0]) {
@@ -355,7 +349,7 @@ int fork_Unix(void) {
              perror("slave socket");
              exit(1);
            }
-            (void)snprintf(PipeName, sizeof(PipeName), "/tmp/LPU%ld-%d", StartTime, slot);
+            sprintf(PipeName, "/tmp/LPU%ld-%d", StartTime, slot);
            memset(&addr, 0, sizeof(struct sockaddr_un));
            addr.sun_family = AF_UNIX;
            strcpy(addr.sun_path, 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)(void)fprintf(stderr, "uraid: Fork failed.\n"); exit(1);
+        case -1: (void)fprintf(stderr, "uraid: Fork failed.\n"); exit(1);

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

@@ -864,9 +864,7 @@ 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

@@ -903,7 +901,7 @@ char *alloc_hideDISP(int size)
  {
        case SFS_NOTSWITCHABLE :
                if((retaddr =malloc(size)) ==0){
-                        (void)fprintf(stderr,"can't alloc hide space\n");
+                        fprintf(stderr,"can't alloc hide space\n");
                 }
                break;
        case 0 :
@@ -927,7 +925,7 @@ char *alloc_hideDISP(int size)
                        printf("Hidespace inside Lisp(4)\n");
                 }
                else if((retaddr=malloc(size)) ==0){
-                        (void)fprintf(stderr,"can't alloc hide disp\n");
+                        fprintf(stderr,"can't alloc hide disp\n");
                         }
                        printf("Hidespace new\n");
                break;
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -204,10 +204,18 @@ 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) {
-    envvalue = MAIKO_ARCH_NAME;
+#if defined(sparc)
+    envvalue = "sun4";
+#elif defined(DOS)
+    envvalue = "dos";
+#elif defined(MAIKO_OS_MACOS)
+    envvalue = "i386";
+#else
+    envvalue = "sun3";
+#endif
+
  } else if (strcmp(envname, "DISPLAY") == 0) {
 #if defined(XWINDOW)
    envvalue = "X";
@@ -231,13 +239,10 @@ LispPTR unix_getparm(LispPTR *args) {
    struct passwd *pwd;
    if ((pwd = getpwuid(getuid())) == NULL) return NIL;
    envvalue = pwd->pw_gecos;
-  } 
-#ifndef MAIKO_OS_HAIKU
-  else if (strcmp(envname, "HOSTID") == 0) {
+  } 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);
-    (void)fprintf(stderr, "Can't set VESA mode %o.\n", dsp->graphicsmode);
+    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);
-  (void)fprintf(stderr, s);
+  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)) {
-    (void)fprintf(stderr, "Can't set graphics mode.\n");
+    fprintf(stderr, "Can't set graphics mode.\n");
    exit(1);
  }
  _getvideoconfig(&vc);
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -487,7 +487,7 @@ LispPTR vmem_save(char *sysout_file_name)

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

--- a/src/xmkicon.c
+++ b/src/xmkicon.c
@@ -136,8 +136,8 @@ Pixmap make_Xicon(DspInterface dsp)
              Lisp_icon_height);

  } else if (value == BitmapFileInvalid)
-    (void)fprintf(stderr, "Iconpixmapfile %s contains invalid bitmap data\n", iconpixmapfile);
+    fprintf(stderr, "Iconpixmapfile %s contains invalid bitmap data\n", iconpixmapfile);
  else if (value == BitmapNoMemory)
-    (void)fprintf(stderr, "Not enough memory to allocate icon pixmap\n");
+    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)
 {
-  (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,
+  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,
          " -g[eometry] <geom>                   -size & placement for the medley window on your X "
          "screen\n");
-  (void)fprintf(stderr,
+  fprintf(stderr,
          " -sc[reen] <geom>                     -size & placement for the medley display\n");
-  (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,
+  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,
          " -xsync                               -turn  XSynchronize on. (default is off)\n\n");
 #if defined(MAIKO_ENABLE_NETHUB)
-  (void)fprintf(stderr,"\
+  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
-  (void)fprintf(stderr, "Please refer to the manual for further information.\n\n");
-  exit(EXIT_FAILURE);
+  fprintf(stderr, "Please refer to the manual for further information.\n\n");
+  exit(0);
 } /* 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) {
-    (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");
+    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");
    print_Xusage(argv[0]);
  } else {
    envname = getenv("DISPLAY");
@@ -228,7 +228,7 @@ void read_Xoption(int *argc, char *argv[])
    }
    XCloseDisplay(xdisplay);
  } else {
-    (void)fprintf(stderr, "Open_Display: cannot connect to display %s.", XDisplayName(Display_Name));
+    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') {
-    (void)fprintf(stderr, "Couldn't find a sysout to run;\n");
+    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 {
-      (void)fprintf(stderr, "Missing or bogus -E argument\n");
+      fprintf(stderr, "Missing or bogus -E argument\n");
      ether_fd = -1;
      exit(1);
    }
Author	SHA1	Message	Date
Frank Halasz	eac4cdc3d3	Update install of sdl2 for emscripten in buildRelease workflow.	2024-02-16 12:45:30 -08:00
Frank Halasz	eacdd98f48	1. Replace wasm build with wasm_nl builds and get rid of wasm_nl flag. Update buildRelease.yml and makeright accordingly. 2. Add -lidbfs.js flag to LDFLAGS in makefile-emscripten-wasm.wasm. 3. Update buildRelease.yml docker action versions to accomdate github moving from node 16 to node 20.	2024-02-16 12:32:15 -08:00