Merge pull request #489 from Interlisp/fgh_em-build-01

Add Emscripten build to buildRelease workflow

.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-11, ubuntu-22.04, 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
@@ -28,7 +28,7 @@ jobs:
 #    runs-on: [self-hosted, linux, ARM]
 #    if: ${{ github.repository == 'Interlisp/maiko' }}
 #    steps:
-#      - uses: actions/checkout@v2
+#      - uses: actions/checkout@v3
 #      - name: Build
 #        working-directory: bin
 #        run: ./makeright x
@@ -37,14 +37,22 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11, ubuntu-22.04, 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,585 @@
+#*******************************************************************************
+# 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@v4
+        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@v4
+        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@v4
+
+      # 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@v4
+
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # 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@v4
+        with:
+          path: cygwin\maiko
+
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: |
+          mv ./Actions_${{ github.sha }}/actions ../actions
+          rm -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 }}
+
+
+
+######################################################################################
+
+  # Emscripten: build and push Maiko compiled for Emscripten (to run Maiko in browser)
+
+  emscripten:
+
+    needs: [inputs, sentry]
+    if: |
+      needs.inputs.outputs.linux == 'true'
+      && (
+         needs.sentry.outputs.release_not_built == 'true'
+         || needs.inputs.outputs.force == 'true'
+      )
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Install SDL2
+      - name: Install SDL2
+        run: |
+          export DEBIAN_FRONTEND=noninteractive
+          sudo -E apt-get install -y libsdl2-dev libsdl2-2.0-0
+
+      # Install Emscripten SDK
+      - name: Install Empscripten
+        working-directory: ../
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          ./emsdk install latest
+          ./emsdk activate latest
+          CWD="$(pwd)"
+          echo "${CWD}"  >> ${GITHUB_PATH}
+          echo "${CWD}/upstream/emscripten" >> ${GITHUB_PATH}
+          echo "${CWD}/upstream/emscripten/tools" >> ${GITHUB_PATH}
+          echo "${CWD}/node/$(ls -d node/*64bit | tail -1)/bin" >> ${GITHUB_PATH}
+
+      # Checkout the maiko branch
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Setup release tag
+      - name: Setup Release Tag
+        id: tag
+        uses: ./../actions/release-tag-action
+
+      # Compile maiko using Emscripten (no load build)
+      - name: Compile Maiko using Emscripten
+        working-directory: ./bin
+        run: |
+          ./makeright wasm_nl
+          cd ../emscripten.wasm_nl
+          tar -c -z -f ../${{ steps.tag.outputs.release_tag }}-emscripten.tgz *
+
+      # Push Release to github
+      - name: Push the release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts: ${{ steps.tag.outputs.release_tag }}-emscripten.tgz
+          tag: ${{ steps.tag.outputs.release_tag }}
+          draft: ${{ needs.inputs.outputs.draft }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+
+######################################################################################
+
+  # Use set-sentry-action to determine set the sentry that says this release has
+  # been successfully built
+
+  complete:
+
+    runs-on: ubuntu-latest
+
+    outputs:
+      build_successful: ${{ steps.output.outputs.build_successful }}
+
+    needs: [inputs, sentry, linux, macos, windows, emscripten]
+
+    steps:
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # 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
+
+######################################################################################

.github/workflows/buildReleaseInclDocker.yml

@@ -1,357 +0,0 @@
-#*******************************************************************************
-# buidReleaseInclDocker.yml
-#
-# Workflow to build a Maiko release that is pushed to github as well as
-# Docker images incorporating the release, which are pushed to Docker Hub.
-# For linux:  release assets are built/pushed for X86_64, aarch64 and arm7vl and 
-#     a multiplatform Docker image is pushed.
-# For macOS:  release assets are built/pushed for X86_64. (No aarch64 as yet.)
-# 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
-#
-# Copyright 2022 by Interlisp.org
-#
-#
-# ******************************************************************************
-
-name: 'Build/Push Release & Docker Image'
-
-env:
-  workflow: 'buildReleaseInclDocker.yml'
-
-# Run this workflow on ...
-on: 
-    workflow_dispatch:
-      inputs:
-        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:
-        force:
-          description: "Force build even if build already successfully completed for this commit"
-          required: false
-          type: string
-          default: 'false'
-
-defaults:
-  run:
-    shell: bash
-
-#  2 separate jobs here that can run in parallel
-#
-#  1.  Linux: Build/push a multiplatform Linux Docker image and use results to
-#      build/push Linux release assets.
-#
-#  2.  MacOs_x86_64:  Build maiko for MacOS on X86_64 then create and push release 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:
-      force: ${{ steps.force.outputs.force }}
-    steps:
-      - id: force
-        run: >
-          if [ '${{ toJSON(inputs) }}' = 'null'  ];
-          then echo ::set-output name=force::'${{ github.event.inputs.force }}'; echo "workflow_dispatch";
-          else echo ::set-output name=force::'${{ inputs.force }}'; echo "workflow_call";
-          fi
-        
-
-
-######################################################################################
-
-  # 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@v2
-        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.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@v2
-        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@v2
-
-      # 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 ::set-output name=build_time::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-          echo ::set-output name=docker_tags::${DOCKER_TAGS}
-
-      # 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 into DockerHub - required to store the created image
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # Do the Docker Build using the Dockerfile in the repository we
-      # checked out.  Push the result 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 for Push to Docker Hub
-        if: ${{ true }}
-        uses: docker/build-push-action@v2
-        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: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          # Push the result to DockerHub
-          push: true
-          tags: ${{ steps.docker_env.outputs.docker_tags }}
-
-      # Redo the Docker Build (hopefully mostly using the cache from the previous build).
-      # But save the results in a directory under /tmp to be used for creating release tars.
-      - name: Rebuild Docker Image For Saving Locally
-        uses: docker/build-push-action@v2
-        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: ./Dockerfile
-          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.8.10
-        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: true
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-
-######################################################################################
-
-  # MacOS: build for MacOS (X86_64) and use results to
-  # create and push release assets to github
-  macos_x86_64:
-
-    needs: [inputs, sentry]
-    if: |
-      needs.sentry.outputs.release_not_built == 'true'
-      || needs.inputs.outputs.force == 'true'
-
-    runs-on: macos-10.15
-
-    steps:
-
-      # Checkout the branch  
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      # Checkout the actions for this repo owner
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        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
-
-      # Install X11 dependencies
-      - name: Install X11 dependencies on MacOS
-        if: ${{ runner.os == 'macOS'}}
-        run: brew install --cask xquartz
-
-      # Build maiko   
-      - name: Build
-        working-directory: ./bin
-        run: |
-          ./makeright x
-          ./makeright init
-
-      # Create release tar for github.
-      - name: Make release tar(s)
-        env:
-          RELEASE_TAG: ${{ steps.tag.outputs.release_tag }}
-        run: |
-          mkdir -p /tmp/release_tars
-          pushd ${GITHUB_WORKSPACE}/../ >/dev/null
-          tar -c -z                                                       \
-            -f /tmp/release_tars/${RELEASE_TAG}-darwin.x86_64.tgz                  \
-            maiko/bin/osversion                                                    \
-            maiko/bin/machinetype                                                  \
-            maiko/bin/config.guess                                                 \
-            maiko/bin/config.sub                                                   \
-            maiko/darwin.x86_64/lde*
-          popd >/dev/null
-
-      # Push Release
-      - name: Push the release
-        uses: ncipollo/release-action@v1.8.10
-        with: 
-          allowUpdates: true
-          artifacts:
-            /tmp/release_tars/${{ steps.tag.outputs.release_tag }}-darwin.x86_64.tgz
-          tag: ${{ steps.tag.outputs.release_tag }}
-          draft: true
-          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_x86_64]
-
-    steps: 
-      # Checkout the actions for this repo owner
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        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 ::set-output name=build_successful::'true'
-          
-######################################################################################

.gitignore

