More Lisp variables to avoid in INIT mode - turn off X11 input handling (#482)

* Add makefile slice for OpenBSD init on x86_64.

* Correct flags for init.

.github/workflows/Dockerfile_builder

@@ -0,0 +1,18 @@
+#*******************************************************************************
+#
+#  Dockerfile to build image with all the tools to build  Maiko
+#
+#  Copyright 2023 by Interlisp.org
+#
+#  Frank Halasz 2023-02-21
+#
+# ******************************************************************************
+
+FROM ubuntu:latest
+SHELL ["/bin/bash", "-c"]
+USER root:root
+# Install build tools
+RUN apt-get update && apt-get install -y make clang libx11-dev gcc
+USER root
+WORKDIR /root
+ENTRYPOINT /bin/bash

.github/workflows/Dockerfile_maiko

@@ -0,0 +1,25 @@
+#*******************************************************************************
+#
+#  Dockerfile to build Maiko for Linux to be used by buildRelease github action
+#  The output of this is intended to be a directory in the github workspace
+#  file system it is not intended to be a useable Docker image.
+#
+#  Copyright 2023 by Interlisp.org
+#
+#  Frank Halasz 2023-02-21
+#
+# ******************************************************************************
+
+FROM ghcr.io/interlisp/maiko-builder
+ARG INSTALL_LOCATION=/usr/local/interlisp/maiko
+SHELL ["/bin/bash", "-c"]
+# Copy over / clean maiko repo
+COPY . ${INSTALL_LOCATION}
+# Build maiko
+RUN cd ${INSTALL_LOCATION}/bin \
+    && ./makeright x cleanup \
+    && ./makeright x
+RUN cd ${INSTALL_LOCATION}/bin \
+    && if [ "$(./machinetype)" = "x86_64" ]; then \
+           ./makeright init; \
+       fi

.github/workflows/build.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15, ubuntu-18.04]
+        os: [macos-11, macos-12, ubuntu-22.04, ubuntu-20.04]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install X11 dependencies on MacOS
         if: ${{ runner.os == 'macOS'}}
         run: brew install --cask xquartz
@@ -21,27 +21,38 @@ jobs:
         working-directory: bin
         run: ./makeright x
 
-  build-pi:
-    runs-on: [self-hosted, linux, ARM]
-    if: ${{ github.repository == 'Interlisp/maiko' }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Build
-        working-directory: bin
-        run: ./makeright x
+#
+# Commented out because the RPi is not online at this time (6 July 2021)
+#
+#  build-pi:
+#    runs-on: [self-hosted, linux, ARM]
+#    if: ${{ github.repository == 'Interlisp/maiko' }}
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Build
+#        working-directory: bin
+#        run: ./makeright x
 
   build-cmake:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15, ubuntu-20.04, ubuntu-18.04]
+        os: [macos-11, macos-12, ubuntu-22.04, ubuntu-20.04]
     env:
       BUILD_TYPE: Release
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - name: Show CMake version
+      run: cmake --version
     - name: Install X11 dependencies on MacOS
       if: ${{ runner.os == 'macOS'}}
       run: brew install --cask xquartz
+    - name: Install SDL2 dependencies on MacOS
+      if: ${{ runner.os == 'macOS'}}
+      run: brew install sdl2
+    - name: Install SDL dependency on Ubuntu
+      if: ${{ runner.os == 'Linux'}}
+      run: sudo apt-get update && sudo apt-get install -y libsdl2-dev
     - name: Create Build Environment
       run: cmake -E make_directory ${{github.workspace}}/build
     - name: Configure CMake

.github/workflows/buildBuilderImage.yml

@@ -0,0 +1,87 @@
+#*******************************************************************************
+# buildBuilderImage.yml
+#
+# Workflow to build a multiarch Docker image that includes all of the tools for
+# building maiko for linux.  Intended to be used (exclusively?) by the github
+# actions that build maiko releases - e.g., buildRelease.yml.
+#
+# The purpose is to make the maiko github actions quicker and less resource
+# consuming by not hving to intll the tools every time and instead just reuse
+# this Docker image.
+#
+#
+# Copyright 2023 by Interlisp.org
+#
+# Frank Haasz 2023-02-21
+#
+# ******************************************************************************
+
+name: 'Build/Push Builder Image'
+
+# Run this workflow on ...
+on: workflow_dispatch
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+
+  buildBuilder:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout maiko
+      - name: Checkout maiko
+        uses: actions/checkout@v3
+
+      # Setup docker environment variables
+      - name: Setup Docker Environment Variables
+        id: docker_env
+        run: |
+          DOCKER_REGISTRY="ghcr.io"
+          DOCKER_NAMESPACE=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+          DOCKER_REPO=${DOCKER_REGISTRY}/${DOCKER_NAMESPACE}/maiko-builder
+          DOCKER_TAGS="${DOCKER_REPO}:latest"
+          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> ${GITHUB_ENV}
+          echo "DOCKER_TAGS=${DOCKER_TAGS}" >> ${GITHUB_ENV}
+
+      # Setup the Docker Machine Emulation environment.  
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@master
+        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@master
+
+      # Login to ghcr.io
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Do the Docker Build using the Dockerfile_builder in the repository we
+      # checked out.  Push the result to ghcr.io.
+      #
+      - name: Build Docker Images for Push to GHCR
+        if: ${{ true }}
+        uses: docker/build-push-action@v4
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          build-args: |
+            BUILD_DATE=${{ env.BUILD_DATE }}
+          context: ./.github/workflows
+          file: ./.github/workflows/Dockerfile_builder
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          # Push the result to DockerHub
+          push: true
+          tags: ${{ env.DOCKER_TAGS }}
+
+
+######################################################################################

.github/workflows/buildRelease.yml