@@ -6,6 +6,8 @@
 .DS_Store
 # build directories
 build/**
+cmake-build-*/**
+.idea/
 *.m68k-x/**
 *.m68k/**
 *.386-x/**
@@ -15,12 +17,21 @@ build/**
 *.sparc-x/**
 *.sparc/**
 *.x86_64-x/**
+*.x86_64-sdl/**
 *.x86_64/**
+*.wasm/**
+*.wasm-wasm/**
+*.wasm_nl/**
+*.wasm_nl-wasm_nl/**
 *.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)
 
@@ -18,15 +18,17 @@ ENDIF()
 
 find_program(
     CLANG_TIDY_EXE
-    NAMES "clang-tidy" "clang-tidy13" "clang-tidy12" "clang-tidy11" "clang-tidy10"
+    NAMES "clang-tidy" "clang-tidy16" "clang-tidy15" "clang-tidy14" "clang-tidy13" "clang-tidy12" "clang-tidy11" "clang-tidy10"
     DOC "Path to clang-tidy executable"
 )
 
 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=.*)
+        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)
@@ -39,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
@@ -70,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()
 
@@ -142,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
@@ -270,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
@@ -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,8 +458,39 @@ 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)
+TARGET_COMPILE_DEFINITIONS(mkvdate PUBLIC ${MAIKO_DEFINITIONS})
+TARGET_INCLUDE_DIRECTORIES(mkvdate PUBLIC inc)
+
 ADD_EXECUTABLE(setsout src/setsout.c src/byteswap.c)
 TARGET_COMPILE_DEFINITIONS(setsout PUBLIC ${MAIKO_DEFINITIONS})
 TARGET_INCLUDE_DIRECTORIES(setsout PUBLIC inc)

Dockerfile

@@ -1,55 +0,0 @@
-#*******************************************************************************
-#
-#  Dockerfile to build Maiko (Stage 1) and create a Docker image and push it
-#  to DockerHub (stage 2).
-#
-#  Copyright 2022 by Interlisp.org
-#
-# ******************************************************************************
-
-#
-#  Build Maiko Stage
-#
-FROM ubuntu:focal AS builder
-SHELL ["/bin/bash", "-c"]
-USER root:root
-# Install build tools
-RUN apt-get update && apt-get install -y make clang libx11-dev gcc x11vnc xvfb
-# Copy over / clean maiko repo
-COPY . /app/maiko
-RUN rm -rf /app/maiko/linux*
-# Build maiko
-WORKDIR /app/maiko/bin
-RUN ./makeright x
-RUN if [ "$(./osversion)" = "linux" ] && [ "$(./machinetype)" = "x86_64" ]; then ./makeright init; fi
-# Prep for Install Stage
-RUN mv ../$(./osversion).$(./machinetype) ../TRANSFER
-#
-#  Install Maiko Stage
-#
-FROM ubuntu:focal
-ARG BUILD_DATE="not_available"
-ARG RELEASE_TAG="not_available"
-LABEL name="Maiko"
-LABEL description="Virtual machine for Interlisp Medley"
-LABEL url="https://github.com/Interlisp/maiko"
-LABEL build-time=$BUILD_DATE
-LABEL release_tag=$RELEASE_TAG
-ENV MAIKO_RELEASE=$RELEASE_TAG
-ENV MAIKO_BUILD_DATE=$BUILD_DATE
-ARG BUILD_LOCATION=/app/maiko
-ARG INSTALL_LOCATION=/usr/local/interlisp/maiko
-#
-SHELL ["/bin/bash", "-c"]
-USER root:root
-# Copy release files into /usr/local/directories
-COPY --from=builder ${BUILD_LOCATION}/bin/osversion    ${INSTALL_LOCATION}/bin/
-COPY --from=builder ${BUILD_LOCATION}/bin/machinetype  ${INSTALL_LOCATION}/bin/
-COPY --from=builder ${BUILD_LOCATION}/bin/config.guess ${INSTALL_LOCATION}/bin/
-COPY --from=builder ${BUILD_LOCATION}/bin/config.sub   ${INSTALL_LOCATION}/bin/
-COPY --from=builder ${BUILD_LOCATION}/TRANSFER/lde*    ${INSTALL_LOCATION}/TRANSFER/
-RUN  cd ${INSTALL_LOCATION} && mv TRANSFER "$(cd bin && ./osversion).$(cd bin/ && ./machinetype)"
-# Some niceties
-USER root
-WORKDIR /root
-ENTRYPOINT /bin/bash

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,7 +4,7 @@ Maiko is the implementation of the Medley Interlisp virtual machine, for a
 byte-coded Lisp instruction set and some low-level functions for
 connecting with Lisp for access to display (via X11) and disk etc.
 
-For an overview, see [Medley Interlisp Introduction](https://github.com/Interlisp/medley/wiki/Medley-Interlisp-Introduction).
+For an overview, see [Medley Interlisp Introduction](https://interlisp.org/medley/using/docs/medley/).
 
 See [the Medley repository](https://github.com/Interlisp/medley) for
 * [Issues](https://github.com/Interlisp/medley/issues) (note that maiko issues are there too)
@@ -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,14 +33,14 @@ $ cd maiko/bin
 $ ./makeright x
 ```
 
-* The build will (attempt to) detect the OS-type and cpu-type. It will build binaries `lde` and `ldex` in `../ostype.cputype` (with .o files in `..ostype.cputype-x`. For example, Linux on a 64-bit x86 will use `linux.x86_64`, while MacOS 11 on a (new M1) Mac will use `darwin.aarch64`.
+* 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 MacOS (and X11 client libraries) can be freely obtained at https://www.xquartz.org/releases
+* 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
 

bin/compile-flags

@@ -134,6 +134,24 @@ 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

bin/machinetype

@@ -9,7 +9,8 @@
 #									#
 #########################################################################
 
-os=${LDEARCH:-`./config.guess`}
+SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+os=${LDEARCH:-`$SCRIPTPATH/config.guess`}
 # o/s switch block
 case "$os" in
         m68k-*)		      echo m68k ;;

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.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 \
@@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O1 -g
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
-DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=201 # was 351
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm
@@ -26,3 +26,4 @@ LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm
 OBJECTDIR = ../$(RELEASENAME)/
 
 default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
+

bin/makefile-dos

@@ -18,7 +18,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c         gcrcell.c llstk.
 OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj         gcr.obj  gcrcell.obj llstk.obj  gcscan.obj loopsops.obj storage.obj     allocmds.obj dir.obj gvar2.obj lowlev1.obj      subr.obj arithops.obj lowlev2.obj       subr0374.obj doscomm.obj     hardrtn.obj lsthandl.obj sxhash.obj draw.obj main.obj testtool.obj array.obj        dsk.obj inet.obj misc7.obj timer.obj    array2.obj dspif.obj initdsp.obj miscn.obj      typeof.obj array3.obj initkbd.obj ubf1.obj      array4.obj dspsubrs.obj initsout.obj    mkatom.obj ubf2.obj array5.obj eqf.obj  intcall.obj mkcell.obj ubf3.obj array6.obj      ether.obj ufn.obj atom.obj      findkey.obj kbdsubrs.obj mouseif.obj ufs.obj    bbtsub.obj foreign.obj keyevent.obj     unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj      unwind.obj bitblt.obj gc.obj    uraid.obj blt.obj gc2.obj       kprint.obj osmsg.obj usrsubr.obj byteswap.obj   gcarray.obj perrno.obj uutils.obj       carcdr.obj asmbbt.obj gccode.obj        vars3.obj gcfinal.obj ldsout.obj        return.obj vmemsave.obj chardev.obj     gchtfind.obj lineblt8.obj rpc.obj xc.obj        common.obj gcmain3.obj lisp2c.obj rplcons.obj   z2.obj  vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES)
 
 
-HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h gcdata.h 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
 
 
 

bin/makefile-emscripten.wasm-wasm

@@ -0,0 +1,34 @@
+# Options for Emscripten, WASM and SDL
+
+CC = emcc $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+XFLAGS = -DSDL -sUSE_SDL=2
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
+
+MEDLEY?=../../medley
+SYSOUT?=$(MEDLEY)/loadups/full.sysout
+
+LD = emcc
+LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 \
+	--preload-file $(SYSOUT)@medley/loadups/full.sysout \
+	--preload-file $(MEDLEY)/loadups/whereis.hash@medley/loadups/whereis.hash \
+	--preload-file $(MEDLEY)/greetfiles/MEDLEYDIR-INIT.LCOM@usr/local/lde/site-init.lisp \
+	--preload-file $(MEDLEY)/docs/@medley/docs \
+	--preload-file $(MEDLEY)/doctools/@medley/doctools \
+	--preload-file $(MEDLEY)/greetfiles/@medley/greetfiles \
+	--preload-file $(MEDLEY)/internal/@medley/internal \
+	--preload-file $(MEDLEY)/sources/@medley/sources \
+	--preload-file $(MEDLEY)/library/@medley/library \
+	--preload-file $(MEDLEY)/lispusers/@medley/lispusers \
+	--preload-file $(MEDLEY)/fonts/@medley/fonts
+
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldesdl.js

bin/makefile-emscripten.wasm_nl-wasm_nl

@@ -0,0 +1,23 @@
+# Options for Emscripten, WASM and SDL
+
+CC = emcc $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)sdl.o
+
+XFLAGS = -DSDL -sUSE_SDL=2
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS = -O2
+DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
+
+MEDLEY?=../../medley
+SYSOUT?=$(MEDLEY)/loadups/full.sysout
+
+LD = emcc
+LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4
+
+LDELDFLAGS =
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldesdl.js

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.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.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-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

@@ -1,6 +1,6 @@
 # Options for MacOS, x86_64 processor, X windows, for INIT processing
 
-CC = clang -m64 $(CLANG_CFLAGS)
+CC = clang -m64 -target x86_64-apple-darwin $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \
@@ -18,7 +18,7 @@ XFLAGS = -I/opt/X11/include -DXWINDOW
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O0 -g
 DEBUGFLAGS = # -DDEBUG -DOPTRACE
-DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=201 -DNOVERSION -DINIT
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
 
 LDFLAGS = -L/opt/X11/lib -lX11 -lm
 LDELDFLAGS =  -L/opt/X11/lib -lX11 -lm

bin/makefile-init-linux.aarch64

@@ -0,0 +1,29 @@
+# Options for Linux, aarch64 processor, X windows, for INIT processing
+
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+XFLAGS = -DXWINDOW
+
+# OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
+OPTFLAGS =  -O0 -g
+DEBUGFLAGS =
+DFLAGS = $(DEBUGFLAGS) $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
+
+LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
+LDELDFLAGS =  -L/usr/X11/lib -lX11 -lc -lm
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/ldeinit

bin/makefile-init-linux.x86_64

@@ -1,7 +1,7 @@
 # Options for Linux, x86 processor, X windows, for INIT processing
 
-#CC = gcc -m64 $(GCC_CFLAGS)
-CC = clang -m64 $(CLANG_CFLAGS)
+CC = gcc $(GCC_CFLAGS)
+#CC = clang $(CLANG_CFLAGS)
 
 XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xbbt.o \

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-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

@@ -1,4 +1,4 @@
-# Options for Linux, ARMv7 and X-Window
+# Options for Linux, aarch64 and X-Window
 
 CC = gcc $(GCC_CFLAGS)
 #CC = clang $(CLANG_CFLAGS)

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-tail

@@ -115,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
 
@@ -322,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
@@ -472,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 \
@@ -647,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 \
@@ -773,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 \
@@ -826,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) \
@@ -890,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 \
@@ -980,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
@@ -1039,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,19 @@ case "$display" in
 	x)	releasename=${osversion}.${architecture}-${display}
 		ldename=ldex
 		;;
+	sdl)	releasename=${osversion}.${architecture}-${display}
+		ldename=ldesdl
+		;;
+	wasm)	osversion=emscripten
+		architecture=wasm
+		releasename=${osversion}.${architecture}-${display}
+		ldename=ldesdl.js
+		;;
+	wasm_nl) osversion=emscripten
+		architecture=wasm_nl
+		releasename=${osversion}.${architecture}-${display}
+		ldename=ldesdl.js
+		;;
 	*)	echo "display-option: $display is not supported."
 		exit
 		;;

bin/osversion

@@ -1,5 +1,6 @@
 #!/bin/sh
-os=${LDEARCH:-`./config.guess`}
+SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+os=${LDEARCH:-`$SCRIPTPATH/config.guess`}
 case "$os" in
         m68k-*-amigaos)		echo amigaos ;;
         sparc-sun-sunos*)	echo sunos4 ;;

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/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

@@ -35,7 +35,7 @@
 #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

@@ -38,7 +38,7 @@ static inline LispPTR LAddrFromNative(void *NAddr)
   if ((uintptr_t)NAddr & 1) {
     printf("Misaligned pointer in LAddrFromNative %p\n", NAddr);
   }
-  return ((DLword *)NAddr) - Lisp_world;
+  return (LispPTR)(((DLword *)NAddr) - Lisp_world);
 }
 
 static inline DLword *NativeAligned2FromLAddr(LispPTR LAddr)
@@ -51,12 +51,12 @@ static inline LispPTR *NativeAligned4FromLAddr(LispPTR LAddr)
   if (LAddr & 1) {
     printf("Misaligned pointer in NativeAligned4FromLAddr 0x%x\n", LAddr);
   }
-  return (LispPTR *)(Lisp_world + LAddr);
+  return (void *)(Lisp_world + LAddr);
 }
 
 static inline LispPTR *NativeAligned4FromLPage(LispPTR LPage)
 {
-  return (LispPTR *)(Lisp_world + (LPage << 8));
+  return (void *)(Lisp_world + (LPage << 8));
 }
 
 static inline DLword StackOffsetFromNative(void *SAddr)
@@ -76,7 +76,10 @@ static inline DLword *NativeAligned2FromStackOffset(DLword StackOffset)
 
 static inline LispPTR *NativeAligned4FromStackOffset(DLword StackOffset)
 {
-  return (LispPTR *)(Stackspace + StackOffset);
+  if (StackOffset & 1) {
+    printf("Misaligned StackOffset in NativeAligned4FromStackOffset 0x%hx\n", StackOffset);
+  }
+  return (void *)(Stackspace + StackOffset);
 }
 
 static inline LispPTR LPageFromNative(void *NAddr)
@@ -84,28 +87,6 @@ static inline LispPTR LPageFromNative(void *NAddr)
   if ((uintptr_t)NAddr & 1) {
     printf("Misaligned pointer in LPageFromNative %p\n", NAddr);
   }
-  return (((DLword *)NAddr) - Lisp_world) >> 8;
+  return (LispPTR)((((DLword *)NAddr) - Lisp_world) >> 8);
 }
-/*  translate 68k ptr to Lisp DLword address */
-#define LADDR_from_68k(ptr68k)	((LispPTR)(((UNSIGNED)(ptr68k) - (UNSIGNED)Lisp_world) >>1))
-
-
-/*  translate 68k ptr to Lisp Page number   */
-#define LPAGE_from_68k(ptr68k)	(LADDR_from_68k(ptr68k) >> 8)
-
-
-/* Translate Lisp_address to 68K address	*/
-/*	Lisp_addr: word offset		*/
-#define Addr68k_from_LADDR(Lisp_addr)	(Lisp_world + (Lisp_addr))
-
-
-/* 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))
 #endif /* ADR68K_H */

inc/arith.h

@@ -22,6 +22,8 @@
 #define MAX_FIXP 2147483647  /* == 0x7FFFFFFF  */
 #define MIN_FIXP (-2147483648) /* == 0x80000000  */
 
+#define SMALLP_ZERO ((LispPTR)S_POSITIVE)
+#define SMALLP_MINUSONE ((LispPTR)(S_NEGATIVE | 0xFFFF))
 /**
  * extract an integer value from a smallp
  */
@@ -101,8 +103,8 @@ static inline LispPTR GetPosSmallp(unsigned long x) {
         int *fixpp;                                           \
         /* arg is FIXP, call createcell */                                 \
         fixpp = (int *)createcell68k(TYPE_FIXP);                       \
-        *((int *)fixpp) = (int)(arg);                                      \
-        (result) = (LAddrFromNative(fixpp));                                \
+        *fixpp = (int)(arg);                                      \
+        (result) = LAddrFromNative(fixpp);                                \
         break;                                                             \
       }                                                                    \
     }                                                                      \
@@ -117,7 +119,7 @@ static inline LispPTR GetPosSmallp(unsigned long x) {
         int *fixpp;                             \
         /* arg is FIXP, call createcell */                   \
         fixpp = (int *)createcell68k(TYPE_FIXP);         \
-        *fixpp = arg;                                       \
+        *fixpp = (int)(arg);				      \
         return (LAddrFromNative(fixpp));                      \
       }                                                      \
     }                                                        \

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/arrayopsdefs.h

@@ -4,7 +4,7 @@
 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, int 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

@@ -705,17 +705,17 @@
 /************************************************************************/
 
 #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;		\
-unsigned int *dst32addr, *src32addr;			\
-unsigned int shS, savedS, newS;			\
-int srcRshift;
+unsigned int *dst32addr = 0, *src32addr = 0;			\
+unsigned int shS = 0, savedS = 0, newS = 0;			\
+int srcRshift = 0;
 
 
 
@@ -738,7 +738,7 @@ 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/bindsdefs.h

@@ -1,7 +1,7 @@
 #ifndef BINDSDEFS_H
 #define BINDSDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR *N_OP_bind(LispPTR *stack_pointer, LispPTR tos, int byte1, int byte2);
+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

@@ -50,9 +50,9 @@ 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); }
 
 #else
 extern DLword *EmCursorX68K,*EmCursorY68K;
@@ -76,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/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) | (unsigned short)((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/cell.h

@@ -416,11 +416,11 @@ struct cadr_cell {
 /* When cadr() function is called, type check should be done. */
 
 #define S_N_CHECKANDCADR(sour, dest, tos)    \
-  {                                          \
+  do {                                        \
     LispPTR parm = sour;            \
     if (GetTypeNumber(parm) != TYPE_LISTP) { \
       ERROR_EXIT(tos);                       \
     } else                                   \
       (dest) = cadr(parm);                   \
-  }
+  } while (0)
 #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(int cons_car, 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

@@ -40,7 +40,7 @@ extern int flushing;
 #endif
 
 #ifdef DEBUG
-#define DBPRINT(X) do {printf X ; if (flushing) fflush(stdout); } while(0)
+#define DBPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X ; if (flushing) fflush(stdout); } while(0)
 #define DEBUGGER(X) X
 #else
 #define DBPRINT(X) if (0) do {printf X ; } while(0)
@@ -51,7 +51,7 @@ extern int flushing;
 	/* For trace print statements */
 
 #ifdef TRACE
-#define TPRINT(X) do {  printf X; if (flushing) fflush(stdout); } while (0)
+#define TPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X; if (flushing) fflush(stdout); } while (0)
 #define TRACER(X) X
 #else /* TRACE */
 
@@ -64,7 +64,7 @@ extern int flushing;
 	/* For tracing individual opcode executions */
 
 #ifdef OPTRACE
-#define OPTPRINT(X) do { printf X; if (flushing) fflush(stdout); } while (0)
+#define OPTPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X; if (flushing) fflush(stdout); } while (0)
 #define OPTRACER(X) X
 #else
 #define OPTPRINT(X) if (0) do {  printf X; } while (0)
@@ -75,7 +75,7 @@ extern int flushing;
 	/* For tracing function calls */
 
 #ifdef FNTRACE
-#define FNTPRINT(X) do { printf X; if (flushing) fflush(stdout); } while (0)
+#define FNTPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X; if (flushing) fflush(stdout); } while (0)
 #define FNTRACER(X)  X
 #else
 #define FNTPRINT(X) if (0) do {  printf X; } while (0)
@@ -86,7 +86,7 @@ extern int flushing;
 	/* For function-call & return stack checking */
 
 #ifdef FNSTKCHECK
-#define FNCHKPRINT(X) do { printf X ; if (flushing) fflush(stdout); } while (0)
+#define FNCHKPRINT(X) do { printf("%s:%d ", __FILE__, __LINE__); printf X ; if (flushing) fflush(stdout); } while (0)
 #define FNCHECKER(X) X
 #else
 #define FNCHKPRINT(X) if (0) do {  printf X; } while (0)

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,10 +254,11 @@ typedef struct
     Pixmap GravityOnPixmap;
     Pixmap GravityOffPixmap;
     XImage ScreenBitmap;
-    Mask   DisableEventMask;
-    Mask   EnableEventMask;
+    long   DisableEventMask;
+    long   EnableEventMask;
 #endif /* XWINDOW */
-  } DspInterfaceRec, *DspInterface;
+  } DspInterfaceRec;
+typedef DspInterfaceRec *DspInterface;
 
 
 

inc/dirdefs.h

@@ -1,8 +1,9 @@
 #ifndef DIRDEFS_H
 #define DIRDEFS_H 1
-#include <dirent.h>         // for MAXNAMLEN
+
 #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
@@ -29,30 +30,26 @@ typedef struct fprop {
   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. */
-  u_short au_len;    /* Byte length of author. */
-  unsigned long nil; /* padding to 8-byte multiple */
 } 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]; /* Name in Lisp Format. */
-  u_short lname_len;     /* Byte length of lname. */
-  char no_ver_name[MAXNAMLEN];
+  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.
    */
-  ino_t ino;          /* I-node number of this file. */
+  size_t lname_len;     /* Byte length of lname. */
+  unsigned dirp;       /* If 1, this file is a directory. */
   unsigned version;   /* Version in Lisp sense. */
-  u_short dirp;       /* If 1, this file is a directory. */
-  struct finfo *next; /*
-                       * Link to a next entry.  Last entry is
-                       * indicated by NULL pointer.
-                       */
+  ino_t ino;          /* I-node number of this file. */
+  struct finfo *next; /* Last entry is indicated by NULL pointer. */
 } FINFO;
 
 typedef struct dfinfo {

inc/display.h

@@ -43,6 +43,10 @@ extern DLword *DISP_MAX_Address;
 #define DISPLAYBUFFER
 #endif /* XWINDOW */
 
+#ifdef SDL
+#define DISPLAYBUFFER
+#endif /* SDL */
+
 #ifdef DOS
 #define DISPLAYBUFFER
 #endif /* DOS */

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/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/etherdefs.h

@@ -14,4 +14,10 @@ LispPTR check_ether(void);
 void init_ifpage_ether(void);
 void init_ether(void);
 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/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

@@ -48,23 +48,23 @@
 
    /* IncAllocCnt is called only when *Reclaim_cnt_word != NIL */
 
-#define IncAllocCnt(n) {\
+#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;\
-	};\
-}
+		/* 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) {                        \
+#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,
@@ -72,7 +72,7 @@
 #define GetLinkptr(entry)       ((entry) & 0x0fffffffe)
 
 
-#define DelLink(link, prev, entry) {                                    \
+#define DelLink(link, prev, entry) do {                                    \
   if ((prev) != (GCENTRY *)0)                                           \
     {                                                                   \
       GETGC((GCENTRY *)(prev) + 1) = GETGC((GCENTRY *)(link) + 1);      \
@@ -88,41 +88,41 @@
       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));                             \
 		else                                                         \
                   (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));                                 \
 	else                                                                 \
           (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(int probe);
-DLword gcscan2(int probe);
+int gcscan1(int probe);
+int gcscan2(int probe);
 #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,7 +5,7 @@
 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);

inc/initsoutdefs.h

@@ -2,7 +2,7 @@
 #define INITSOUTDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
 LispPTR *fixp_value(LispPTR *ptr);
-void init_ifpage(int sysout_size);
+void init_ifpage(unsigned sysout_size);
 void init_iopage(void);
 void build_lisp_map(void);
 void init_for_keyhandle(void);

inc/inlineC.h

@@ -449,15 +449,15 @@
 
 #define GCSCAN1                                    \
   do {                                             \
-    TOPOFSTACK = gcscan1(TOPOFSTACK & 0xffff);     \
-    if (TOPOFSTACK) { TOPOFSTACK |= S_POSITIVE; }; \
+    int scan = gcscan1(TOPOFSTACK & 0xffff);     \
+    TOPOFSTACK = (scan == -1) ? NIL : (S_POSITIVE | scan); \
     nextop1;                                       \
   } while (0)
 
 #define GCSCAN2                                    \
   do {                                             \
-    TOPOFSTACK = gcscan2(TOPOFSTACK & 0xffff);     \
-    if (TOPOFSTACK) { TOPOFSTACK |= S_POSITIVE; }; \
+    int scan = gcscan2(TOPOFSTACK & 0xffff);     \
+    TOPOFSTACK = (scan == -1) ? NIL : (S_POSITIVE | scan); \
     nextop1;                                       \
   } while (0)
 

inc/ldsoutdefs.h

@@ -1,4 +1,4 @@
 #ifndef LDSOUTDEFS_H
 #define LDSOUTDEFS_H 1
-int sysout_loader(const char * sysout_file_name, int sys_size);
+unsigned sysout_loader(const char * sysout_file_name, unsigned sys_size);
 #endif

inc/lispemul.h

@@ -142,12 +142,6 @@ typedef struct wbits {
   unsigned LSB : 1;
 } WBITS;
 
-typedef struct lbits {
-  unsigned xMSB : 1;
-  unsigned MIDDLE : 30;
-  unsigned LSB : 1;
-} LBITS;
-
 #define PUTBASEBIT68K(base68k, offset, bitvalue)               \
   do {                                                         \
     if (bitvalue)                                              \
@@ -291,12 +285,6 @@ typedef struct wbits {
   USHORT xMSB : 1;
 } WBITS;
 
-typedef struct lbits {
-  unsigned LSB : 1;
-  unsigned MIDDLE : 30;
-  unsigned xMSB : 1; /* xMSB b/c HPUX defined MSB in a header */
-} LBITS;
-
 #define PUTBASEBIT68K(base68k, offset, bitvalue)                                             \
   do {                                                                                       \
     UNSIGNED real68kbase;                                                                    \
@@ -318,19 +306,18 @@ typedef struct lbits {
 
 extern struct state MachineState;
 
-#define MState (&MachineState)
-#define CURRENTFX ((struct frameex1 *)(((DLword *)PVar) - FRAMESIZE))
-#define IVar (MState->ivar)
-#define PVar (MState->pvar)
-#define CurrentStackPTR (MState->csp)
-#define TopOfStack (MState->tosvalue)
-#define PC (MState->currentpc)
-#define FuncObj (MState->currentfunc)
-#define EndSTKP (MState->endofstack)
-#define Irq_Stk_Check (MState->irqcheck)
-#define Irq_Stk_End (MState->irqend)
-#define Scratch_CSTK (MState->scratch_cstk)
-#define Error_Exit (MState->errorexit)
+#define CURRENTFX ((struct frameex1 *)(void *)(((DLword *)PVar) - FRAMESIZE))
+#define IVar (MachineState.ivar)
+#define PVar (MachineState.pvar)
+#define CurrentStackPTR (MachineState.csp)
+#define TopOfStack (MachineState.tosvalue)
+#define PC (MachineState.currentpc)
+#define FuncObj (MachineState.currentfunc)
+#define EndSTKP (MachineState.endofstack)
+#define Irq_Stk_Check (MachineState.irqcheck)
+#define Irq_Stk_End (MachineState.irqend)
+#define Scratch_CSTK (MachineState.scratch_cstk)
+#define Error_Exit (MachineState.errorexit)
 
 /****************************************************
  MakeAddr:
@@ -357,23 +344,33 @@ GetLongWord:
 *****************************************************/
 #define GetLongWord(address) (*((LispPTR *)(address)))
 
+/* The stack is maintained as a DLword* pointer, carefully incremented
+ * and decremented by 2 (= 4 bytes), and mostly accessed as a LispPTR*
+ * to fetch 4-byte cells. There are a few places where items are
+ * accessed as 2 separate DLwords, so don't be tempted to blindly replace
+ * the DLword* declaration by a LispPTR*.  The (void *) cast discourages
+ * the compiler from complaining about a required upgrade in the
+ * alignment when we know(!) that it will always point to an
+ * appropriate boundary.
+ */
+
 /****************************************************
 PopCStack:
 #define PopCStack	{TopOfStack = *((LispPTR *)(--CurrentStackPTR)); --CurrentStackPTR;}
 *****************************************************/
 #define PopCStack                                 \
   do {                                            \
-    TopOfStack = *((LispPTR *)(CurrentStackPTR)); \
+    TopOfStack = *((LispPTR *)(void *)(CurrentStackPTR));	\
     CurrentStackPTR -= 2;                         \
   } while (0)
 
 /****************************************************
 PopStackTo:  CSTK -> Place
-#define PopStackTo(Place)	{Place= *((LispPTR *)(--CurrentStackPTR)); CurrentStackPTR--; }
+#define PopStackTo(Place)	{Place= *((LispPTR *)(void *)(--CurrentStackPTR)); CurrentStackPTR--; }
 *****************************************************/
 #define PopStackTo(Place)                      \
   do {                                         \
-    (Place) = *((LispPTR *)(CurrentStackPTR)); \
+    (Place) = *((LispPTR *)(void *)(CurrentStackPTR));	\
     CurrentStackPTR -= 2;                      \
   } while (0)
 
@@ -384,7 +381,7 @@ PushCStack:
 #define PushCStack                                \
   do {                                            \
     CurrentStackPTR += 2;                         \
-    *((LispPTR *)(CurrentStackPTR)) = TopOfStack; \
+    *((LispPTR *)(void *)(CurrentStackPTR)) = TopOfStack;	\
   } while (0)
 
 /****************************************************
@@ -394,14 +391,14 @@ PushStack:
 #define PushStack(x)                     \
   do {                                   \
     CurrentStackPTR += 2;                \
-    *((LispPTR *)(CurrentStackPTR)) = x; \
+    *((LispPTR *)(void *)(CurrentStackPTR)) = x;	\
   } while (0)
 
 /****************************************************
 SmashStack:
 #define SmashStack(x)	(*((LispPTR *)(CurrentStackPTR-1))=x)
 *****************************************************/
-#define SmashStack(x) (*((LispPTR *)(CurrentStackPTR)) = (x))
+#define SmashStack(x) (*((LispPTR *)(void *)(CurrentStackPTR)) = (x))
 
 /*********************************************************
 Get_BYTE(byteptr)	byteptr: pointer to  8 bit data
@@ -413,7 +410,7 @@ Get_BYTE(byteptr)	byteptr: pointer to  8 bit data
 
 /**********************************************************
 DOSTACKOVERFLOW(argnum,bytenum) if it needs hardreturn-cleanup
-        then upnt to contextsw and immediately return
+        then punt to contextsw and immediately return
 **********************************************************/
 #define DOSTACKOVERFLOW(argnum, bytenum) \
   do {                                   \

inc/lispver1.h

@@ -4,7 +4,7 @@
 
 /* DOS version of LispVersionToUnixVersion */
 #define LispVersionToUnixVersion(pathname, ver)				\
-  {									\
+  do {									\
 									\
     char	*cp;						\
     char	*vp;						\
@@ -43,5 +43,5 @@
 	else ver = -1;							\
       }									\
       else ver = -1;							\
-  }
+    } while (0)
 #endif /* LISPVER1_H */

inc/lispver2.h

@@ -4,7 +4,7 @@
 
 /* non-DOS version of LispVersionToUnixVersion */
 
-#define LispVersionToUnixVersion(pathname){				\
+#define LispVersionToUnixVersion(pathname) do {				\
 									\
 	char	*lv_cp;						\
 	char	*lv_vp;						\
@@ -70,5 +70,5 @@
 			lv_vp--;	/* Just for label */		\
 		}							\
 	}								\
-}
+} while (0)
 #endif /* LISPVER2_H */

inc/locfile.h

@@ -8,6 +8,9 @@
 /*	Manufactured in the United States of America.			*/
 /*									*/
 /************************************************************************/
+#include <errno.h>
+#include <limits.h>   /* for NAME_MAX */
+#include <dirent.h>   /* for MAXNAMLEN */
 #include "lispemul.h" /* for DLword */
 
 #define	FDEV_PAGE_SIZE		512	/* 1 page == 512 byte */