@@ -0,0 +1,511 @@
+#*******************************************************************************
+# buidRelease.yml
+#
+# Workflow to build a Maiko release that is pushed to github.
+# For linux:  release assets are built/pushed for X86_64, aarch64 and arm7vl.
+# For macOS:  release assets are built/pushed for X86_64 and aarch64 as well as
+#             a set of universal binaries.
+# For Windows:  not supported
+#
+# Note release pushed to github automatically includes source code assets
+# in tar and zip formats.
+#
+# 2022-01-16 by Frank Halasz based on earlier workflow called buildDocker.yml
+# Updated 2023-06-06: Remove docker image push; increase build efficeincy for linux
+#
+# Copyright 2022-2023 by Interlisp.org
+#
+#
+# ******************************************************************************
+
+name: 'Build/Push Release'
+
+# Run this workflow on ...
+on:
+    workflow_dispatch:
+      inputs:
+        draft:
+          description: "Mark this as a draft release"
+          type: choice
+          options:
+          - 'false'
+          - 'true'
+        force:
+          description: "Force build even if build already successfully completed for this commit"
+          type: choice
+          options:
+          - 'false'
+          - 'true'
+
+    workflow_call:
+      secrets:
+        DOCKER_USERNAME:
+          required: true
+        DOCKER_PASSWORD:
+          required: true
+      outputs:
+        successful:
+          description: "'True' if maiko build completed successully"
+          value: ${{ jobs.complete.outputs.build_successful }}
+      inputs:
+        draft:
+          description: "Mark this as a draft release"
+          required: false
+          type: string
+          default: 'false'
+        force:
+          description: "Force build even if build already successfully completed for this commit"
+          required: false
+          type: string
+          default: 'false'
+
+defaults:
+  run:
+    shell: bash
+
+#  3 separate jobs here that can run in parallel
+#
+#  1.  Linux: Build a multiplatform Linux Docker file system (not saved) and use
+#      results to build/push Linux release assets.
+#
+#  2.  MacOs:  Build maiko for MacOS (x86_64, aarch64, and universal) then create
+#      and push release assets.
+#
+#  3. Windows: Build maiko for cygwin and SDL (x86_64).  Build is done within the
+#     cygwin-maiko-builder Docker image by building a new docker files system (and
+#     not a docker container) which is used to build/push Windows(cygwin) assets.
+#
+
+jobs:
+
+######################################################################################
+
+  # Regularize the inputs so they can be referenced the same way whether they are
+  # the result of a workflow_dispatch or a workflow_call
+
+  inputs:
+    runs-on: ubuntu-latest
+    outputs:
+      draft: ${{ steps.one.outputs.draft }}
+      force: ${{ steps.one.outputs.force }}
+      linux: ${{ steps.one.outputs.linux }}
+      macos: ${{ steps.one.outputs.macos }}
+      windows: ${{ steps.one.outputs.windows }}
+    steps:
+      - id: one
+        run: >
+          if [ '${{ toJSON(inputs) }}' = 'null'  ];
+          then
+              echo "workflow_dispatch";
+              echo "draft=${{ github.event.inputs.draft }}" >> $GITHUB_OUTPUT;
+              echo "force=${{ github.event.inputs.force }}" >> $GITHUB_OUTPUT;
+          else
+              echo "workflow_call";
+              echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
+              echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
+          fi;
+          echo "linux=true" >> $GITHUB_OUTPUT;
+          echo "macos=true" >> $GITHUB_OUTPUT;
+          echo "windows=true" >> $GITHUB_OUTPUT;
+          
+
+######################################################################################
+
+  # Use sentry-action to determine if this release has already been built
+  # based on the latest commit to the repo
+
+  sentry:
+    needs: inputs
+    runs-on: ubuntu-latest
+    outputs:
+      release_not_built: ${{ steps.check.outputs.release_not_built }}
+
+    steps:
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Check if build already run for this commit
+      - name: Build already completed?
+        id: check
+        continue-on-error: true
+        uses: ./../actions/check-sentry-action
+        with:
+          tag: "release_docker"
+
+######################################################################################
+
+  # Linux: build and push multi-platform docker image for Linux
+  # Use docker images to create and push release assets to github
+
+  linux:
+
+    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@v3
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Checkout the branch
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      # Setup release tag
+      - name: Setup Release Tag
+        id: tag
+        uses: ./../actions/release-tag-action
+
+      # Setup docker environment variables
+      - name: Setup Docker Environment Variables
+        id: docker_env
+        run: |
+          DOCKER_NAMESPACE=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+          echo "DOCKER_NAMESPACE=${DOCKER_NAMESPACE}" >> ${GITHUB_ENV}
+          DOCKER_IMAGE=${DOCKER_NAMESPACE}/${{ steps.tag.outputs.repo_name }}
+          DOCKER_TAGS="${DOCKER_IMAGE}:latest,${DOCKER_IMAGE}:${RELEASE_TAG#*-}"
+          echo "build_time=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
+          echo "docker_tags=${DOCKER_TAGS}"  >> $GITHUB_OUTPUT
+
+      # Setup the Docker Machine Emulation environment.
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        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
+
+      # Do the Docker Build using the Dockerfile in the repository we
+      # checked out.  Save the results in a directory under /tmp to be used
+      # for creating release tars.  Does not creatre a docker image and does not
+      # push anything to Docker Hub.
+      #
+      # NOTE: THE ACTUAL MAIKO BUILD (FOR LINUX) HAPPENS HERE - I.E., IN THE
+      #       DOCKER BUILD CALL.  BUILD COMMANDS ARE SPECIFIED IN THE
+      #       Dockerfile, NOT HERE IN THE WORKFLOW.
+      #
+      - name: Build Docker Image and Save It Locally
+        uses: docker/build-push-action@v4
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          build-args: |
+            BUILD_DATE=${{ steps.docker_env.outputs.build_time }}
+            RELEASE_TAG=${{ steps.tag.outputs.release_tag }}
+          context: .
+          file: ./.github/workflows/Dockerfile_maiko
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          # Put the results out to the local file system
+          outputs: type=local,dest=/tmp/docker_images
+          tags: ${{ steps.docker_env.outputs.docker_tags }}
+
+      # Use docker results to create releases for github.
+      # Docker results are in /tmp/docker_images. One subdir for each platform.
+      - name: Make release tars for each platform
+        env:
+          RELEASE_TAG: ${{ steps.tag.outputs.release_tag }}
+        run: |
+          mkdir -p /tmp/release_tars
+          for OSARCH in "linux.x86_64:linux_amd64" "linux.aarch64:linux_arm64" "linux.armv7l:linux_arm_v7" ;    \
+            do                                                                         \
+              pushd /tmp/docker_images/${OSARCH##*:}/usr/local/interlisp >/dev/null ;  \
+              /usr/bin/tar -c -z                                                       \
+                -f /tmp/release_tars/${RELEASE_TAG}-${OSARCH%%:*}.tgz                  \
+                maiko/bin/osversion                                                    \
+                maiko/bin/machinetype                                                  \
+                maiko/bin/config.guess                                                 \
+                maiko/bin/config.sub                                                   \
+                maiko/${OSARCH%%:*}/lde*                                               \
+              ;                                                                        \
+              popd >/dev/null ;                                                        \
+            done
+
+      # Push Release to github
+      - name: Push the release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts:
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-linux.x86_64.tgz,
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-linux.aarch64.tgz,
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-linux.armv7l.tgz
+          tag: ${{ steps.tag.outputs.release_tag }}
+          draft: ${{ needs.inputs.outputs.draft }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+
+######################################################################################
+
+  # MacOS: build for MacOS (x86_64, aarch64, universal) and use results to
+  # create and push release assets to github
+  macos:
+
+    needs: [inputs, sentry]
+    if: |
+      needs.inputs.outputs.macos == 'true'
+      && (
+          needs.sentry.outputs.release_not_built == 'true'
+          || needs.inputs.outputs.force == 'true'
+      )
+
+    runs-on: macos-latest
+
+    steps:
+
+      # Checkout the branch
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Setup release tag
+      - name: Setup Release Tag
+        id: tag
+        uses: ./../actions/release-tag-action
+
+      # 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
+
+      - name: Install X11 dependencies on MacOS
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release download XQuartz-2.8.5 --repo XQuartz/XQuartz --pattern XQuartz-2.8.5.pkg
+          sudo installer -pkg ./XQuartz-2.8.5.pkg -target /
+
+      # Install SDL dependencies
+      - name: Install SDL2 dependencies on MacOS
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release download release-2.26.5 --repo libsdl-org/SDL --pattern SDL2-2.26.5.dmg
+          hdiutil attach SDL2-2.26.5.dmg
+          sudo ditto /Volumes/SDL2/SDL2.framework /Library/Frameworks/SDL2.framework
+          hdiutil detach /Volumes/SDL2/
+
+      # Build maiko
+      - name: Build ldeinit
+        working-directory: ./bin
+        run: |
+          export LDEARCH=x86_64-apple-darwin
+          ./makeright init
+          export LDEARCH=aarch64-apple-darwin
+          ./makeright init
+          mkdir -p ../darwin.universal
+          exe=ldeinit 
+          lipo -create \
+               -arch arm64 ../darwin.aarch64/${exe}  \
+               -arch x86_64 ../darwin.x86_64/${exe} \
+               -output ../darwin.universal/${exe}
+
+      - name: Build lde, ldex, & ldesdl
+        run: |
+          mkdir build
+          cd build
+          # -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12
+          cmake .. \
+            -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
+            -DMAIKO_DISPLAY_SDL=ON \
+            -DMAIKO_DISPLAY_X11=ON \
+            -DCMAKE_BUILD_TYPE=Release
+          cmake --build . --config Release
+          for exe in lde ldex ldesdl
+          do
+            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  
+
+      # Create release tar for github.
+      - name: Make release tar(s)
+        env:
+          RELEASE_TAG: ${{ steps.tag.outputs.release_tag }}
+        run: |
+          mkdir -p /tmp/release_tars
+          cd ${GITHUB_WORKSPACE}/../
+          for arch in x86_64 aarch64 universal
+          do
+            tar -c -z                                                                \
+              -f /tmp/release_tars/${RELEASE_TAG}-darwin.${arch}.tgz                 \
+              maiko/bin/osversion                                                    \
+              maiko/bin/machinetype                                                  \
+              maiko/bin/config.guess                                                 \
+              maiko/bin/config.sub                                                   \
+              maiko/darwin.${arch}/lde*
+          done
+
+      # Push Release
+      - name: Push the release
+        uses: ncipollo/release-action@v1
+        with: 
+          allowUpdates: true
+          artifacts:
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-darwin.x86_64.tgz,
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-darwin.aarch64.tgz,
+            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-darwin.universal.tgz
+          tag: ${{ steps.tag.outputs.release_tag }}
+          draft: ${{ needs.inputs.outputs.draft }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+######################################################################################
+
+  # Windows: build for Windows-Cygwin via Docker build and use results to
+  # create and push release assets to github
+  
+  windows:
+
+    needs: [inputs, sentry]
+    if: |
+      needs.inputs.outputs.windows == 'true'
+      && (
+          needs.sentry.outputs.release_not_built == 'true'
+          || needs.inputs.outputs.force == 'true'
+      )
+
+    runs-on: windows-2022
+
+    defaults:
+      run:
+        shell: powershell
+
+    steps:
+
+      # setup git to not mess up line endings
+      - name: git config
+        run: git config --global core.autocrlf input
+
+      # Retrieve Cygwin setup and install cygwin
+      - name: Install cygwin
+        id: cygwin
+        run: |
+          wget https://cygwin.com/setup-x86_64.exe -OutFile setup-x86_64.exe
+          Unblock-File setup-x86_64.exe
+          Start-Process setup-x86_64.exe -Wait -ArgumentList @("--root", ".\cygwin", "--quiet-mode", "--no-admin", "--wait", "--no-shortcuts", "--no-write-registry",  "--verbose", "--site", "http://www.gtlib.gatech.edu/pub/cygwin/", "--packages", "nano,binutils,make,cmake,gcc,clang")
+          cygwin\bin\bash -login -c 'sed -i -e "s/^none/#none/" /etc/fstab; echo "none / cygdrive binary,posix=0,user 0 0" >>/etc/fstab'
+
+      # Retrieve SDL2 and install in cygwin
+      - name: Install SDL2
+        id: sdl2
+        env: 
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release download 2.26.5 --repo interlisp/cygwin-sdl --pattern *.tgz --output .\cygwin\sdl2.tar.gz
+          cygwin\bin\bash -login -c 'cd /; tar xzf sdl2.tar.gz'
+
+      # Checkout the branch
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          path: cygwin\maiko
+
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: |
+          mv ./Actions_${{ github.sha }}/actions ../actions
+          rm -recurse -force ./Actions_${{ github.sha }}
+
+      # Setup release tag
+      - name: Setup Release Tag
+        id: tag
+        uses: ./../actions/release-tag-action
+        with:
+          path: cygwin/maiko
+
+      # Build maiko TODO-cleanup
+      - name: Build Cygwin-SDL Maiko
+        run: |
+          cygwin\bin\bash -login -c 'cd /maiko/bin && ./makeright sdl cleanup && ./makeright sdl'
+          cygwin\bin\bash -login -c 'mkdir /tmp/maiko; mkdir /tmp/maiko/bin; mkdir /tmp/maiko/cygwin.x86_64'
+          cygwin\bin\bash -login -c 'cp /maiko/bin/osversion /tmp/maiko/bin; cp /maiko/bin/machinetype /tmp/maiko/bin'
+          cygwin\bin\bash -login -c 'cp /maiko/bin/config.guess /tmp/maiko/bin; cp /maiko/bin/config.sub /tmp/maiko/bin'
+          cygwin\bin\bash -login -c 'cp /maiko/cygwin.x86_64/* /tmp/maiko/cygwin.x86_64; cp /usr/local/bin/SDL2.DLL /tmp/maiko/cygwin.x86_64'
+          cygwin\bin\bash -login -c 'chmod +x /tmp/maiko/bin/*; chmod +x /tmp/maiko/cygwin.x86_64/*'
+          cygwin\bin\bash -login -c 'echo lde > /tmp/maiko/cygwin.x86_64/lde.exe.local; echo ldesdl > /tmp/maiko/cygwin.x86_64/ldesdl.exe.local'
+          cygwin\bin\bash -login -c 'mkdir -p /tmp/release_tars'
+          cygwin\bin\bash -login -c 'tar -c -z -C /tmp -f /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-cygwin.x86_64.tgz maiko'
+
+     # Push Release to github
+      - name: Push the release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts:
+            cygwin/tmp/release_tars/${{ steps.tag.outputs.release_tag }}-cygwin.x86_64.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
+  # been successfully built
+
+  complete:
+
+    runs-on: ubuntu-latest
+
+    outputs:
+      build_successful: ${{ steps.output.outputs.build_successful }}
+
+    needs: [inputs, sentry, linux, macos, windows]
+
+    steps:
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v3
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Set sentry
+      - name: Is build for this commit already completed?
+        id: set
+        uses: ./../actions/set-sentry-action
+        with:
+          tag: "release_docker"
+
+      - name: Output
+        id: output
+        run: |
+          echo "build_successful=true"  >> $GITHUB_OUTPUT
+
+######################################################################################

.gitignore

@@ -5,6 +5,11 @@
 \#*#
 .DS_Store
 # build directories
+build/**
+cmake-build-*/**
+.idea/
+*.m68k-x/**
+*.m68k/**
 *.386-x/**
 *.386/**
 *.ppc-x/**
@@ -12,12 +17,17 @@
 *.sparc-x/**
 *.sparc/**
 *.x86_64-x/**
+*.x86_64-sdl/**
 *.x86_64/**
 *.armv7l-x/**
 *.armv7l/**
 *.aarch64-x/**
+*.aarch64-sdl/**
 *.aarch64/**
 init.386/**
+*.universal/**
 # core files
 core
 *.core
+*.swp
+

CMakeLists.txt

@@ -1,5 +1,5 @@
-PROJECT(maiko C)
 CMAKE_MINIMUM_REQUIRED(VERSION 3.15)
+PROJECT(maiko C)
 
 SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
@@ -16,6 +16,21 @@ IF(CMAKE_C_COMPILER_ID MATCHES "SunPro")
   SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
 ENDIF()
 
+find_program(
+    CLANG_TIDY_EXE
+    NAMES "clang-tidy" "clang-tidy16" "clang-tidy15" "clang-tidy14" "clang-tidy13" "clang-tidy12" "clang-tidy11" "clang-tidy10"
+    DOC "Path to clang-tidy executable"
+)
+
+IF (CLANG_TIDY_EXE)
+   IF (NOT CMAKE_CROSSCOMPILING)
+# There are many many warnings for strcpy instances to deal with,
+# but suppress it for now so that other issues are more obvious
+#
+        SET(CMAKE_C_CLANG_TIDY ${CLANG_TIDY_EXE} -checks=-*,cert-*,clang-analyzer-security.*,-clang-analyzer-security.insecureAPI.strcpy,-clang-analyzer-security.insecureAPI.bzero -header-filter=.*)
+   ENDIF()
+ENDIF()
+
 INCLUDE(CheckLibraryExists)
 CHECK_LIBRARY_EXISTS(m fmod "" NEED_LIB_M)
 IF(NEED_LIB_M)
@@ -26,7 +41,13 @@ 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)
+
 IF(MAIKO_DISPLAY_X11)
   FIND_PACKAGE(X11 REQUIRED)
   SET(MAIKO_DISPLAY_X11_DEFINITIONS
@@ -57,12 +78,49 @@ IF(MAIKO_DISPLAY_X11)
     inc/xscroll.h
     inc/xwinmandefs.h
   )
+  MESSAGE("-- Configured for X11 display")
 ENDIF()
 
+IF(MAIKO_DISPLAY_SDL)
+  FIND_PACKAGE(SDL2 REQUIRED)
+  SET(MAIKO_DISPLAY_SDL_DEFINITIONS
+          "-DSDL"
+          )
+  SET(MAIKO_DISPLAY_SDL_LIBRARIES ${SDL2_LIBRARIES})
+  SET(MAIKO_DISPLAY_SDL_SRCS
+          src/sdl.c
+          )
+  SET(MAIKO_DISPLAY_SDL_HDRS
+          inc/sdldefs.h
+          )
+  MESSAGE("-- Configured for SDL display")
+ENDIF()
+
+# according to: https://cmake.org/pipermail/cmake/2016-October/064342.html
+# the following 2 lines should produce a dropdown-box in the cmake-gui
+# but this will happen only after running the command line version of cmake,
+# possibly after "clearing the cache" (i.e. starting with a fresh build directory)
+SET(MAIKO_NETWORK_TYPE NONE CACHE STRING "Type of networking to use: one of: NONE, SUN_DLPI, SUN_NIT, NETHUB")
+SET_PROPERTY(CACHE MAIKO_NETWORK_TYPE PROPERTY STRINGS NONE SUN_DLPI SUN_NIT NETHUB)
+
+# configure networking implementation to use
+IF(MAIKO_NETWORK_TYPE STREQUAL "NETHUB")
+  LIST(APPEND MAIKO_DEFINITIONS "-DMAIKO_ENABLE_NETHUB")
+  MESSAGE("-- Configured for NETHUB network support")
+ELSEIF(MAIKO_NETWORK_TYPE STREQUAL "SUN_DLPI")
+  LIST(APPEND MAIKO_DEFINITIONS "-DMAIKO_ENABLE_ETHERNET -DUSE_DLPI")
+  MESSAGE("-- Configured for (SunOS) DLPI networking")
+ELSEIF(MAIKO_NETWORK_TYPE STREQUAL "SUN_NIT")
+  LIST(APPEND MAIKO_DEFINITIONS "-DMAIKO_ENABLE_ETHERNET -DUSE_NIT")
+  MESSAGE("-- Configured for (SunOS) NIT networking")
+ELSEIF(NOT MAIKO_NETWORK_TYPE STREQUAL "NONE")
+  MESSAGE(WARNING "Invalid option given for MAIKO_NETWORK_TYPE, must be one of:\nNONE, SUN_DLPI, SUN_NIT, NETHUB")
+ENDIF()
+
+
 IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
   LIST(APPEND MAIKO_DEFINITIONS
     "-DOS5"
-    "-DUSE_DLPI"
   )
 ENDIF()
 
@@ -108,15 +166,8 @@ SET(BAD_SRCS
 
 SET(MAIKO_SRCS
     src/allocmds.c
-    src/arith2.c
-    src/arith3.c
-    src/arith4.c
-    src/array2.c
-    src/array3.c
-    src/array4.c
-    src/array5.c
-    src/array6.c
-    src/array.c
+    src/arithops.c
+    src/arrayops.c
     src/asmbbt.c
     src/bbtsub.c
     src/bin.c
@@ -136,7 +187,9 @@ SET(MAIKO_SRCS
     src/dspif.c
     src/dspsubrs.c
     src/eqf.c
-    src/ether.c
+    src/ether_common.c
+    src/ether_sunos.c
+    src/ether_nethub.c
     src/findkey.c
     src/foreign.c
     src/fp.c
@@ -210,16 +263,9 @@ SET(MAIKO_HDRS
     inc/address.h
     inc/adr68k.h
     inc/allocmdsdefs.h
-    inc/arith2defs.h
-    inc/arith3defs.h
-    inc/arith4defs.h
+    inc/arithopsdefs.h
     inc/arith.h
-    inc/array2defs.h
-    inc/array3defs.h
-    inc/array4defs.h
-    inc/array5defs.h
-    inc/array6defs.h
-    inc/arraydefs.h
+    inc/arrayopsdefs.h
     inc/array.h
     inc/bb.h
     inc/bbtsubdefs.h
@@ -271,7 +317,6 @@ SET(MAIKO_HDRS
     inc/gcscandefs.h
     inc/gvar2defs.h
     inc/hardrtndefs.h
-    inc/hdw_conf.h
     inc/ifpage.h
     inc/inetdefs.h
     inc/initatms.h
@@ -366,6 +411,7 @@ SET(MAIKO_HDRS
     inc/unixfork.h
     inc/unwinddefs.h
     inc/uraiddefs.h
+    inc/uraidextdefs.h
     inc/usrsubrdefs.h
     inc/uutilsdefs.h
     inc/vars3defs.h
@@ -377,7 +423,7 @@ SET(MAIKO_HDRS
 )
 
 ADD_CUSTOM_TARGET(gen-vdate
-  COMMAND mkvdate > vdate.c
+  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bin/mkvdate > vdate.c
   BYPRODUCTS vdate.c
 )
 
@@ -391,6 +437,11 @@ IF(MAIKO_DISPLAY_X11)
   TARGET_LINK_LIBRARIES(lde X11::X11)
 ENDIF()
 
+IF(MAIKO_DISPLAY_SDL)
+  # Tell it that the SDL launcher is available.
+  TARGET_COMPILE_DEFINITIONS(lde PUBLIC ${MAIKO_DISPLAY_SDL_DEFINITIONS})
+ENDIF()
+
 ADD_EXECUTABLE(ldeether src/ldeether.c src/dlpi.c)
 TARGET_COMPILE_DEFINITIONS(ldeether PUBLIC ${MAIKO_DEFINITIONS})
 TARGET_INCLUDE_DIRECTORIES(ldeether PUBLIC inc)
@@ -407,6 +458,33 @@ 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)
+  ADD_EXECUTABLE(ldesdl
+    src/main.c
+    vdate.c
+    ${MAIKO_SRCS}
+    ${MAIKO_HDRS}
+    ${MAIKO_DISPLAY_SDL_SRCS}
+    ${MAIKO_DISPLAY_SDL_HDRS}
+  )
+  TARGET_COMPILE_DEFINITIONS(ldesdl PUBLIC ${MAIKO_DEFINITIONS} ${MAIKO_DISPLAY_SDL_DEFINITIONS})
+  TARGET_INCLUDE_DIRECTORIES(ldesdl PUBLIC inc)
+  TARGET_INCLUDE_DIRECTORIES(ldesdl PRIVATE ${SDL2_INCLUDE_DIRS})
+  TARGET_LINK_LIBRARIES(ldesdl ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_SDL_LIBRARIES})
 ENDIF()
 
 ADD_EXECUTABLE(mkvdate src/mkvdate.c)

NEWCDRCODING.md

@@ -1,14 +0,0 @@
-# CDR CODING in cons cells
-
-The cdr-code is a 4-bit field of a 32-bit cons cell.
-It is treated as an on-page indicator bit and a 3-bit scaled offset.
-
-Certain combinations are treated specially.
-
-
-on-page| offset	| interpretation
--------|--------|----------------------------------------------------------------------------
-   1   |    0	| CDR is NIL
-   1   |  1 - 7	| CDR is at 2*offset (counted in 32-bit cells) on same page
-   0   |    0	| CDR is indirect, CDR(car)
-   0   |  1 - 7	| CDR is not a cons cell but is in the car of cell at 2*offset on same page

README.md

@@ -4,9 +4,9 @@ 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.
 
-Newcomers should check out the [Medley Interlisp Introduction](https://github.com/Interlisp/medley/wiki/Medley-Interlisp-Introduction).
+For an overview, see [Medley Interlisp Introduction](https://github.com/Interlisp/medley/wiki/Medley-Interlisp-Introduction).
 
-See [the Medley repository](https://github.org/Interlisp/medley) for
+See [the Medley repository](https://github.com/Interlisp/medley) for
 * [Issues](https://github.com/Interlisp/medley/issues) (note that maiko issues are there too)
 * [Discussions](https://github.com/Interlisp/medley/discussions) (Q&A, announcements, etc)
 * [Medley's README](https://github.com/Interlisp/medley/blob/master/README.md)
@@ -15,7 +15,7 @@ Bug reports, feature requests, fixes and improvements, support for additional pl
 
 ## Development Platforms
 
-We are developing on FreeBSD, Linux, MacOS, and Solaris currently
+We are developing on FreeBSD, Linux, macOS, and Solaris currently
 on arm7l, arm64, PowerPC, SPARC, i386, and x86_64 hardware.
 
 
@@ -25,7 +25,7 @@ Building requires `clang`, `make`, X11 client libraries (`libx11-dev`). For exam
 
 ``` sh
 $ sudo apt update
-$ sudo apt install clang make x11dev
+$ sudo apt install clang make libx11-dev
 ```
 
 ```
@@ -33,18 +33,17 @@ $ cd maiko/bin
 $ ./makeright x
 ```
 
-* The build will (attempt to) detect the OS-type and cpu-type. It will build binaries `lde` and `ldex` in `../ostype.cputype` (with .o files in `..ostype.cputype-x`. For example, Linux on a 64-bit x86 will use `linux.x86_64`, while MacOS 11 on (new) Mac will use `darwin.arm64`.
-* If you prefer using `gcc` over `clang`, you will need to edit the makefile fragment for your configuration (`makefile-ostype.cputype-x1) and comment out the line (with a #) that defines `CC` for `clang` and uncomment the line (delete the #) for the line that defines `CC` for `gcc`.
-* There is a cmake configuration (TBD)
+* The build will (attempt to) detect the OS-type and cpu-type. It will build binaries `lde` and `ldex` in `../ostype.cputype` (with .o files in `..ostype.cputype-x`. For example, Linux on a 64-bit x86 will use `linux.x86_64`, while macOS 11 on a (new M1) Mac will use `darwin.aarch64`.
+* If you prefer using `gcc` over `clang`, you will need to edit the makefile fragment for your configuration (`makefile-ostype.cputype-x`) and comment out the line (with a #) that defines `CC` for `clang` and uncomment the line (delete the #) for the line that defines `CC` for `gcc`.
+* There is a cmake configuration (TBD To Be Described here).
 
-### Building For MacOS
+### Building For macOS
 
-* Running on MacOS requires an X server, and building on a Mac requires X client libraries.
-An X-server for x86 MacOS (and X11 client libraries) can be freely obtained at https://www.xquartz.org/
-For the new arm64 MacOS 11, you'll need https://x.org which you can get via MacPorts or Brew.
+* Running on macOS requires an X server, and building on a Mac requires X client libraries.
+An X-server for macOS (and X11 client libraries) can be freely obtained at https://www.xquartz.org/releases
 
 ### Building for Windows 10
 
-Windows 10 currently requires "Docker for Desktop" or WSL2 -- basically a Linux virtual machine -- and a (Windows X-server).
+Windows 10 currently requires "Docker for Desktop" or WSL2 and a (Windows X-server).
 See [Medley's README](https://github.com/Interlisp/medley/blob/master/README.md) for more.
 

bin/compile-flags

@@ -124,9 +124,37 @@ BIGATOMS	True if this emulator will support 3-byte symbols, instead of
 NEWBITBLT	True if we want to use assembler BITBLT code, rather than
 		have code created inline by macro calls.
 
+USE_DLPI	True if the ethernet API is via the SysV Data Link Provider
+		Interface.  Solaris uses DLPI.
+
+USE_NIT		True if the ethernet API is via the Network Interface Tap.
+		SunOS uses NIT.
+
+PKTFILTER	True if the ethernet packets are to be filtered before being
+		passed to the Lisp ethernet handler.  Available on Sun systems
+		for both the NIT and DLPI cases.
+
+MAIKO_ENABLE_NETHUB enables the support for Dodo Nethub networking for Dodo
+		XNS services, see documentation: using-dodo-networking-with-maiko.md
+		(implicitely disables USE_DLPI and USE_NIT)
+
+MAIKO_EMULATE_TIMER_INTERRUPTS enables emulation of recurring timer interrupts for
+		platforms where SIGVTALRM/ITIMER_VIRTUAL or SIGALRM/ITIMER_REAL
+		do not work as expected (like cygwin)
+		timer is emulated by signaling an interrupt after a number of
+		executed instructions, by default 20.000 instructions, this can be
+		overriden by defining MAIKO_TIMER_ASYNC_EMULATION_INSNS_COUNTDOWN
+		with the number of instructions between 2 interrupts
+		additionally this adds the command line arguments -intr-emu-insns
+		for overriding the compiled in instruction interval
+		(not working if OPDISP (fast opcode dispatch) is used)
+
+MAIKO_EMULATE_ASYNC_INTERRUPTS same as MAIKO_EMULATE_TIMER_INTERRUPTS, but also
+		signals an I/O interrupt after each instruction interval
+
+
 bitbltsub.c:#ifdef GETBASE
 testdisplay.c:#ifdef NOTUSED
 uraid.c:#ifdef ETHERINT
 bitblt.c:#ifndef COLOR
-bitbltsub.c:#ifndef prropstyle
 lispmap.h:#ifdef MEDLEY

bin/machinetype

@@ -9,9 +9,11 @@
 #									#
 #########################################################################
 
-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 ;;
         sparc-*)	      echo sparc ;;
         alpha-*)	      echo alpha ;;
 	i*86-*-*)             echo 386 ;;

bin/makefile-cygwin.x86_64-sdl

@@ -0,0 +1,20 @@
+# Options for Linux, Intel x86_64 and X-Window
+
+CC = gcc -m64 $(GCC_CFLAGS) -I/usr/local/include
+#CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+XFLAGS = -DSDL
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g3
+DFLAGS = $(XFLAGS) -DRELEASE=351
+
+LDFLAGS = -lm -L/usr/local/lib -lSDL2
+#
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-darwin.386-x

@@ -19,7 +19,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
 OPTFLAGS =  -O2 -g
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
 DFLAGS = $(DEBUGFLAGS) $(XFLAGS) \
-	-DRELEASE=351 -DSTACKCHECK -DFSBCHECK -DPCTRACE
+	-DRELEASE=351 # -DSTACKCHECK -DFSBCHECK -DPCTRACE
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm

bin/makefile-darwin.aarch64-sdl

@@ -0,0 +1,19 @@
+# Options for MacOS, arm64 (aka aarch64) processor, SDL
+
+CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+SDLFLAGS = -DSDL -F /Library/Frameworks
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g
+DEBUGFLAGS = # -DDEBUG -DOPTRACE
+DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=351
+
+LDFLAGS = -F /Library/Frameworks -framework SDL2
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-darwin.aarch64-x

@@ -1,6 +1,6 @@
-# Options for MacOS, x86 processor, X windows
+# Options for MacOS, arm64 (aka aarch64) processor, X windows
 
-CC = clang $(CLANG_CFLAGS)
+CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \

bin/makefile-darwin.x86_64-sdl

@@ -0,0 +1,19 @@
+# Options for MacOS, x86 processor, SDL
+
+CC = clang -m64 -target x86_64-apple-darwin $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+SDLFLAGS = -DSDL -F /Library/Frameworks
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g
+DEBUGFLAGS = # -DDEBUG -DOPTRACE
+DFLAGS = $(DEBUGFLAGS) $(SDLFLAGS) -DRELEASE=351
+
+LDFLAGS = -F /Library/Frameworks -framework SDL2
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-darwin.x86_64-x

@@ -1,6 +1,6 @@
 # Options for MacOS, x86 processor, X windows
 
-CC = clang -m64 $(CLANG_CFLAGS)
+CC = clang -target x86_64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
@@ -26,3 +26,4 @@ LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm
 OBJECTDIR = ../$(RELEASENAME)/
 
 default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
+

bin/makefile-dos

@@ -13,12 +13,12 @@ LDFLAGS = -g graphics.lib binmode.lib mouse.lib
 
 RM = del
 
-SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c         gcrcell.c llstk.c gcscan.c loopsops.c   storage.c allocmds.c dir.c gvar2.c lowlev1.c    subr.c arith2.c lowlev2.c subr0374.c    arith3.c doscomm.c hardrtn.c lsthandl.c sxhash.c        arith4.c draw.c main.c testtool.c array.c dsk.c         inet.c misc7.c timer.c array2.c dspif.c initdsp.c       miscn.c typeof.c array3.c initkbd.c ubf1.c      array4.c dspsubrs.c initsout.c mkatom.c ubf2.c  array5.c eqf.c intcall.c mkcell.c ubf3.c array6.c       ether.c mkvdate.c ufn.c atom.c findkey.c        kbdsubrs.c mouseif.c ufs.c bbtsub.c foreign.c   keyevent.c unixcomm.c bin.c fp.c binds.c       asmbbt.c fvar.c mvs.c unwind.c bitblt.c gc.c    uraid.c blt.c gc2.c kprint.c osmsg.c usrsubr.c byteswap.c gcarray.c  perrno.c ldeboot.c ldeether.c uutils.c carcdr.c gccode.c        rawcolor.c vars3.c gcfinal.c ldsout.c return.c  vmemsave.c chardev.c gchtfind.c lineblt8.c rpc.c        xc.c common.c gcmain3.c lisp2c.c rplcons.c z2.c xmkicon.c xbbt.c xinit.c xscroll.c xcursor.c xlspwin.c  xrdopt.c xwinman.c      dosmouse.c vesafns.asm vesainit.c vgainit.c kbdif.c     dspsparc.il copyright launch.asm lpread.c lpsolve.c lpmain.c lpwrite.c lpdual.c lptran.c
+SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c         gcrcell.c llstk.c gcscan.c loopsops.c   storage.c allocmds.c dir.c gvar2.c lowlev1.c    subr.c arithops.c lowlev2.c subr0374.c doscomm.c hardrtn.c lsthandl.c sxhash.c draw.c main.c testtool.c array.c dsk.c         inet.c misc7.c timer.c array2.c dspif.c initdsp.c       miscn.c typeof.c array3.c initkbd.c ubf1.c      array4.c dspsubrs.c initsout.c mkatom.c ubf2.c  array5.c eqf.c intcall.c mkcell.c ubf3.c array6.c       ether.c mkvdate.c ufn.c atom.c findkey.c        kbdsubrs.c mouseif.c ufs.c bbtsub.c foreign.c   keyevent.c unixcomm.c bin.c fp.c binds.c       asmbbt.c fvar.c mvs.c unwind.c bitblt.c gc.c    uraid.c blt.c gc2.c kprint.c osmsg.c usrsubr.c byteswap.c gcarray.c  perrno.c ldeboot.c ldeether.c uutils.c carcdr.c gccode.c        rawcolor.c vars3.c gcfinal.c ldsout.c return.c  vmemsave.c chardev.c gchtfind.c lineblt8.c rpc.c        xc.c common.c gcmain3.c lisp2c.c rplcons.c z2.c xmkicon.c xbbt.c xinit.c xscroll.c xcursor.c xlspwin.c  xrdopt.c xwinman.c      dosmouse.c vesafns.asm vesainit.c vgainit.c kbdif.c     dspsparc.il copyright launch.asm lpread.c lpsolve.c lpmain.c lpwrite.c lpdual.c lptran.c
 
-OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj         gcr.obj  gcrcell.obj llstk.obj  gcscan.obj loopsops.obj storage.obj     allocmds.obj dir.obj gvar2.obj lowlev1.obj      subr.obj arith2.obj lowlev2.obj       subr0374.obj arith3.obj doscomm.obj     hardrtn.obj lsthandl.obj sxhash.obj arith4.obj  draw.obj main.obj testtool.obj array.obj        dsk.obj inet.obj misc7.obj timer.obj    array2.obj dspif.obj initdsp.obj miscn.obj      typeof.obj array3.obj initkbd.obj ubf1.obj      array4.obj dspsubrs.obj initsout.obj    mkatom.obj ubf2.obj array5.obj eqf.obj  intcall.obj mkcell.obj ubf3.obj array6.obj      ether.obj ufn.obj atom.obj      findkey.obj kbdsubrs.obj mouseif.obj ufs.obj    bbtsub.obj foreign.obj keyevent.obj     unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj      unwind.obj bitblt.obj gc.obj    uraid.obj blt.obj gc2.obj       kprint.obj osmsg.obj usrsubr.obj byteswap.obj   gcarray.obj perrno.obj uutils.obj       carcdr.obj asmbbt.obj gccode.obj        vars3.obj gcfinal.obj ldsout.obj        return.obj vmemsave.obj chardev.obj     gchtfind.obj lineblt8.obj rpc.obj xc.obj        common.obj gcmain3.obj lisp2c.obj rplcons.obj   z2.obj  vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES)
+OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj         gcr.obj  gcrcell.obj llstk.obj  gcscan.obj loopsops.obj storage.obj     allocmds.obj dir.obj gvar2.obj lowlev1.obj      subr.obj arithops.obj lowlev2.obj       subr0374.obj doscomm.obj     hardrtn.obj lsthandl.obj sxhash.obj draw.obj main.obj testtool.obj array.obj        dsk.obj inet.obj misc7.obj timer.obj    array2.obj dspif.obj initdsp.obj miscn.obj      typeof.obj array3.obj initkbd.obj ubf1.obj      array4.obj dspsubrs.obj initsout.obj    mkatom.obj ubf2.obj array5.obj eqf.obj  intcall.obj mkcell.obj ubf3.obj array6.obj      ether.obj ufn.obj atom.obj      findkey.obj kbdsubrs.obj mouseif.obj ufs.obj    bbtsub.obj foreign.obj keyevent.obj     unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj      unwind.obj bitblt.obj gc.obj    uraid.obj blt.obj gc2.obj       kprint.obj osmsg.obj usrsubr.obj byteswap.obj   gcarray.obj perrno.obj uutils.obj       carcdr.obj asmbbt.obj gccode.obj        vars3.obj gcfinal.obj ldsout.obj        return.obj vmemsave.obj chardev.obj     gchtfind.obj lineblt8.obj rpc.obj xc.obj        common.obj gcmain3.obj lisp2c.obj rplcons.obj   z2.obj  vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES)
 
 
-HFILES = address.h adr68k.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h gcdata.h hdw_conf.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h
+HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h
 
 
 
@@ -202,9 +202,9 @@ subr.obj : ../src/subr.c
 	$(CC) @copts ../src/subr.c -I ../inc -c $@
 	del copts
 
-arith2.obj : ../src/arith2.c
+arithops.obj : ../src/arithops.c
 	@ echo  $(CFLAGS) > copts
-	$(CC) @copts ../src/arith2.c -I ../inc -c $@
+	$(CC) @copts ../src/arithops.c -I ../inc -c $@
 	del copts
 
 lowlev2.obj : ../src/lowlev2.c
@@ -217,11 +217,6 @@ subr0374.obj : ../src/subr0374.c
 	$(CC) @copts ../src/subr0374.c -I ../inc -c $@
 	del copts
 
-arith3.obj : ../src/arith3.c
-	@ echo  $(CFLAGS) > copts
-	$(CC) @copts ../src/arith3.c -I ../inc -c $@
-	del copts
-
 doscomm.obj : ../src/doscomm.c
 	@ echo  $(CFLAGS) > copts
 	$(CC) @copts ../src/doscomm.c -I ../inc -c $@
@@ -242,11 +237,6 @@ sxhash.obj : ../src/sxhash.c
 	$(CC) @copts ../src/sxhash.c -I ../inc -c $@
 	del copts
 
-arith4.obj : ../src/arith4.c
-	@ echo  $(CFLAGS) > copts
-	$(CC) @copts ../src/arith4.c -I ../inc -c $@
-	del copts
-
 draw.obj : ../src/draw.c
 	@ echo  $(CFLAGS) > copts
 	$(CC) @copts ../src/draw.c -I ../inc -c $@

bin/makefile-freebsd.386-sdl

@@ -0,0 +1,18 @@
+# Options for FreeBSD, Intel 386/486 and SDL
+
+CC = clang -m32 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+SDLFLAGS = -DSDL -I/usr/local/include
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2 -g
+DFLAGS = $(SDLFLAGS) -DRELEASE=351
+
+LDFLAGS = -L/usr/local/lib -lSDL2 -lm
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-freebsd.386-x

@@ -16,7 +16,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 XFLAGS = -I/usr/local/include -DXWINDOW
 
 # OPTFLAGS is normally -O2.
-OPTFLAGS = -O1 -gdwarf-2
+OPTFLAGS = -O2 -g
 DFLAGS = $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm

bin/makefile-freebsd.aarch64-sdl

@@ -0,0 +1,18 @@
+# Options for FreeBSD, ARM64 and SDL
+
+CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+SDLFLAGS = -DSDL -I/usr/local/include
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2 -g
+DFLAGS = $(SDLFLAGS) -DRELEASE=351
+
+LDFLAGS = -L/usr/local/lib -lSDL2 -lm
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-freebsd.aarch64-x

@@ -0,0 +1,27 @@
+# Options for FreeBSD, ARMv7 and X-Windows
+
+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/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

bin/makefile-freebsd.x86_64-sdl

@@ -0,0 +1,18 @@
+# Options for FreeBSD, Intel x86_64 and X-Windows
+
+CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+SDLFLAGS = -DSDL -I/usr/local/include
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2 -g
+DFLAGS = $(SDLFLAGS) -DRELEASE=351
+
+LDFLAGS = -L/usr/local/lib -lSDL2 -lm
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-freebsd.x86_64-x

@@ -0,0 +1,27 @@
+# Options for FreeBSD, Intel x86_64 and X-Windows
+
+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/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

bin/makefile-init-darwin.aarch64

@@ -1,6 +1,6 @@
 # Options for MacOS, aarch64 processor, X windows, for INIT processing
 
-CC = clang $(CLANG_CFLAGS)
+CC = clang -target aarch64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
         $(OBJECTDIR)xbbt.o \

bin/makefile-init-darwin.x86_64

@@ -0,0 +1,28 @@
+# Options for MacOS, x86_64 processor, X windows, for INIT processing
+
+CC = clang -m64 -target x86_64-apple-darwin $(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/opt/X11/include -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O0 -g
+DEBUGFLAGS = # -DDEBUG -DOPTRACE
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/opt/X11/lib -lX11 -lm
+LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit

bin/makefile-init-freebsd.386

@@ -0,0 +1,27 @@
+# Options for FreeBSD, Intel 386/486 and X Windows
+
+CC = clang -m32 $(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/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O0 for init
+OPTFLAGS = -O0 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit

bin/makefile-init-freebsd.aarch64

@@ -0,0 +1,27 @@
+# Options for FreeBSD, ARMv7 and X-Windows
+
+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/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O0 for init
+OPTFLAGS = -O0 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit

bin/makefile-init-freebsd.x86_64

@@ -0,0 +1,27 @@
+# Options for FreeBSD, Intel x86_64 and X-Windows
+
+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/local/include -DXWINDOW
+
+# OPTFLAGS is normally -O0 for init
+OPTFLAGS = -O0 -g
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit

bin/makefile-init-linux.x86_64

@@ -0,0 +1,29 @@
+# Options for Linux, x86 processor, X windows, for INIT processing
+
+#CC = gcc -m64 $(GCC_CFLAGS)
+CC = clang -m64 $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+XFLAGS = -DXWINDOW
+
+# OPTFLAGS is normally -O2, 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

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

bin/makefile-init-sunos5.sparc

@@ -41,7 +41,7 @@ OPTFLAGS = -g3 -O0
 
 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
-MACHINEFLAGS = -DOS5 -DUSE_DLPI -DLOCK_X_UPDATES
+MACHINEFLAGS = -DOS5 -DUSE_DLPI
 
 # The LDEINIT wants to have NOVERSION set, so we don't hang up on
 # any change-over in versions.

bin/makefile-linux.386-sdl

@@ -0,0 +1,19 @@
+# Options for Linux, Intel 386/486 and SDL
+
+CC = gcc -m32 $(GCC_CFLAGS)
+# CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+XFLAGS = -DSDL
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g3
+DFLAGS = $(XFLAGS) -DRELEASE=351
+
+LDFLAGS = -lm -lSDL2
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-linux.386-x

@@ -1,7 +1,8 @@
 # Options for Linux, Intel 386/486 and X-Window
 
-#CC = gcc -m32 $(GCC_CFLAGS)
-CC = clang -m32 $(CLANG_CFLAGS)
+CC = gcc -m32 $(GCC_CFLAGS)
+# CC = clang -m32 $(CLANG_CFLAGS)
+
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
 	$(OBJECTDIR)dspif.o \
@@ -12,7 +13,6 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-
 XFLAGS = -DXWINDOW
 
 # OPTFLAGS is normally -O2.

bin/makefile-linux.aarch64-sdl

@@ -0,0 +1,19 @@
+# Options for Linux, ARM64 and SDL
+
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+SDLFLAGS = -DSDL
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g3
+DFLAGS = $(SDLFLAGS) -DRELEASE=351
+
+LDFLAGS = -lSDL2 -lm
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-linux.aarch64-x

@@ -0,0 +1,27 @@
+# Options for Linux, ARMv7 and X-Window
+
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+XFLAGS = -DXWINDOW
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g3
+DFLAGS = $(XFLAGS) -DRELEASE=351
+
+LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

bin/makefile-linux.armv7l-sdl

@@ -0,0 +1,19 @@
+# Options for Linux, ARMv7 and SDL
+
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+XFLAGS = -DSDL
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O2 -g3
+DFLAGS = $(XFLAGS) -DRELEASE=351
+
+LDFLAGS = -lm -lSDL2
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-linux.x86_64-sdl

@@ -0,0 +1,19 @@
+# Options for Linux, 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 = -lm -lSDL2
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldesdl

bin/makefile-linux.x86_64-x

@@ -1,7 +1,7 @@
 # Options for Linux, Intel x86_64 and X-Window
 
-#CC = gcc -m64 $(GCC_CFLAGS)
-CC = clang -m64 $(CLANG_CFLAGS)
+CC = gcc -m64 $(GCC_CFLAGS)
+# CC = clang -m64 $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \

bin/makefile-sunos5.386-x

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

bin/makefile-sunos5.i386-x

@@ -36,7 +36,6 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 DFLAGS = $(XFLAGS) \
 	$(DEBUGFLAGS) \
 	-DOS5 -DUSE_DLPI \
-	-DLOCK_X_UPDATES   \
 	-I$(OPENWINHOME)/include \
 	-DRELEASE=210
 

bin/makefile-sunos5.sparc-x

@@ -40,7 +40,7 @@ OPTFLAGS =  -O2 -g3
 
 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
-MACHINEFLAGS = -DOS5 -DUSE_DLPI -DLOCK_X_UPDATES
+MACHINEFLAGS = -DOS5 -DUSE_DLPI
 
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \

bin/makefile-sunos5.x86_64-x

@@ -36,7 +36,6 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	-DOS5 \
-	-DLOCK_X_UPDATES   \
 	-DUSE_DLPI \
 	-DRELEASE=351
 

bin/makefile-tail

@@ -38,15 +38,8 @@ REQUIRED-INCS = $(INCDIR)version.h $(INCDIR)maiko/platform.h
 CFLAGS = $(OPTFLAGS) $(DFLAGS)
 RFLAGS = -c $(CFLAGS) -I$(INCDIR) -I$(INCLUDEDIR)
 
-OFILES = $(OBJECTDIR)arith2.o \
-	$(OBJECTDIR)arith3.o \
-	$(OBJECTDIR)arith4.o \
-	$(OBJECTDIR)array.o \
-	$(OBJECTDIR)array2.o \
-	$(OBJECTDIR)array3.o \
-	$(OBJECTDIR)array4.o \
-	$(OBJECTDIR)array5.o \
-	$(OBJECTDIR)array6.o \
+OFILES = $(OBJECTDIR)arithops.o \
+	$(OBJECTDIR)arrayops.o \
 	$(OBJECTDIR)bin.o \
 	$(OBJECTDIR)binds.o \
 	$(OBJECTDIR)bitblt.o \
@@ -122,7 +115,9 @@ DEVICES = $(OBJECTDIR)dspsubrs.o \
 	$(OBJECTDIR)dir.o \
 	$(OBJECTDIR)keyevent.o \
 	$(OBJECTDIR)kbdsubrs.o \
-	$(OBJECTDIR)ether.o \
+	$(OBJECTDIR)ether_common.o \
+	$(OBJECTDIR)ether_sunos.o \
+	$(OBJECTDIR)ether_nethub.o \
 	$(OBJECTDIR)tty.o \
 	$(OBJECTDIR)initkbd.o
 
@@ -160,9 +155,6 @@ $(OSARCHDIR)$(LDENAME): $(LIBFILES) $(EXTFILES) $(OBJECTDIR)vdate.o
 $(OSARCHDIR)ldeether: $(OBJECTDIR)ldeether.o $(DLPIFILES)
 	$(CC) $(OBJECTDIR)ldeether.o $(DLPIFILES) $(LDEETHERLDFLAGS) -o $(OSARCHDIR)ldeether
 
-$(OSARCHDIR)mkvdate: $(OBJECTDIR)mkvdate.o $(REQUIRED-INCS)
-	$(CC) $(OBJECTDIR)mkvdate.o $(LDFLAGS) -o $(OSARCHDIR)mkvdate
-
 $(OSARCHDIR)tstsout: $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(REQUIRED-INCS)
 	$(CC) $(OBJECTDIR)tstsout.o $(BYTESWAPFILES) $(LDFLAGS) -lc -lm -o $(OSARCHDIR)tstsout
 
@@ -171,9 +163,9 @@ $(OSARCHDIR)setsout: $(OBJECTDIR)setsout.o $(REQUIRED-INCS)
 
 #### Component files ######################################################
 
-$(OBJECTDIR)vdate.o: $(LIBFILES) $(EXTFILES) $(OSARCHDIR)mkvdate
+$(OBJECTDIR)vdate.o: $(LIBFILES) $(EXTFILES) mkvdate
 	$(RM) $(OBJECTDIR)vdate.c
-	$(OSARCHDIR)mkvdate > $(OBJECTDIR)vdate.c
+	$(BINDIR)mkvdate > $(OBJECTDIR)vdate.c
 	$(CC) $(RFLAGS) $(OBJECTDIR)vdate.c -o $(OBJECTDIR)vdate.o
 
 $(OBJECTDIR)tstsout.o: $(SRCDIR)tstsout.c $(REQUIRED-INCS) \
@@ -197,9 +189,6 @@ $(OBJECTDIR)ldeboot.o: $(SRCDIR)ldeboot.c $(REQUIRED-INCS) \
 $(OBJECTDIR)ldeether.o: $(SRCDIR)ldeether.c $(REQUIRED-INCS)
 	$(CC) $(RFLAGS) $(SRCDIR)ldeether.c -o $(OBJECTDIR)ldeether.o
 
-$(OBJECTDIR)mkvdate.o: $(SRCDIR)mkvdate.c $(REQUIRED-INCS)
-	$(CC) $(RFLAGS) $(SRCDIR)mkvdate.c -o $(OBJECTDIR)mkvdate.o
-
 $(OBJECTDIR)main.o: $(SRCDIR)main.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)dbprint.h \
 	$(INCDIR)emlglob.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h \
@@ -218,7 +207,7 @@ $(OBJECTDIR)dbgtool.o: $(SRCDIR)dbgtool.c $(REQUIRED-INCS) \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h $(INCDIR)cell.h \
 	$(INCDIR)stack.h $(INCDIR)dbgtooldefs.h $(INCDIR)kprintdefs.h \
-	$(INCDIR)testtooldefs.h
+	$(INCDIR)testtooldefs.h $(INCDIR)uraidextdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)dbgtool.c -o $(OBJECTDIR)dbgtool.o
 
 $(OBJECTDIR)dlpi.o: $(SRCDIR)dlpi.c \
@@ -239,7 +228,7 @@ $(OBJECTDIR)testtool.o: $(SRCDIR)testtool.c $(REQUIRED-INCS) \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h $(INCDIR)cell.h \
 	$(INCDIR)debug.h $(INCDIR)dbprint.h $(INCDIR)tosfns.h $(INCDIR)testtooldefs.h \
 	$(INCDIR)stack.h $(INCDIR)dbgtooldefs.h $(INCDIR)gcarraydefs.h \
-	$(INCDIR)kprintdefs.h $(INCDIR)mkatomdefs.h
+	$(INCDIR)kprintdefs.h $(INCDIR)mkatomdefs.h $(INCDIR)uraidextdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)testtool.c -o $(OBJECTDIR)testtool.o
 
 $(OBJECTDIR)allocmds.o: $(SRCDIR)allocmds.c $(REQUIRED-INCS) \
@@ -251,48 +240,40 @@ $(OBJECTDIR)allocmds.o: $(SRCDIR)allocmds.c $(REQUIRED-INCS) \
 	$(INCDIR)timerdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)allocmds.c -o $(OBJECTDIR)allocmds.o
 
-$(OBJECTDIR)arith2.o: $(SRCDIR)arith2.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
-	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)medleyfp.h $(INCDIR)arith.h \
-	$(INCDIR)arith2defs.h $(INCDIR)fpdefs.h $(INCDIR)mkcelldefs.h
-	$(CC) $(RFLAGS) $(SRCDIR)arith2.c -o $(OBJECTDIR)arith2.o
+$(OBJECTDIR)arithops.o: $(SRCDIR)arithops.c $(REQUIRED-INCS) \
+	$(INCDIR)adr68k.h \
+	$(INCDIR)arith.h \
+	$(INCDIR)commondefs.h \
+	$(INCDIR)lispemul.h \
+	$(INCDIR)lispmap.h \
+	$(INCDIR)lsptypes.h \
+	$(INCDIR)mkcelldefs.h \
+	$(INCDIR)arithopsdefs.h \
+	$(INCDIR)fpdefs.h \
+	$(INCDIR)lspglob.h \
+	$(INCDIR)ifpage.h \
+	$(INCDIR)iopage.h \
+	$(INCDIR)miscstat.h
+	$(CC) $(RFLAGS) $(SRCDIR)arithops.c -o $(OBJECTDIR)arithops.o
 
-$(OBJECTDIR)arith3.o: $(SRCDIR)arith3.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
-	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)cell.h \
-	$(INCDIR)arith.h $(INCDIR)arith3defs.h $(INCDIR)mkcelldefs.h
-	$(CC) $(RFLAGS) $(SRCDIR)arith3.c -o $(OBJECTDIR)arith3.o
-
-$(OBJECTDIR)arith4.o: $(SRCDIR)arith4.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
-	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)cell.h \
-	$(INCDIR)medleyfp.h $(INCDIR)arith.h $(INCDIR)arith4defs.h $(INCDIR)fpdefs.h \
-	$(INCDIR)mkcelldefs.h
-	$(CC) $(RFLAGS) $(SRCDIR)arith4.c -o $(OBJECTDIR)arith4.o
-
-$(OBJECTDIR)array.o: $(SRCDIR)array.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
-	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)arraydefs.h \
-	$(INCDIR)mkcelldefs.h $(INCDIR)arith.h $(INCDIR)my.h
-	$(CC) $(RFLAGS) $(SRCDIR)array.c -o $(OBJECTDIR)array.o
-
-$(OBJECTDIR)array3.o: $(SRCDIR)array3.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
-	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)emlglob.h \
-	$(INCDIR)array3defs.h $(INCDIR)mkcelldefs.h $(INCDIR)arith.h $(INCDIR)my.h
-	$(CC) $(RFLAGS) $(SRCDIR)array3.c -o $(OBJECTDIR)array3.o
-
-$(OBJECTDIR)array5.o: $(SRCDIR)array5.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
-	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)emlglob.h \
-	$(INCDIR)array5defs.h $(INCDIR)mkcelldefs.h $(INCDIR)arith.h $(INCDIR)my.h
-	$(CC) $(RFLAGS) $(SRCDIR)array5.c -o $(OBJECTDIR)array5.o
+$(OBJECTDIR)arrayops.o: $(SRCDIR)arrayops.c $(REQUIRED-INCS) \
+	$(INCDIR)adr68k.h \
+	$(INCDIR)arrayopsdefs.h \
+	$(INCDIR)lispemul.h \
+	$(INCDIR)lispmap.h \
+	$(INCDIR)emlglob.h \
+	$(INCDIR)lspglob.h \
+	$(INCDIR)ifpage.h \
+	$(INCDIR)iopage.h \
+	$(INCDIR)miscstat.h \
+	$(INCDIR)lsptypes.h \
+	$(INCDIR)my.h \
+	$(INCDIR)arith.h \
+	$(INCDIR)commondefs.h \
+	$(INCDIR)mkcelldefs.h \
+	$(INCDIR)gcdata.h \
+	$(INCDIR)gchtfinddefs.h
+	$(CC) $(RFLAGS) $(SRCDIR)arrayops.c -o $(OBJECTDIR)arrayops.o
 
 $(OBJECTDIR)bin.o: $(SRCDIR)bin.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
@@ -343,7 +324,7 @@ $(OBJECTDIR)blt.o: $(SRCDIR)blt.c $(REQUIRED-INCS) \
 	$(CC) $(RFLAGS) $(SRCDIR)blt.c -o $(OBJECTDIR)blt.o
 
 $(OBJECTDIR)byteswap.o: $(SRCDIR)byteswap.c $(REQUIRED-INCS) \
-	$(INCDIR)hdw_conf.h $(INCDIR)lispemul.h \
+	$(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)stack.h \
 	$(INCDIR)byteswapdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)byteswap.c -o $(OBJECTDIR)byteswap.o
@@ -388,7 +369,7 @@ $(OBJECTDIR)common.o: $(SRCDIR)common.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)emlglob.h $(INCDIR)stack.h $(INCDIR)dbprint.h \
-	$(INCDIR)commondefs.h $(INCDIR)kprintdefs.h $(INCDIR)uraiddefs.h
+	$(INCDIR)commondefs.h $(INCDIR)kprintdefs.h $(INCDIR)uraiddefs.h $(INCDIR)uraidextdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)common.c -o $(OBJECTDIR)common.o
 
 $(OBJECTDIR)conspage.o: $(SRCDIR)conspage.c $(REQUIRED-INCS) \
@@ -493,12 +474,26 @@ $(OBJECTDIR)mouseif.o: $(SRCDIR)mouseif.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 	$(INCDIR)dbprint.h $(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)mouseif.c -o $(OBJECTDIR)mouseif.o
 
-$(OBJECTDIR)ether.o: $(SRCDIR)ether.c $(REQUIRED-INCS) \
+$(OBJECTDIR)ether_common.o: $(SRCDIR)ether_common.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
 	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
-	$(CC) $(RFLAGS) $(SRCDIR)ether.c -o $(OBJECTDIR)ether.o
+	$(CC) $(RFLAGS) $(SRCDIR)ether_common.c -o $(OBJECTDIR)ether_common.o
+
+$(OBJECTDIR)ether_sunos.o: $(SRCDIR)ether_sunos.c $(REQUIRED-INCS) \
+	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
+	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
+	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(CC) $(RFLAGS) $(SRCDIR)ether_sunos.c -o $(OBJECTDIR)ether_sunos.o
+
+$(OBJECTDIR)ether_nethub.o: $(SRCDIR)ether_nethub.c $(REQUIRED-INCS) \
+	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
+	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
+	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
+	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(CC) $(RFLAGS) $(SRCDIR)ether_nethub.c -o $(OBJECTDIR)ether_nethub.o
 
 $(OBJECTDIR)findkey.o: $(SRCDIR)findkey.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
@@ -668,7 +663,7 @@ $(OBJECTDIR)initkbd.o: $(SRCDIR)initkbd.c $(REQUIRED-INCS) \
 	$(CC) $(RFLAGS) $(SRCDIR)initkbd.c -o $(OBJECTDIR)initkbd.o
 
 $(OBJECTDIR)initsout.o: $(SRCDIR)initsout.c $(REQUIRED-INCS) \
-	$(INCDIR)hdw_conf.h $(INCDIR)lispemul.h \
+	$(INCDIR)lispemul.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
 	$(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)adr68k.h $(INCDIR)cell.h \
 	$(INCDIR)devconf.h $(INCDIR)dbprint.h $(INCDIR)lldsp.h $(INCDIR)gcdata.h \
@@ -794,7 +789,7 @@ $(OBJECTDIR)shift.o: $(SRCDIR)shift.c $(REQUIRED-INCS) \
 	$(CC) $(RFLAGS) $(SRCDIR)shift.c -o $(OBJECTDIR)shift.o
 
 $(OBJECTDIR)storage.o: $(SRCDIR)storage.c $(REQUIRED-INCS) \
-	$(INCDIR)hdw_conf.h $(INCDIR)lispemul.h \
+	$(INCDIR)lispemul.h \
 	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lispmap.h $(INCDIR)stack.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
 	$(INCDIR)cell.h $(INCDIR)lsptypes.h $(INCDIR)gcdata.h $(INCDIR)storagedefs.h \
@@ -813,7 +808,7 @@ $(OBJECTDIR)subr.o: $(SRCDIR)subr.c $(REQUIRED-INCS) \
 	$(INCDIR)gcrdefs.h $(INCDIR)inetdefs.h $(INCDIR)kbdsubrsdefs.h \
 	$(INCDIR)mkcelldefs.h $(INCDIR)osmsgdefs.h $(INCDIR)rpcdefs.h \
 	$(INCDIR)storagedefs.h $(INCDIR)timerdefs.h $(INCDIR)ufsdefs.h \
-	$(INCDIR)unixcommdefs.h $(INCDIR)uutilsdefs.h $(INCDIR)vmemsavedefs.h
+	$(INCDIR)unixcommdefs.h $(INCDIR)uraidextdefs.h $(INCDIR)uutilsdefs.h $(INCDIR)vmemsavedefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)subr.c -o $(OBJECTDIR)subr.o
 
 $(OBJECTDIR)miscn.o: $(SRCDIR)miscn.c $(REQUIRED-INCS) \
@@ -847,8 +842,8 @@ $(OBJECTDIR)timer.o: $(SRCDIR)timer.c $(REQUIRED-INCS) \
 
 $(OBJECTDIR)tty.o: $(SRCDIR)tty.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
-	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
-	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)commondefs.h $(INCDIR)tty.h
+	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
+	$(INCDIR)commondefs.h $(INCDIR)tty.h $(INCDIR)ttydefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)tty.c -o $(OBJECTDIR)tty.o
 
 $(OBJECTDIR)typeof.o: $(SRCDIR)typeof.c $(REQUIRED-INCS) \
@@ -886,7 +881,7 @@ $(OBJECTDIR)uraid.o: $(SRCDIR)uraid.c $(REQUIRED-INCS) \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)initkbddefs.h \
 	$(INCDIR)kprintdefs.h $(INCDIR)llstkdefs.h $(INCDIR)mkatomdefs.h \
 	$(INCDIR)returndefs.h $(INCDIR)testtooldefs.h $(INCDIR)timerdefs.h \
-	$(INCDIR)vmemsavedefs.h $(INCDIR)devif.h
+	$(INCDIR)uraidextdefs.h $(INCDIR)vmemsavedefs.h $(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)uraid.c -o $(OBJECTDIR)uraid.o
 
 $(OBJECTDIR)rpc.o: $(SRCDIR)rpc.c $(REQUIRED-INCS) \
@@ -911,7 +906,7 @@ $(OBJECTDIR)vars3.o: $(SRCDIR)vars3.c $(REQUIRED-INCS) \
 	$(CC) $(RFLAGS) $(SRCDIR)vars3.c -o $(OBJECTDIR)vars3.o
 
 $(OBJECTDIR)vmemsave.o: $(SRCDIR)vmemsave.c $(REQUIRED-INCS) \
-	$(INCDIR)hdw_conf.h $(INCDIR)lispemul.h \
+	$(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)vmemsave.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
 	$(INCDIR)lsptypes.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \
@@ -920,29 +915,6 @@ $(OBJECTDIR)vmemsave.o: $(SRCDIR)vmemsave.c $(REQUIRED-INCS) \
 	$(INCDIR)ufsdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)vmemsave.c -o $(OBJECTDIR)vmemsave.o
 
-$(OBJECTDIR)array2.o: $(SRCDIR)array2.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
-	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)gcdata.h \
-	$(INCDIR)mkcelldefs.h $(INCDIR)arith.h $(INCDIR)my.h $(INCDIR)array2defs.h \
-	$(INCDIR)gchtfinddefs.h
-	$(CC) $(RFLAGS) $(SRCDIR)array2.c -o $(OBJECTDIR)array2.o
-
-$(OBJECTDIR)array4.o: $(SRCDIR)array4.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
-	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)mkcelldefs.h $(INCDIR)arith.h \
-	$(INCDIR)gcdata.h $(INCDIR)my.h $(INCDIR)array4defs.h $(INCDIR)gchtfinddefs.h
-	$(CC) $(RFLAGS) $(SRCDIR)array4.c -o $(OBJECTDIR)array4.o
-
-$(OBJECTDIR)array6.o: $(SRCDIR)array6.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
-	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)lispmap.h $(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)gcdata.h \
-	$(INCDIR)mkcelldefs.h $(INCDIR)arith.h $(INCDIR)my.h $(INCDIR)array6defs.h \
-	$(INCDIR)gchtfinddefs.h
-	$(CC) $(RFLAGS) $(SRCDIR)array6.c -o $(OBJECTDIR)array6.o
-
 $(OBJECTDIR)sxhash.o: $(SRCDIR)sxhash.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
@@ -962,10 +934,8 @@ $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(REQUIRED-INCS) \
 	$(INCDIR)miscstat.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \
 	$(INCDIR)initatms.h $(INCDIR)gcdata.h $(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)tos1defs.h $(INCDIR)tosret.h $(INCDIR)tosfns.h $(INCDIR)inlineC.h \
-	$(INCDIR)xcdefs.h $(INCDIR)arith2defs.h $(INCDIR)arith3defs.h \
-	$(INCDIR)arith4defs.h $(INCDIR)arraydefs.h $(INCDIR)array2defs.h \
-	$(INCDIR)array3defs.h $(INCDIR)array4defs.h $(INCDIR)array5defs.h \
-	$(INCDIR)array6defs.h $(INCDIR)bitbltdefs.h $(INCDIR)bltdefs.h \
+	$(INCDIR)xcdefs.h $(INCDIR)arithopsdefs.h $(INCDIR)arrayopsdefs.h  \
+	$(INCDIR)bitbltdefs.h $(INCDIR)bltdefs.h \
 	$(INCDIR)byteswapdefs.h $(INCDIR)car-cdrdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)conspagedefs.h $(INCDIR)drawdefs.h $(INCDIR)eqfdefs.h \
 	$(INCDIR)findkeydefs.h $(INCDIR)fpdefs.h $(INCDIR)fvardefs.h \
@@ -1026,6 +996,9 @@ $(OBJECTDIR)xwinman.o: $(SRCDIR)xwinman.c $(REQUIRED-INCS) \
 	$(INCDIR)xlspwindefs.h $(INCDIR)xscrolldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)xwinman.c -o $(OBJECTDIR)xwinman.o
 
+$(OBJECTDIR)sdl.o: $(SRCDIR)sdl.c $(REQUIRED-INCS)
+	$(CC) $(RFLAGS) $(SRCDIR)sdl.c -o $(OBJECTDIR)sdl.o
+
 $(OBJECTDIR)foreign.o: $(SRCDIR)foreign.c $(REQUIRED-INCS) \
 	$(INCDIR)/foreigndefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)foreign.c -o $(OBJECTDIR)foreign.o
@@ -1085,7 +1058,7 @@ $(OBJECTDIR)lpy.tab.o: $(SRCDIR)lpy.tab.c $(REQUIRED-INCS) $(INCDIR)lpdefs.h $(I
 #	.c.s. should always have -O
 ################################################################################
 
-cleanup:
+clean cleanup:
 	$(RM) -r $(OBJECTDIR) $(OSARCHDIR)
 
 .c.o:

bin/makeright

@@ -71,6 +71,9 @@ case "$display" in
 	x)	releasename=${osversion}.${architecture}-${display}
 		ldename=ldex
 		;;
+	sdl)	releasename=${osversion}.${architecture}-${display}
+		ldename=ldesdl
+		;;
 	*)	echo "display-option: $display is not supported."
 		exit
 		;;

bin/mkvdate

@@ -0,0 +1,6 @@
+#!/bin/sh
+cat <<EOF
+#include <time.h>
+extern const time_t MDate;
+const time_t MDate = $(date +%s);
+EOF

bin/osversion

@@ -1,6 +1,8 @@
 #!/bin/sh
-os=`./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 ;;
         sparc-sun-solaris1*)	echo sunos4 ;;
         *-*-solaris2*)	        echo sunos5 ;;

bin/release-one

@@ -0,0 +1,44 @@
+#!/bin/sh
+# Make and release maiko for one os / arch
+# Hopefully to be replaced by GitHub Action
+
+if [ ! -x ../../maiko/bin/machinetype ] ; then
+    echo ERROR: Must be run from maiko/bin
+    exit 1
+fi
+
+tag=$1
+if [ -z "$tag" ] ; then
+    tag=maiko-`date +%y%m%d`
+fi
+
+export PATH=.:"$PATH"
+osarch=`osversion`.`machinetype`
+
+
+./makeright x
+./makeright init
+
+cd ../..
+mkdir -p maiko/build
+echo making $tag-$osarch.tgz
+
+tar cfz maiko/build/$tag-$osarch.tgz         \
+    maiko/bin/osversion                      \
+    maiko/bin/machinetype                    \
+    maiko/bin/config.guess                   \
+    maiko/bin/config.sub                     \
+    maiko/$osarch/lde*
+
+if ! command -v gh >/dev/null ; then
+    echo 
+    echo The GitHub Command Line Interface, gh
+    echo does not seem to be installed.
+    echo Please upload  maiko/build/$tag-$osarch.tgz
+    echo to https://github.com/Interlisp/maiko/releases $tag
+    exit 0
+fi
+
+echo uploading 
+cd maiko
+gh release upload --clobber $tag build/$tag-$osarch.tgz

bin/start-release

@@ -0,0 +1,36 @@
+#!/bin/sh
+# This script is just a placeholder until we get GitHub
+# Actions to do releases 
+
+# Start Maiko release from maiko/bin
+#     startrelease [tag]
+# tag defaults to maiko-YYMMDD
+
+tag=$1
+if [ -z "$tag" ] ; then
+    tag=maiko-`date +%y%m%d`
+fi
+
+if ! command -v gh >/dev/null ; then
+    echo "It seems like 'gh', the GitHub Command Line Interface is"
+    echo "not installed. You can start a release using the"
+    echo "web interface at"
+    echo "https://github.com/Interlisp/maiko/releases/new"
+    echo "Make up a tag (or use  $tag)"
+    echo "and run './release-one tag' (or manually upload if"
+    echo "no 'gh' is installed) on every os/machine you want"
+    echo "this release to work for"
+    exit 0
+fi
+
+# Now for the only thing this script is actually doing
+
+gh release create $tag -p -t $tag -n "See release notes in medley repo"
+
+
+echo "Now run "
+echo ./release-one $tag
+echo "in maiko/bin on every os/machine you want this release"
+echo "to work for. When done, edit the release in your"
+echo "browser and uncheck the prerelease box	"
+

docs/NEWCDRCODING.md

@@ -0,0 +1,14 @@
+# CDR CODING in cons cells
+
+The cdr-code is a 4-bit field of a 32-bit cons cell.
+It is treated as an on-page indicator bit and a 3-bit scaled offset.
+
+Certain combinations are treated specially.
+
+
+| on-page | offset  | interpretation                                                            |
+|---------|---------|---------------------------------------------------------------------------|
+| 1       | 0       | CDR is NIL                                                                |
+| 1       | 1 - 7   | CDR is at 2*offset (counted in 32-bit cells) on same page                 |
+| 0       | 0       | CDR is indirect, CDR(car)                                                 |
+| 0       | 1 - 7   | CDR is not a cons cell but is in the car of cell at 2*offset on same page |

docs/Using-Dodo-networking-with-Maiko.md

@@ -0,0 +1,86 @@
+# Using Dodo-networking with Maiko
+
+The [Dodo XNS services](https://github.com/devhawala/dodo) provide an emulation for a usable
+subset of the Xerox 8000 Network Services from the 1980-ies. Dodo uses its own virtual
+network infrastructure - the Dodo *Nethub* - for avoiding the problems involved with
+implementing the transmission of XNS protocol packets over (real or virtual) network
+adapters of the diverse contemporary operating systems.
+
+The Dodo Nethub provides a simple virtual network, a kind of *XNS-over-TCP/IP*,
+where clients and servers connect with TCP/IP to the central Nethub program, which relays all
+packets ingoing from one connection to the other connections.
+
+The following sections describe the support for Dodo-networking added to
+Maiko. The Dodo Nethub support was implemented and tested with Linux on the x86_64
+architecture. However as only standard system calls for TCP/IP were used, adapting to other
+platforms if necessary should be possible.
+
+This extension allows Medley 3.51 running in a Maiko VM to use the XNS services
+*Clearinghouse*, *Filing* and *Printing* provided by Dodo (using the *Mail* service may
+also be possible, but this was not verified so far)  
+
+## Building Maiko with Dodo-networking support
+
+As long as Dodo-networking support is not merged into the `master`-branch
+of the primary Maiko repository, this networking option is only available in this
+clone of the original Maiko repository in the branch `dodo-nethub-support`.    
+(however: this branch should already be checked out if this file is present)
+
+The Dodo-networking support is enabled by defining `MAIKO_ENABLE_NETHUB`
+when compiling Maiko. This can be done in the Makefile for the relevant platform
+(file `bin/makefile-`*platform*) for example in the line where the compiler-command
+variable is defined.
+
+This is already done in the Makefile for the *Linux-x86_64-X* platform (file
+`bin/makefile-linux.x86_64-x`), where the compiler-command defined as follows:
+
+```
+CC = clang -m64 $(CLANG_CFLAGS) -DMAIKO_ENABLE_NETHUB
+```
+
+After a complete (re-)build, this Maiko VM optionally allows to connect to a Dodo Nethub
+and through this to use Dodo XNS services.
+  
+
+## Running Maiko with Dodo-networking
+
+With Dodo-networking support compiled in, Maiko (i.e. the program `ldex`) accepts the
+following additional commandline options:
+
+- `-nh-host` *dodo-host*    
+  the name or IP-address of the host where the Dodo Nethub program runs; no connection to
+  Dodo services will be opened if this option is not specified    
+  Default: (*none*)
+
+- `-nh-port` *port-number*    
+  the port which the Dodo Nethub is listening to at *dodo-host*    
+  Default: `3333`
+
+- `-nh-mac` *machine-id*    
+  the machine-id (aka. MAC-address) that this Maiko VM instance will use in the Dodo network;
+  the machine-id must be given as 48 bit hexadecimal value with a dash as byte-separator, i.e.
+  in the format *XX-XX-XX-XX-XX-XX* (with *XX* the hexcode for a single byte)     
+  Default: `CA-FF-EE-12-34-56`
+
+- `-nh-loglevel` *log-level*    
+  the detail level of logging to `stdout`, one of:    
+  `0`: log only main events (connect, disconnect or the like)    
+  `1`: log network events each with a single line    
+  `2`: detailled log of network events    
+  Default: `0`
+
+So by default Maiko will not connect to a Dodo nethub and behave like a "standard" version
+without networking support.    
+To use Dodo XNS services, the option `-nh-host` must be given to specify the location
+of the Dodo nethub. In the simplest (and probably most usual) case where Dodo is run on the
+same machine as Maiko/Medley, the value for option `-nh-host` will be *localhost*, so
+adding the option `-nh-host localhost` when starting the Medley Lisp system will allow
+to use the XNS services of a Dodo system running locally.  
+
+Specifying the *machine-id* is optional unless more than one Maiko/Medley instances are to use
+Dodo XNS services concurrently: in this case, each Maiko VM *must* use a *unique* machine-id,
+so at most one Maiko VM may omit the `-nh-mac` option.    
+However, each machine-id used by the Maiko VMs should have an entry in the `machine.cfg`
+file of the Dodo installation, cloning or copying the low-level SPP-configuration of the
+`maiko-Lisp-One` example entry in the `machine.cfg` of the Dodo `dist.zip`
+distribution.

inc/MyWindow.h

@@ -24,7 +24,6 @@
 #define VERTICAL   0
 #define HORIZONTAL 1
 
-#define PERCENT_OF_SCREEN 95
 #define SCROLL_PITCH      30
 
 typedef struct _MyEvent
@@ -77,7 +76,7 @@ typedef struct
 						, White_Pixel ); \
 			XLOCK;					\
 			XFlush( display ); 	\
-			XUNLOCK;		\
+			XUNLOCK( display );                 \
 			(child_win)->parent = parent_win; \
 			if( (child_win)->after_create ) \
 			    ((child_win)->after_create)(parent_win,child_win);\
@@ -96,7 +95,7 @@ typedef struct
 					, (window)->width 					\
 					, (window)->height ); 				\
 			XFlush( display ); 							\
-			XUNLOCK;									\
+			XUNLOCK( display );                               \
 			if( (window)->after_resize ) 				\
 				((window)->after_resize)( window ); 	\
 		} \
@@ -106,7 +105,7 @@ typedef struct
 		XLOCK;													\
 		XDefineCursor( display, (window)->win, *(mycursor) ); \
 		XFlush( display ); 	 \
-		XUNLOCK;										\
+		XUNLOCK( display );            \
 		(window)->cursor = mycursor; \
 }
 

inc/XKeymap.h

@@ -61,7 +61,7 @@
  * triples in this array are interpreted in initkbd.c as
  *  reusable, (Lisp keyboard) code, (X keysym) symbol
  */
-int generic_X_keymap[] = {
+static const int generic_X_keymap[] = {
     0, 107, 0x1000ff10,            /* Un-named KEYSYM used on Sun kbd for F11 */
     0, 108, 0x1000ff11,            /* Un-named KEYSYM used on Sun kbd for F12 */
     0, 107, XK_F11,

inc/address.h

@@ -29,13 +29,13 @@
 /**********************************************************************/
 
 /* NOTE: These MACRO should be used for the pointers in LISP SYSOUT */
-#define LLSH(datum , n)		((datum )<< n)
-#define LRSH(datum , n)		((datum) >> n)
+#define LLSH(datum, n)			((datum) << (n))
+#define LRSH(datum, n)			((datum) >> (n))
 
 #define HILOC(ptr)			(LRSH(((unsigned int)(ptr) & SEGMASK),16))
 #define LOLOC(ptr)			((unsigned int)(ptr) & 0x0ffff)
 
-#define VAG2(hi,lo)			(LLSH((hi),16) | (lo))
+#define VAG2(hi,lo)			(LispPTR)(LLSH((hi),16) | (lo))
 
 
 /* NOTE: argument off must be WORD offset */

inc/adr68k.h

@@ -9,8 +9,6 @@
  *			Hiroshi Hayata
  */
 
-
-
 /************************************************************************/
 /*									*/
 /*	Copyright 1989, 1990 Venue, Fuji Xerox Co., Ltd, Xerox Corp.	*/
@@ -20,8 +18,6 @@
 /*									*/
 /************************************************************************/
 
-
-
 /**********************************************************************/
 /*
 		Func name :	adr68k.h
@@ -32,32 +28,65 @@
 */
 /**********************************************************************/
 
+#include <stddef.h>
+#include <stdio.h>
+#include "lispemul.h"
+#include "lspglob.h"
 
+static inline LispPTR LAddrFromNative(void *NAddr)
+{
+  if ((uintptr_t)NAddr & 1) {
+    printf("Misaligned pointer in LAddrFromNative %p\n", NAddr);
+  }
+  return (LispPTR)(((DLword *)NAddr) - Lisp_world);
+}
 
-/*  translate 68k ptr to Lisp DLword address */
-#define LADDR_from_68k(ptr68k)	((LispPTR)(((UNSIGNED)(ptr68k) - (UNSIGNED)Lisp_world) >>1))
+static inline DLword *NativeAligned2FromLAddr(LispPTR LAddr)
+{
+  return (Lisp_world + LAddr);
+}
 
+static inline LispPTR *NativeAligned4FromLAddr(LispPTR LAddr)
+{
+  if (LAddr & 1) {
+    printf("Misaligned pointer in NativeAligned4FromLAddr 0x%x\n", LAddr);
+  }
+  return (void *)(Lisp_world + LAddr);
+}
 
-/*  translate 68k ptr to Lisp Page number   */
-#define LPAGE_from_68k(ptr68k)	(LADDR_from_68k(ptr68k) >> 8)
+static inline LispPTR *NativeAligned4FromLPage(LispPTR LPage)
+{
+  return (void *)(Lisp_world + (LPage << 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);
+  }
+  return (DLword)hoffset;
+}
 
-/* Translate Lisp_address to 68K address	*/
-/*	Lisp_addr: word offset		*/
-#define Addr68k_from_LADDR(Lisp_addr)	(Lisp_world + (Lisp_addr))
+static inline DLword *NativeAligned2FromStackOffset(DLword StackOffset)
+{
+  return Stackspace + StackOffset;
+}
 
+static inline LispPTR *NativeAligned4FromStackOffset(DLword StackOffset)
+{
+  if (StackOffset & 1) {
+    printf("Misaligned StackOffset in NativeAligned4FromStackOffset 0x%hx\n", StackOffset);
+  }
+  return (void *)(Stackspace + StackOffset);
+}
 
-/* translate LispPage to 68k address */
-#define Addr68k_from_LPAGE(Lisp_page)	(Addr68k_from_LADDR((Lisp_page << 8) ))
-
-
-
-
-/* Stack Offset Macros */
-
-#define StkOffset_from_68K(ptr68k)\
-	((LispPTR)(((UNSIGNED)(ptr68k) - (UNSIGNED)Stackspace) >>1))
-
-#define Addr68k_from_StkOffset(stkoffset)\
-	(Stackspace + (stkoffset))
+static inline LispPTR LPageFromNative(void *NAddr)
+{
+  if ((uintptr_t)NAddr & 1) {
+    printf("Misaligned pointer in LPageFromNative %p\n", NAddr);
+  }
+  return (LispPTR)((((DLword *)NAddr) - Lisp_world) >> 8);
+}
 #endif /* ADR68K_H */

inc/allocmdsdefs.h

@@ -1,6 +1,6 @@
 #ifndef ALLOCMDSDEFS_H
 #define ALLOCMDSDEFS_H 1
 #include "lispemul.h" /* for LispPTR, DLword */
-LispPTR initmdspage(register LispPTR *base, register DLword size, register LispPTR prev);
-LispPTR *alloc_mdspage(register short int type);
+LispPTR initmdspage(LispPTR *base, DLword size, LispPTR prev);
+LispPTR *alloc_mdspage(short int type);
 #endif

inc/arith.h

@@ -9,54 +9,86 @@
 /*									*/
 /************************************************************************/
 
+#include "adr68k.h"    // for NativeAligned4FromLAddr, LAddrFromNative
+#include "commondefs.h" // for error
+#include "lispemul.h"  // for SEGMASK, ERROR_EXIT
+#include "lispmap.h"   // for S_NEGATIVE, S_POSITIVE
+#include "lsptypes.h"  // for TYPE_FIXP, GetTypeNumber, TYPE_FLOATP
+#include "mkcelldefs.h" // for createcell68k
+
 #define MAX_SMALL 65535  /* == 0x0000FFFF  */
-#define MIN_SMALL -65536 /* == 0xFFFF0000  */
+#define MIN_SMALL (-65536) /* == 0xFFFF0000  */
 
 #define MAX_FIXP 2147483647  /* == 0x7FFFFFFF  */
-#define MIN_FIXP -2147483648 /* == 0x80000000  */
+#define MIN_FIXP (-2147483648) /* == 0x80000000  */
 
-#define GetSmalldata(x)          \
-  (((SEGMASK & x) == S_POSITIVE) \
-       ? (0xFFFF & x)            \
-       : (((SEGMASK & x) == S_NEGATIVE) ? (0xFFFF0000 | x) : error("Not smallp address")))
+#define SMALLP_ZERO ((LispPTR)S_POSITIVE)
+#define SMALLP_MINUSONE ((LispPTR)(S_NEGATIVE | 0xFFFF))
+/**
+ * extract an integer value from a smallp
+ */
+static inline int GetSmalldata(LispPTR x) {
+  if ((SEGMASK & (int)x) == S_POSITIVE) return (int)(x & 0xFFFF);
+  if ((SEGMASK & (int)x) == S_NEGATIVE) return (int)(x | 0xFFFF0000);
+  error("Not smallp address");
+  return (0);
+}
 
-#define GetSmallp(x)                                                                  \
-  ((0xFFFF0000 & x) ? (((0xFFFF0000 & x) == 0xFFFF0000) ? (S_NEGATIVE | (0xFFFF & x)) \
-                                                        : error("Not Smallp data"))   \
-                    : (S_POSITIVE | (0xFFFF & x)))
+/**
+ * construct a smallp from an integer value
+ */
 
-#define FIXP_VALUE(dest) *((int *)Addr68k_from_LADDR(dest))
+static inline LispPTR GetSmallp(long x) {
+  if (x >= 0) {
+    if (x <= MAX_SMALL) return (LispPTR)(S_POSITIVE | x);
+  } else {
+    if (x >= MIN_SMALL) return (LispPTR)(S_NEGATIVE | (x & 0xFFFF));
+  }
+  error("Not Smallp data");
+  return (S_POSITIVE | 0);
+}
 
-#define FLOATP_VALUE(dest) *((float *)Addr68k_from_LADDR(dest))
+/**
+ * construct a smallp from an unsigned value
+ */
+static inline LispPTR GetPosSmallp(unsigned long x) {
+  if (x <= MAX_SMALL) return (LispPTR)(S_POSITIVE | x);
+  error("Not Smallp data");
+  return (S_POSITIVE | 0);
+}
+
+#define FIXP_VALUE(dest) *((int *)NativeAligned4FromLAddr(dest))
+
+#define FLOATP_VALUE(dest) *((float *)NativeAligned4FromLAddr(dest))
 
 #define N_GETNUMBER(sour, dest, label)                        \
   do {                                                        \
-    dest = sour; /* access memory once */                     \
-    switch (SEGMASK & dest) {                                 \
-      case S_POSITIVE: dest = 0xFFFF & (dest); break;         \
-      case S_NEGATIVE: dest = 0xFFFF0000 | (dest); break;     \
+    switch (SEGMASK & (sour)) {                               \
+    case S_POSITIVE: (dest) = (int)((sour) & 0xFFFF); break;  \
+    case S_NEGATIVE: (dest) = (int)((sour) | 0xFFFF0000); break; \
       default:                                                \
-        if (GetTypeNumber(dest) != TYPE_FIXP) goto label;     \
-        dest = FIXP_VALUE(dest);                              \
+        /* NOLINTNEXTLINE(bugprone-macro-parentheses) */      \
+        if (GetTypeNumber(sour) != TYPE_FIXP) goto label;     \
+        (dest) = FIXP_VALUE(sour);                            \
     }                                                         \
   } while (0)
 
 #define N_IGETNUMBER(sour, dest, label)                                                   \
   do {                                                                                    \
-    dest = sour; /* access memory once */                                                 \
-    switch (SEGMASK & dest) {                                                             \
-      case S_POSITIVE: dest = 0xFFFF & dest; break;                                       \
-      case S_NEGATIVE: dest = 0xFFFF0000 | dest; break;                                   \
+    switch (SEGMASK & (sour)) {                                                           \
+    case S_POSITIVE: (dest) = (int)((sour) & 0xFFFF); break;            \
+    case S_NEGATIVE: (dest) = (int)((sour) | 0xFFFF0000); break;        \
       default:                                                                            \
-        switch (GetTypeNumber(dest)) {                                                    \
-          case TYPE_FIXP: dest = FIXP_VALUE(dest); break;                                 \
+        switch (GetTypeNumber(sour)) {                                                    \
+          case TYPE_FIXP: (dest) = FIXP_VALUE(sour); break;               \
           case TYPE_FLOATP: {                                                             \
-            register float temp;                                                          \
-            temp = FLOATP_VALUE(dest);                                                    \
+            float temp;                                                          \
+            temp = FLOATP_VALUE(sour);                                                    \
+            /* NOLINTNEXTLINE(bugprone-macro-parentheses) */                              \
             if ((temp > ((float)0x7fffffff)) || (temp < ((float)0x80000000))) goto label; \
-            dest = (int)temp;                                                             \
+            (dest) = (int)temp;                                                           \
           } break;                                                                        \
-          default: goto label;                                                            \
+          default: goto label; /* NOLINT(bugprone-macro-parentheses) */                   \
         }                                                                                 \
         break;                                                                            \
     }                                                                                     \
@@ -64,100 +96,33 @@
 
 #define ARITH_SWITCH(arg, result)                                          \
   do {                                                                     \
-    switch ((int)arg & 0xFFFF0000) {                                       \
-      case 0: result = (S_POSITIVE | (int)arg); break;                     \
-      case 0xFFFF0000: result = (S_NEGATIVE | (0xFFFF & (int)arg)); break; \
+    switch ((arg) & (int)0xFFFF0000) {                      \
+      case 0: (result) = (S_POSITIVE | (int)(arg)); break;                 \
+      case (int)0xFFFF0000: (result) = (S_NEGATIVE | (0xFFFF & (arg))); break; \
       default: {                                                           \
-        register LispPTR *wordp;                                           \
+        int *fixpp;                                           \
         /* arg is FIXP, call createcell */                                 \
-        wordp = (LispPTR *)createcell68k(TYPE_FIXP);                       \
-        *((int *)wordp) = (int)arg;                                        \
-        result = (LADDR_from_68k(wordp));                                  \
+        fixpp = (int *)createcell68k(TYPE_FIXP);                       \
+        *fixpp = (int)(arg);                                      \
+        (result) = LAddrFromNative(fixpp);                                \
         break;                                                             \
       }                                                                    \
     }                                                                      \
   } while (0)
 
-/* *******
-        NEED to See if this is faster than the N_ARITH_SWITCH macro
-
-        if( (MIN_FIXP <= result) && (result <= MAX_FIXP) ){
-                if(0 <= result){
-                        if(result <= MAX_SMALL)
-                                return(S_POSITIVE | result);
-                        else{
-                                wordp = createcell68k(TYPE_FIXP);
-                                *((unsigned int *)wordp) = result;
-                                return(LADDR_from_68k(wordp));
-                        }
-                }else{
-                        if(MIN_SMALL <= result)
-                                return(S_NEGATIVE | (0xFFFF & result));
-                        else{
-                                wordp = createcell68k(TYPE_FIXP);
-                                *((unsigned int *)wordp) = result;
-                                return(LADDR_from_68k(wordp));
-                        }
-                }/
-        }
-****** */
-
 #define N_ARITH_SWITCH(arg)                                  \
   do {                                                       \
-    switch (arg & 0xFFFF0000) {                              \
-      case 0: return (S_POSITIVE | arg);                     \
-      case 0xFFFF0000: return (S_NEGATIVE | (0xFFFF & arg)); \
+    switch ((arg) & (int)0xFFFF0000) {             \
+    case 0: return (LispPTR) (S_POSITIVE | (arg));                       \
+    case (int)0xFFFF0000: return (LispPTR)(S_NEGATIVE | (0xFFFF & (arg))); \
       default: {                                             \
-        register LispPTR *fixpp;                             \
+        int *fixpp;                             \
         /* arg is FIXP, call createcell */                   \
-        fixpp = (LispPTR *)createcell68k(TYPE_FIXP);         \
-        *((int *)fixpp) = arg;                               \
-        return (LADDR_from_68k(fixpp));                      \
+        fixpp = (int *)createcell68k(TYPE_FIXP);         \
+        *fixpp = (int)(arg);				      \
+        return (LAddrFromNative(fixpp));                      \
       }                                                      \
     }                                                        \
   } while (0)
 
-#define N_IARITH_BODY_2(a, tos, op)  \
-  do {                               \
-    register int arg1, arg2;         \
-                                     \
-    N_IGETNUMBER(a, arg1, do_ufn);   \
-    N_IGETNUMBER(tos, arg2, do_ufn); \
-                                     \
-    arg1 = arg1 op arg2;             \
-                                     \
-    N_ARITH_SWITCH(arg1);            \
-                                     \
-  do_ufn:                            \
-    ERROR_EXIT(tos);                 \
-  } while (0)
-
-#define N_ARITH_BODY_1(a, n, op)  \
-  do {                            \
-    register int arg1;            \
-                                  \
-    N_GETNUMBER(a, arg1, do_ufn); \
-                                  \
-    arg1 = arg1 op n;             \
-                                  \
-    N_ARITH_SWITCH(arg1);         \
-                                  \
-  do_ufn:                         \
-    ERROR_EXIT(a);                \
-  } while (0)
-
-#define N_ARITH_BODY_1_UNSIGNED(a, n, op) \
-  do {                                    \
-    register unsigned int arg1;           \
-                                          \
-    N_GETNUMBER(a, arg1, do_ufn);         \
-                                          \
-    arg1 = arg1 op n;                     \
-                                          \
-    N_ARITH_SWITCH(arg1);                 \
-                                          \
-  do_ufn:                                 \
-    ERROR_EXIT(a);                        \
-  } while (0)
-
 #endif /* ARITH_H */

inc/arith2defs.h

@@ -1,15 +0,0 @@
-#ifndef ARITH2DEFS_H
-#define ARITH2DEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_plus2(int tosm1, int tos);
-LispPTR N_OP_iplus2(int tosm1, int tos);
-LispPTR N_OP_difference(int tosm1, int tos);
-LispPTR N_OP_idifference(int tosm1, int tos);
-LispPTR N_OP_logxor(int tosm1, int tos);
-LispPTR N_OP_logand(int tosm1, int tos);
-LispPTR N_OP_logor(int tosm1, int tos);
-LispPTR N_OP_greaterp(int tosm1, int tos);
-LispPTR N_OP_igreaterp(int tosm1, int tos);
-LispPTR N_OP_iplusn(int tos, int n);
-LispPTR N_OP_idifferencen(int tos, int n);
-#endif

inc/arith3defs.h

@@ -1,7 +0,0 @@
-#ifndef ARITH3DEFS_H
-#define ARITH3DEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_makenumber(int tosm1, int tos);
-LispPTR N_OP_boxiplus(register int a, int tos);
-LispPTR N_OP_boxidiff(register int a, int tos);
-#endif

inc/arith4defs.h

@@ -1,8 +0,0 @@
-#ifndef ARITH4DEFS_H
-#define ARITH4DEFS_H 1
-int N_OP_times2(int tosm1, int tos);
-int N_OP_itimes2(int tosm1, int tos);
-int N_OP_quot(int tosm1, int tos);
-int N_OP_iquot(int tosm1, int tos);
-int N_OP_iremainder(int tosm1, int tos);
-#endif

inc/arithopsdefs.h

@@ -0,0 +1,23 @@
+#ifndef ARITHOPSDEFS_H
+#define ARITHOPSDEFS_H 1
+#include "lispemul.h" /* for LispPTR */
+LispPTR N_OP_plus2(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_iplus2(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_difference(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_idifference(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_logxor(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_logand(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_logor(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_greaterp(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_igreaterp(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_iplusn(LispPTR tos, int n);
+LispPTR N_OP_idifferencen(LispPTR tos, int n);
+LispPTR N_OP_makenumber(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_boxiplus(LispPTR a, LispPTR tos);
+LispPTR N_OP_boxidiff(LispPTR a, LispPTR tos);
+LispPTR N_OP_times2(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_itimes2(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_quot(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_iquot(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_iremainder(LispPTR tosm1, LispPTR tos);
+#endif

inc/array.h

@@ -24,8 +24,8 @@ typedef struct sequencedescriptor {
 	unsigned 	nil2		:1;
 	unsigned	base		:28;
 	unsigned	typ		:4;
-	unsigned		length: 28;
-	LispPTR		offst;
+	unsigned	length		:28;
+	int32_t		offst;
 } Arrayp;
 
 struct arrayheader {
@@ -41,8 +41,8 @@ struct arrayheader {
 	unsigned        extendablep     :1;
 	unsigned        typenumber      :8;
 	DLword          offset;
-	LispPTR          fillpointer;
-	LispPTR          totalsize;
+	int32_t         fillpointer;
+	int32_t         totalsize;
       };
 #else
 typedef struct sequencedescriptor {
@@ -100,9 +100,9 @@ typedef struct sequencedescriptor {
 	unsigned	readonly	:1;
 	unsigned	nil		:1;
 	unsigned	orig		:1;
-	unsigned		length: 28;
+	unsigned	length		:28;
 	unsigned	typ		:4;
-	LispPTR		offst;
+	int32_t		offst;
 } Arrayp;
 
 struct arrayheader {
@@ -118,8 +118,8 @@ struct arrayheader {
 	unsigned        bitp            :1;
 	unsigned        indirectp       :1;
 	unsigned        readonlyp       :1;
-	LispPTR          totalsize;
-	LispPTR          fillpointer;
+	int32_t         totalsize;
+	int32_t         fillpointer;
       };
 #else
 typedef struct sequencedescriptor {
@@ -216,14 +216,6 @@ struct abdum
 #define FIRSTARRAYSEGMENT	19
 #define MAXCELLSPERHUNK		64
 
-/****************** The following are for codereclaimer *********************/
-
-#define BITSPERBITE		8
-
-/********************* End of codereclaimer *********************************/
-
-
-
 /****************************************************************************/
 /*                                                                          */
 /*                  End of Definitions                                      */

inc/array2defs.h

@@ -1,6 +0,0 @@
-#ifndef ARRAY2DEFS_H
-#define ARRAY2DEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_misc4(register LispPTR data, register LispPTR base, register LispPTR typenumber,
-                   register LispPTR inx, int alpha);
-#endif

inc/array3defs.h

@@ -1,5 +0,0 @@
-#ifndef ARRAY3DEFS_H
-#define ARRAY3DEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_aref1(register LispPTR arrayarg, register LispPTR inx);
-#endif

inc/array4defs.h

@@ -1,5 +0,0 @@
-#ifndef ARRAY4DEFS_H
-#define ARRAY4DEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_aset1(register LispPTR data, LispPTR arrayarg, register int inx);
-#endif

inc/array5defs.h

@@ -1,5 +0,0 @@
-#ifndef ARRAY5DEFS_H
-#define ARRAY5DEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_aref2(LispPTR arrayarg, LispPTR inx0, LispPTR inx1);
-#endif

inc/array6defs.h

@@ -1,5 +0,0 @@
-#ifndef ARRAY6DEFS_H
-#define ARRAY6DEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_aset2(register LispPTR data, LispPTR arrayarg, LispPTR inx0, LispPTR inx1);
-#endif

inc/arraydefs.h

@@ -1,5 +0,0 @@
-#ifndef ARRAYDEFS_H
-#define ARRAYDEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_misc3(LispPTR baseL, LispPTR typenumber, LispPTR inx, int alpha);
-#endif

inc/arrayopsdefs.h

@@ -0,0 +1,10 @@
+#ifndef ARRAYOPSDEFS_H
+#define ARRAYOPSDEFS_H 1
+#include "lispemul.h" /* for LispPTR */
+LispPTR N_OP_misc3(LispPTR baseL, LispPTR typenumber, LispPTR inx, int alpha);
+LispPTR N_OP_misc4(LispPTR data, LispPTR base, LispPTR typenumber, LispPTR inx, int alpha);
+LispPTR N_OP_aref1(LispPTR arrayarg, LispPTR inx);
+LispPTR N_OP_aset1(LispPTR data, LispPTR arrayarg, LispPTR inx);
+LispPTR N_OP_aref2(LispPTR arrayarg, LispPTR inx0, LispPTR inx1);
+LispPTR N_OP_aset2(LispPTR data, LispPTR arrayarg, LispPTR inx0, LispPTR inx1);
+#endif

inc/bb.h

@@ -140,7 +140,7 @@
 #define  B_src_word_in_postloop  src32lbit >= dst32lbit
 
 /*   VARIABLES   */
-#define  F_num_loop  ((dst32lbit + w) >> 5) - 1
+#define  F_num_loop  (((dst32lbit + w) >> 5) - 1)
 #define  B_num_loop  ((w - dst32rbit - 1) > 0) ? ((w - dst32rbit - 1) >> 5) : 0
 #define  F_preloop_mask  ((dst32lbit) ? (~(0xFFFFFFFF << (32 - dst32lbit))) : 0xFFFFFFFF)
 #define  F_postloop_mask  0xFFFFFFFF << (31 - dst32rbit)
@@ -389,7 +389,7 @@
  do_partial_transfer						\
  dst32addr++;							\
  switch (op)							\
- { register int cnt;						\
+ { int cnt;						\
    case op_repl_src: ForInner { DestGetsF(=)  } break;		\
    case op_fn_and:   ForInner { DestGetsF(&=) } break;		\
    case op_fn_or:    ForInner { DestGetsF(|=) } break;		\
@@ -416,14 +416,14 @@
  if (aligned_loop)						\
  {								\
    if (src_comp) switch (op)					\
-   { register int cnt;							\
+   { int cnt;							\
      case op_repl_src: ForInner {*dst32addr++  = ~*src32addr++;} break;	\
      case op_fn_and:   ForInner {*dst32addr++ &= ~*src32addr++;} break;	\
      case op_fn_or:    ForInner {*dst32addr++ |= ~*src32addr++;} break;	\
      case op_fn_xor:   ForInner {*dst32addr++ ^= ~*src32addr++;} break;	\
    }									\
    else switch (op)							\
-   { register int cnt;							\
+   { int cnt;							\
      case op_repl_src: ForInner {*dst32addr++  = *src32addr++;} break;	\
      case op_fn_and:   ForInner {*dst32addr++ &= *src32addr++;} break;	\
      case op_fn_or:    ForInner {*dst32addr++ |= *src32addr++;} break;	\
@@ -433,14 +433,14 @@
  else									\
  {									\
    if (src_comp) switch (op)						\
-   { register int cnt;							\
+   { int cnt;							\
      case op_repl_src: ForInner {GetSrcCF DestGetsF(=)  } break;	\
      case op_fn_and:   ForInner {GetSrcCF DestGetsF(&=) } break;	\
      case op_fn_or:    ForInner {GetSrcCF DestGetsF(|=) } break;	\
      case op_fn_xor:   ForInner {GetSrcCF DestGetsF(^=) } break;	\
    }									\
    else switch (op)							\
-   { register int cnt;							\
+   { int cnt;							\
      case op_repl_src: ForInner {GetSrcF  DestGetsF(=)  } break;	\
      case op_fn_and:   ForInner {GetSrcF  DestGetsF(&=) } break;	\
      case op_fn_or:    ForInner {GetSrcF  DestGetsF(|=) } break;	\
@@ -470,14 +470,14 @@
  if (aligned_loop)						\
  {								\
    if (src_comp) switch (op)					\
-   { register int cnt;							\
+   { int cnt;							\
      case op_repl_src: ForInner {*dst32addr--  = ~*src32addr--;} break;	\
      case op_fn_and:   ForInner {*dst32addr-- &= ~*src32addr--;} break;	\
      case op_fn_or:    ForInner {*dst32addr-- |= ~*src32addr--;} break;	\
      case op_fn_xor:   ForInner {*dst32addr-- ^= ~*src32addr--;} break;	\
    }									\
    else switch (op)							\
-   { register int cnt;							\
+   { int cnt;							\
      case op_repl_src: ForInner {*dst32addr--  = *src32addr--;} break;	\
      case op_fn_and:   ForInner {*dst32addr-- &= *src32addr--;} break;	\
      case op_fn_or:    ForInner {*dst32addr-- |= *src32addr--;} break;	\
@@ -487,14 +487,14 @@
  else									\
  {									\
    if (src_comp) switch (op)						\
-   { register int cnt;							\
+   { int cnt;							\
      case op_repl_src: ForInner {GetSrcCB DestGetsB(=)  } break;	\
      case op_fn_and:   ForInner {GetSrcCB DestGetsB(&=) } break;	\
      case op_fn_or:    ForInner {GetSrcCB DestGetsB(|=) } break;	\
      case op_fn_xor:   ForInner {GetSrcCB DestGetsB(^=) } break;	\
    }									\
    else switch (op)							\
-   { register int cnt;							\
+   { int cnt;							\
      case op_repl_src: ForInner {GetSrcB  DestGetsB(=)  } break;	\
      case op_fn_and:   ForInner {GetSrcB  DestGetsB(&=) } break;	\
      case op_fn_or:    ForInner {GetSrcB  DestGetsB(|=) } break;	\
@@ -698,24 +698,24 @@
 /*	However, YOU must set up the control variables that are used	*/
 /*	as "arguments" to the bitblt code:				*/
 /*									*/
-/*	register DLword	*srcbase, *dstbase;				*/
+/*	DLword	*srcbase, *dstbase;				*/
 /*	int	sx, dx, w, h, srcbpl, dstbpl, backwardflg;		*/
 /*	int	src_comp, op, gray, num_gray, curr_gray_line;		*/
 /*									*/
 /************************************************************************/
 
 #define variables						\
-int num_lines_remaining;					\
-int dstnumL, src32lbit, srcLshift, dst32lbit;			\
-unsigned int srcRmask, dstold, dstdata, mask;			\
-UNSIGNED x32byta, x32nbyt, x32ia;					\
-int abc, dst32rbit, src32rbit, fwd;				\
-unsigned int *OrigSrcAddr, *OrigDstAddr;			\
+int num_lines_remaining = 0;					\
+int dstnumL = 0, src32lbit = 0, srcLshift = 0, dst32lbit = 0;	\
+unsigned int srcRmask = 0, dstold = 0, dstdata = 0, mask = 0;	\
+UNSIGNED x32byta = 0, x32nbyt = 0, x32ia = 0;			\
+int abc, dst32rbit = 0, src32rbit = 0, fwd;			\
+unsigned int *OrigSrcAddr = 0, *OrigDstAddr = 0;		\
 int bb_fast;							\
 unsigned int preloop_mask, postloop_mask, sdw_mask;		\
-register unsigned int *dst32addr, *src32addr;			\
-register unsigned int shS, savedS, newS;			\
-register int srcRshift;
+unsigned int *dst32addr = 0, *src32addr = 0;			\
+unsigned int shS = 0, savedS = 0, newS = 0;			\
+int srcRshift = 0;
 
 
 
@@ -738,7 +738,7 @@ register int srcRshift;
 /************************************************************************/
 
 #define  new_bitblt_code			\
-{						\
+do {						\
 variables					\
 some_init					\
 while (num_lines_remaining-- > 0)		\
@@ -778,7 +778,7 @@ next_line:					\
     continue;					\
   }						\
 } /* end line loop */				\
-}
+} while (0)
 
 
 
@@ -791,7 +791,7 @@ next_line:					\
 /************************************************************************/
 
 #define  new_gray_bitblt_code			\
-{						\
+do {						\
 variables					\
 some_init					\
 while (num_lines_remaining-- > 0)		\
@@ -803,7 +803,7 @@ do_fpt:						\
 next_line:					\
   do_gray_advance				\
 } /* end line loop */				\
-}
+} while (0)
 
 
 
@@ -816,7 +816,7 @@ next_line:					\
 /************************************************************************/
 
 #define  new_char_bitblt_code			\
-{						\
+do {						\
 variables					\
 some_init					\
 while (num_lines_remaining-- > 0)		\
@@ -828,7 +828,7 @@ do_fpt:						\
 next_line:					\
   F_do_advance					\
 } /* end line loop */				\
-}
+} while (0)
 
 
 

inc/bbtsubdefs.h

@@ -1,36 +1,19 @@
 #ifndef BBTSUBDEFS_H
 #define BBTSUBDEFS_H 1
 
-/***** Don't use PixRect code on 386i for now *****/
-/***** -or on any machine that doesn't support it (HP, e.g.) *****/
-
 /********************************************************/
 /*                                                      */
-/*      prropstyle is DEFINED when we want to use       */
-/*      pixrect versions of the operations in this      */
-/*      file, and UNDEFINED, when we want to use        */
-/*      Don Charnley's bitblt code to do them.          */
+/*      Don Charnley's bitblt code                      */
 /*                                                      */
 /********************************************************/
 #include "lispemul.h" /* for LispPTR, DLword */
 
-#if defined(SUNDISPLAY) && \
-    !defined(NOPIXRECT) && \
-    !defined(NEWBITBLT)
-#define prropstyle 1
-#endif
-
 void bitbltsub(LispPTR *argv);
 LispPTR n_new_cursorin(DLword *baseaddr, int dx, int dy, int w, int h);
 LispPTR bitblt_bitmap(LispPTR *args);
 LispPTR bitshade_bitmap(LispPTR *args);
-#ifndef prropstyle
 void bltchar(LispPTR *args);
 void newbltchar(LispPTR *args);
-#else
-LispPTR bltchar(LispPTR *args);
-LispPTR newbltchar(LispPTR *args);
-#endif
 void ccfuncall(unsigned int atom_index, int argnum, int bytenum);
 void tedit_bltchar(LispPTR *args);
 

inc/bindefs.h

@@ -1,5 +1,5 @@
 #ifndef BINDEFS_H
 #define BINDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_bin(register int tos);
+LispPTR N_OP_bin(LispPTR tos);
 #endif

inc/bindsdefs.h

@@ -1,7 +1,7 @@
 #ifndef BINDSDEFS_H
 #define BINDSDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR *N_OP_bind(register LispPTR *stack_pointer, register LispPTR tos, int byte1, int byte2);
-LispPTR *N_OP_unbind(register LispPTR *stack_pointer);
-LispPTR *N_OP_dunbind(register LispPTR *stack_pointer, register LispPTR tos);
+LispPTR *N_OP_bind(LispPTR *stack_pointer, LispPTR tos, unsigned byte1, unsigned byte2);
+LispPTR *N_OP_unbind(LispPTR *stack_pointer);
+LispPTR *N_OP_dunbind(LispPTR *stack_pointer, LispPTR tos);
 #endif

inc/bitblt.h

@@ -27,16 +27,16 @@
 #define	ERROR	PIX_SRC
 
 #define PixOperation( SRCTYPE, OPERATION )	\
-	( SRCTYPE == ERASE ? \
-		(OPERATION == REPLACE ? PIX_NOT(PIX_SRC) : \
-		(OPERATION == PAINT   ? PIX_NOT(PIX_SRC) | PIX_DST : \
-		(OPERATION == ERASE   ? PIX_NOT(PIX_SRC) & PIX_DST : \
-		(OPERATION == INVERT  ? PIX_NOT(PIX_SRC) ^ PIX_DST : ERROR)))) : \
+        ( (SRCTYPE) == ERASE ?                                 \
+		((OPERATION) == REPLACE ? PIX_NOT(PIX_SRC) : \
+		((OPERATION) == PAINT   ? PIX_NOT(PIX_SRC) | PIX_DST : \
+		((OPERATION) == ERASE   ? PIX_NOT(PIX_SRC) & PIX_DST : \
+		((OPERATION) == INVERT  ? PIX_NOT(PIX_SRC) ^ PIX_DST : ERROR)))) : \
 	/*  SRCTYPE == INPUT */ \
-		(OPERATION == REPLACE ? PIX_SRC : \
-		(OPERATION == PAINT   ? PIX_SRC | PIX_DST : \
-		(OPERATION == ERASE   ? PIX_SRC & PIX_DST : \
-		(OPERATION == INVERT  ? PIX_SRC ^ PIX_DST : ERROR)))))
+		((OPERATION) == REPLACE ? PIX_SRC : \
+		((OPERATION) == PAINT   ? PIX_SRC | PIX_DST : \
+		((OPERATION) == ERASE   ? PIX_SRC & PIX_DST : \
+		((OPERATION) == INVERT  ? PIX_SRC ^ PIX_DST : ERROR)))))
 
 
 extern DLword	*EmMouseX68K, *EmMouseY68K;
@@ -50,17 +50,10 @@ extern int DisplayRasterWidth;
 
 
 #ifdef DOS
-#define HideCursor { (currentdsp->mouse_invisible)(currentdsp, IOPage68K); }
-#define ShowCursor { (currentdsp->mouse_visible)(IOPage68K->dlmousex, \
-												  IOPage68K->dlmousey); }
+#define HideCursor { (currentdsp->mouse_invisible)(currentdsp, IOPage); }
+#define ShowCursor { (currentdsp->mouse_visible)(IOPage->dlmousex, \
+												  IOPage->dlmousey); }
 
-#elif defined(SUNDISPLAY) && defined(OLD_CURSOR)
-extern struct winlock DisplayLockArea;
-#define	HideCursor	\
-	ioctl( LispWindowFd, WINLOCKSCREEN, &DisplayLockArea)
-
-#define ShowCursor \
-	ioctl( LispWindowFd, WINUNLOCKSCREEN, &DisplayLockArea)
 #else
 extern DLword *EmCursorX68K,*EmCursorY68K;
 #define	HideCursor	{ taking_mouse_down();}
@@ -83,13 +76,13 @@ extern DLword *EmCursorX68K,*EmCursorY68K;
 /* Macro for locking and unlocking screen to prevent multiple updates */
 
 #ifdef DOS
-#define LOCKSCREEN currentdsp->device.locked++;
-#define UNLOCKSCREEN currentdsp->device.locked--;
+#define LOCKSCREEN currentdsp->device.locked++
+#define UNLOCKSCREEN currentdsp->device.locked--
 
 #else
 
-#define LOCKSCREEN ScreenLocked = T;
-#define UNLOCKSCREEN ScreenLocked = NIL;
+#define LOCKSCREEN ScreenLocked = T
+#define UNLOCKSCREEN ScreenLocked = NIL
 
 #endif /* DOS */
 #endif /* BITBLT_H */

inc/bitbltdefs.h

@@ -1,7 +1,7 @@
 #ifndef BITBLTDEFS_H
 #define BITBLTDEFS_H 1
 #include "lispemul.h" /* for LispPTR, DLword */
-LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl,int tos);
+LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl, LispPTR tos);
 int cursorin(DLword addrhi, DLword addrlo, int w, int h, int backward);
 #endif
 

inc/bltdefs.h

@@ -1,6 +1,6 @@
 #ifndef BLTDEFS_H
 #define BLTDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_blt(LispPTR destptr, LispPTR sourceptr, register LispPTR wordcount);
+LispPTR N_OP_blt(LispPTR destptr, LispPTR sourceptr, LispPTR wordcount);
 #endif
 

inc/byteswapdefs.h

@@ -10,17 +10,7 @@ static inline unsigned int swapx(unsigned int word) {
   return (((word >> 16) & 0xffff) | ((word & 0xffff) << 16));
 }
 
-/****************************************************************/
-/*                                                              */
-/*                 Byte-swap a single 2-byte word               */
-/*                                                              */
-/****************************************************************/
-static inline unsigned short byte_swap_word(unsigned short word) {
-  return (((word >> 8) & 0xff) | ((word & 0xff) << 8));
-}
-
-void byte_swap_page(unsigned short *page, int wordcount);
-void word_swap_page(unsigned short *page, int longwordcount);
+void word_swap_page(void *page, unsigned longwordcount);
 void bit_reverse_region(unsigned short *top, int width, int height, int rasterwidth);
 #ifdef RESWAPPEDCODESTREAM
 unsigned int byte_swap_code_block(unsigned int *base);

inc/car-cdrdefs.h

@@ -2,13 +2,13 @@
 #define CAR_CDRDEFS_H 1
 #include "cell.h" /* for ConsCell */
 #include "lispemul.h" /* for LispPTR */
-LispPTR car(register LispPTR datum);
-LispPTR cdr(register LispPTR datum);
-LispPTR rplaca(register LispPTR x, register LispPTR y);
-LispPTR rplacd(LispPTR x, register LispPTR y);
-LispPTR N_OP_car(register LispPTR tos);
-LispPTR N_OP_cdr(register LispPTR tos);
-LispPTR N_OP_rplaca(register LispPTR tosm1, register LispPTR tos);
-LispPTR N_OP_rplacd(register LispPTR tosm1, register LispPTR tos);
+LispPTR car(LispPTR datum);
+LispPTR cdr(LispPTR datum);
+LispPTR rplaca(LispPTR x, LispPTR y);
+LispPTR rplacd(LispPTR x, LispPTR y);
+LispPTR N_OP_car(LispPTR tos);
+LispPTR N_OP_cdr(LispPTR tos);
+LispPTR N_OP_rplaca(LispPTR tosm1, LispPTR tos);
+LispPTR N_OP_rplacd(LispPTR tosm1, LispPTR tos);
 ConsCell *find_close_prior_cell(struct conspage *page, LispPTR oldcell);
 #endif

inc/cell.h

@@ -9,6 +9,8 @@
 /*									*/
 /************************************************************************/
 
+#include "version.h"
+
 /**********************************************************************/
 /*
                 File Name :	cell.h
@@ -20,8 +22,8 @@
 
 */
 /**********************************************************************/
+#include "adr68k.h"   /* for NativeAligned4FromLPage, NativeAligned4FromLAddr */
 #include "lispemul.h" /* for LispPTR, DLword */
-#include "version.h" /* for BIGVM, NEWCDRCODING, BIGATOMS */
 
 /*  CONS CELL (LISTP) definitions moved to lispemulater.h */
 
@@ -29,7 +31,7 @@
 /* On 68010,68000 This Macro does not effect */
 
 #ifdef NEWCDRCODING
-#define CARFIELD(x) ((int)x & 0x0fffffff)
+#define CARFIELD(x) ((int)(x) & 0x0fffffff)
 
 /* CDR-Codes defs */
 #define CDR_ONPAGE 8
@@ -100,13 +102,13 @@ struct conspage {
 /* Following MACROs for Conspage */
 
 /* lisp_ptr is LISP pointer, returns 68k ptr points struct conspage obj */
-#define Get_ConsPageBase(lisp_ptr) (struct conspage *)Addr68k_from_LPAGE(POINTER_PAGEBASE(lisp_ptr))
+#define Get_ConsPageBase(lisp_ptr) (struct conspage *)NativeAligned4FromLPage(POINTER_PAGEBASE(lisp_ptr))
 
 #define GetNewCell_68k(conspage68k) \
   (ConsCell *)(((DLword *)(conspage68k)) + (unsigned)((conspage68k)->next_cell))
 
 /* page : LISP page */
-#define GetCONSCount(page) (((struct conspage *)Addr68k_from_LPAGE(page))->count)
+#define GetCONSCount(page) (((struct conspage *)NativeAligned4FromLPage(page))->count)
 
 #ifndef BYTESWAP
 /* For chaining together free cons cells on a page */
@@ -124,7 +126,7 @@ typedef struct freec {
 
 #endif /* BYTESWAP */
 
-#define FREECONS(page, offset) ((freecons *)((DLword *)page + offset))
+#define FREECONS(page, offset) ((freecons *)((DLword *)(page) + (offset)))
 
 /************************************************************************/
 /*									*/
@@ -375,21 +377,17 @@ struct cadr_cell {
 
 #else
 /* Good for old LITATOMS and new NEW-ATOMs */
-#define GetDEFCELL68k(index)                                                               \
-  (((index & SEGMASK) != 0) ? (LispPTR *)(Addr68k_from_LADDR(index) + NEWATOM_DEFN_OFFSET) \
-                            : GetDEFCELLlitatom(index))
+#define GetDEFCELL68k(index)                                                                 \
+  ((((index) & SEGMASK) != 0) ? GetDEFCELLnew(index) : GetDEFCELLlitatom(index))
 
-#define GetVALCELL68k(index)                                                                \
-  (((index & SEGMASK) != 0) ? (LispPTR *)(Addr68k_from_LADDR(index) + NEWATOM_VALUE_OFFSET) \
-                            : GetVALCELLlitatom(index))
+#define GetVALCELL68k(index)                                                                  \
+  ((((index) & SEGMASK) != 0) ? GetVALCELLnew(index) : GetVALCELLlitatom(index))
 
-#define GetPnameCell(index)                                                                 \
-  (((index & SEGMASK) != 0) ? (LispPTR *)(Addr68k_from_LADDR(index) + NEWATOM_PNAME_OFFSET) \
-                            : GetPnameCelllitatom(index))
+#define GetPnameCell(index)                                                                   \
+  ((((index) & SEGMASK) != 0) ? GetPnameCellnew(index) : GetPnameCelllitatom(index))
 
-#define GetPropCell(index)                                                                  \
-  (((index & SEGMASK) != 0) ? (LispPTR *)(Addr68k_from_LADDR(index) + NEWATOM_PLIST_OFFSET) \
-                            : GetPropCelllitatom(index))
+#define GetPropCell(index)                                                                    \
+  ((((index) & SEGMASK) != 0) ? GetPropCellnew(index) : GetPropCelllitatom(index))
 
 /* Good only for old-style LITATOMS */
 #ifdef BIGVM
@@ -405,21 +403,24 @@ struct cadr_cell {
 #endif
 
 /* Good only for new-style NEW-ATOMs */
-#define GetDEFCELLnew(index) (LispPTR *)(Addr68k_from_LADDR(index) + NEWATOM_DEFN_OFFSET)
-#define GetVALCELLnew(index) (LispPTR *)(Addr68k_from_LADDR(index) + NEWATOM_VALUE_OFFSET)
-#define GetPnameCellnew(index) (LispPTR *)(Addr68k_from_LADDR(index) + NEWATOM_PNAME_OFFSET)
-#define GetPropCellnew(index) (LispPTR *)(Addr68k_from_LADDR(index) + NEWATOM_PLIST_OFFSET)
+/* Note: the _OFFSET values are in units of DLword so need to be adjusted before doing pointer
+ *       arithmetic since we now have native pointers to cells not DLwords
+ */
+#define GetDEFCELLnew(index) (NativeAligned4FromLAddr(index) + (NEWATOM_DEFN_OFFSET / DLWORDSPER_CELL))
+#define GetVALCELLnew(index) (NativeAligned4FromLAddr(index) + (NEWATOM_VALUE_OFFSET / DLWORDSPER_CELL))
+#define GetPnameCellnew(index) (NativeAligned4FromLAddr(index) + (NEWATOM_PNAME_OFFSET / DLWORDSPER_CELL))
+#define GetPropCellnew(index) (NativeAligned4FromLAddr(index) + (NEWATOM_PLIST_OFFSET / DLWORDSPER_CELL))
 
 #endif /* BIGATOMS */
 
 /* When cadr() function is called, type check should be done. */
 
 #define S_N_CHECKANDCADR(sour, dest, tos)    \
-  {                                          \
-    register LispPTR parm = sour;            \
+  do {                                        \
+    LispPTR parm = sour;            \
     if (GetTypeNumber(parm) != TYPE_LISTP) { \
       ERROR_EXIT(tos);                       \
     } else                                   \
-      dest = cadr(parm);                     \
-  }
+      (dest) = cadr(parm);                   \
+  } while (0)
 #endif

inc/commondefs.h

@@ -3,6 +3,4 @@
 void stab(void);
 void warn(const char *s);
 int error(const char *s);
-int stackcheck(void);
-void stackoverflow(void);
 #endif

inc/conspagedefs.h

@@ -2,6 +2,6 @@
 #define CONSPAGEDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
 struct conspage *next_conspage(void);
-LispPTR N_OP_cons(register int cons_car, register int cons_cdr);
+LispPTR N_OP_cons(LispPTR cons_car, LispPTR cons_cdr);
 LispPTR cons(LispPTR cons_car, LispPTR cons_cdr);
 #endif

inc/dbprint.h

@@ -43,7 +43,7 @@ extern int flushing;
 #define DBPRINT(X) do {printf X ; if (flushing) fflush(stdout); } while(0)
 #define DEBUGGER(X) X
 #else
-#define DBPRINT(X) do {} while(0)
+#define DBPRINT(X) if (0) do {printf X ; } while(0)
 #define DEBUGGER(X)
 #endif
 
@@ -55,7 +55,7 @@ extern int flushing;
 #define TRACER(X) X
 #else /* TRACE */
 
-#define TPRINT(X) do { } while (0)
+#define TPRINT(X) if (0) do {  printf X; } while (0)
 #define TRACER(X)
 #endif /* TRACE */
 
@@ -67,7 +67,7 @@ extern int flushing;
 #define OPTPRINT(X) do { printf X; if (flushing) fflush(stdout); } while (0)
 #define OPTRACER(X) X
 #else
-#define OPTPRINT(X) do { } while (0)
+#define OPTPRINT(X) if (0) do {  printf X; } while (0)
 #define OPTRACER(X)
 #endif
 
@@ -78,7 +78,7 @@ extern int flushing;
 #define FNTPRINT(X) do { printf X; if (flushing) fflush(stdout); } while (0)
 #define FNTRACER(X)  X
 #else
-#define FNTPRINT(X) do { } while (0)
+#define FNTPRINT(X) if (0) do {  printf X; } while (0)
 #define FNTRACER(X)
 #endif
 
@@ -89,7 +89,7 @@ extern int flushing;
 #define FNCHKPRINT(X) do { printf X ; if (flushing) fflush(stdout); } while (0)
 #define FNCHECKER(X) X
 #else
-#define FNCHKPRINT(X) do { } while (0)
+#define FNCHKPRINT(X) if (0) do {  printf X; } while (0)
 #define FNCHECKER(X)
 #endif
 

inc/devif.h

@@ -11,13 +11,6 @@
 /************************************************************************/
 #include "lispemul.h" /* for LispPTR, DLword */
 
-typedef void (*PFV)();		/* Pointer to Function returning Void */
-typedef int (*PFI)();		/* Pointer to Function returning Int */
-typedef char (*PFC)();		/* Pointer to Function returning Char */
-typedef float (*PFF)();		/* Pointer to Function returning Float */
-typedef int (*PFP)();		/* Pointer to Function returning a Pointer */
-typedef unsigned long (*PFUL)(); /* Pointer to Function returning an unsigned long */
-
 #ifdef XWINDOW
 #include <X11/Xlib.h>
 #endif /* XWINDOW */
@@ -52,17 +45,16 @@ typedef struct
   {
     int	x;
     int	y;
-    int	width;
-    int	height;
+    unsigned width;
+    unsigned height;
   } MRegion;
 
-
-
 /**************************************************************/
 /*		           D e v R e c                        */
 /*                                                            */
 /* Definition common to all devices. Used for mouse, kbd and  */
-/* display.                                                   */
+/* display. The xxxInterfaceRec containing this device is     */
+/* passed as the only argument to the device methods          */
 /**************************************************************/
 typedef struct
   {
@@ -71,22 +63,22 @@ typedef struct
 			   to prevent multiple consecutive initializations. */
     int	locked;		/* LOCK, a semaphore:  0 if dev is free.
 			   Test and increment to use this device. */
-    void (* enter)();	/* ENTER, a function
-			   args: self
+    void (* enter)(void *);	/* ENTER, a function
+			   args: interface rec (Kbd, Dsp, Mouse)
 			   Called to set up the device. Has to be called before
 			   anything else is done to the device. */
-    void (* exit)();	/* EXIT, a function
-			   args: self
+    void (* exit)(void *);	/* EXIT, a function
+			   args: interface rec (Kbd, Dsp, Mouse)
 			   Called to deactivate the device and restore the
 			   device to its previous state */
-    void (* before_raid)(); /* BEFORE_RAID, a function.
-			   args: self
+    void (* before_raid)(void *); /* BEFORE_RAID, a function.
+			   args: interface rec (Kbd, Dsp, Mouse)
 			   Prepare this device for uraid. */
-    void (* after_raid)(); /* BEFORE_RAID, a function.
-			   args: self
+    void (* after_raid)(void *); /* BEFORE_RAID, a function.
+			   args: interface rec (Kbd, Dsp, Mouse)
 			   Cleanup and restart device after uraid. */
-    void (* sync_device)(); /* SYNC_DEVICE, a function.
-			   args: self
+    void (* sync_device)(void *); /* SYNC_DEVICE, a function.
+			   args: interface rec (Kbd, Dsp, Mouse)
 			   Make reality and emulator coincide with each other */
   } DevRec;
 
@@ -96,7 +88,7 @@ typedef struct
 /*                M o u s e I n t e r f a c e                 */
 /*                                                            */
 /* Definition of the mouse. Note that the mouse is also       */
-/* dependent on the IOPage68K                                 */
+/* dependent on the IOPage                                    */
 /**************************************************************/
 typedef struct
   {
@@ -114,7 +106,7 @@ typedef struct
     short tick;		/* Clock for timeout. */
     long StartTime;	/* The maximum timeout */
     long RunTimer;	/* Chording timer activate flag. */
-    PFV     NextHandler;	/* Pointer to the next timer (used with 2button) */
+    void (* NextHandler)(void);	/* Pointer to the next timer (used with 2button) */
   } Button;
 
 
@@ -133,14 +125,15 @@ typedef struct {
 typedef struct
   {
     DevRec device;
-    void   (* Handler)();	/* Event handler for the mouse. */
+    void   (* Handler)(void);	/* Event handler for the mouse. */
     MCursor Cursor;
     Button Button;
     LispPTR *timestamp;
     unsigned int keyeventsize;	/* The sizeof() one kbd event */
     unsigned int maxkeyevent;	/* Offset to the end of the ringbuffer. */
     int eurokbd;		/* Keep tabs of the euro-ness of the kbd */
-  } MouseInterfaceRec, *MouseInterface;
+  } MouseInterfaceRec;
+typedef MouseInterfaceRec *MouseInterface;
 
 
 
@@ -148,12 +141,12 @@ typedef struct
 /*                  K b d I n t e r f a c e                   */
 /*                                                            */
 /* Definition of the keyboard. Note that the keyboard is also */
-/* dependent on the IOPage68K                                 */
+/* dependent on the IOPage                                    */
 /**************************************************************/
 typedef struct
   {
     DevRec device;
-    PFV device_event;		/* Event handler for the keyboard. */
+    void (*device_event)(void);	/* Event handler for the keyboard. */
 #ifdef DOS
     u_char KeyMap[0x80];	/* The key translation table. Use the keycode you
 				   get from the keyboard as an index. The value
@@ -162,14 +155,13 @@ typedef struct
     unsigned int keyeventsize;	/* The sizeof() one kbd event */
     unsigned int maxkeyevent;	/* Offset to the end of the ringbuffer. */
     int eurokbd;		/* Keep tabs of the euro-ness of the kbd */
-    PFV prev_handler;		/* The previous keyboard handler.
+    void (* prev_handler)(void);/* The previous keyboard handler.
 				   Keep this around
 				   to restore when we exit Medley */
     int	URaid;			/* Put this in a better place later.. /jarl */
 #endif /* DOS */
-  } KbdInterfaceRec, *KbdInterface;
-
-
+  } KbdInterfaceRec;
+typedef KbdInterfaceRec *KbdInterface;
 
 /**************************************************************/
 /*                  D s p I n t e r f a c e                   */
@@ -177,47 +169,53 @@ typedef struct
 /* Definition of the display. This structure collects all the */
 /* special knowledge needed to manipulate the screen.         */
 /**************************************************************/
-typedef struct
+/*
+ * NOTE: At this time only the DspInterface methods
+ *       bitblt_to_screen(), clearscreen(), mouse_visible(), and mouse_invisible()
+ *       are called, and the mouse_* are only used for DOS.
+ *       All the other methods are not implemented and not called.
+ */
+typedef struct DspInterfaceRec
   {
     DevRec device;
   
-    void (* drawline)();	/* DRAWLINE
+    unsigned long (* drawline)(void);	/* DRAWLINE
 				 args: dont know yet. Not yet implemented.*/
-    void (* cleardisplay)();	/* CLEARDISPLAY, a function
+    unsigned long (* cleardisplay)(struct DspInterfaceRec *);	/* CLEARDISPLAY, a function
 				 args: self
 				 clears the screen.*/
 
-    unsigned long (* get_color_map_entry)();
-    unsigned long (* set_color_map_entry)();
-    unsigned long (* available_colors)();	/* How many colors do I have on my palette */
-    unsigned long (* possible_colors)(); /* How many colors is it possible to select from */
+    unsigned long (* get_color_map_entry)(void);
+    unsigned long (* set_color_map_entry)(void *);
+    unsigned long (* available_colors)(void);	/* How many colors do I have on my palette */
+    unsigned long (* possible_colors)(void); /* How many colors is it possible to select from */
 
 #ifdef NOTYET
-    unsigned long (* get_color_map)(); /* get a pointer to a colormap */
-    unsigned long (* set_color_map)(); /* set the current colormap */
-    unsigned long (* make_color_map)(); /* return a brand new colormap */
+    unsigned long (* get_color_map)(void); /* get a pointer to a colormap */
+    unsigned long (* set_color_map)(void); /* set the current colormap */
+    unsigned long (* make_color_map)(void); /* return a brand new colormap */
 #endif /* NOTYET */
 
-    unsigned long (* medley_to_native_bm)(); /* 1 bit/pix to native bit/pix */
-    unsigned long (* native_to_medley_bm)(); /* native bit/pix to 1 bit/pix */
+    unsigned long (* medley_to_native_bm)(void); /* 1 bit/pix to native bit/pix */
+    unsigned long (* native_to_medley_bm)(void); /* native bit/pix to 1 bit/pix */
 
-    unsigned long (* bitblt_to_screen)();	/* BITBLT_TO_SCREEN, a function
+    unsigned long (* bitblt_to_screen)(struct DspInterfaceRec *, DLword *, int, int, int, int);	/* BITBLT_TO_SCREEN, a function
 					   args: self, buffer left top width height.
 					   biblt's buffer to the screen. */
-    unsigned long (* bitblt_from_screen)();
-    unsigned long (* scroll_region)(); /* ie. bbt from screen to screen */
-
-    void (* mouse_invisible)();	/* MOUSE_INVISIBLE
+    unsigned long (* bitblt_from_screen)(void);
+    unsigned long (* scroll_region)(void); /* ie. bbt from screen to screen */
+    unsigned long (* mouse_invisible)(struct DspInterfaceRec *, void *);	/* MOUSE_INVISIBLE
 				   args: self (a dsp), iop (an IOPAGE preferably the one and only)
 				   This method makes the mouse invisible on the screen. Note that
 				   the dsp supplies the method and the iop supplies the data. */
-  void	(* mouse_visible)();	/* MOUSE_VISIBLE
-				   args: self (a dsp), iop (an IOPAGE preferably the one and only)
-				   This method makes the mouse visible on the screen. Note that
-				   the dsp supplies the method and the iop supplies the data. */
+    unsigned long (* mouse_visible)(int x, int y);	/* MOUSE_VISIBLE
+				   args: x, y position where the mouse/cursor should be displayed.
+				   NOTE: this should probably include the DspInterface as the first arg?
+							*/
     MRegion Display;		/* Dimensions of the physical display. */
+    unsigned short unused0;	/* alignment padding for next field */
     unsigned short bitsperpixel;
-    unsigned long colors;	/* cash for the available_colors */
+    unsigned long colors;	/* cache for the available_colors */
     unsigned long oldstate; /* Keep the old state around */
     unsigned long graphicsmode; /* Magic cookie used to set the state. */
     unsigned long numberofbanks;
@@ -256,22 +254,24 @@ typedef struct
     Pixmap GravityOnPixmap;
     Pixmap GravityOffPixmap;
     XImage ScreenBitmap;
-    Mask   DisableEventMask;
-    Mask   EnableEventMask;
+    long   DisableEventMask;
+    long   EnableEventMask;
 #endif /* XWINDOW */
-  } DspInterfaceRec, *DspInterface;
+  } DspInterfaceRec;
+typedef DspInterfaceRec *DspInterface;
 
 
 
 #ifdef XWINDOW
-#define DefineCursor(display, window, mycursor) { \
-	XLOCK;\
-	XDefineCursor( display, window, *(mycursor) );\
-	XUNLOCK;\
-}
+#define DefineCursor(dsp, window, mycursor)                     \
+  do {								\
+    XLOCK;                                                      \
+    XDefineCursor((dsp)->display_id, window, *(mycursor) );     \
+    XUNLOCK(dsp);                                               \
+  } while (0)
 #endif /* XWINDOW */
 
-#define OUTER_SB_WIDTH(dsp) (dsp->ScrollBarWidth + 2*(dsp->InternalBorderWidth))
+#define OUTER_SB_WIDTH(dsp) ((dsp)->ScrollBarWidth + 2*((dsp)->InternalBorderWidth))
 
 #ifndef min
 #define min( a, b ) (((a)<(b))?(a):(b))

inc/dirdefs.h

@@ -1,6 +1,62 @@
 #ifndef DIRDEFS_H
 #define DIRDEFS_H 1
-#include "lispemul.h" /* for LispPTR */
+
+#include <sys/types.h>      // for u_short, ino_t
+#include "lispemul.h"       // for LispPTR
+#include "locfile.h"        // for MAXNAMLEN
+/*
+ * FINFO and FPROP are used to store the information of the enumerated files
+ * and directories.  They are arranged in a form of linked list.  Each list is
+ * corresponding to the each directory enumeration.  All of the informations
+ * Lisp needs are stored in the list.  This list is in the emulator's address space
+ * and can be specified by "ID" which is the interface between the emulator and Lisp
+ * code.  In this implementation, ID is represented as an integer and is actually
+ * an index of the array of the lists.
+ *
+ * To avoid the overhead of the FINFO and FPROP structure dynamic allocation and
+ * deallocation, some number of their instances are pre-allocated when the emulator
+ * starts and managed in a free list.  If all of the pre-allocated instances are in
+ * use, new instances are allocated.  The new instances are linked to the free list
+ * when it is freed.
+ *
+ * As described above, the linked list result of the enumeration is stored in a
+ * array for the subsequent request from Lisp.  Lisp code requests the emulator to
+ * release the list when it enumerated all of the entries in the list or the
+ * enumerating operation is aborted.
+ */
+
+typedef struct fprop {
+  unsigned length;   /* Byte length of this file. */
+  unsigned wdate;    /* Written (Creation) date in Lisp sense. */
+  unsigned rdate;    /* Read date in Lisp sense. */
+  unsigned protect;  /* Protect mode of this file. */
+  size_t au_len;     /* Byte length of author. */
+  char author[256];  /* Author in Lisp sense. */
+} FPROP;
+
+/* This structure has a pointer at each end to force alignment to
+   be correct when a pointer is 8 bytes long. */
+typedef struct finfo {
+  FPROP *prop;           /* File properties Lisp needs. */
+  char lname[MAXNAMLEN + 1]; /* Name in Lisp Format. */
+  char no_ver_name[MAXNAMLEN + 1]; 
+  /*
+   * Name in UNIX Format.  Does not
+   * include Version field.
+   * All lower case.
+   */
+  size_t lname_len;     /* Byte length of lname. */
+  unsigned dirp;       /* If 1, this file is a directory. */
+  unsigned version;   /* Version in Lisp sense. */
+  ino_t ino;          /* I-node number of this file. */
+  struct finfo *next; /* Last entry is indicated by NULL pointer. */
+} FINFO;
+
+typedef struct dfinfo {
+  FINFO *head; /* Head of the linked FINFO structures. */
+  FINFO *next; /* FINFO structure generated next time. */
+} DFINFO;
+
 #ifdef DOS
 int make_old_version(char *old, char *file);
 #endif
@@ -8,7 +64,7 @@ int make_old_version(char *old, char *file);
 void print_finfo(FINFO *fp);
 #endif
 int init_finfo(void);
-LispPTR COM_gen_files(register LispPTR *args);
-LispPTR COM_next_file(register LispPTR *args);
-LispPTR COM_finish_finfo(register LispPTR *args);
+LispPTR COM_gen_files(LispPTR *args);
+LispPTR COM_next_file(LispPTR *args);
+LispPTR COM_finish_finfo(LispPTR *args);
 #endif

inc/display.h

@@ -10,7 +10,6 @@
 /*									*/
 /************************************************************************/
 #include "lispemul.h" /* for DLword */
-#include "version.h" /* for UNSIGNED */
 
 #define BCPLDISPLAY	stdout
 
@@ -44,6 +43,10 @@ extern DLword *DISP_MAX_Address;
 #define DISPLAYBUFFER
 #endif /* XWINDOW */
 
+#ifdef SDL
+#define DISPLAYBUFFER
+#endif /* SDL */
+
 #ifdef DOS
 #define DISPLAYBUFFER
 #endif /* DOS */
@@ -66,21 +69,12 @@ extern DLword *DISP_MAX_Address;
 extern DLword *DisplayRegion68k;
 
 #define in_display_segment(baseaddr)  \
-            (((DisplayRegion68k <= baseaddr) && \
-	      (baseaddr <=DISP_MAX_Address)) ? T :NIL )
+    (((DisplayRegion68k <= (baseaddr)) &&               \
+      ((baseaddr) <= DISP_MAX_Address)) ? T : NIL )
 #endif
 
 #ifdef XWINDOW
 #undef DISPLAYBUFFER
 #endif /* XWINDOW */
 
-void flush_display_buffer();
-void flush_display_lineregion(UNSIGNED x, DLword *ybase, UNSIGNED w, UNSIGNED h);
-void flush_display_region(int x, int y, int w, int h);
-void flush_display_ptrregion(DLword *ybase, UNSIGNED bitoffset, UNSIGNED w, UNSIGNED h);
-
-#ifdef BYTESWAP
-void byte_swapped_displayregion(int x, int y, int w, int h);
-#endif
-
 #endif

inc/dlpidefs.h

@@ -4,6 +4,5 @@
 int setup_dlpi_dev(char *device);
 void flush_dlpi(int fd);
 int dlpi_devtype(int fd);
-char *savestr(char *s);
 int dlunitdatareq(int fd, u_char *addrp, int addrlen, u_long minpri, u_long maxpri, u_char *datap, int datalen);
 #endif

inc/dskdefs.h

@@ -6,20 +6,20 @@ void separate_host(char *lfname, char *host, char *drive);
 #else
 void separate_host(char *lfname, char *host);
 #endif
-LispPTR COM_openfile(register LispPTR *args);
-LispPTR COM_closefile(register LispPTR *args);
-LispPTR DSK_getfilename(register LispPTR *args);
-LispPTR DSK_deletefile(register LispPTR *args);
-LispPTR DSK_renamefile(register LispPTR *args);
-LispPTR DSK_directorynamep(register LispPTR *args);
-LispPTR COM_getfileinfo(register LispPTR *args);
-LispPTR COM_setfileinfo(register LispPTR *args);
-LispPTR COM_readpage(register LispPTR *args);
-LispPTR COM_writepage(register LispPTR *args);
-LispPTR COM_truncatefile(register LispPTR *args);
-LispPTR COM_changedir(register LispPTR *args);
-LispPTR COM_getfreeblock(register LispPTR *args);
+LispPTR COM_openfile(LispPTR *args);
+LispPTR COM_closefile(LispPTR *args);
+LispPTR DSK_getfilename(LispPTR *args);
+LispPTR DSK_deletefile(LispPTR *args);
+LispPTR DSK_renamefile(LispPTR *args);
+LispPTR DSK_directorynamep(LispPTR *args);
+LispPTR COM_getfileinfo(LispPTR *args);
+LispPTR COM_setfileinfo(LispPTR *args);
+LispPTR COM_readpage(LispPTR *args);
+LispPTR COM_writepage(LispPTR *args);
+LispPTR COM_truncatefile(LispPTR *args);
+LispPTR COM_changedir(LispPTR *args);
+LispPTR COM_getfreeblock(LispPTR *args);
 void separate_version(char *name, char *ver, int checkp);
 int unpack_filename(char *file, char *dir, char *name, char *ver, int checkp);
-int true_name(register char *path);
+int true_name(char *path);
 #endif

inc/dspifdefs.h

@@ -2,7 +2,8 @@
 #define DSPIFDEFS_H 1
 #include "devif.h"
 void make_dsp_instance(DspInterface dsp, char *lispbitmap, int width_hint, int height_hint, int depth_hint);
-unsigned long GenericReturnT(void);
-void GenericPanic(DspInterface dsp);
+unsigned long GenericReturnT(void *d);
+void GenericReturnVoid(void *d);
+void GenericPanic(void *d);
 void describedsp(DspInterface dsp);
 #endif

inc/dspsubrsdefs.h

@@ -5,7 +5,7 @@ void DSP_dspbout(LispPTR *args);
 void DSP_showdisplay(LispPTR *args);
 LispPTR DSP_VideoColor(LispPTR *args);
 void DSP_Cursor(LispPTR *args, int argnum);
-void DSP_SetMousePos(register LispPTR *args);
+void DSP_SetMousePos(LispPTR *args);
 LispPTR DSP_ScreenWidth(LispPTR *args);
 LispPTR DSP_ScreenHight(LispPTR *args);
 void flip_cursor(void);

inc/eqfdefs.h

@@ -1,8 +1,8 @@
 #ifndef EQFDEFS_H
 #define EQFDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_clequal(register int arg1, register int arg2);
-LispPTR N_OP_eqlop(register int arg1, register int arg2);
-LispPTR N_OP_equal(register int arg1, register int arg2);
-LispPTR N_OP_eqq(register int arg1, register int arg2);
+LispPTR N_OP_clequal(LispPTR arg1, LispPTR arg2);
+LispPTR N_OP_eqlop(LispPTR arg1, LispPTR arg2);
+LispPTR N_OP_equal(LispPTR arg1, LispPTR arg2);
+LispPTR N_OP_eqq(LispPTR arg1, LispPTR arg2);
 #endif

inc/etherdefs.h

@@ -13,5 +13,11 @@ int *ether_debug(void);
 LispPTR check_ether(void);
 void init_ifpage_ether(void);
 void init_ether(void);
-LispPTR check_sum(register LispPTR *args);
+LispPTR check_sum(LispPTR *args);
+
+void setNethubHost(char* host);
+void setNethubPort(int port);
+void setNethubMac(int m0, int m1, int m2, int m3, int m4, int m5);
+void setNethubLogLevel(int ll);
+void connectToHub(void);
 #endif

inc/findkeydefs.h

@@ -1,5 +1,5 @@
 #ifndef FINDKEYDEFS_H
 #define FINDKEYDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_findkey(register LispPTR tos, register int byte);
+LispPTR N_OP_findkey(LispPTR tos, int byte);
 #endif

inc/fvardefs.h

@@ -2,10 +2,10 @@
 #define FVARDEFS_H 1
 #include "lispemul.h" /* for LispPTR, DLword */
 #include "stack.h" /* for fnhead, frameex1 */
-LispPTR N_OP_fvarn(register int n);
+LispPTR N_OP_fvarn(int n);
 LispPTR N_OP_stkscan(LispPTR tos);
-LispPTR N_OP_fvar_(register LispPTR tos, register int n);
-void nnewframe(register struct frameex1 *newpfra2, register DLword *achain, register int name);
-void nfvlookup(struct frameex1 *apframe1, register DLword *achain, register struct fnhead *apfnhead1);
+LispPTR N_OP_fvar_(LispPTR tos, int n);
+void nnewframe(struct frameex1 *newpfra2, DLword *achain, int name);
+void nfvlookup(struct frameex1 *apframe1, DLword *achain, struct fnhead *apfnhead1);
 LispPTR native_newframe(int slot);
 #endif

inc/gccodedefs.h

@@ -1,8 +1,6 @@
 #ifndef GCCODEDEFS_H
 #define GCCODEDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR map_code_pointers(LispPTR codeblock, short int casep);
-LispPTR remimplicitkeyhash(LispPTR item, LispPTR ik_hash_table);
 LispPTR reclaimcodeblock(LispPTR codebase);
 int code_block_size(long unsigned int codeblock68k);
 #endif

inc/gcdata.h

@@ -19,6 +19,7 @@
 /**********************************************************************/
 #include "lispemul.h" /* for LispPTR, DLword */
 #include "version.h" /* for USHORT */
+#include "gchtfinddefs.h"
 
 #define ADDREF  0       /* for gclookup routine. */
 #define DELREF  1       /* for gclookup routine. */
@@ -47,81 +48,81 @@
 
    /* IncAllocCnt is called only when *Reclaim_cnt_word != NIL */
 
-#define IncAllocCnt(n) {\
-	if ((*Reclaim_cnt_word -= n) <= S_POSITIVE) {\
-		/* time for GC */\
-		Irq_Stk_Check = Irq_Stk_End = 0;\
-		*Reclaim_cnt_word = S_POSITIVE;\
-	};\
-}
+#define IncAllocCnt(n) do { \
+	if ((*Reclaim_cnt_word -= (n)) <= S_POSITIVE) { \
+		/* time for GC */ \
+		Irq_Stk_Check = Irq_Stk_End = 0; \
+		*Reclaim_cnt_word = S_POSITIVE; \
+	} \
+  } while (0)
 
    /* DecAllocCnt only called when *Reclaim_cnt_word != NIL */
 
-#define DecAllocCnt(n) { *Reclaim_cnt_word += n; }
+#define DecAllocCnt(n) do { *Reclaim_cnt_word += (n); } while (0)
 
-#define FreeLink(link) {\
-	GETGC(link) = 0;\
-	GETGC(link+1) = GETGC(HTcoll);\
-	GETGC(HTcoll) = (link - HTcoll);\
-}
+#define FreeLink(link) do {                        \
+	GETGC(link) = 0;                        \
+	GETGC((link)+1) = GETGC(HTcoll);        \
+	GETGC(HTcoll) = ((link) - HTcoll);      \
+  } while (0)
 
 
   /* Given the contents of an HTMAIN or HTCOLL entry,
 	 get the link pointer (i.e., turn off the low bit) */
-#define GetLinkptr(entry)       (entry & 0x0fffffffe)
+#define GetLinkptr(entry)       ((entry) & 0x0fffffffe)
 
 
-#define DelLink(link, prev, entry) {                                    \
-  if (prev != (GCENTRY *)0)                                             \
+#define DelLink(link, prev, entry) do {                                    \
+  if ((prev) != (GCENTRY *)0)                                           \
     {                                                                   \
-      GETGC((GCENTRY *)prev + 1) = GETGC((GCENTRY *)link + 1);          \
+      GETGC((GCENTRY *)(prev) + 1) = GETGC((GCENTRY *)(link) + 1);      \
     }                                                                   \
   else                                                                  \
     {                                                                   \
-      GETGC((GCENTRY *)entry) = GETGC((GCENTRY *)link + 1) | 1;         \
+      GETGC((GCENTRY *)(entry)) = GETGC((GCENTRY *)(link) + 1) | 1;     \
     }                                                                   \
-  FreeLink((GCENTRY *)link);                                            \
-  link = (GCENTRY *)(HTcoll + GetLinkptr(GETGC((GCENTRY *)entry)));     \
-  if (GETGC((GCENTRY *)link + 1) == 0)                                  \
+  FreeLink((GCENTRY *)(link));                                          \
+  (link) = (GCENTRY *)(HTcoll + GetLinkptr(GETGC((GCENTRY *)(entry)))); \
+  if (GETGC((GCENTRY *)(link) + 1) == 0)                                \
     {                                                                   \
-      GETGC((GCENTRY *)entry) = GETGC((GCENTRY *)link);                 \
-      FreeLink((GCENTRY *)link);                                        \
+      GETGC((GCENTRY *)(entry)) = GETGC((GCENTRY *)(link));             \
+      FreeLink((GCENTRY *)(link));                                      \
     }                                                                   \
-}
+  } while (0)
 
 #define RefCntP(ptr) (!(GetTypeEntry((ptr)) & TT_NOREF) &&              \
 		      (*GcDisabled_word != ATOM_T))
 
-#define GCLOOKUP(ptr, case) {                                                \
+#define GCLOOKUP(ptr, case) do {                                                \
 	if (RefCntP(ptr)) {                                                  \
 		if (*Reclaim_cnt_word != NIL)                                \
 		  htfind(ptr, case);                                         \
 		else                                                         \
 		  rec_htfind(ptr, case);                                     \
 	}                                                                    \
-}
+  } while (0)
 
-#define GCLOOKUPV(ptr, case, val) {                                          \
+#define GCLOOKUPV(ptr, case, val) do {                                          \
 	if (RefCntP(ptr)) {                                                  \
 		if (*Reclaim_cnt_word != NIL)                                \
-		  val = htfind(ptr, case);                                   \
+                  (val) = htfind((ptr), (case));                             \
 		else                                                         \
-		  val = rec_htfind(ptr, case);                               \
-	} else val = NIL;                                                    \
-}
+                  (val) = rec_htfind((ptr), (case));                         \
+	} else (val) = NIL;                                                  \
+  } while (0)
 
-#define REC_GCLOOKUP(ptr, case) { if (RefCntP(ptr)) rec_htfind(ptr, case); }
-#define REC_GCLOOKUPV(ptr, case, val) {                                      \
+#define REC_GCLOOKUP(ptr, case) do { if (RefCntP(ptr)) rec_htfind(ptr, case); } while (0)
+#define REC_GCLOOKUPV(ptr, case, val) do {                                      \
 	if (RefCntP(ptr))                                                    \
-	  val = rec_htfind(ptr, case);                                       \
+          (val) = rec_htfind((ptr), (case));                                 \
 	else                                                                 \
-	  val = NIL;                                                         \
-}
+          (val) = NIL;                                                       \
+  } while (0)
 
-#define FRPLPTR(old , new) { \
+#define FRPLPTR(old , new) do { \
 		GCLOOKUP(new, ADDREF); \
 		GCLOOKUP(old, DELREF); \
-		(old) = (new) ; }
+		(old) = (new) ; } while (0)
 
 
 #ifndef BYTESWAP

inc/gcscandefs.h

@@ -1,6 +1,5 @@
 #ifndef GCSCANDEFS_H
 #define GCSCANDEFS_H 1
-#include "lispemul.h" /* for DLword */
-DLword gcscan1(register int probe);
-DLword gcscan2(register int probe);
+int gcscan1(int probe);
+int gcscan2(int probe);
 #endif

inc/gvar2defs.h

@@ -1,6 +1,6 @@
 #ifndef GVAR2DEFS_H
 #define GVAR2DEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_gvar_(register LispPTR tos, unsigned int atom_index);
-LispPTR N_OP_rplptr(register LispPTR tos_m_1, register LispPTR tos, unsigned int alpha);
+LispPTR N_OP_gvar_(LispPTR tos, unsigned int atom_index);
+LispPTR N_OP_rplptr(LispPTR tos_m_1, LispPTR tos, unsigned int alpha);
 #endif

inc/hdw_conf.h

@@ -1,39 +0,0 @@
-#ifndef HDW_CONF_H
-#define HDW_CONF_H 1
-/* $Id: hdw_conf.h,v 1.2 1999/01/03 02:06:01 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-
-
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-92 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-
-
-
-
-/**************************************************************/
-/*
-	File name :	machineconfig.h
-
-	Created	:	Aug-19-87 take
-
-	Desc. :		Define for Machine dependent param
-
-*/
-/**************************************************************/
-/* Machine Type */
-
-#define KATANA		3
-
-/* Lastvmempage(32Mbyte) */
-#ifdef BIGVM
-#define LASTVMEMPAGE 0x1FFFF
-#else
-#define LASTVMEMPAGE	(65535)
-#endif
-
-#endif /* HDW_CONF_H */

inc/ifpage.h

@@ -11,6 +11,7 @@
 #include "lispemul.h" /* for LispPTR, DLword */
 #include "version.h" /* for BIGVM */
 
+#define MACHINETYPE_MAIKO 3
 #define IFPAGE_KEYVAL 0x15e3
 #ifndef BYTESWAP
 #ifdef BIGVM
@@ -91,10 +92,10 @@ typedef struct ifpage {
 	LispPTR	dlnilp1;
 	LispPTR	dlnilp2;
 	LispPTR	dlnilp3;
-	int    dllastvmempage;
+	unsigned dllastvmempage;
 	int	    nactivepages;
 	int    ndirtypages;
-	int    process_size; /* was lastnumchars */
+	unsigned  process_size; /* was lastnumchars */
 } IFPAGE;
 #else
 /* Normal definition, for big-endian machines */
@@ -248,10 +249,10 @@ typedef struct ifpage {
 	LispPTR	dlnilp1;
 	LispPTR	dlnilp2;
 	LispPTR	dlnilp3;
-	int    dllastvmempage;
+	unsigned dllastvmempage;
 	int	    nactivepages;
 	int    ndirtypages;
-	int    process_size; /* was lastnumchars */
+	unsigned process_size; /* was lastnumchars */
 } IFPAGE;
 #else
 	/***********************************************************/

inc/initdspdefs.h

@@ -5,11 +5,11 @@
 void init_cursor(void);
 void set_cursor(void);
 void clear_display(void);
-void init_display2(DLword *display_addr, int display_max);
+void init_display2(DLword *display_addr, unsigned display_max);
 void display_before_exit(void);
 void flush_display_buffer(void);
 void flush_display_region(int x, int y, int w, int h);
 void byte_swapped_displayregion(int x, int y, int w, int h);
-void flush_display_lineregion(UNSIGNED x, DLword *ybase, UNSIGNED w, UNSIGNED h);
-void flush_display_ptrregion(DLword *ybase, UNSIGNED bitoffset, UNSIGNED w, UNSIGNED h);
+void flush_display_lineregion(UNSIGNED x, DLword *ybase, int w, int h);
+void flush_display_ptrregion(DLword *ybase, UNSIGNED bitoffset, int w, int h);
 #endif