@@ -32,10 +35,6 @@
 #define	EOL			(S_POSITIVE | 7)
 #define	ALL			(S_POSITIVE | 8)
 
-
-extern	DLword	*Lisp_world;	/* To access LispSysout area */
-
-
 #define	ToLispTime(x)	((int)(x) + 29969152)
 			/* For getfileinfo. For WDATE&RDATE */
 			/* 29969152 == (timer.c)LISP_UNIX_TIME_DIFF */
@@ -45,24 +44,24 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 			/* For getfileinfo. For WDATE&RDATE */
 			/* 29969152 == (timer.c)LISP_UNIX_TIME_DIFF */
 
-#define StrNCpyFromCToLisp(lispbuf, cbuf ,len)	{	\
+#define StrNCpyFromCToLisp(lispbuf, cbuf ,len)	do {	\
 			char *lf_sptr = (cbuf);		\
                         char *lf_dptr = (lispbuf);                      \
 			for(size_t lf_i=0;lf_i<(len);lf_i++)\
 				GETBYTE(lf_dptr++) = *lf_sptr++;		\
-		}
+  } while (0)
 
-#define StrNCpyFromLispToC(cbuf , lispbuf, len)	{	\
+#define StrNCpyFromLispToC(cbuf , lispbuf, len)	do {	\
 			char *lf_sptr = (lispbuf);                                          \
 			char *lf_dptr = (cbuf);                       \
 			for(size_t lf_i=0;lf_i<(len);lf_i++)\
 				*lf_dptr++ = GETBYTE(lf_sptr++);		\
-		}
+  } while (0)
 
-#define FGetNum(ptr, place) { \
+#define FGetNum(ptr, place) do { \
              if(((ptr) & SEGMASK)== S_POSITIVE) {(place) = ((ptr) & 0xffff);}\
         else if(((ptr) & SEGMASK)== S_NEGATIVE) {(place) = (int)((ptr)| 0xffff0000);}\
-        else {return(NIL);}}
+        else {return(NIL);}} while (0)
 
 
 /************************************************************************/
@@ -81,7 +80,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 /************************************************************************/
 #ifndef BYTESWAP
 #define	LispStringToCString(Lisp, C, MaxLen)				\
-  {									\
+  do {									\
     OneDArray	*lf_arrayp;						\
     char	*lf_base, *lf_dp;						\
     short	*lf_sbase;							\
@@ -108,10 +107,10 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 	default:							\
 		error("LispStringToCString: Not a character array.\n");	\
       }									\
-  }
+ } while (0)
 #else  /* BYTESWAP == T CHANGED-BY-TAKE */
 #define	LispStringToCString(Lisp, C, MaxLen)				\
-  {									\
+  do {									\
     OneDArray	*lf_arrayp;						\
     char	*lf_base, *lf_dp;						\
     short	*lf_sbase;							\
@@ -138,7 +137,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 	default:							\
 		error("LispStringToCString: Not a character array.\n");	\
       }									\
-  }
+  } while (0)
 
 #endif /* BYTESWAP */
 
@@ -154,7 +153,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 /*									*/
 /************************************************************************/
 #define	LispStringLength(LispString, Length, FatP)			\
-  {									\
+  do {									\
     OneDArray	*lf_arrayp;						\
     lf_arrayp = (OneDArray *)(NativeAligned4FromLAddr(LispString));		\
     switch(lf_arrayp->typenumber)					\
@@ -171,7 +170,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 	default:							\
 		error("LispStringLength: Not a character array.\n");	\
       }									\
-  }
+    } while (0)
 
 
 
@@ -184,39 +183,40 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 /*									*/
 /************************************************************************/
 #define STRING_BASE(lstringp, cstringp) \
-  {				\
+do  {				\
 	LispPTR	*lf_naddress;				  \
 	lf_naddress = (LispPTR *)(NativeAligned4FromLAddr(lstringp));		  \
 	(cstringp) = (char *)(NativeAligned2FromLAddr(((OneDArray *)lf_naddress)->base)); \
-  }
+ } while (0)
 
 #ifndef min
 #define min(a, b) (((a) <= (b))?(a):(b))
 #endif /* min */
 
 #define	LispNumToCInt(Lisp)					\
-	( (((Lisp) & SEGMASK) == S_POSITIVE) ?                  \
-          ((Lisp) & 0xFFFF) : (*((int *)(NativeAligned4FromLAddr(Lisp)))) )
+       ( (((Lisp) & SEGMASK) == S_POSITIVE) ? ((Lisp) & 0xFFFF) : \
+          (((Lisp) & SEGMASK) == S_NEGATIVE) ? ((Lisp) | 0xFFFF0000) : \
+          (*((int *)(NativeAligned4FromLAddr(Lisp)))) )
 
 #define	UPLOWDIFF	0x20
 
-#define	DOWNCASE(name){						\
+#define	DOWNCASE(name) do {						\
 								\
 	char	*lf_cp;						\
 								\
 	for(lf_cp = (name); *lf_cp!='\0'; ++lf_cp)                      \
 	  if((*lf_cp >= 'A') && (*lf_cp <= 'Z')) *lf_cp += UPLOWDIFF;	\
-}
+  } while (0)
 
-#define	UPCASE(name){						\
+#define	UPCASE(name) do {						\
 								\
 	char	*lf_cp;					\
 								\
 	for(lf_cp = (name); *lf_cp!='\0'; ++lf_cp)                      \
 	  if((*lf_cp >= 'a') && (*lf_cp <= 'z')) *lf_cp -= UPLOWDIFF;	\
-}
+  } while (0)
 
-#define DIR_OR_FILE_P(name, type){				\
+#define DIR_OR_FILE_P(name, type) do {				\
 	int	lf_result;				\
 	struct stat	lf_statbuf;				\
 								\
@@ -244,9 +244,9 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 			break;					\
 		}						\
 	}							\
-}
+  } while (0)
 
-#define	DIRP(path, dir, buf){				\
+#define	DIRP(path, dir, buf) do {				\
 	int lf_rval;					\
 	struct	stat	lf_statbuf;			\
 		strcpy(buf, path);			\
@@ -262,9 +262,9 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 			*Lisp_errno = 60;		\
 			return(0);			\
 		}					\
-		}
+  } while (0)
 
-#define	FILEP(path, file, buf){				\
+#define	FILEP(path, file, buf) do {				\
 	int lf_rval;					\
 		strcpy(buf, path);			\
 		strcat(buf, file);			\
@@ -273,7 +273,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 			strcat(path, file);		\
 			return(1);			\
 		}					\
-		}
+  } while (0)
 
 #define	STREQ(name1, name2)(	\
                 (*(name1) == *(name2)) && (strcmp(name1, name2) == 0)   \
@@ -281,7 +281,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 
 #define	SPECIALFILEMARK		(-1)
 
-#define NumericStringP(str, truetag, falsetag) {			\
+#define NumericStringP(str, truetag, falsetag) do {			\
 	char	*lfn_cp;						\
 									\
         /* NOLINTNEXTLINE(bugprone-macro-parentheses) */		\
@@ -291,7 +291,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 	  if(*lfn_cp < '0' || '9' < *lfn_cp)				\
 	    goto falsetag; /* NOLINT(bugprone-macro-parentheses) */	\
 	goto truetag;	/* NOLINT(bugprone-macro-parentheses) */	\
-}
+  } while (0)
 
 /*		
  * Name:	LispVersionToUnixVersion
@@ -353,7 +353,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
  * dealt with as version 1. 
  */
 
-#define UnixVersionToLispVersion(pathname, vlessp){				\
+#define UnixVersionToLispVersion(pathname, vlessp) do {				\
 										\
 	char	*start;							\
 	char	*end;							\
@@ -408,7 +408,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 		/* Dealt with as version 1 unless vlessp. */			\
                 if (!(vlessp)) strcat(pathname, ";1");                          \
 	}									\
-}
+  } while (0)
 
 /*		
  * Name:	ConcDirAndName
@@ -428,7 +428,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
  *
  */
 
-#define ConcDirAndName(dir, name, fname){					\
+#define ConcDirAndName(dir, name, fname) do {					\
 									\
 	char	*lf_cp1, *lf_cp2;					\
 									\
@@ -464,7 +464,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 		strcat(fname, "/");					\
 		strcat(fname, name);					\
 	}								\
-}
+  } while (0)
 
 /*		
  * Name:	ConcNameAndVersion
@@ -483,7 +483,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
  *
  */
 
-#define ConcNameAndVersion(name, ver, rname){				\
+#define ConcNameAndVersion(name, ver, rname) do {				\
 	if (*(ver) != '\0') {						\
 		strcpy(rname, name);					\
 		strcat(rname, ".~");					\
@@ -492,7 +492,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 	} else {							\
 		strcpy(rname, name);					\
 	}								\
-}
+} while (0)
 
 #define	 VERSIONLEN		16
 
@@ -517,7 +517,7 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 /* Like "foo/fee.fee;3" or "/foo/foo;3" */
 /* AddDotNoExtension must be put after UnixVersionToLispVersion */
 
-#define	AddDotNoExtension(file){			\
+#define	AddDotNoExtension(file) do {			\
 		char	*lf_cp;			\
 		char	*lf_cp1;			\
 		if( (strrchr(file,'.')== 0) && ((lf_cp=strrchr(file,';'))!=0) ){	\
@@ -527,41 +527,38 @@ extern	DLword	*Lisp_world;	/* To access LispSysout area */
 				*lf_cp1 = *(lf_cp1-1);	\
 			*lf_cp = '.';			\
 		}					\
-		}
+  } while (0)
 
 /* An argument of RemoveDotNoExtension must be LispVersion convention */
 /* Like "foo/fee.fee;3" or "/foo/foo.;3" */
 /* RemoveDotNoExtension must be put before LispVersionToUnixVersion */
 
-#define RemoveDotNoExtension(file){					\
+#define RemoveDotNoExtension(file) do {					\
 		char	*lf_cp;					\
 		if( ((lf_cp=strrchr(file, ';'))!=0) && (*(lf_cp-1)=='.') ){	\
 			for(;*lf_cp!='\0';++lf_cp)				\
 				*(lf_cp-1) = *lf_cp;				\
 			*(lf_cp-1) = '\0';					\
 		}							\
-		}
+  } while (0)
 		
-
-extern	int	errno;
-
-#define	ChangeToVersionless(pathname){			\
+#define	ChangeToVersionless(pathname) do {			\
 		char	*lf_cp;			\
 		if( (lf_cp=strrchr(pathname, ';')) != 0)	\
 			*lf_cp = '\0';			\
-		}
+  } while (0)
 
 
-#define	UNLINK(x){					\
+#define	UNLINK(x) do {					\
 		TIMEOUT(lf_rval=unlink(x));		\
 		if(lf_rval == -1){				\
 			err_mess("unlink", errno);	\
 			*Lisp_errno = errno;		\
 			return(0);			\
 		}					\
-		}
+  } while (0)
 
-#define LINK(x,y){					\
+#define LINK(x,y) do {					\
 		TIMEOUT(lf_rval=link(x, y));		\
 		if(lf_rval == -1){				\
 			if(errno == 2)			\
@@ -572,9 +569,9 @@ extern	int	errno;
 				return(0);		\
 			}				\
 		}					\
-		}
+  } while (0)
 
-#define RENAME(x,y){					\
+#define RENAME(x,y) do {					\
 		TIMEOUT(lf_rval=rename(x, y));		\
 		if(lf_rval == -1){				\
 			switch(errno){			\
@@ -589,26 +586,26 @@ extern	int	errno;
 				return(0);		\
 			}				\
 		}					\
-		}
+  } while (0)
 
-#define	STAT(x,y){					\
+#define	STAT(x,y) do {					\
 		TIMEOUT(lf_rval=stat(x, y));		\
 		if(lf_rval != 0){				\
 			err_mess("stat", errno);	\
 			*Lisp_errno = errno;		\
 			return(-1);			\
 		}					\
-		}
+  } while (0)
 
 /*
  * For file name length check
  */
 #define FNAMETOOLONG	200
 
-#define FileNameTooLong(val) {				\
+#define FileNameTooLong(val) do {				\
 	*Lisp_errno = FNAMETOOLONG;			\
 	return((val));					\
-}
+  } while (0)
 
 
 

inc/lspglob.h

@@ -45,20 +45,20 @@
 #ifdef BIGVM
 extern LispPTR *FPtoVP;
 #else
-extern DLword *FPtoVP ;
+extern DLword *FPtoVP;
 #endif /* BIGVM */
 extern DLword *PAGEMap;
-extern DLword *PageMapTBL ;
+extern DLword *PageMapTBL;
 extern DLword *LockedPageTable;
 
 /* For Interface to Micro or Device */
-extern DLword *IOCBPage ;
-extern IOPAGE *IOPage ;
-extern IFPAGE *InterfacePage ;
-extern MISCSTATS *MiscStats ;
+extern DLword *IOCBPage;
+extern IOPAGE *IOPage;
+extern IFPAGE *InterfacePage;
+extern MISCSTATS *MiscStats;
 
 /* UFN Tbl */
-extern DLword *UFNTable ;
+extern DLword *UFNTable;
 
 /* Internal Hash Table for GC */
 #ifdef BIGVM
@@ -75,15 +75,15 @@ extern DLword *UFNTable ;
 
 
 /* DISPLAY */
- extern DLword *DisplayRegion ;
+ extern DLword *DisplayRegion;
 
 
 /* FLEX STORAGES */
  extern  DLword *MDS_space_bottom;  /* Start of MDS (pre -2) */
- extern  DLword *PnCharspace ;	/* Space for PN char codes (Thin only) */
+ extern  DLword *PnCharspace;	/* Space for PN char codes (Thin only) */
 
- extern  struct dtd *ListpDTD ;	/* DTD for LISTP chang. 25-mar-87 take */
- extern  DLword *Next_Array ;	/* Next available ARRAY space */
+ extern  struct dtd *ListpDTD;	/* DTD for LISTP chang. 25-mar-87 take */
+ extern  DLword *Next_Array;	/* Next available ARRAY space */
  extern  DLword *Next_MDSpage;	/* Next available MDS space */
   
  /* Pointers in Cell or any object means DLword offset from Lisp_world.
@@ -100,7 +100,7 @@ extern LispPTR *Next_MDSpage_word;
 extern LispPTR *Next_Array_word;
 extern LispPTR *MDS_free_page_word;
 
-extern LispPTR *Reclaim_cnt_word ;
+extern LispPTR *Reclaim_cnt_word;
 
 /*** cache values for array reclaimer by Tomtom 30-Sep-1987 ***/
 
@@ -145,6 +145,7 @@ extern LispPTR *LeastMDSPage_word;
 extern LispPTR *SecondMDSPage_word;
 extern LispPTR *SecondArrayPage_word;
 extern LispPTR *INTERRUPTSTATE_word;
+extern LispPTR *IOINTERRUPTFLAGS_word;
 extern LispPTR *SYSTEMCACHEVARS_word;
 extern LispPTR *MACHINETYPE_word;
 
@@ -168,6 +169,31 @@ extern int UnixPipeIn;
 extern int UnixPipeOut;
 extern int UnixPID;
 
+/* Interrupt frame calls */
+extern LispPTR DOBUFFEREDTRANSITION_index;
+extern LispPTR INTERRUPTFRAME_index;
+extern LispPTR PERIODIC_INTERRUPTFRAME_index;
+extern LispPTR DORECLAIM_index;
+
+/* BITBLT related atoms */
+extern LispPTR BITBLTBITMAP_index;
+extern LispPTR BLTSHADEBITMAP_index;
+extern LispPTR BLTCHAR_index;
+extern LispPTR TEDIT_BLTCHAR_index;
+#ifdef COLOR
+extern LispPTR SLOWBLTCHAR_index;
+extern LispPTR COLORSCREEN_index;
+#endif
+
+/* BITBLT operation atoms */
+extern DLword TEXTURE_atom;
+extern DLword MERGE_atom;
+extern DLword INPUT_atom;
+extern DLword INVERT_atom;
+extern DLword ERASE_atom;
+extern DLword PAINT_atom;
+extern DLword REPLACE_atom;
+
 /* Atom index for IL:\MVLIST, for the VALUES opcode */
 extern LispPTR MVLIST_index;
 

inc/lsptypes.h

@@ -403,7 +403,7 @@ struct dtd {
 	LispPTR dtd_typespecs;
 	LispPTR dtd_ptrs ;
 	int  dtd_oldcnt;
-	int dtd_nextpage ;
+	LispPTR dtd_nextpage ;
 	DLword dtd_supertype ;
 	DLword dtd_typeentry ;
 };
@@ -617,9 +617,9 @@ typedef struct
 
 /* Get DTD pointer(68k) from typenum */
 #ifdef BIGVM
-#define GetDTD(typnum)	(DTDspace + ((typnum)<<4)+((typnum)<<1))
+#define GetDTD(typnum)	(void *)(DTDspace + ((typnum)<<4)+((typnum)<<1))
 #else
-#define GetDTD(typnum)	(DTDspace + ((typnum)<<4))
+#define GetDTD(typnum)	(void *)(DTDspace + ((typnum)<<4))
 #endif /* BIGVM */
 
 /* Get all type entry */

inc/maiko/platform.h

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

inc/medleyfp.h

@@ -41,12 +41,12 @@ extern volatile sig_atomic_t FP_error;
 
 #elif defined(DOS)
 #include <i32.h>
-#define FPCLEAR
+#define FPCLEAR do {} while (0)
 #define FPTEST(result) (_getrealerror() & ( I87_ZERO_DIVIDE | I87_OVERFLOW | I87_UNDERFLOW))
 
 #else
 #include <math.h>
-#define FPCLEAR
+#define FPCLEAR do {} while (0)
 #define FPTEST(result) (!isfinite(result))
 
 #endif /* FLTINT */

inc/mkcelldefs.h

@@ -2,5 +2,5 @@
 #define MKCELLDEFS_H 1
 #include "lispemul.h" /* for LispPTR, DLword */
 LispPTR N_OP_createcell(LispPTR tos);
-DLword *createcell68k(unsigned int type);
+void *createcell68k(unsigned int type);
 #endif

inc/mnxdefs.h

@@ -216,8 +216,8 @@ typedef struct dspifrec
 {
   int		error;		/* A generic errornumber */
   Display	*handle;	/* The X Display this dspif describes */
-  Mask		DisableEventMask;
-  Mask		EnableEventMask;
+  long		DisableEventMask;
+  long		EnableEventMask;
   XImage	image;		/* The scratch image structure (used in blt'ing) */
   XImage	tmpimage;	/* The tmp image (used for depth conversion) */
   GC		TitleGC;	/* The gc for title blitting. */

inc/my.h

@@ -16,6 +16,7 @@
 /*	Manufactured in the United States of America.			*/
 /*									*/
 /************************************************************************/
+#include <sys/types.h>   // for u_char
 #include "version.h"     // for BIGVM
 #include "adr68k.h"      // for NativeAligned2FromLAddr, NativeAligned4FromLAddr, LAddrFromNative
 #include "arith.h"       // for N_ARITH_SWITCH, N_GETNUMBER
@@ -34,7 +35,7 @@
 /*	from SMALLP or FIXP, if necessary.				*/
 /*									*/
 /************************************************************************/
-#define	N_MakeFloat(arg, dest, tos){					\
+#define	N_MakeFloat(arg, dest, tos) do {				\
 	switch (SEGMASK & (LispPTR)(arg)) {				\
 	case S_POSITIVE:						\
 		(dest) = (float)(0xFFFF & (LispPTR)(arg));		\
@@ -53,42 +54,41 @@
 		  default: ERROR_EXIT(tos);				\
 		}							\
 	}								\
-}
+} while (0)
 
 
 
-#define	N_GetPos(arg, dest, tos){					\
+#define	N_GetPos(arg, dest, tos) do {					\
 	if (((arg) & SEGMASK) == S_POSITIVE)				\
 		(dest) = (arg) & 0xFFFF;				\
 	else	{							\
 	if (GetTypeNumber(arg) != TYPE_FIXP) ERROR_EXIT(tos);		\
-	if (((dest) = *((int *)NativeAligned4FromLAddr(arg))) & 0x80000000)	\
-		ERROR_EXIT(tos);					\
-		}							\
-	}
+	(dest) = *((int *)NativeAligned4FromLAddr(arg));		\
+	if ((unsigned)(dest) & 0x80000000) ERROR_EXIT(tos);		\
+	}								\
+} while (0)
 
 static inline LispPTR
 aref_switch(unsigned type, LispPTR tos, LispPTR baseL, int index)
 {
-  int result;
-
   switch (type)
     {
     case 38: /* pointer : 32 bits */
       return(*(((LispPTR *)NativeAligned4FromLAddr(baseL)) + index));
 
-    case 20: /* signed : 16 bits */
-      result = (GETWORD(((DLword *)NativeAligned2FromLAddr(baseL)) + index)) & 0xFFFF;
+    case 20: { /* signed : 16 bits */
+      DLword result = (GETWORD(((DLword *)NativeAligned2FromLAddr(baseL)) + index));
       if (result & 0x8000) return(result | S_NEGATIVE);
       else return(result | S_POSITIVE);
+    }
 
     case 67: /* Character :  8 bits */
       return(S_CHARACTER | ((GETBYTE(((char *)NativeAligned2FromLAddr(baseL)) + index)) & 0xFF));
 
-    case 22: /* signed : 32 bits */
-      result = *(((int *)NativeAligned4FromLAddr(baseL)) + index);
+    case 22: {/* signed : 32 bits */
+      int result = *(((int *)NativeAligned4FromLAddr(baseL)) + index);
       N_ARITH_SWITCH(result);
-
+    }
     case 0: /* unsigned : 1 bit per element */
       return(S_POSITIVE | (((GETBYTE(((char *)NativeAligned2FromLAddr(baseL)) + (index >> 3))) >> (7 - (index & 7))) & 1));
 
@@ -117,66 +117,78 @@ aref_switch(unsigned type, LispPTR tos, LispPTR baseL, int index)
 }
 
 #define aset_switch(type, tos)						\
-{									\
+do {									\
    switch (type) {							\
       case 38: /* pointer : 32 bits */					\
-	GCLOOKUP(*(((int *)NativeAligned4FromLAddr(base)) + index), DELREF); \
+	GCLOOKUP(*(((LispPTR *)NativeAligned4FromLAddr(base)) + index), DELREF); \
 	GCLOOKUP(data, ADDREF);						\
-        *(((int *)NativeAligned4FromLAddr(base)) + index) = data;		\
+        *(((LispPTR *)NativeAligned4FromLAddr(base)) + index) = data;	\
         return(data);							\
-      case 20: /* signed : 16 bits */					\
-        new = data & 0xFFFF;						\
+      case 20: { /* signed : 16 bits */					\
+        DLword new = data & 0xFFFF;					\
         if ((((data & SEGMASK) == S_POSITIVE) && ((data & 0x8000) == 0)) ||\
 	    (((data & SEGMASK) == S_NEGATIVE) && (data & 0x8000)))	\
         GETWORD(((DLword *)NativeAligned2FromLAddr(base)) + index) = new;		\
         else ERROR_EXIT(tos);						\
         return(data);							\
-      case 67: /* Character :  8 bits */				\
-        if ((data & SEGMASK) != S_CHARACTER) ERROR_EXIT(tos);	\
-        new = data & 0xFFFF;						\
+        }								\
+      case 67: { /* Character :  8 bits */				\
+        DLword new = data & 0xFFFF;					\
+        if ((data & SEGMASK) != S_CHARACTER) ERROR_EXIT(tos);		\
         if (new > 0xFF) ERROR_EXIT(tos);				\
-        GETBYTE(((char *)NativeAligned2FromLAddr(base)) + index) = new;		\
+        GETBYTE(((char *)NativeAligned2FromLAddr(base)) + index) = (u_char)new; \
         return(data);							\
-      case 22: /* signed : 32 bits */					\
+      }									\
+      case 22: { /* signed : 32 bits */					\
+	int new;							\
         N_GETNUMBER(data, new, doufn);					\
-        *(((int *)NativeAligned4FromLAddr(base)) + index) = new;		\
+        *(((int *)NativeAligned4FromLAddr(base)) + index) = new;	\
         return(data);							\
-      case 0: /* unsigned : 1 bit per element */			\
+      }									\
+      case 0: { /* unsigned : 1 bit per element */			\
+        int new;							\
         N_GetPos(data, new, tos);					\
         if (new > 1) ERROR_EXIT(tos);					\
         if (new) {							\
           new = (1 << (7 - (index & 7)));				\
-          GETBYTE(((char *)NativeAligned2FromLAddr(base)) + (index >> 3)) |= new;	\
+          GETBYTE(((u_char *)NativeAligned2FromLAddr(base)) + (index >> 3)) |= (u_char)new; \
         }								\
         else {								\
           new = 0xFF - (1 << (7 - (index & 7)));			\
-          GETBYTE(((char *)NativeAligned2FromLAddr(base)) + (index >> 3)) &= new;	\
+          GETBYTE(((u_char *)NativeAligned2FromLAddr(base)) + (index >> 3)) &= (u_char)new; \
         }								\
         return(data);							\
-      case 3: /* unsigned : 8 bits per element */			\
+      }									\
+      case 3: { /* unsigned : 8 bits per element */			\
+        int new;							\
         N_GetPos(data, new, tos);					\
         if (new > 0xFF) ERROR_EXIT(tos);				\
-        GETBYTE(((char *)NativeAligned2FromLAddr(base)) + index) = new;		\
+        GETBYTE(((char *)NativeAligned2FromLAddr(base)) + index) = (u_char)new; \
         return(data);							\
-      case 4: /* unsigned : 16 bits per element */			\
+      }									\
+      case 4: { /* unsigned : 16 bits per element */			\
+        int new;							\
         N_GetPos(data, new, tos); 					\
         if (new > 0xFFFF) ERROR_EXIT(tos);				\
-        GETWORD(((DLword *)NativeAligned2FromLAddr(base)) + index) = new;		\
+        GETWORD(((DLword *)NativeAligned2FromLAddr(base)) + index) = (DLword)new; \
         return(data);							\
+      }									\
       case 54: /* Float : 32 bits */					\
         if (GetTypeNumber(data) != TYPE_FLOATP) ERROR_EXIT(tos);	\
         *(((int *)NativeAligned4FromLAddr(base)) + index) = *((int *)NativeAligned4FromLAddr(data)); \
         return(data);							\
-      case 68: /* Character :  16 bits */				\
-        if ((data & SEGMASK) != S_CHARACTER) ERROR_EXIT(tos); 	\
+      case 68: {/* Character :  16 bits */				\
+        DLword new;							\
+        if ((data & SEGMASK) != S_CHARACTER) ERROR_EXIT(tos); 		\
         new = data & 0xFFFF;						\
-        GETWORD(((DLword *)NativeAligned2FromLAddr(base)) + index) = new;		\
+        GETWORD(((DLword *)NativeAligned2FromLAddr(base)) + index) = new; \
         return(data);							\
+      }									\
       case 86: /* XPointer : 32 bits */					\
-        *(((int *)NativeAligned4FromLAddr(base)) + index) = data;		\
+        *(((LispPTR *)NativeAligned4FromLAddr(base)) + index) = data;	\
         return(data);							\
       default: /* Illegal or Unimplemented */				\
         ERROR_EXIT(tos);						\
     }/* end switch typenumber */					\
-}
+} while (0)
 #endif /* MY_H */

inc/osmsg.h

@@ -18,9 +18,9 @@
 #include "osmsgdefs.h"   // for flush_pty
 
 #define	OSMESSAGE_PRINT(print_exp)		\
-  {						\
+  do {						\
     flush_pty();				\
     print_exp;					\
-  }
+  } while (0)
 
 #endif /* OSMSG_H */

inc/return.h

@@ -65,21 +65,22 @@
 /** in CONTEXTSW , for exchanging context **/
 
 #define Midpunt(fxnum) 							\
-  { DLword midpunt; 					\
+  do { DLword midpunt; 					\
     midpunt = LOLOC(LAddrFromNative(CURRENTFX));			\
     PVar=(DLword *)							\
-	    Addr68k_from_StkOffset(					\
+	    NativeAligned2FromStackOffset(					\
                         (GETWORD(((DLword *)InterfacePage) + (fxnum)))) \
 		+ FRAMESIZE; 						\
     GETWORD(((DLword *)InterfacePage) + (fxnum)) = midpunt ;		\
-  }
+  } while (0)
 
 
 #define CHECKFX							\
-  if (((UNSIGNED)PVar -(UNSIGNED)CURRENTFX) != 20)			\
+  do { if (((UNSIGNED)PVar -(UNSIGNED)CURRENTFX) != 20)          \
     { printf("Invalid FX(0x%x) and PV(0x%x) \n",		\
 	     LAddrFromNative(CURRENTFX),LAddrFromNative(PVar));	\
-    }
+    }                                                           \
+  } while (0)
 
 
 
@@ -87,17 +88,17 @@
 	that it is called by CONTEXTSW in original LISP code **/
 
 #define BEFORE_CONTEXTSW						\
-  { CurrentStackPTR += 2; 						\
-    CURRENTFX->nextblock=StkOffset_from_68K(CurrentStackPTR); 		\
+  do { CurrentStackPTR += 2; 						\
+    CURRENTFX->nextblock=StackOffsetFromNative(CurrentStackPTR); 		\
     GETWORD(CurrentStackPTR)=STK_FSB_WORD; 				\
     GETWORD(CurrentStackPTR+1)= (((UNSIGNED)EndSTKP-(UNSIGNED)(CurrentStackPTR))>>1); \
     if (GETWORD(CurrentStackPTR+1) == 0) error("0-long free block."); \
-  }
+  } while (0)
 
 
 #define AFTER_CONTEXTSW							\
-  { DLword *ac_ptr68k,*ac_freeptr;					\
-    ac_ptr68k = (DLword*)Addr68k_from_StkOffset(CURRENTFX->nextblock);	\
+  do { DLword *ac_ptr68k,*ac_freeptr;					\
+    ac_ptr68k = (DLword*)NativeAligned2FromStackOffset(CURRENTFX->nextblock);	\
     if(GETWORD(ac_ptr68k) != STK_FSB_WORD) error("pre_moveframe: MP9316");	\
     CHECK_FX(CURRENTFX);						\
     ac_freeptr=ac_ptr68k;							\
@@ -109,5 +110,5 @@
     CHECK_FX(CURRENTFX);						\
     S_CHECK( EndSTKP > CurrentStackPTR, 				\
 		"End of stack isn't beyond current stk pointer."); 	\
-  }
+  } while (0)
 #endif /* RETURN_H */

inc/rs232c.h

@@ -160,7 +160,4 @@ typedef struct {
 	DLword rs232c_length;
 	char   rs232c_data;
 } RS232C_ENCAPSULATION;
-
-extern DLword *Lisp_world;
-
 #endif

inc/sdldefs.h

@@ -0,0 +1,11 @@
+#ifndef SDLDEFS_H
+#define SDLDEFS_H 1
+
+void sdl_notify_damage(int x, int y, int w, int h);
+void sdl_setCursor(int hot_x, int hot_y);
+void sdl_bitblt_to_screen(int x, int y, int w, int h);
+void sdl_set_invert(int flag);
+void sdl_setMousePosition(int x, int y);
+void process_SDLevents();
+int init_SDL(char *windowtitle, int w, int h, int s);
+#endif

inc/stack.h

@@ -164,7 +164,7 @@ typedef struct stackp {
 /*************************************************************/
 /*  Pointer-dereferencing macros for one-word structure ptrs */
 /*************************************************************/
-#define BFRAMEPTR(ptr) ((Bframe *)(ptr))
+#define BFRAMEPTR(ptr) ((Bframe *)(void *)(ptr))
 #define STKWORDPTR(ptr) ((StackWord *)(ptr))
 
 #else
@@ -289,7 +289,7 @@ typedef struct stackp {
 /*************************************************************/
 /*  Pointer-dereferencing macros for one-word structure ptrs */
 /*************************************************************/
-#define BFRAMEPTR(ptr) ((Bframe *)(ptr))
+#define BFRAMEPTR(ptr) ((Bframe *)(void *)(ptr))
 #define STKWORDPTR(ptr) ((StackWord *)(2 ^ (UNSIGNED)(ptr)))
 
 #endif
@@ -297,59 +297,59 @@ typedef struct stackp {
 #define STKWORD(stkptr) ((StackWord *)WORDPTR(stkptr))
 
 #define FX_INVALIDP(fx68k) (((fx68k) == 0) || ((DLword *)(fx68k) == Stackspace))
-#define FX_size(fx68k) (((FX *)(fx68k))->nextblock - LOLOC(LAddrFromNative(fx68k)))
-#define FSBP(ptr68k) (((STKBLK *)(ptr68k))->flagword == STK_FSB_WORD)
-#define FSB_size(ptr68k) (((STKBLK *)(ptr68k))->size)
+#define FX_size(fx68k) (((FX *)(void *)(fx68k))->nextblock - LOLOC(LAddrFromNative(fx68k)))
+#define FSBP(ptr68k) (((STKBLK *)(void *)(ptr68k))->flagword == STK_FSB_WORD)
+#define FSB_size(ptr68k) (((STKBLK *)(void *)(ptr68k))->size)
 /** Following suff assumes fx is 68kptr and val is LISP_LO_OFFSET **/
 #define DUMMYBF(fx) (((DLword *)(fx)) - DLWORDSPER_CELL)
-#define SLOWP(fx) (((FXBLOCK *)(fx))->slowp)
+#define SLOWP(fx) (((FXBLOCK *)(void *)(fx))->slowp)
 #define FASTP(fx) (!SLOWP(fx))
 #define SET_FASTP_NIL(fx68k)                                       \
-  {                                                                \
+  do {                                                             \
     if (FASTP(fx68k)) {                                            \
-      ((FX *)(fx68k))->blink = StkOffset_from_68K(DUMMYBF(fx68k)); \
+      ((FX *)(fx68k))->blink = StackOffsetFromNative(DUMMYBF(fx68k)); \
       ((FX *)(fx68k))->clink = ((FX *)(fx68k))->alink;             \
       SLOWP(fx68k) = T;                                            \
     }                                                              \
-  }
+  } while (0)
 
 #define GETALINK(fx) ((((fx)->alink) & 0xfffe) - FRAMESIZE)
 #define SETALINK(fx, val)                                \
-  {                                                      \
+  do {                                                   \
     if (FASTP(fx)) {                                     \
       ((FX *)(fx))->blink = LAddrFromNative(DUMMYBF(fx)); \
       ((FX *)(fx))->clink = ((FX *)(fx))->alink;         \
     }                                                    \
     ((FX *)(fx))->alink = (val) + FRAMESIZE + 1;         \
-  }
+  } while (0)
 
 #define GETBLINK(fx) (SLOWP(fx) ? ((FX *)(fx))->blink : LOLOC(LAddrFromNative(DUMMYBF(fx))))
 #define SETBLINK(fx, val)                        \
-  {                                              \
+  do {                                           \
     ((FX *)(fx))->blink = (val);                 \
     if (FASTP(fx)) {                             \
       ((FX *)(fx))->clink = ((FX *)(fx))->alink; \
       SLOWP(fx) = 1;                             \
     }                                            \
-  }
+  } while (0)
 
 #define GETCLINK(fx) \
   (SLOWP(fx) ? (((FX *)(fx))->clink - FRAMESIZE) : (((FX *)(fx))->alink - FRAMESIZE))
 #define SETCLINK(fx, val)                                \
-  {                                                      \
+  do {                                                   \
     ((FX *)(fx))->clink = (val) + FRAMESIZE;             \
     if (FASTP((fx))) {                                   \
       ((FX *)(fx))->blink = LAddrFromNative(DUMMYBF(fx)); \
       SLOWP(fx) = 1;                                     \
     }                                                    \
-  }
+  } while (0)
 
 #define SETACLINK(fx, val)                                                \
-  {                                                                       \
+  do {                                                                    \
     if (FASTP(fx)) { ((FX *)(fx))->blink = LAddrFromNative(DUMMYBF(fx)); } \
     ((FX *)(fx))->clink = (val) + FRAMESIZE;                              \
     ((FX *)(fx))->alink = ((FX *)(fx))->clink + 1;                        \
-  }
+  } while (0)
 
 #ifdef BIGVM
 #define SWAP_FNHEAD
@@ -364,16 +364,18 @@ typedef struct stackp {
       POINTERMASK))
 
 #define MAKEFREEBLOCK(ptr68k, size)                                   \
-  {                                                                   \
-    if ((size) <= 0) error("creating 0 long FSP");                    \
-    *((LispPTR *)(ptr68k)) = (STK_FSB_WORD << 16) | ((DLword)(size)); \
-  }
+  do {                                                                \
+    if ((size) <= 0) error("creating 0 length free stack block");      \
+    if ((size) & 1) error("creating odd length free stack block");	\
+    *((LispPTR *)(void *)(ptr68k)) = (STK_FSB_WORD << 16) | ((DLword)(size)); \
+  } while (0)
 
 #define SETUPGUARDBLOCK(ptr68k, size)                                     \
-  {                                                                       \
-    if ((size) <= 0) error("creating 0 long Guard block");                \
-    (*((LispPTR *)(ptr68k)) = (STK_GUARD_WORD << 16) | ((DLword)(size))); \
-  }
+  do {                                                                    \
+    if ((size) <= 0) error("creating 0 length stack guard block");        \
+    if ((size) & 1) error("creating odd sized stack guard block");        \
+    (*((LispPTR *)(void *)(ptr68k)) = (STK_GUARD_WORD << 16) | ((DLword)(size))); \
+  } while (0)
 
 /************************************************************************/
 /*									*/
@@ -389,47 +391,47 @@ typedef struct stackp {
 #include "testtooldefs.h"
 
 #define S_CHECK(condition, msg)                          \
-  {                                                      \
+  do {                                                   \
     if (!(condition)) {                                  \
       printf("\n\nStack check failed:  %s.\n\n", (msg)); \
       error("S_Check..");                                \
     }                                                    \
-  }
+  } while (0)
 
 #define S_WARN(condition, msg, scanptr)                                                       \
-  {                                                                                           \
+  do {                                                                                           \
     if (!(condition)) { printf("\n\nStack check failed at %p:  %s.\n\n", (scanptr), (msg)); } \
-  }
+  } while (0)
 
 #define CHECK_BF(bf68k) check_BF(bf68k)
 
 #define CHECK_FX(fx68k) check_FX(fx68k)
 
 #define PreMoveFrameCheck(fx68k)                                                \
-  {                                                                             \
+  do {                                                                          \
     LispPTR *tos_on_stack;                                                      \
     if (check_stack_rooms(fx68k) > 1000) {                                      \
       warn("moveframe:there is more than 100 words SPACE for FX");              \
       printf("# When calling ");                                                \
-      tos_on_stack = (LispPTR *)Addr68k_from_StkOffset((fx68k)->nextblock - 2); \
+      tos_on_stack = (LispPTR *)NativeAligned4FromStackOffset((fx68k)->nextblock - 2); \
       print_atomname(*tos_on_stack);                                            \
       printf("\n");                                                             \
       stack_check(0);                                                           \
     }                                                                           \
-  }
+    } while (0)
 
 #else /* STACKCHECK */
 
 #define S_CHECK(condition, msg) \
-  {}
+  do {} while (0)
 #define S_WARN(condition, msg, scanptr) \
-  {}
+  do {} while (0)
 #define PreMoveFrameCheck(fx68k) \
-  {}
+  do {} while (0)
 #define CHECK_BF(bf68k) \
-  {}
+  do {} while (0)
 #define CHECK_FX(fx68k) \
-  {}
+  do {} while (0)
 
 #endif /* STACKCHECK */
 

inc/subrdefs.h

@@ -1,6 +1,4 @@
 #ifndef SUBRDEFS_H
 #define SUBRDEFS_H 1
-#include "lispemul.h" /* for LispPTR */
-char *atom_to_str(LispPTR atom_index);
 void OP_subrcall(int subr_no, int argnum);
 #endif

inc/timeout.h

@@ -19,37 +19,37 @@ extern jmp_buf jmpbuf;
 extern	unsigned int TIMEOUT_TIME;
 
 #define	SETJMP(x)	\
-  {				\
+  do {				\
     if(setjmp(jmpbuf) != 0) return(x);		\
-  }
+  } while (0)
 
 #define	TIMEOUT(exp)			\
-  {			\
+  do {			\
     alarm(TIMEOUT_TIME);	\
     INTRSAFE(exp);			\
     alarm(0);		\
-  }
+  } while (0)
 
 #define	TIMEOUT0(exp)			\
-  {			\
+  do {			\
     alarm(TIMEOUT_TIME);	\
     INTRSAFE0(exp);			\
     alarm(0);		\
-  }
+  } while (0)
 
 #define	S_TOUT(exp)	\
-		alarm(TIMEOUT_TIME),\
-		(exp),			\
-		alarm(0)
+  alarm(TIMEOUT_TIME),                  \
+    (exp),                              \
+    alarm(0)
 
 #define	ERRSETJMP(rval)					\
-  {							\
+  do {							\
     if(setjmp(jmpbuf) != 0)				\
       {							\
 	*Lisp_errno = 100;				\
 	return(rval);					\
       }							\
-  }
+  } while (0)
 
 
 /************************************************************************/

inc/tos1defs.h

@@ -69,9 +69,9 @@
 /* OPCODE interface routines */
 
 #define StackPtrSave \
-  do { CurrentStackPTR = (DLword *)(CSTKPTR - 1); } while (0)
+  do { CurrentStackPTR = (void *)(CSTKPTR - 1); /* CSTKPTR in cells */ } while (0)
 #define StackPtrRestore \
-  do { CSTKPTRL = ((LispPTR *)CurrentStackPTR) + 1; } while (0)
+  do { CSTKPTRL = (void *)(CurrentStackPTR + 2); /* CurrentStackPTR in DLwords */ } while (0)
 
 #define EXT                  \
   do {                       \

inc/tosfns.h

@@ -202,9 +202,8 @@
     BCE_CURRENTFX->pc = ((UNSIGNED)PCMAC - (UNSIGNED)FuncObj) + FN_OPCODE_SIZE;        \
     FN_STACK_CHECK;                                                                    \
     {                                                                                  \
-      UNSIGNED newivar;                                                       \
-      newivar = (UNSIGNED)(IVARL = (DLword *)(CSTKPTR - (argcount) + 1));              \
-      BCE_CURRENTFX->nextblock = NEXTBLOCK = StkOffset_from_68K(newivar);              \
+      IVARL = (DLword *)(CSTKPTR - (argcount) + 1);                                    \
+      BCE_CURRENTFX->nextblock = NEXTBLOCK = StackOffsetFromNative(IVARL);             \
     }                                                                                  \
     HARD_PUSH(TOPOFSTACK); /* save TOS */                                              \
     if (LOCFNCELL->na >= 0) {                                                          \
@@ -218,7 +217,7 @@
     } /* if end */                                                                     \
     /* Set up BF */                                                                    \
     HARD_PUSH(BF_MARK32 | NEXTBLOCK);                                                  \
-    *((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StkOffset_from_68K(PVAR));              \
+    *((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StackOffsetFromNative(PVAR));              \
     ((struct frameex2 *)CSTKPTR)->fnheader = SWAP_FNHEAD(defcell_word);                \
     CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE);                           \
     PVARL = (DLword *)CSTKPTR;                                                         \
@@ -258,9 +257,8 @@
     BCE_CURRENTFX->pc = ((UNSIGNED)PCMAC - (UNSIGNED)FuncObj) + FNX_OPCODE_SIZE;       \
     FN_STACK_CHECK;                                                                    \
     {                                                                                  \
-      UNSIGNED newivar;                                                       \
-      newivar = (UNSIGNED)(IVARL = (DLword *)(CSTKPTR - num_args + 1));                \
-      BCE_CURRENTFX->nextblock = NEXTBLOCK = StkOffset_from_68K(newivar);              \
+      IVARL = (DLword *)(CSTKPTR - num_args + 1);                                      \
+      BCE_CURRENTFX->nextblock = NEXTBLOCK = StackOffsetFromNative(IVARL);             \
     }                                                                                  \
     HARD_PUSH(TOPOFSTACK); /* save TOS */                                              \
     if (LOCFNCELL->na >= 0) {                                                          \
@@ -274,7 +272,7 @@
     } /* if end */                                                                     \
     /* Set up BF */                                                                    \
     HARD_PUSH(BF_MARK32 | NEXTBLOCK);                                                  \
-    *((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StkOffset_from_68K(PVAR));              \
+    *((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StackOffsetFromNative(PVAR));              \
     ((struct frameex2 *)CSTKPTR)->fnheader = SWAP_FNHEAD(defcell->defpointer);         \
     CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE);                           \
     PVARL = (DLword *)CSTKPTR;                                                         \
@@ -368,13 +366,12 @@
       }                                                                                        \
       LOCFNCELL = (struct fnhead *)NativeAligned4FromLAddr(defcell->defpointer);                    \
       BCE_CURRENTFX->pc = ((UNSIGNED)PCMAC - (UNSIGNED)FuncObj) + fn_opcode_size;              \
-      FNTPRINT(("Saving PC = 0%o (%p).\n", BCE_CURRENTFX->pc, (void *)PCMAC + fn_opcode_size)); \
+      FNTPRINT(("Saving PC = 0%o (%p).\n", BCE_CURRENTFX->pc, (char *)PCMAC + fn_opcode_size)); \
       FN_STACK_CHECK;                                                                          \
       APPLY_POP_PUSH_TEST;                                                                     \
       {                                                                                        \
-        UNSIGNED newivar;                                                             \
-        newivar = (UNSIGNED)(IVARL = (DLword *)(CSTKPTR + (1 - fn_num_args - needpush)));      \
-        BCE_CURRENTFX->nextblock = NEXTBLOCK = StkOffset_from_68K(newivar);                    \
+        IVARL = (DLword *)(CSTKPTR + (1 - fn_num_args - needpush));                            \
+        BCE_CURRENTFX->nextblock = NEXTBLOCK = StackOffsetFromNative(IVARL);                   \
       }                                                                                        \
       HARD_PUSH(TOPOFSTACK); /* save TOS */                                                    \
       if (LOCFNCELL->na >= 0) {                                                                \
@@ -389,7 +386,7 @@
       /* Set up BF */                                                                          \
       HARD_PUSH(BF_MARK32 | NEXTBLOCK);                                                        \
     } /* NEXTBLOCK BLOCK */                                                                    \
-    *((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StkOffset_from_68K(PVAR));                      \
+    *((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StackOffsetFromNative(PVAR));                      \
     ((struct frameex2 *)CSTKPTR)->fnheader = SWAP_FNHEAD(defcell->defpointer);                 \
     CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE);                                   \
     PVARL = (DLword *)CSTKPTR;                                                                 \
@@ -441,9 +438,8 @@
     FN_STACK_CHECK;                                                       \
     CSTKPTRL -= 2;                                                        \
     {                                                                     \
-      UNSIGNED newivar;                                          \
-      newivar = (UNSIGNED)(IVARL = (DLword *)(CSTKPTR - num_args));       \
-      BCE_CURRENTFX->nextblock = NEXTBLOCK = StkOffset_from_68K(newivar); \
+      IVARL = (DLword *)(CSTKPTR - num_args);                             \
+      BCE_CURRENTFX->nextblock = NEXTBLOCK = StackOffsetFromNative(IVARL);\
     }                                                                     \
     if (LOCFNCELL->na >= 0) {                                             \
       int RESTARGS;                                              \
@@ -456,7 +452,7 @@
     } /* if end */                                                        \
     /* Set up BF */                                                       \
     HARD_PUSH(BF_MARK32 | NEXTBLOCK);                                     \
-    *((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StkOffset_from_68K(PVAR)); \
+    *((LispPTR *)CSTKPTR) = (FX_MARK << 16) | (StackOffsetFromNative(PVAR)); \
     ((struct frameex2 *)CSTKPTR)->fnheader = SWAP_FNHEAD(Fn_DefCell);     \
     CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE);              \
     PVARL = (DLword *)CSTKPTR;                                            \

inc/ttydefs.h

@@ -0,0 +1,14 @@
+#ifndef TTYDEFS_H
+#define TTYDEFS_H 1
+void tty_init(void);
+void tty_open(void);
+void tty_close(void);
+void tty_get(void);
+void tty_put(void);
+void tty_setbaudrate(void);
+void tty_setparam(void);
+void tty_breakon(void);
+void tty_breakoff(void);
+void tty_cmd(void);
+void tty_debug(const char *name);
+#endif

inc/ubf1defs.h

@@ -1,5 +1,5 @@
 #ifndef UBF1DEFS_H
 #define UBF1DEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_ubfloat1(int arg, int alpha);
+LispPTR N_OP_ubfloat1(LispPTR arg, int alpha);
 #endif

inc/ufsdefs.h

@@ -14,4 +14,8 @@ int lisppathname(char *fullname, char *lispname, int dirp, int versionp);
 int quote_fname(char *file);
 int quote_fname_ufs(char *file);
 int quote_dname(char *dir);
+#ifdef DOS
+init_host_filesystem(void);
+exit_host_filesystem(void);
+#endif
 #endif

inc/uraidextdefs.h

@@ -12,7 +12,7 @@
 extern FX *URaid_FXarray[URMAXFXNUM];
 extern char URaid_arg1[URMAXCOMM / 2];
 extern char URaid_arg2[URMAXCOMM / 2];
-extern char URaid_comm;
+extern char URaid_comm[2];
 extern char URaid_inputstring[URMAXCOMM];
 extern const char *URaid_errmess;
 extern int URaid_ArrMAXIndex;

inc/version.h

@@ -218,17 +218,6 @@ typedef intptr_t INT;
 
 
 
-	/********************************************************/
-	/*							*/
-	/********************************************************/
-#ifdef OS5
-		/* Solaris, sort of SYSV-ish, but not really */
-#define MAIKO_ENABLE_ETHERNET
-#endif /* OS5 */
-
-
-
-
 	/********************************************************/
 	/*							*/
 	/********************************************************/

inc/vmemsavedefs.h

@@ -4,7 +4,5 @@
 int lispstringP(LispPTR Lisp);
 LispPTR vmem_save(char *sysout_file_name);
 LispPTR vmem_save0(LispPTR *args);
-int twowords(const void *i, const void *j);
-void sort_fptovp(DLword *fptovp, int size);
 void lisp_finish(void);
 #endif

inc/xbitmaps.h

@@ -17,9 +17,9 @@
 
 
 typedef struct {
-	short cubitsprepixel;	/* bits per pixel in the cursor, mostly 1 */
 	const uint8_t *cuimage;	/* the image bitmap */
 	const uint8_t *cumask;	/* the mask bitmap */
+	short cubitsperpixel;	/* bits per pixel in the cursor, mostly 1 */
 	short cuhotspotx;	/* hot-spot X coordinate */
 	short cuhotspoty;	/* hot-spot Y coordinate */
 	short cudata;		/* ?? */
@@ -33,11 +33,11 @@ static const uint8_t defaultcursor_bitmap[]=
 	, 0x06, 0, 0x06, 0, 0x03, 0, 0x03, 0
   };
 	
-LISP_CURSOR default_cursor =
+static const LISP_CURSOR default_cursor =
   {
-     1
-   , defaultcursor_bitmap
+     defaultcursor_bitmap
    , defaultcursor_bitmap
+   , 1
    , 0
    , 15
    , 0
@@ -52,11 +52,11 @@ static const uint8_t  waitcursor_bitmap[]=
 	, 0x37, 0xD8, 0x67, 0xEC, 0xFF, 0xFE, 0xFF, 0xFE
   };
 
-LISP_CURSOR wait_cursor =
+static const LISP_CURSOR wait_cursor =
   {
-     1
-   , waitcursor_bitmap
+     waitcursor_bitmap
    , waitcursor_bitmap
+   , 1
    , 7
    , 8
    , 0
@@ -81,10 +81,10 @@ static const uint8_t horizscrollcursor_bitmap[]={
 	, 0x08, 0x20
 };
 
-LISP_CURSOR horizscroll_cursor = {
-		  1
-		, horizscrollcursor_bitmap
+static const LISP_CURSOR horizscroll_cursor = {
+		  horizscrollcursor_bitmap
 		, horizscrollcursor_bitmap
+		, 1
 		, 7
 		, 5
 		, 0
@@ -111,10 +111,10 @@ static const uint8_t horizthumbcursor_bitmap[]={
 	, 0xAA, 0xA8
 };
 
-LISP_CURSOR horizthumb_cursor = {
-		  1
-		, horizthumbcursor_bitmap
+static const LISP_CURSOR horizthumb_cursor = {
+		  horizthumbcursor_bitmap
 		, horizthumbcursor_bitmap
+		, 1
 		, 6
 		, 8
 		, 0
@@ -141,10 +141,10 @@ static const uint8_t scrolldowncursor_bitmap[]={
 		, 0x01, 0x00
 };
 
-LISP_CURSOR scrolldown_cursor = {
-		  1
-		, scrolldowncursor_bitmap
+static const LISP_CURSOR scrolldown_cursor = {
+		  scrolldowncursor_bitmap
 		, scrolldowncursor_bitmap
+		, 1
 		, 7
 		, 15
 		, 0
@@ -171,10 +171,10 @@ static const uint8_t scrollleftcursor_bitmap[]={
 	, 0x00, 0x80
 };
 
-LISP_CURSOR scrollleft_cursor = {
-		  1
-		, scrollleftcursor_bitmap
+static const LISP_CURSOR scrollleft_cursor = {
+		  scrollleftcursor_bitmap
 		, scrollleftcursor_bitmap
+		, 1
 		, 8
 		, 5
 		, 0
@@ -201,10 +201,10 @@ static const uint8_t scrollrightcursor_bitmap[]={
 	, 0x01, 0x00
 };
 
-LISP_CURSOR scrollright_cursor = {
-		  1
-		, scrollrightcursor_bitmap
+static const LISP_CURSOR scrollright_cursor = {
+		  scrollrightcursor_bitmap
 		, scrollrightcursor_bitmap
+		, 1
 		, 7
 		, 5
 		, 0
@@ -231,10 +231,10 @@ static const uint8_t scrollupcursor_bitmap[]={
 		, 0x03, 0x80
 };
 
-LISP_CURSOR scrollup_cursor = {
-		  1
-		, scrollupcursor_bitmap
+static const LISP_CURSOR scrollup_cursor = {
+		  scrollupcursor_bitmap
 		, scrollupcursor_bitmap
+		, 1
 		, 7
 		, 15
 		, 0
@@ -261,10 +261,10 @@ static const uint8_t vertscrollcursor_bitmap[]={
 		, 0x01, 0x00
 };
 
-LISP_CURSOR vertscroll_cursor = {
-		  1
-		, vertscrollcursor_bitmap
+static const LISP_CURSOR vertscroll_cursor = {
+		  vertscrollcursor_bitmap
 		, vertscrollcursor_bitmap
+		, 1
 		, 7
 		, 15
 		, 0
@@ -291,19 +291,19 @@ static const uint8_t vertthumbcursor_bitmap[]={
 		,0x00,0x00
 };
 
-LISP_CURSOR vertthumb_cursor = {
-		  1
-		, vertthumbcursor_bitmap
+static const LISP_CURSOR vertthumb_cursor = {
+		  vertthumbcursor_bitmap
 		, vertthumbcursor_bitmap
+		, 1
 		, 8
 		, 8
 		, 0
 };
 
-int check_width = 16;
-int check_height = 16;
+static unsigned int check_width = 16;
+static unsigned int check_height = 16;
 
-static const uint8_t check_bits[] = {  0x88, 0x88,
+static uint8_t check_bits[] = {  0x88, 0x88,
 			      0x00, 0x00,
 			      0x22, 0x22,
 			      0x00, 0x00,
@@ -319,7 +319,7 @@ static const uint8_t check_bits[] = {  0x88, 0x88,
 			      0x00, 0x00,
 			      0x22, 0x22,
 			      0x00, 0x00 };
-static const uint8_t plain_bits[] =  {   0x00, 0x00,
+static uint8_t plain_bits[] =  {   0x00, 0x00,
 				0x00, 0x00,
 				0x00, 0x00,
 				0x00, 0x00,
@@ -336,68 +336,4 @@ static const uint8_t plain_bits[] =  {   0x00, 0x00,
 				0x00, 0x00,
 				0x00, 0x00 };
 	
-int Lisp_icon_width = 88;
-int Lisp_icon_height = 58;
-
-const uint8_t Lisp_icon[] =
-  {
-    0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08,
-    0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x3f, 0xe2,
-    0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x10, 0x20,
-    0xbf, 0xff, 0xff, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x97, 0xa8,
-    0x3f, 0xff, 0xff, 0xa0, 0x82, 0x08, 0x20, 0x82, 0x08, 0x30, 0x22,
-    0x20, 0x00, 0x00, 0x88, 0x20, 0x82, 0x08, 0x20, 0x83, 0xf0, 0x20,
-    0xa0, 0x00, 0x00, 0x82, 0x08, 0x20, 0x82, 0x08, 0x21, 0x10, 0x28,
-    0x24, 0x01, 0x00, 0xa0, 0x87, 0xff, 0xff, 0xc2, 0x09, 0x1f, 0xe2,
-    0x29, 0xb2, 0x00, 0x88, 0x24, 0x00, 0x00, 0x60, 0x83, 0x04, 0x20,
-    0xa9, 0xb2, 0x50, 0x82, 0x0c, 0x00, 0x00, 0x48, 0x21, 0x06, 0x08,
-    0x29, 0xb2, 0x00, 0xa0, 0x87, 0xff, 0xff, 0xc2, 0x09, 0xfc, 0x82,
-    0x24, 0x01, 0x00, 0xbf, 0xff, 0xff, 0xff, 0xe0, 0x82, 0x08, 0x20,
-    0xa0, 0x00, 0x00, 0xbf, 0xff, 0xe0, 0x08, 0x48, 0x21, 0xfe, 0x08,
-    0x20, 0x01, 0x20, 0xe0, 0x00, 0x20, 0x0f, 0x42, 0x0a, 0x02, 0x82,
-    0x20, 0x00, 0x90, 0xe0, 0x00, 0x3f, 0xf8, 0x60, 0x83, 0xfe, 0x20,
-    0xa5, 0x48, 0x90, 0xbf, 0xff, 0xff, 0xff, 0x48, 0x20, 0x82, 0x08,
-    0x20, 0x00, 0x90, 0xbf, 0xff, 0xe0, 0x08, 0x42, 0x08, 0x20, 0x82,
-    0x20, 0x01, 0x20, 0xa0, 0x00, 0x35, 0x4f, 0x7f, 0xff, 0xff, 0xe0,
-    0xa0, 0x00, 0x00, 0xaa, 0xa0, 0x20, 0x08, 0x5f, 0xff, 0xff, 0xe8,
-    0x20, 0x00, 0x00, 0xa0, 0x00, 0x35, 0x4f, 0x50, 0x00, 0x00, 0x22,
-    0x3f, 0xff, 0xff, 0xab, 0x56, 0x20, 0x08, 0x70, 0x07, 0xc0, 0x20,
-    0x82, 0x00, 0x00, 0x20, 0x00, 0x35, 0x0f, 0xd0, 0x0c, 0x47, 0xa8,
-    0x22, 0x00, 0x00, 0x2d, 0x5a, 0xa0, 0x08, 0x90, 0x0f, 0xcc, 0xa2,
-    0x0a, 0x00, 0x00, 0x20, 0x00, 0x34, 0x08, 0x30, 0x10, 0x17, 0xa0,
-    0x82, 0x00, 0x00, 0x20, 0x00, 0x20, 0x0a, 0x10, 0x17, 0xd0, 0x28,
-    0x22, 0x00, 0x00, 0x20, 0x00, 0x35, 0x08, 0x90, 0x2c, 0x67, 0xa2,
-    0x0a, 0x00, 0x00, 0x20, 0x00, 0x20, 0x08, 0x30, 0x37, 0xdc, 0xa0,
-    0x82, 0x00, 0x00, 0x20, 0x00, 0x35, 0x4a, 0x17, 0xe0, 0x07, 0xa8,
-    0x22, 0x00, 0x00, 0x20, 0x00, 0x20, 0x08, 0x94, 0x57, 0xc0, 0x22,
-    0x0a, 0x00, 0x00, 0x20, 0x00, 0x20, 0x08, 0x37, 0xec, 0x40, 0x20,
-    0x83, 0xff, 0xff, 0xe0, 0x00, 0x20, 0x0a, 0x10, 0x27, 0xc0, 0x28,
-    0x20, 0x82, 0x08, 0x20, 0x00, 0x20, 0x08, 0x90, 0x10, 0x00, 0x22,
-    0x08, 0x20, 0x82, 0x20, 0x00, 0x3f, 0xf8, 0x30, 0x1f, 0xc0, 0x20,
-    0x82, 0x08, 0x20, 0xa0, 0x00, 0x20, 0x82, 0x10, 0x0c, 0x40, 0x28,
-    0x20, 0x82, 0x08, 0x3f, 0xff, 0xe8, 0x20, 0x90, 0x07, 0xc0, 0x22,
-    0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x30, 0x00, 0x00, 0x20,
-    0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x10, 0x00, 0x00, 0x28,
-    0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x9f, 0xff, 0xff, 0xe2,
-    0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20,
-    0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82,
-    0x42, 0x13, 0x18, 0xc7, 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
-    0x99, 0x34, 0xa5, 0x24, 0x29, 0x26, 0x38, 0xc5, 0x04, 0x00, 0x00,
-    0xa1, 0x14, 0x99, 0x27, 0x35, 0x29, 0x40, 0x26, 0x9c, 0x00, 0x00,
-    0xa1, 0x13, 0xa4, 0xe4, 0x25, 0x29, 0x30, 0xe4, 0xa4, 0x00, 0x00,
-    0xa1, 0x10, 0xa4, 0x24, 0x24, 0xc9, 0x09, 0x24, 0xa4, 0x00, 0x00,
-    0x5a, 0x13, 0x18, 0xc7, 0xa4, 0xc6, 0x70, 0xd4, 0x9c, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x03, 0xc0, 0x50, 0x84, 0x00, 0x00, 0x01, 0xc0, 0x02, 0x10, 0x20,
-    0x02, 0x12, 0x00, 0x48, 0xcb, 0x32, 0x22, 0x0c, 0x02, 0x38, 0x20,
-    0x03, 0x92, 0x50, 0x31, 0x2c, 0x49, 0x42, 0x12, 0x02, 0x10, 0xe0,
-    0x02, 0x12, 0x50, 0x31, 0xe8, 0x48, 0x82, 0x12, 0x02, 0x11, 0x20,
-    0x02, 0x16, 0x50, 0x49, 0x08, 0x49, 0x42, 0x12, 0x02, 0x15, 0x20,
-    0x02, 0x0a, 0x50, 0x84, 0xc8, 0x32, 0x21, 0xcc, 0x93, 0xc8, 0xe0,
-    0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
-    0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
 #endif /* XBITMAPS_H */

inc/xdefs.h

@@ -19,7 +19,7 @@
 #define WIN_MIN_HEIGHT 100
 #define DEF_BDRWIDE      2
 #define SCROLL_WIDTH	18
-#define WINDOW_NAME    "Medley (C) Copyright 1980-2001 Venue"
+#define WINDOW_NAME    "Medley Interlisp"
 #define ICON_NAME      "Medley"
 
 
@@ -49,8 +49,8 @@ extern volatile sig_atomic_t XNeedSignal;
     XLocked--;					\
   } while (0)
 #else
-#define XLOCK
-#define XUNLOCK(dsp)
+#define XLOCK do {} while (0)
+#define XUNLOCK(dsp) do {} while (0)
 #endif	/* LOCK_X_UPDATES */
 
 #endif /* XDEFS_H */

inc/xinitdefs.h

@@ -7,5 +7,5 @@ void lisp_Xexit(DspInterface dsp);
 void Xevent_before_raid(DspInterface dsp);
 void Xevent_after_raid(DspInterface dsp);
 void Open_Display(DspInterface dsp);
-DspInterface X_init(DspInterface dsp, LispPTR lispbitmap, int width_hint, int height_hint, int depth_hint);
+DspInterface X_init(DspInterface dsp, LispPTR lispbitmap, unsigned width_hint, unsigned height_hint, unsigned depth_hint);
 #endif

inc/xwinmandefs.h

@@ -3,7 +3,6 @@
 #include <X11/X.h>     /* for Window */
 #include <X11/Xlib.h>  /* for XButtonEvent */
 #include "devif.h"     /* for DspInterface */
-int bound(int a, int b, int c);
 void Set_BitGravity(XButtonEvent *event, DspInterface dsp, Window window, int grav);
 void enable_Xkeyboard(DspInterface dsp);
 void disable_Xkeyboard(DspInterface dsp);

src/allocmds.c

@@ -68,8 +68,6 @@ LispPTR initmdspage(LispPTR *base, DLword size, LispPTR prev)
 /* keeping top of previous MDS cell */
 
 {
-  extern DLword *MDStypetbl;
-
   int remain_size; /* (IREMAINDER WORDSPERPAGE SIZE) */
   short num_pages;
   int limit;
@@ -109,7 +107,7 @@ LispPTR initmdspage(LispPTR *base, DLword size, LispPTR prev)
 /*
                 Func name :	alloc_mdspage
 
-                        This version works only for KATANA-SUN
+                        This version works only for Maiko
 
                         Date :		January 13, 1987
                         Edited by :	Takeshi Shimizu
@@ -122,12 +120,6 @@ LispPTR initmdspage(LispPTR *base, DLword size, LispPTR prev)
 /**********************************************************************/
 
 LispPTR *alloc_mdspage(short int type) {
-  extern LispPTR *MDS_free_page_word; /* Free MDS page number */
-
-  extern DLword *Next_MDSpage; /* next vacant(new) MDS page */
-  extern LispPTR *Next_MDSpage_word;
-  extern LispPTR *Next_Array_word;
-
   LispPTR *ptr; /* points Top 32 bit of the MDS page */
   LispPTR next_page;