WIP still, trying for a fix

WIP still; now it looks like inlineC.h but it still fails
WIP: make variable types in simulate_unbind match OP_unbind
2026-03-16 14:57:20 +00:00 · 2021-05-24 12:26:31 -07:00 · 2021-05-15 16:10:06 -07:00 · 2021-05-15 12:21:06 -07:00
76 changed files with 2064 additions and 415 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,17 +21,14 @@ jobs:
        working-directory: bin
        run: ./makeright x

-#
-# Commented out because the RPi is not online at this time (6 July 2021)
-#
-#  build-pi:
-#    runs-on: [self-hosted, linux, ARM]
-#    if: ${{ github.repository == 'Interlisp/maiko' }}
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Build
-#        working-directory: bin
-#        run: ./makeright x
+  build-pi:
+    runs-on: [self-hosted, linux, ARM]
+    if: ${{ github.repository == 'Interlisp/maiko' }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build
+        working-directory: bin
+        run: ./makeright x

  build-cmake:
    runs-on: ${{ matrix.os }}
--- a/.github/workflows/buildDocker.yml
+++ b/.github/workflows/buildDocker.yml
@@ -1,84 +0,0 @@
-#  based on https://blog.oddbit.com/post/2020-09-25-building-multi-architecture-im/
---
-# Interlisp workflow to build a Docker Image that supports multiple architectures
-name: 'Build Maiko Docker image'
-
-# Run this workflow on push to master
-# Other branches can be added it needed. 
-on:
-  push:
-    branches:
-      - master
-
-#  Jobs that are run as part of this workflow.
-jobs:
-  # Job to build the docker image
-  # see: https://github.com/docker/build-push-action
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout the branch  
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      # Setup some environment variables
-      - name: Prepare
-        id: prep
-        run: |
-          # Name of the Docker Image. 
-          DOCKER_IMAGE=interlisp/${GITHUB_REPOSITORY#*/}
-          VERSION=latest
-          SHORTREF=${GITHUB_SHA::8}
-          ## Do we want to use tags and or versions 
-          # If this is git tag, use the tag name as a docker tag
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/v}
-          fi
-          TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}"
-          # If the VERSION looks like a version number, assume that
-          # this is the most recent version of the image and also
-          # tag it 'latest'.
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-            TAGS="$TAGS,${DOCKER_IMAGE}:latest"
-          fi
-          # Set output parameters.
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=docker_image::${DOCKER_IMAGE}
-          echo ::set-output name=build_time::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-      # Setup the Docker Machine Emulation environment.  
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
-        with:
-          platforms: all
-
-      # 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
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # Start the Docker Build using the Dockerfile in the repository we
-      # checked out.  
-      - name: Build
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          build-args: BUILD_DATE=${{ steps.prep.outputs.build_time }}
-          context: .
-          file: ./Dockerfile
-          # Platforms - Sepecify the platforms to include in the build
-          #  linux/amd64 -- Standard x86_64
-          #  linux/arm64 -- Apple M1
-          #  linux/arm/v7 -- Raspberry pi
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          # Push the result to DockerHub
-          push: true
-          # tags to assign to the Docker image
-          tags: ${{ steps.prep.outputs.tags }}
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 \#*#
 .DS_Store
 # build directories
-build/**
 *.386-x/**
 *.386/**
 *.ppc-x/**
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ OPTION(MAIKO_DISPLAY_X11 "Use X11 for display." ON)
 IF(MAIKO_DISPLAY_X11)
  FIND_PACKAGE(X11 REQUIRED)
  SET(MAIKO_DISPLAY_X11_DEFINITIONS
-    "-DXWINDOW -DLOCK_X_UPDATES"
+    "-DXWINDOW"
  )
  SET(MAIKO_DISPLAY_X11_LIBRARIES X11::X11)
  SET(MAIKO_DISPLAY_X11_SRCS
--- a/18
+++ b/18
@@ -1,18 +0,0 @@
-FROM ubuntu:focal
-ARG BUILD_DATE
-LABEL name="Maiko"
-LABEL description="Virtual machine for Interlisp Medley"
-LABEL url="https://github.com/Interlisp/maiko"
-LABEL build-time=$BUILD_DATE
-
-ARG TARGETPLATFORM
-
-RUN apt-get update && apt-get install -y make clang libx11-dev gcc x11vnc xvfb
-
-COPY --chown=nonroot:nonroot . /app/maiko
-RUN rm -rf /app/maiko/linux*
-
-WORKDIR /app/maiko/bin
-RUN ./makeright x
-
-RUN rm -rf /app/maiko/inc /app/maiko/include /app/maiko/src
--- a/bin/compile-flags
+++ b/bin/compile-flags
@@ -128,4 +128,5 @@ bitbltsub.c:#ifdef GETBASE
 testdisplay.c:#ifdef NOTUSED
 uraid.c:#ifdef ETHERINT
 bitblt.c:#ifndef COLOR
+bitbltsub.c:#ifndef prropstyle
 lispmap.h:#ifdef MEDLEY
--- a/bin/makefile-cygwin.x86_64-x
+++ b/bin/makefile-cygwin.x86_64-x
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
--- a/bin/makefile-darwin.386-x
+++ b/bin/makefile-darwin.386-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -I/opt/X11/include -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
--- a/bin/makefile-darwin.aarch64-x
+++ b/bin/makefile-darwin.aarch64-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -I/opt/X11/include -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2
--- a/bin/makefile-darwin.ppc-x
+++ b/bin/makefile-darwin.ppc-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -I/usr/X11/include -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -I/usr/X11/include -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
--- a/bin/makefile-darwin.x86_64-x
+++ b/bin/makefile-darwin.x86_64-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -I/opt/X11/include -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O1 -g
--- a/bin/makefile-freebsd.386-x
+++ b/bin/makefile-freebsd.386-x
@@ -13,10 +13,10 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -I/usr/local/include -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -I/usr/local/include -DXWINDOW

 # OPTFLAGS is normally -O2.
-OPTFLAGS = -O2 -g
+OPTFLAGS = -O1 -gdwarf-2
 DFLAGS = $(XFLAGS) -DRELEASE=351

 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
--- a/bin/makefile-freebsd.aarch64-x
+++ b/bin/makefile-freebsd.aarch64-x
@@ -1,27 +0,0 @@
-# Options for FreeBSD, ARMv7 and X-Windows
-
-CC = clang -m64 $(CLANG_CFLAGS)
-
-XFILES = $(OBJECTDIR)xmkicon.o \
-	$(OBJECTDIR)xbbt.o \
-	$(OBJECTDIR)dspif.o \
-	$(OBJECTDIR)xinit.o \
-	$(OBJECTDIR)xscroll.o \
-	$(OBJECTDIR)xcursor.o \
-	$(OBJECTDIR)xlspwin.o \
-	$(OBJECTDIR)xrdopt.o \
-	$(OBJECTDIR)xwinman.o
-
-
-XFLAGS = -I/usr/local/include -DXWINDOW -DLOCK_X_UPDATES
-
-# OPTFLAGS is normally -O2.
-OPTFLAGS = -O2 -g
-DFLAGS = $(XFLAGS) -DRELEASE=351
-
-LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
-LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
-
-OBJECTDIR = ../$(RELEASENAME)/
-
-default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
--- a/bin/makefile-freebsd.x86_64-x
+++ b/bin/makefile-freebsd.x86_64-x
@@ -1,27 +0,0 @@
-# Options for FreeBSD, Intel x86_64 and X-Windows
-
-CC = clang -m64 $(CLANG_CFLAGS)
-
-XFILES = $(OBJECTDIR)xmkicon.o \
-	$(OBJECTDIR)xbbt.o \
-	$(OBJECTDIR)dspif.o \
-	$(OBJECTDIR)xinit.o \
-	$(OBJECTDIR)xscroll.o \
-	$(OBJECTDIR)xcursor.o \
-	$(OBJECTDIR)xlspwin.o \
-	$(OBJECTDIR)xrdopt.o \
-	$(OBJECTDIR)xwinman.o
-
-
-XFLAGS = -I/usr/local/include -DXWINDOW -DLOCK_X_UPDATES
-
-# OPTFLAGS is normally -O2.
-OPTFLAGS = -O2 -g
-DFLAGS = $(XFLAGS) -DRELEASE=351
-
-LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
-LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
-
-OBJECTDIR = ../$(RELEASENAME)/
-
-default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
--- a/bin/makefile-init-darwin.386
+++ b/bin/makefile-init-darwin.386
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -I/opt/X11/include -DXWINDOW

 # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
 OPTFLAGS =  -O0 -g
--- a/bin/makefile-init-darwin.aarch64
+++ b/bin/makefile-init-darwin.aarch64
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
        $(OBJECTDIR)xwinman.o


-XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -I/opt/X11/include -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O0 -g3
--- a/bin/makefile-init-darwin.x86_64
+++ b/bin/makefile-init-darwin.x86_64
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -I/opt/X11/include -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -I/opt/X11/include -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O0 -g
--- a/bin/makefile-init-freebsd.386
+++ b/bin/makefile-init-freebsd.386
@@ -1,27 +0,0 @@
-# Options for FreeBSD, Intel 386/486 and X Windows
-
-CC = clang -m32 $(CLANG_CFLAGS)
-
-XFILES = $(OBJECTDIR)xmkicon.o \
-	$(OBJECTDIR)xbbt.o \
-	$(OBJECTDIR)dspif.o \
-	$(OBJECTDIR)xinit.o \
-	$(OBJECTDIR)xscroll.o \
-	$(OBJECTDIR)xcursor.o \
-	$(OBJECTDIR)xlspwin.o \
-	$(OBJECTDIR)xrdopt.o \
-	$(OBJECTDIR)xwinman.o
-
-
-XFLAGS = -I/usr/local/include -DXWINDOW -DLOCK_X_UPDATES
-
-# OPTFLAGS is normally -O0 for init
-OPTFLAGS = -O0 -g
-DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
-
-LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
-LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
-
-OBJECTDIR = ../$(RELEASENAME)/
-
-default	: ../$(OSARCHNAME)/ldeinit
--- a/bin/makefile-init-freebsd.aarch64
+++ b/bin/makefile-init-freebsd.aarch64
@@ -1,27 +0,0 @@
-# Options for FreeBSD, ARMv7 and X-Windows
-
-CC = clang -m64 $(CLANG_CFLAGS)
-
-XFILES = $(OBJECTDIR)xmkicon.o \
-	$(OBJECTDIR)xbbt.o \
-	$(OBJECTDIR)dspif.o \
-	$(OBJECTDIR)xinit.o \
-	$(OBJECTDIR)xscroll.o \
-	$(OBJECTDIR)xcursor.o \
-	$(OBJECTDIR)xlspwin.o \
-	$(OBJECTDIR)xrdopt.o \
-	$(OBJECTDIR)xwinman.o
-
-
-XFLAGS = -I/usr/local/include -DXWINDOW -DLOCK_X_UPDATES
-
-# OPTFLAGS is normally -O0 for init
-OPTFLAGS = -O0 -g
-DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
-
-LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
-LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
-
-OBJECTDIR = ../$(RELEASENAME)/
-
-default	: ../$(OSARCHNAME)/ldeinit
--- a/bin/makefile-init-freebsd.x86_64
+++ b/bin/makefile-init-freebsd.x86_64
@@ -1,27 +0,0 @@
-# Options for FreeBSD, Intel x86_64 and X-Windows
-
-CC = clang -m64 $(CLANG_CFLAGS)
-
-XFILES = $(OBJECTDIR)xmkicon.o \
-	$(OBJECTDIR)xbbt.o \
-	$(OBJECTDIR)dspif.o \
-	$(OBJECTDIR)xinit.o \
-	$(OBJECTDIR)xscroll.o \
-	$(OBJECTDIR)xcursor.o \
-	$(OBJECTDIR)xlspwin.o \
-	$(OBJECTDIR)xrdopt.o \
-	$(OBJECTDIR)xwinman.o
-
-
-XFLAGS = -I/usr/local/include -DXWINDOW -DLOCK_X_UPDATES
-
-# OPTFLAGS is normally -O0 for init
-OPTFLAGS = -O0 -g
-DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT
-
-LDFLAGS = -L/usr/local/lib -lX11 -lc -lm
-LDELDFLAGS =  -L/usr/local/lib -lX11 -lc -lm
-
-OBJECTDIR = ../$(RELEASENAME)/
-
-default	: ../$(OSARCHNAME)/ldeinit
--- a/bin/makefile-init-linux.x86_64
+++ b/bin/makefile-init-linux.x86_64
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
 OPTFLAGS =  -O0 -g
--- a/bin/makefile-init-sunos5.sparc
+++ b/bin/makefile-init-sunos5.sparc
@@ -30,7 +30,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o

-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -g for MAKEINIT, as it needs debugging often.
 OPTFLAGS = -g3 -O0
--- a/bin/makefile-linux.386-x
+++ b/bin/makefile-linux.386-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
--- a/bin/makefile-linux.aarch64-x
+++ b/bin/makefile-linux.aarch64-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o

-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
--- a/bin/makefile-linux.armv7l-x
+++ b/bin/makefile-linux.armv7l-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o

-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
--- a/bin/makefile-linux.x86_64-x
+++ b/bin/makefile-linux.x86_64-x
@@ -14,10 +14,10 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2.
-OPTFLAGS =  -O2 -g3
+OPTFLAGS =  -O0 -g3
 DFLAGS = $(XFLAGS) -DRELEASE=351

 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm
--- a/bin/makefile-openbsd.x86_64-x
+++ b/bin/makefile-openbsd.x86_64-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o


-XFLAGS = -I/usr/X11R6/include -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -I/usr/X11R6/include -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
--- a/bin/makefile-sunos5.386-x
+++ b/bin/makefile-sunos5.386-x
@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o

-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
--- a/bin/makefile-sunos5.i386-x
+++ b/bin/makefile-sunos5.i386-x
@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o

-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
--- a/bin/makefile-sunos5.sparc-x
+++ b/bin/makefile-sunos5.sparc-x
@@ -29,7 +29,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o

-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g3
--- a/bin/makefile-sunos5.x86_64-x
+++ b/bin/makefile-sunos5.x86_64-x
@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o

-XFLAGS = -DXWINDOW -DLOCK_X_UPDATES
+XFLAGS = -DXWINDOW

 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
--- a/inc/MyWindow.h
+++ b/inc/MyWindow.h
@@ -77,7 +77,7 @@ typedef struct
 						, White_Pixel ); \
 			XLOCK;					\
 			XFlush( display ); 	\
-			XUNLOCK( display );                 \
+			XUNLOCK;		\
 			(child_win)->parent = parent_win; \
 			if( (child_win)->after_create ) \
 			    ((child_win)->after_create)(parent_win,child_win);\
@@ -96,7 +96,7 @@ typedef struct
 					, (window)->width 					\
 					, (window)->height ); 				\
 			XFlush( display ); 							\
-			XUNLOCK( display );                               \
+			XUNLOCK;									\
 			if( (window)->after_resize ) 				\
 				((window)->after_resize)( window ); 	\
 		} \
@@ -106,7 +106,7 @@ typedef struct
 		XLOCK;													\
 		XDefineCursor( display, (window)->win, *(mycursor) ); \
 		XFlush( display ); 	 \
-		XUNLOCK( display );            \
+		XUNLOCK;										\
 		(window)->cursor = mycursor; \
 }

--- a/inc/bbtsubdefs.h
+++ b/inc/bbtsubdefs.h
@@ -1,19 +1,36 @@
 #ifndef BBTSUBDEFS_H
 #define BBTSUBDEFS_H 1

+/***** Don't use PixRect code on 386i for now *****/
+/***** -or on any machine that doesn't support it (HP, e.g.) *****/
+
 /********************************************************/
 /*                                                      */
-/*      Don Charnley's bitblt code                      */
+/*      prropstyle is DEFINED when we want to use       */
+/*      pixrect versions of the operations in this      */
+/*      file, and UNDEFINED, when we want to use        */
+/*      Don Charnley's bitblt code to do them.          */
 /*                                                      */
 /********************************************************/
 #include "lispemul.h" /* for LispPTR, DLword */

+#if defined(SUNDISPLAY) && \
+    !defined(NOPIXRECT) && \
+    !defined(NEWBITBLT)
+#define prropstyle 1
+#endif
+
 void bitbltsub(LispPTR *argv);
 LispPTR n_new_cursorin(DLword *baseaddr, int dx, int dy, int w, int h);
 LispPTR bitblt_bitmap(LispPTR *args);
 LispPTR bitshade_bitmap(LispPTR *args);
+#ifndef prropstyle
 void bltchar(LispPTR *args);
 void newbltchar(LispPTR *args);
+#else
+LispPTR bltchar(LispPTR *args);
+LispPTR newbltchar(LispPTR *args);
+#endif
 void ccfuncall(unsigned int atom_index, int argnum, int bytenum);
 void tedit_bltchar(LispPTR *args);

--- a/inc/bitblt.h
+++ b/inc/bitblt.h
@@ -54,6 +54,13 @@ extern int DisplayRasterWidth;
 #define ShowCursor { (currentdsp->mouse_visible)(IOPage68K->dlmousex, \
 												  IOPage68K->dlmousey); }

+#elif defined(SUNDISPLAY) && defined(OLD_CURSOR)
+extern struct winlock DisplayLockArea;
+#define	HideCursor	\
+	ioctl( LispWindowFd, WINLOCKSCREEN, &DisplayLockArea)
+
+#define ShowCursor \
+	ioctl( LispWindowFd, WINUNLOCKSCREEN, &DisplayLockArea)
 #else
 extern DLword *EmCursorX68K,*EmCursorY68K;
 #define	HideCursor	{ taking_mouse_down();}
--- a/inc/devif.h
+++ b/inc/devif.h
@@ -264,12 +264,11 @@ typedef struct


 #ifdef XWINDOW
-#define DefineCursor(dsp, window, mycursor)                     \
-  do {								\
-    XLOCK;                                                      \
-    XDefineCursor((dsp)->display_id, window, *(mycursor) );     \
-    XUNLOCK(dsp);                                               \
-  } while (0)
+#define DefineCursor(display, window, mycursor) { \
+	XLOCK;\
+	XDefineCursor( display, window, *(mycursor) );\
+	XUNLOCK;\
+}
 #endif /* XWINDOW */

 #define OUTER_SB_WIDTH(dsp) ((dsp)->ScrollBarWidth + 2*((dsp)->InternalBorderWidth))
--- a/inc/ldeXdefs.h
+++ b/inc/ldeXdefs.h
@@ -13,24 +13,23 @@
 /************************************************************************/

 #ifdef LOCK_X_UPDATES
-#define XLOCK do { XLocked++; } while (0)
-#define XUNLOCK(dsp)				\
-  do { 						\
-    if (XLocked == 1 && XNeedSignal)		\
+#define XLOCK { XLocked++; /* printf("L"); fflush(stdout);*/}
+#define XUNLOCK					\
+  { XLocked--;/* printf("U"); fflush(stdout);*/	\
+    if (XNeedSignal)				\
      {						\
 	XNeedSignal = 0;			\
-	getXsignaldata(dsp);			\
-      };					\
-    XLocked--;					\
-  } while (0)
+	kill(getpid(), SIGPOLL);		\
+      };						\
+  }
 #else
 #define XLOCK
 #define XUNLOCK
 #endif	/* LOCK_X_UPDATES */

-#include <signal.h>
-extern volatile sig_atomic_t XLocked;
-extern volatile sig_atomic_t XNeedSignal;
+extern int XLocked;
+extern int XNeedSignal;
+/* this is !0 if we're locked; it should be 0 or larger always */

 #endif

--- a/inc/mkcelldefs.h
+++ b/inc/mkcelldefs.h
@@ -3,4 +3,5 @@
 #include "lispemul.h" /* for LispPTR, DLword */
 LispPTR N_OP_createcell(register LispPTR tos);
 DLword *createcell68k(unsigned int type);
+LispPTR Create_n_Set_Cell(unsigned int type, LispPTR value);
 #endif
--- a/inc/return.h
+++ b/inc/return.h
@@ -35,7 +35,7 @@
 /* FAST case return use */
 #ifndef RESWAPPEDCODESTREAM
 #define FastRetCALL							\
-  do {									\
+  {									\
    /* Get IVar from Returnee's IVAR offset slot(BF) */ 			\
    IVar = Addr68k_from_LADDR(STK_OFFSET | GETWORD((DLword *)CURRENTFX -1)); \
    /* Get FuncObj from Returnee's FNHEAD slot in FX */ 			\
@@ -43,10 +43,10 @@
 		Addr68k_from_LADDR(FX_FNHEADER);	\
    /* Get PC from Returnee's pc slot in FX */ 				\
    PC = (ByteCode *)FuncObj + CURRENTFX->pc ; 				\
-  } while (0)
+  }
 #else
 #define FastRetCALL							\
-  do {									\
+  {									\
    /* Get IVar from Returnee's IVAR offset slot(BF) */ 			\
    IVar = Addr68k_from_LADDR(STK_OFFSET | GETWORD((DLword *)CURRENTFX -1)); \
    /* Get FuncObj from Returnee's FNHEAD slot in FX */ 			\
@@ -59,7 +59,7 @@
 	byte_swap_code_block(FuncObj);				\
 	FuncObj->byteswapped = 1;				\
      }								\
-  } while (0)
+  }
 #endif /* RESWAPPEDCODESTREAM */


--- a/inc/stack.h
+++ b/inc/stack.h
@@ -78,7 +78,7 @@ typedef struct fnhead {
 typedef struct frameex1 {
  unsigned flags : 3;
  unsigned fast : 1;
-  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned mvscase : 1; /* was not used, prev: This frame treats N-func */
  unsigned incall : 1;
  unsigned validnametable : 1;
  /* 0: look for FunctionHeader
@@ -109,7 +109,7 @@ typedef struct frameex1 {
 typedef struct frameex2 {
  unsigned flags : 3;
  unsigned fast : 1;
-  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned mvscase : 1; /* not used, prev: This frame treats N-func */
  unsigned incall : 1;
  unsigned validnametable : 1;
  /* 0: look for FunctionHeader
@@ -200,7 +200,7 @@ typedef struct frameex1 {
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
  unsigned incall : 1;
-  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned mvscase : 1; /* not used, prev: This frame treats N-func */
  unsigned fast : 1;
  unsigned flags : 3; /* hi word */

@@ -235,7 +235,7 @@ typedef struct frameex2 {
  /* 0: look for FunctionHeader
     1: look for NameTable on this FrameEx */
  unsigned incall : 1;
-  unsigned nil2 : 1; /* not used, prev: This frame treats N-func */
+  unsigned mvscase : 1; /* not used, prev: This frame treats N-func */
  unsigned fast : 1;
  unsigned flags : 3;

--- a/inc/testtooldefs.h
+++ b/inc/testtooldefs.h
@@ -33,7 +33,6 @@ LispPTR *MakeAtom68k(char *string);
 void GETTOPVAL(char *string);
 void all_stack_dump(DLword start, DLword end, DLword silent);
 void dtd_chain(DLword type);
-void check_dtd_chain(DLword type);
 void Trace_FNCall(int numargs, int atomindex, int arg1, LispPTR *tos);
 void Trace_APPLY(int atomindex);
 #endif
--- a/inc/tosfns.h
+++ b/inc/tosfns.h
@@ -223,10 +223,22 @@
    CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE);                           \
    PVARL = (DLword *)CSTKPTR;                                                         \
    {                                                                                  \
-      for (int pv = LOCFNCELL->pv; pv >= 0; pv--) {                                    \
-        const LispPTR unboundval = 0xffffffff;                                         \
+      register int result;                                                             \
+      result = LOCFNCELL->pv;                                                          \
+      if (result >= 0) {                                                               \
+        register LispPTR unboundval;                                                   \
+        unboundval = (LispPTR)0xffffffff;                                              \
        HARD_PUSH(unboundval);                                                         \
        HARD_PUSH(unboundval);                                                         \
+        if (result > 0) {                                                              \
+          HARD_PUSH(unboundval);                                                       \
+          HARD_PUSH(unboundval);                                                       \
+          result -= 1;                                                                 \
+          for (; --result >= 0;) {                                                     \
+            HARD_PUSH(unboundval);                                                     \
+            HARD_PUSH(unboundval);                                                     \
+          }                                                                            \
+        }                                                                              \
      }                                                                                \
    }                                                                                  \
    CSTKPTRL += 1;                                                                     \
@@ -279,10 +291,22 @@
    CSTKPTRL = (LispPTR *)(((DLword *)CSTKPTR) + FRAMESIZE);                           \
    PVARL = (DLword *)CSTKPTR;                                                         \
    {                                                                                  \
-      for (int pv = LOCFNCELL->pv; pv >= 0; pv--) {                                    \
-        const LispPTR unboundval = 0xffffffff;                                         \
+      register int result;                                                             \
+      result = LOCFNCELL->pv;                                                          \
+      if (result >= 0) {                                                               \
+        register LispPTR unboundval;                                                   \
+        unboundval = (LispPTR)0xffffffff;                                              \
        HARD_PUSH(unboundval);                                                         \
        HARD_PUSH(unboundval);                                                         \
+        if (result > 0) {                                                              \
+          HARD_PUSH(unboundval);                                                       \
+          HARD_PUSH(unboundval);                                                       \
+          result -= 1;                                                                 \
+          for (; --result >= 0;) {                                                     \
+            HARD_PUSH(unboundval);                                                     \
+            HARD_PUSH(unboundval);                                                     \
+          }                                                                            \
+        }                                                                              \
      }                                                                                \
    }                                                                                  \
    CSTKPTRL += 1;                                                                     \
--- a/inc/xcursordefs.h
+++ b/inc/xcursordefs.h
@@ -6,6 +6,6 @@
 #include "devif.h"     /* for DspInterface */
 void Init_XCursor(void);
 void Set_XCursor(int x, int y);
-void init_Xcursor(DspInterface dsp);
+void init_Xcursor(Display *display, Window window);
 void set_Xcursor(DspInterface dsp, const uint8_t *bitmap, int hotspot_x, int hotspot_y, Cursor *return_cursor, int from_lisp);
 #endif
--- a/inc/xdefs.h
+++ b/inc/xdefs.h
@@ -32,25 +32,22 @@

 #include <unistd.h>
 #include <signal.h>
-#include "xwinmandefs.h"
-
+extern int XLocked;
+extern int XNeedSignal;
 /* this is !0 if we're locked; it should be 0 or larger always */
-extern volatile sig_atomic_t XLocked;
-extern volatile sig_atomic_t XNeedSignal;

-#define XLOCK do { XLocked++; } while (0)
-#define XUNLOCK(dsp)				\
-  do { 						\
-    if (XLocked == 1 && XNeedSignal)		\
+#define XLOCK do { XLocked++; /* printf("L"); fflush(stdout);*/} while (0)
+#define XUNLOCK					\
+  do { XLocked--;/* printf("U"); fflush(stdout);*/	\
+    if (XNeedSignal)				\
      {						\
 	XNeedSignal = 0;			\
-	getXsignaldata(dsp);			\
+	kill(getpid(), SIGPOLL);		\
      };					\
-    XLocked--;					\
  } while (0)
 #else
 #define XLOCK
-#define XUNLOCK(dsp)
+#define XUNLOCK
 #endif	/* LOCK_X_UPDATES */

 #endif /* XDEFS_H */
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -37,6 +37,12 @@
 #include "xdefs.h"
 #endif /* XWINDOW */

+#ifdef SUNDISPLAY
+#ifndef NOPIXRECT
+#include <sunwindow/window_hs.h>
+#include <sunwindow/win_ioctl.h>
+#endif /* NOPIXRECT */
+#endif /* SUNDISPLAY */

 #include "lispemul.h"
 #include "lspglob.h"
@@ -81,8 +87,10 @@ extern int  kbd_for_makeinit;
  };
 #endif

+#if !defined(SUNDISPLAY)
 #include "devif.h"
 extern DspInterface currentdsp;
+#endif /* SUNDISPLAY */

 #ifdef COLOR
 extern int MonoOrColor;
@@ -476,7 +484,9 @@ do_it_now:
 #endif

 #ifdef XWINDOW
+  XLOCK;
  if (in_display_segment(dstbase)) flush_display_region(dx, dty, w, h);
+  XUNLOCK;
 #endif /* XWINDOW */

 #ifdef DOS
@@ -831,7 +841,9 @@ do_it_now:
 #endif

 #ifdef XWINDOW
+  XLOCK;
  if (in_display_segment(dstbase)) flush_display_region(dlx, dty, width, height);
+  XUNLOCK;
 #endif /* XWINDOW */

 #ifdef DOS
@@ -1078,7 +1090,9 @@ do_it_now:
 #endif

 #ifdef XWINDOW
+  XLOCK;
  if (in_display_segment(dstbase)) flush_display_region(left, dty, width, height);
+  XUNLOCK;
 #endif /* XWINDOW */

 #ifdef DOS
@@ -1130,6 +1144,7 @@ bad_arg:
 /*                                                                      */
 /*                                                                      */
 /************************************************************************/
+#ifndef prropstyle
 /********************************************************/
 /*             Non-PIXRECT version of the code          */
 /********************************************************/
@@ -1207,7 +1222,9 @@ void bltchar(LispPTR *args)
 #endif

 #ifdef XWINDOW
+  XLOCK;
  if (in_display_segment(dstbase)) flush_display_lineregion(dx, dstbase, w, h);
+  XUNLOCK;
 #endif /* XWINDOW */

 #ifdef DOS
@@ -1221,6 +1238,100 @@ void bltchar(LispPTR *args)
  UNLOCKSCREEN;
 }

+#else
+/* prropstyle */
+
+LispPTR bltchar(LispPTR *args)
+/*      args[0] :       PILOTBBT
+ *      args[1] :       DISPLAYDATA
+ *      args[2] :       CHAR8CODE
+ *      args[3] :       CURX
+ *      args[4] :       LEFT
+ *      args[5] :       RIGHT
+ */
+{
+  register PILOTBBT *pbt;
+  register DISPLAYDATA *dspdata;
+  int x, y, destbpl, srcebpl, srcebit, distance;
+  int base;
+  register int displayflg;
+  unsigned int pix_op;
+  DLword *dstbase;
+
+  pbt = (PILOTBBT *)Addr68k_from_LADDR(((BLTC *)args)->pilotbbt);
+  dspdata = (DISPLAYDATA *)Addr68k_from_LADDR(((BLTC *)args)->displaydata);
+
+  (mpr_d(SrcePixRect))->md_image =
+      (short *)Addr68k_from_LADDR(VAG2(pbt->pbtsourcehi, pbt->pbtsourcelo));
+
+  dstbase = (mpr_d(DestPixRect))->md_image =
+      (short *)Addr68k_from_LADDR(VAG2(pbt->pbtdesthi, pbt->pbtdestlo));
+
+  SrcePixRect->pr_width = srcebpl = abs(pbt->pbtsourcebpl);
+  DestPixRect->pr_width = destbpl = abs(pbt->pbtdestbpl);
+  SrcePixRect->pr_height = DestPixRect->pr_height = pbt->pbtheight;
+
+  mpr_mdlinebytes(DestPixRect) = (destbpl + 7) >> 3;
+  mpr_mdlinebytes(SrcePixRect) = (srcebpl + 7) >> 3;
+
+  base = GETWORD(Addr68k_from_LADDR(dspdata->ddoffsetscache + ((BLTC *)args)->char8code));
+  srcebit = base + ((BLTC *)args)->left - ((BLTC *)args)->curx;
+
+#ifdef REALCURSOR
+  /* if displayflg != 0 then source or destination is DisplayBitMap
+   * Now we consider about only destination
+   */
+  displayflg = old_cursorin(pbt->pbtdesthi, pbt->pbtdestlo, ((BLTC *)args)->left, (((BLTC *)args)->right - ((BLTC *)args)->left),
+                            pbt->pbtheight, y, pbt->pbtbackward);
+#endif /* REALCURSOR */
+
+  /**** for DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG *****/
+  /*      displayflg = T;                                         */
+  /**** for DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG DEBUG *****/
+
+  pix_op = PixOperation(pbt->pbtsourcetype, pbt->pbtoperation);
+
+  LOCKSCREEN;
+
+#ifdef REALCURSOR
+  if (displayflg) HideCursor;
+#endif /* REALCURSOR */
+
+  if (pr_rop(DestPixRect, ((BLTC *)args)->left, 0, (((BLTC *)args)->right - ((BLTC *)args)->left), pbt->pbtheight, pix_op,
+             SrcePixRect, srcebit, 0) != 0)
+    error("pilotbitblt: pr_rop failed\n");
+
+#ifdef DISPLAYBUFFER
+#ifdef COLOR
+  if (MonoOrColor == MONO_SCREEN)
+#endif /* COLOR */
+
+    if (in_display_segment(dstbase)) {
+      /*          DBPRINT(("bltchar pix:  x %x, y %d, w %d, h %d.\n", ((BLTC *)args)->left, dstbase,
+       * (((BLTC *)args)->right - ((BLTC *)args)->left),pbt->pbtheight));
+      */
+      flush_display_lineregion(((BLTC *)args)->left, dstbase, (((BLTC *)args)->right - ((BLTC *)args)->left), pbt->pbtheight);
+    }
+#endif
+
+#ifdef XWINDOW
+  XLOCK;
+  if (in_display_segment(dstbase))
+    flush_display_lineregion(((BLTC *)args)->left, dstbase, (((BLTC *)args)->right - ((BLTC *)args)->left), pbt->pbtheight);
+  XUNLOCK;
+#endif /* XWINDOW */
+
+#ifdef DOS
+  if (in_display_segment(dstbase)) flush_display_lineregion(dx, dstbase, w, h);
+#endif /* DOS */
+
+#ifdef REALCURSOR
+  if (displayflg) ShowCursor;
+#endif /* REALCURSOR */
+
+  ScreenLocked = NIL;
+}
+#endif

 /************************************************************************/
 /*                                                                      */
@@ -1307,6 +1418,7 @@ LispPTR BLTCHAR_index;       /* Atom # for \PUNTBLTCHAR punt fn */
 LispPTR TEDIT_BLTCHAR_index; /* if NIL ,TEDIT is not yet loaded */


+#ifndef prropstyle

 /************************************************************************/
 /*                                                                      */
@@ -1435,6 +1547,150 @@ void newbltchar(LispPTR *args) {

 } /* end of newbltchar */

+#else /* prropstyle */
+
+/************************************************************************/
+/*                                                                      */
+/*                          n e w b l t c h a r                                 */
+/*                           (PIXRECT version)                          */
+/*                                                                      */
+/************************************************************************/
+
+LispPTR newbltchar(LispPTR *args) {
+  register DISPLAYDATA *displaydata68k;
+
+  register int right, left, curx;
+  register PILOTBBT *pbt;
+  register int lmargin, rmargin, xoff;
+  int displayflg; /* T if cursor needs to be taken down */
+  displaydata68k = (DISPLAYDATA *)Addr68k_from_LADDR(((BLTARG *)args)->displaydata);
+
+  if ((displaydata68k->ddcharset & 0xFFFF) != ((BLTARG *)args)->charset) {
+    /* Currently, this has BUG, so I can't call it */
+    /*if(changecharset_display(displaydata68k,((BLTARG *)args)->charset) ==-1)*/
+    { PUNT_TO_BLTCHAR; }
+  }
+
+  if (displaydata68k->ddslowprintingcase) { PUNT_TO_BLTCHAR; /** \SLOWBLTCHAR--return;**/ }
+
+  FGetNum(displaydata68k->ddxposition, curx);
+  FGetNum(displaydata68k->ddrightmargin, rmargin);
+  FGetNum(displaydata68k->ddleftmargin, lmargin);
+  FGetNum(displaydata68k->ddxoffset, xoff);
+
+  right =
+      curx +
+      GETWORD((DLword *)Addr68k_from_LADDR(displaydata68k->ddcharimagewidths + ((BLTARG *)args)->char8code));
+
+  if ((right > rmargin) && (curx > lmargin)) PUNT_TO_BLTCHAR;
+  if (((BLTARG *)args)->displaystream != *TOPWDS68k) PUNT_TO_BLTCHAR;
+  {
+    register int newpos;
+    newpos = curx +
+             GETWORD((DLword *)Addr68k_from_LADDR(displaydata68k->ddwidthscache + ((BLTARG *)args)->char8code));
+
+    if ((0 <= newpos) && (newpos < 65536))
+      (displaydata68k->ddxposition) = (LispPTR)(S_POSITIVE | newpos);
+    else if (-65537 < newpos)
+      (displaydata68k->ddxposition) = (LispPTR)(S_NEGATIVE | (0xffff & newpos));
+    else {
+      PUNT_TO_BLTCHAR;
+    }
+  }
+
+  curx += xoff;
+  right += xoff;
+  if (right > (int)(displaydata68k->ddclippingright)) right = displaydata68k->ddclippingright;
+
+  if (curx > (int)(displaydata68k->ddclippingleft))
+    left = curx;
+  else
+    left = displaydata68k->ddclippingleft;
+
+  if (left < right) {
+    pbt = (PILOTBBT *)Addr68k_from_LADDR(displaydata68k->ddpilotbbt);
+    if (pbt->pbtheight != 0) {
+      /****** OLD bltchar *****/
+      register int destbpl, srcebpl, sourcebit;
+      DLword *dstbase;
+      int base, y;
+
+      (mpr_d(SrcePixRect))->md_image =
+          (short *)Addr68k_from_LADDR(VAG2(pbt->pbtsourcehi, pbt->pbtsourcelo));
+
+      dstbase = (mpr_d(DestPixRect))->md_image =
+          (short *)Addr68k_from_LADDR(VAG2(pbt->pbtdesthi, pbt->pbtdestlo));
+
+      SrcePixRect->pr_width = srcebpl = abs(pbt->pbtsourcebpl);
+      DestPixRect->pr_width = destbpl = abs(pbt->pbtdestbpl);
+      SrcePixRect->pr_height = DestPixRect->pr_height = pbt->pbtheight;
+
+      mpr_mdlinebytes(DestPixRect) = (destbpl + 7) >> 3;
+      mpr_mdlinebytes(SrcePixRect) = (srcebpl + 7) >> 3;
+
+      base = GETBASE(Addr68k_from_LADDR(displaydata68k->ddoffsetscache), ((BLTARG *)args)->char8code);
+      sourcebit = base + left - curx;
+
+      LOCKSCREEN;
+
+#ifdef SUNDISPLAY
+      if (displayflg = old_cursorin(pbt->pbtdesthi, pbt->pbtdestlo, left, (right - left),
+                                    pbt->pbtheight, y, pbt->pbtbackward)) {
+        HideCursor;
+        if (pr_rop(DestPixRect, left, 0, (right - left), pbt->pbtheight,
+                   PixOperation(pbt->pbtsourcetype, pbt->pbtoperation), SrcePixRect, sourcebit,
+                   0) != 0)
+          error("pilotbitblt: pr_rop failed\n");
+/* Save SHOWCURSOR 'til after paint to screen */
+#ifndef DISPLAYBUFFER
+        ShowCursor;
+#endif
+      } /* display case */
+      else {
+        if (pr_rop(DestPixRect, left, 0, (right - left), pbt->pbtheight,
+                   PixOperation(pbt->pbtsourcetype, pbt->pbtoperation), SrcePixRect, sourcebit,
+                   0) != 0)
+          error("pilotbitblt: pr_rop failed\n");
+
+      } /* else */
+
+#ifdef DISPLAYBUFFER
+#ifdef COLOR
+      if (MonoOrColor == MONO_SCREEN)
+#endif /* COLOR */
+
+        if (in_display_segment(dstbase)) {
+          /*               DBPRINT(("newbltchar:  x %d, y 0x%x, w %d, h %d.\n", left, dstbase,
+           * (right - left), pbt->pbtheight)); */
+
+          flush_display_lineregion(left, dstbase, (right - left), pbt->pbtheight);
+          if (displayflg) ShowCursor; /* because hide is done earlier */
+        }
+#endif
+#endif /* SUNDISPLAY */
+
+#ifdef XWINDOW
+      if (pr_rop(DestPixRect, left, 0, (right - left), pbt->pbtheight,
+                 PixOperation(pbt->pbtsourcetype, pbt->pbtoperation), SrcePixRect, sourcebit,
+                 0) != 0)
+        error("pilotbitblt: pr_rop failed\n");
+
+      if (in_display_segment(dstbase))
+        flush_display_lineregion(left, dstbase, (right - left), pbt->pbtheight);
+#endif /* XWINDOW */
+
+#ifdef DOS
+      if (in_display_segment(dstbase)) flush_display_lineregion(dx, dstbase, w, h);
+      if (displayflg) ShowCursor;
+#endif /* DOS */
+
+      ScreenLocked = NIL;
+
+      /****** OLD bltchar *****/
+    }
+  }
+} /* newbltchar */
+#endif

 /******************************************************************/
 #ifndef BYTESWAP
@@ -1732,6 +1988,7 @@ void ccfuncall(register unsigned int atom_index, register int argnum, register i
 /*                                                              */
 /****************************************************************/

+#ifndef prropstyle
 /***************************/
 /*   Non-PIXRECT version   */
 /***************************/
@@ -1789,6 +2046,67 @@ void tedit_bltchar(LispPTR *args)
 #undef backwardflg

 } /* end tedit_bltchar */
+#else
+
+/* pr_op style */
+/**********************/
+/*   PIXRECT version  */
+/**********************/
+
+void tedit_bltchar(LispPTR *args)
+{
+  register DISPLAYDATA *displaydata68k;
+  register int left, right;
+  register PILOTBBT *pbt;
+  register int imagewidth, newx;
+  register displayflg;
+
+  displaydata68k = (DISPLAYDATA *)Addr68k_from_LADDR(((TBLTARG *)args)->displaydata);
+  if (displaydata68k->ddcharset != ((TBLTARG *)args)->charset) {
+    /**if(changecharset_display(displaydata68k, ((TBLTARG *)args)->charset)== -1)**/
+    { PUNT_TO_TEDIT_BLTCHAR; }
+  }
+  imagewidth = *((DLword *)Addr68k_from_LADDR(displaydata68k->ddcharimagewidths + ((TBLTARG *)args)->char8code));
+  newx = ((TBLTARG *)args)->current_x + imagewidth;
+  left = IMAX(0, ((TBLTARG *)args)->current_x);
+  right = IMIN(newx, ((TBLTARG *)args)->clipright);
+  LOCKSCREEN;
+
+  if (left < right) {
+    pbt = (PILOTBBT *)Addr68k_from_LADDR(displaydata68k->ddpilotbbt);
+    if (pbt->pbtheight) {
+      (mpr_d(SrcePixRect))->md_image =
+          (short *)Addr68k_from_LADDR(VAG2(pbt->pbtsourcehi, pbt->pbtsourcelo));
+
+      (mpr_d(DestPixRect))->md_image =
+          (short *)Addr68k_from_LADDR(VAG2(pbt->pbtdesthi, pbt->pbtdestlo));
+      {
+        register int srcebpl, destbpl;
+        SrcePixRect->pr_width = srcebpl = abs(pbt->pbtsourcebpl);
+        DestPixRect->pr_width = destbpl = abs(pbt->pbtdestbpl);
+        SrcePixRect->pr_height = DestPixRect->pr_height = pbt->pbtheight;
+
+        mpr_mdlinebytes(DestPixRect) = (destbpl + 7) >> 3;
+        mpr_mdlinebytes(SrcePixRect) = (srcebpl + 7) >> 3;
+      }
+
+      pbt->pbtwidth = IMIN(imagewidth, (right - left));
+      pbt->pbtsourcebit =
+          GETBASE(Addr68k_from_LADDR(displaydata68k->ddoffsetscache), ((TBLTARG *)args)->char8code);
+
+      if (pr_rop(DestPixRect, left, 0, pbt->pbtwidth, pbt->pbtheight,
+                 PixOperation(pbt->pbtsourcetype, pbt->pbtoperation), SrcePixRect,
+                 pbt->pbtsourcebit, 0) != 0)
+        error("pilotbitblt: pr_rop failed\n");
+
+    } /* if pbt->pbtheight */
+  }   /* if left<right */
+
+  UNLOCKSCREEN;
+
+} /* end tedit_bltchar */
+
+#endif

 #if defined(REALCURSOR) || defined(SUNDISPLAY)
 #ifndef COLOR
--- a/src/bitblt.c
+++ b/src/bitblt.c
@@ -12,6 +12,16 @@

 #include <stdio.h>

+#ifdef SUNDISPLAY
+#include <sunwindow/window_hs.h>
+#include <sunwindow/win_ioctl.h>
+
+#include <suntool/sunview.h>
+#include <sunwindow/cms_mono.h>
+#include <suntool/canvas.h>
+#include <sys/ioctl.h>
+#include <signal.h>
+#endif

 #ifdef XWINDOW
 #define DISPLAYBUFFER
@@ -117,14 +127,25 @@ LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl,int tos)
  num_gray = ((TEXTUREBBT *)pbt)->pbtgrayheightlessone + 1;
  curr_gray_line = ((TEXTUREBBT *)pbt)->pbtgrayoffset;

-#if   DOS
+#ifdef SUNDISPLAY
+  if (displayflg) HideCursor;
+#elif DOS
  if (displayflg) (currentdsp->mouse_invisible)(currentdsp, IOPage68K);
  ;
 #endif /* SUNDISPLAY / DOS */

  new_bitblt_code

-#if   DOS
+#ifdef SUNDISPLAY
+#ifdef DISPLAYBUFFER
+#ifdef COLOR
+      if (MonoOrColor == MONO_SCREEN)
+#endif /* COLOR */
+
+          if (in_display_segment(dstbase)) flush_display_lineregion(dx, dstbase, w, h);
+#endif
+  if (displayflg) ShowCursor;
+#elif DOS
      flush_display_lineregion(dx, dstbase, w, h);
  if (displayflg) (currentdsp->mouse_visible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
 #endif /* SUNDISPLAY / DOS */
--- a/src/draw.c
+++ b/src/draw.c
@@ -20,6 +20,11 @@
 #include <stdio.h>
 #include <stdlib.h>

+#ifdef SUNDISPLAY
+#include <sys/ioctl.h>
+#include <sunwindow/window_hs.h>
+#include <sunwindow/win_ioctl.h>
+#endif

 #include "lispemul.h"
 #include "lspglob.h"
@@ -128,6 +133,17 @@ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int
  if (MonoOrColor == MONO_SCREEN)
 #endif /* COLOR */

+#ifdef SUNDISPLAY
+#ifndef DISPLAYBUFFER
+    HideCursor; /** Figure out how to be smart later **/
+#else           /* DISPLAYBUFFER */
+#ifndef OLD_CURSOR
+    HideCursor;
+#endif /* OLD_CURSOR */
+
+#endif /* DISPLAYBUFFER */
+
+#endif /* SUNDISPLAY */

  delta &= 0xFFFF;
  op &= 3;
@@ -261,6 +277,17 @@ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int
  if (MonoOrColor == MONO_SCREEN)
 #endif /* COLOR */

+#ifdef SUNDISPLAY
+#ifndef DISPLAYBUFFER
+    ShowCursor; /** figure how to be smart later **/
+#else
+#ifndef OLD_CURSOR
+    ShowCursor;
+#endif /* OLD_CURSOR */
+
+#endif /* DISPLAYBUFFER */
+
+#endif /* SUNDISPLAY */

 #ifdef DISPLAYBUFFER
 #ifdef COLOR
@@ -277,6 +304,9 @@ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int
        ((int)(temp_e = (DLword *)(dataptr - DisplayRegion68k)) >= 0) &&
        ((DLword *)dataptr < DisplayRegion68k_end_addr)) {
      int start_x, start_y, end_x, end_y, w, h;
+#if defined(SUNDISPLAY) && defined(OLD_CURSOR)
+      int displayflg;
+#endif

      start_y = (int)temp_s / DisplayRasterWidth;
      start_x = ((int)temp_s % DisplayRasterWidth) * BITSPER_DLWORD;
@@ -290,6 +320,18 @@ int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int
      if (start_x > end_x) start_x = end_x;
      if (start_y > end_y) start_y = end_y;

+#if defined(SUNDISPLAY) && !defined(BYTESWAP)
+#ifdef OLD_CURSOR
+      if ((displayflg = n_new_cursorin_CG6(start_x, start_y, w, h))) HideCursor;
+#endif /* OLD_CURSOR */
+
+      pr_rop(ColorDisplayPixrect, start_x, start_y, w, h, PIX_SRC, DisplayRegionPixrect, start_x,
+             start_y);
+#ifdef OLD_CURSOR
+      if (displayflg) ShowCursor;
+#endif /* OLD_CURSOR */
+
+#endif /* SUNDISPLAY */

 #if defined(XWINDOW) || defined(BYTESWAP)
      flush_display_region(start_x, start_y, w, h);
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -53,6 +53,9 @@
 #include "commondefs.h"
 #include "ufsdefs.h"

+#ifdef GCC386
+#include "inlnPS2.h"
+#endif /* GCC386 */

 extern int *Lisp_errno;
 extern int Dummy_errno;
--- a/src/dspsubrs.c
+++ b/src/dspsubrs.c
@@ -12,6 +12,9 @@
 #include "version.h"

 #include <stdio.h>
+#ifdef SUNDISPLAY
+#include <sunwindow/window_hs.h>
+#endif

 #include "lispemul.h"
 #include "lsptypes.h"
@@ -65,7 +68,9 @@ void DSP_showdisplay(LispPTR *args)
 LispPTR DSP_VideoColor(LispPTR *args) /* args[0] :	black flag	*/
 {
  int invert;
-#if   defined(XWINDOW)
+#ifdef SUNDISPLAY
+  return NIL;
+#elif defined(XWINDOW)
  invert = args[0] & 0xFFFF;
  lisp_Xvideocolor(invert);
  if (invert)
@@ -94,7 +99,50 @@ void DSP_Cursor(LispPTR *args, int argnum)
  extern int ScreenLocked;
  extern DLword *EmCursorX68K, *EmCursorY68K;
  extern int LastCursorX, LastCursorY;
+#if defined(SUNDISPLAY) && !defined(OLD_CURSOR)
+  static int Init = T;
+#endif

+#ifdef SUNDISPLAY
+  if (argnum == 2) {
+    CurrentCursor.cur_xhot = args[0] & 0xffff;
+    CurrentCursor.cur_yhot = args[1] & 0xffff;
+  };
+
+#ifdef OLD_CURSOR
+  win_setcursor(LispWindowFd, &CurrentCursor);
+#else
+#ifndef INIT
+  ScreenLocked = T;
+  if (!Init) {
+    taking_mouse_down();
+    taking_mouse_up(*EmCursorX68K, *EmCursorY68K);
+  } else {
+    Init = NIL;
+    cursor_hidden_bitmap(0, 0);
+    taking_mouse_up(0, 0);
+    *EmCursorX68K = LastCursorX = 0;
+    *EmCursorY68K = LastCursorY = 0;
+  }
+
+  ScreenLocked = NIL;
+#else
+  /* Init specific lde only */
+  ScreenLocked = T;
+  if (!Init) {
+    taking_mouse_down();
+    taking_mouse_up(0, 0);
+  } else {
+    Init = NIL;
+    cursor_hidden_bitmap(0, 0);
+    taking_mouse_up(0, 0);
+  }
+
+  ScreenLocked = NIL;
+#endif /* INIT */
+
+#endif
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  /* For X-Windows, set the cursor to the given location. */
@@ -113,6 +161,32 @@ void DSP_Cursor(LispPTR *args, int argnum)
  */
 void DSP_SetMousePos(register LispPTR *args)
 {
+#ifdef SUNDISPLAY
+#ifdef OLD_CURSOR
+  register int x, y;
+  x = GetSmalldata(args[0]);
+  y = GetSmalldata(args[1]); /* debug */
+  win_setmouseposition(LispWindowFd, GetSmalldata(args[0]), GetSmalldata(args[1]));
+#else
+  extern int ScreenLocked;
+  extern DLword *EmCursorX68K, *EmCursorY68K, *EmMouseX68K, *EmMouseY68K;
+  register int x, y;
+  ScreenLocked = T;
+  x = GetSmalldata(args[0]);
+  y = GetSmalldata(args[1]);
+  /* for Suntool's invisible cursor */
+  win_setmouseposition(LispWindowFd, x, y);
+  /* for REAL cursor image */
+  taking_mouse_down();
+  taking_mouse_up(x, y);
+
+#ifndef INIT
+  *EmMouseX68K = x;
+  *EmMouseY68K = y;
+#endif
+  ScreenLocked = NIL;
+#endif
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  if (Mouse_Included)
@@ -177,6 +251,25 @@ void flip_cursor() {

 #endif

+#ifdef SUNDISPLAY
+#ifdef OLD_CURSOR
+
+  win_setcursor(LispWindowFd, &CurrentCursor);
+#else
+  ScreenLocked = T;
+  taking_mouse_down();
+#ifndef INIT
+  taking_mouse_up(*EmCursorX68K, *EmCursorY68K);
+#else
+  if (!for_makeinit)
+    taking_mouse_up(*EmCursorX68K, *EmCursorY68K);
+  else
+    taking_mouse_up(0, 0);
+#endif /* INIT */
+
+  ScreenLocked = NIL;
+#endif
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  /* JDS 011213: 15- cur y, as function does same! */
--- a/src/fvar.c
+++ b/src/fvar.c
@@ -24,6 +24,9 @@
 #include "commondefs.h"
 #include "gchtfinddefs.h"

+#ifdef GCC386
+#include "inlnPS2.h"
+#endif

 #define MaskShift(x) (((x) << 16) & SEGMASK)

--- a/src/gc2.c
+++ b/src/gc2.c
@@ -34,6 +34,9 @@
 #include "gc2defs.h"
 #include "gcscandefs.h"

+#ifdef GCC386
+#include "inlnPS2.h"
+#endif /* GCC386 */

 /**********************************************************************/
 /*
--- a/src/gcmain3.c
+++ b/src/gcmain3.c
@@ -52,6 +52,9 @@
 #include "gcrcelldefs.h"
 #include "gcscandefs.h"

+#ifdef GCC386
+#include "inlnPS2.h"
+#endif

 #define WORDSPERCELL 2
 #define MAXHTCNT 63
@@ -96,6 +99,203 @@
 #define STKREFBIT 0x200
 #endif /* BIGVM */

+#ifdef GCC386
+/* byte-swapped, 386 assembler version */
+LispPTR gcmapscan() {
+  volatile DLword probe;
+  volatile DLword *entry;
+  volatile DLword offset;
+  volatile LispPTR ptr;
+
+  asm volatile(
+      " \n\
+	movl $32768,%%edi	/ probe = HTSIZE.			\n\
+	.align 4							\n\
+nextentry:			/ nextentry:				\n\
+	decl %%edi							\n\
+	js returNIL							\n\
+	leal 0(,%%edi,2),%%esi						\n\
+	addl HTmain,%%esi	/htlptr = (struct htlinkptr *)(HTmain+probe);	\n\
+	.align 4							\n\
+scanloop:								\n\
+	movl %%esi,%%edx						\n\
+	xorb $2,%%dl							\n\
+	movzwl (%%edx),%%eax	/ contents = ((struct htlinkptr *)WORDPTR(htlptr))->contents	\n\
+	testl %%eax,%%eax	/ if (contents && 			\n\
+	je scanbot							\n\
+	testb $1,%%al							\n\
+	jne scanok							\n\
+	testb $254,%%ah							\n\
+	jne scanbot							\n\
+scanok:									\n\
+	jmp scandone							\n\
+	.align 4							\n\
+scanbot:								\n\
+	addl $-2,%%esi		/ end of while loop.			\n\
+	decl %%edi							\n\
+	jns scanloop							\n\
+	jmp returNIL							\n\
+									\n\
+									\n\
+scandone:								\n\
+	movl %%edx,%0	/ entry = (DLword *) HTmain + probe.		\n\
+retry:	/ retry:							\n\
+	movl %0,%%ecx							\n\
+	movzwl (%%ecx),%%eax						\n\
+	testb $1,%%al		/ if HENTRY->collision,			\n\
+	je nocollision							\n\
+	xorl %%esi,%%esi		/ prev = 0			\n\
+	andl $65534,%%eax						\n\
+linkloop:		// linkloop:					\n\
+	leal 0(,%%eax,2),%%ecx						\n\
+	addl HTcoll,%%ecx						\n\
+	movw 2(%%ecx),%%ax	/ offset = ((struct htcoll *)link)->free_ptr;	\n\
+	testb $254,%%ah		/ if StkCountIsZero(offset)		\n\
+	jne stknz							\n\
+	sall $15,%%eax		/	, (probe << 1));		\n\
+	andl $16711680,%%eax						\n\
+	leal 0(,%%edi,2),%%edx						\n\
+	orl %%eax,%%edx							\n\
+	movl %%edx,%2	/ to ptr.					\n\
+	testl %%esi,%%esi		/ DelLink.  if (prev != 0)	\n\
+	je prevZ							\n\
+	leal 2(%%esi),%%edx	/ GETWORD((DLword *)prev + 1) = GETWORD((DLword *)link + 1)	\n\
+	xorb $2,%%dl							\n\
+	leal 2(%%ecx),%%eax						\n\
+	xorb $2,%%al							\n\
+	movw (%%eax),%%ax						\n\
+	jmp freelink							\n\
+	.align 4							\n\
+prevZ:	\n\
+	movl %0,%%edx	/ else GETWORD((DLword *)entry) = GETWORD((DLword *)link + 1)	\n\
+	leal 2(%%ecx),%%eax	\n\
+	xorb $2,%%al	\n\
+	movw (%%eax),%%ax	\n\
+	orb $1,%%al	\n\
+freelink:	/ FreeLink	\n\
+	movw %%ax,(%%edx)	\n\
+	movl %%ecx,%%eax	\n\
+	xorb $2,%%al	\n\
+	movw $0,(%%eax)	\n\
+	leal 2(%%ecx),%%eax	\n\
+	xorb $2,%%al	\n\
+	movl HTcoll,%%edx	/ GETWORD(link+1) = GETWORD(HTcoll);	\n\
+	xorb $2,%%dl	\n\
+	movw (%%edx),%%dx	\n\
+	movw %%dx,(%%eax)	\n\
+	movl HTcoll,%%edx	/ GETWORD(HTcoll) = (link - HTcoll);	\n\
+	xorb $2,%%dl	\n\
+	movl %%ecx,%%eax	\n\
+	subl HTcoll,%%eax	\n\
+	sarl $1,%%eax	\n\
+	movw %%ax,(%%edx)	\n\
+	movl %0,%%esi	/ link = (DLword *)HTcoll + GetLinkptr(GETWORD((DLword *)entry	\n\
+	movw (%%esi),%%ax	\n\
+	andl $65534,%%eax	\n\
+	addl %%eax,%%eax	\n\
+	movl %%eax,%%ecx	\n\
+	addl HTcoll,%%ecx	\n\
+	leal 2(%%ecx),%%edx	/ if (GETWORD((DLword *)link + 1) == 0) {	\n\
+	xorb $2,%%dl	\n\
+	cmpw $0,(%%edx)	\n\
+	jne sgclp1	\n\
+	movl %%ecx,%%eax	/ GETWORD((DLword *)entry) = GETWORD((DLword *)link)	\n\
+	xorb $2,%%al	\n\
+	movw (%%eax),%%bx	\n\
+	movw %%bx,(%%esi)	\n\
+	movw $0,(%%eax)		/ FreeLink: GETWORD(link) = 0	\n\
+	movl HTcoll,%%eax	/ GETWORD(link+1) = GETWORD(HTcoll)	\n\
+	xorb $2,%%al	\n\
+	movw (%%eax),%%bx	\n\
+	movw %%bx,(%%edx)	\n\
+	movl %%ecx,%%ebx	\n\
+	subl HTcoll,%%ebx	\n\
+	sarl $1,%%ebx	\n\
+	movw %%bx,(%%eax)	\n\
+	.align 4	\n\
+sgclp1:	/ start of gcloop 1 - do setup		\n\
+	movl GcDisabled_word,%%ecx		\n\
+	movl	MDStypetbl,%%ebx		\n\
+gclp1:		/ GcreclaimLp:	\n\
+	pushl %2	\n\
+	call gcreccell	\n\
+	addl $4,%%esp	\n\
+	movl %%eax,%2	\n\
+	testl %%eax,%%eax	\n\
+	je eogclp1	\n\
+	shrl $9,%%eax	\n\
+	leal 0(%%ebx,%%eax,2),%%eax		\n\
+	xorb $2,%%al	\n\
+	cmpw $0,(%%eax)	\n\
+	jl gclp1	\n\
+	cmpl $76,(%%ecx)	\n\
+	je gclp1	\n\
+	pushl $0	\n\
+	pushl %2	\n\
+	call rec_htfind	\n\
+	addl $8,%%esp	\n\
+	jmp gclp1	\n\
+	.align 4	\n\
+	.align 4	\n\
+eogclp1:	\n\
+	movl %0,%%eax	/ if (HTLPTR->contents == 0)	\n\
+	cmpw $0,(%%eax)	\n\
+	je nextentry		/ goto nextentry;	\n\
+	jmp retry	/ else goto retry;	\n\
+	.align 4	\n\
+	.align 4	\n\
+	\n\
+stknz:	\n\
+	movw (%%ecx),%%ax	/ if ((offset = ((struct htcoll *)link)->next_free))	\n\
+	testw %%ax,%%ax	\n\
+	je nextentry	\n\
+	movl %%ecx,%%esi	\n\
+	andl $65535,%%eax	\n\
+	jmp linkloop	\n\
+	.align 4	\n\
+	.align 4	\n\
+nocollision:	\n\
+	testw $65024,(%%ecx)	/ if (StkCntIsZero(HTLPTR->contents)) {	\n\
+	jne nextentry	\n\
+	movw (%%ecx),%%dx	/ptr = VAG2(HENTRY->segnum, (probe << 1));	\n\
+	sall $15,%%edx	\n\
+	andl $16711680,%%edx	\n\
+	leal (,%%edi,2),%%eax	\n\
+	orl %%eax,%%edx	\n\
+	movl %%edx,%2	\n\
+	movw $0,(%%ecx)	/ HTLPTR->contents = 0	\n\
+	.align 4	\n\
+	movl GcDisabled_word,%%ecx	\n\
+	movl MDStypetbl,%%ebx	\n\
+gclp2:	/ GcreclaimLp	\n\
+	pushl %2	\n\
+	call gcreccell	\n\
+	addl $4,%%esp	\n\
+	movl %%eax,%2	\n\
+	testl %%eax,%%eax	\n\
+	je nextentry	\n\
+	shrl $9,%%eax	\n\
+	leal 0(%%ebx,%%eax,2),%%eax	\n\
+	xorb $2,%%al	\n\
+	cmpw $0,(%%eax)	\n\
+	jl gclp2	\n\
+	cmpl $76,(%%ecx)	\n\
+	je gclp2	\n\
+	pushl $0	\n\
+	pushl %2	\n\
+	call rec_htfind	\n\
+	addl $8,%%esp	\n\
+	jmp gclp2	\n\
+	.align 4	\n\
+returNIL:	\n\
+    "
+      : "=g"(entry), "=g"(offset), "=g"(ptr)
+      :
+      : "ax", "dx", "cx", "bx", "si", "di");
+
+  return NIL;
+}
+#else

 LispPTR gcmapscan(void) {
  register GCENTRY probe;
@@ -142,6 +342,7 @@ nextentry:
  }
  return (NIL);
 }
+#endif /* GCC386 */

 LispPTR gcmapunscan(void) {
  register GCENTRY probe;
--- a/src/hardrtn.c
+++ b/src/hardrtn.c
@@ -211,8 +211,13 @@ retry: /* this is retry entry after MAKE_FXCOPY etc */
    } else {
      if (CURRENTFX->nopush) {
        CURRENTFX->nopush = NIL;
-        CurrentStackPTR = next68k - 2;
-        TopOfStack = *((LispPTR *)CurrentStackPTR);
+        if (CURRENTFX->mvscase) {
+	  CurrentStackPTR = next68k;
+	  CURRENTFX->mvscase = NIL;
+	} else {
+	  CurrentStackPTR = next68k - 2;
+	  TopOfStack = *((LispPTR *)CurrentStackPTR);
+	}
        CurrentStackPTR -= 2;

      } else
--- a/src/inet.c
+++ b/src/inet.c
@@ -49,6 +49,9 @@
 #include "commondefs.h"
 #include "mkcelldefs.h"

+#ifdef GCC386
+#include "inlnPS2.h"
+#endif

 #define TCPhostlookup 0
 #define TCPservicelookup 1
--- a/src/initdsp.c
+++ b/src/initdsp.c
@@ -18,6 +18,20 @@
 #include <stdio.h>
 #include <unistd.h>

+#ifdef SUNDISPLAY
+#ifndef NOPIXRECT
+#include <sunwindow/window_hs.h>
+#include <sunwindow/cms.h>
+#include <sunwindow/win_ioctl.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <pixrect/pixrect_hs.h>
+#include <sun/fbio.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <pixrect/pr_planegroups.h>
+#endif /* NOPIXRECT */
+#endif /* SUNDISPLAY */

 #ifdef OS4
 #include <vfork.h>
@@ -62,6 +76,21 @@ extern DspInterface currentdsp;
 #define FBTYPE_SUNFAST_COLOR 12
 #endif

+#ifdef SUNDISPLAY
+struct screen LispScreen;
+#ifndef NOPIXRECT
+struct pixrect *CursorBitMap, *InvisibleCursorBitMap;
+struct pixrect *SrcePixRect, *DestPixRect;
+#ifdef DISPLAYBUFFER
+int black = 0, white = -1;
+struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect;
+#define COPY_PIXRECT_TO_COLOR (PIX_SRC /*| PIX_DONTCLIP */)
+#ifdef DEBUG
+int oldred[2], oldgreen[2], oldblue[2];
+#endif /* DEBUG */
+#endif /* DISPLAYBUFFER */
+#endif /* NOPIXRECT */
+#endif /* SUNDISPLAY */

 int LispWindowFd = -1;
 int FrameBufferFd = -1;
@@ -78,6 +107,10 @@ DLword *DisplayRegion68k_end_addr;
 /* some functions use this variable when undef DISPLAYBUFFER */
 DLword *DISP_MAX_Address;

+#ifdef SUNDISPLAY
+struct cursor CurrentCursor, InvisibleCursor;
+struct winlock DisplayLockArea;
+#endif /* SUNDISPLAY */

 extern DLword *EmCursorBitMap68K;
 extern IFPAGE *InterfacePage;
@@ -94,6 +127,13 @@ DLword *DisplayRegion68k_end_addr;
 extern int *Xdisplay; /* DAANGER -jarl nilsson 27-apr-92 */
 #endif                /* XWINDOW */

+#ifdef SUNDISPLAY
+/* For SunOS4.1 Window Security Feature. */
+int Win_security_p;
+#include <sys/wait.h>
+#define SV_ACQUIRE "/bin/sunview1/sv_acquire"
+#define SV_RELEASE "/bin/sunview1/sv_release"
+#endif /* SUNDISPLAY */

 /************************************************************************/
 /*									*/
@@ -104,6 +144,30 @@ extern int *Xdisplay; /* DAANGER -jarl nilsson 27-apr-92 */
 /************************************************************************/

 void init_cursor() {
+#ifdef SUNDISPLAY
+#ifndef NOPIXRECT
+  CursorBitMap = mem_create(CURSORWIDTH, CURSORHEIGHT, 1);
+  mpr_mdlinebytes(CursorBitMap) = CURSORWIDTH >> 3; /* 2(byte) */
+#endif                                              /* NOPIXRECT */
+
+  CurrentCursor.cur_xhot = 0;
+  CurrentCursor.cur_yhot = 0;
+  CurrentCursor.cur_shape = CursorBitMap;
+  CurrentCursor.cur_function = PIX_SRC | PIX_DST;
+
+  /*  Invisible Cursor */
+
+#ifndef NOPIXRECT
+  InvisibleCursorBitMap = mem_create(0, 0, 1);
+#endif /* NOPIXRECT */
+
+  InvisibleCursor.cur_xhot = 0;
+  InvisibleCursor.cur_yhot = 0;
+  InvisibleCursor.cur_shape = InvisibleCursorBitMap;
+  InvisibleCursor.cur_function = /*PIX_SRC |*/ PIX_DST;
+  win_setcursor(LispWindowFd, &InvisibleCursor);
+  win_setmouseposition(LispWindowFd, 0, 0);
+#endif /* SUNDISPLAY */
 }

 /************************************************************************/
@@ -114,6 +178,18 @@ void init_cursor() {
 /*									*/
 /************************************************************************/
 void set_cursor() {
+#ifdef SUNDISPLAY
+#ifdef OLD_CURSOR
+  (mpr_d(CursorBitMap))->md_image = (short *)(IOPage->dlcursorbitmap);
+  /* BitmapBase of CurrentCursor
+   * is set to IOPage->dlcursorbitmap
+   */
+  if (win_setcursor(LispWindowFd, &CurrentCursor) == -1) perror("SET Cursor");
+  if (win_setmouseposition(LispWindowFd, 0, 0) == -1) perror("SET Mouse POS");
+#else
+  if (win_setcursor(LispWindowFd, &InvisibleCursor) == -1) perror("SET Cursor:");
+#endif
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  Init_XCursor();
@@ -132,6 +208,22 @@ void set_cursor() {

 #ifndef COLOR
 void clear_display() {
+#ifdef SUNDISPLAY
+#ifndef DISPLAYBUFFER
+  register short *word;
+  register int w, h;
+  word = (short *)DisplayRegion68k;
+  for (h = displayheight; (h--);) {
+    for (w = DisplayRasterWidth; (w--);) { *word++ = 0; }
+  }
+#else
+  pr_rop(ColorDisplayPixrect, 0, 0, displaywidth, displayheight, PIX_CLR, ColorDisplayPixrect, 0,
+         0);
+/* Original images are still kept in SYSOUT(DisplayRegion)  */
+/*  clear_CG6; */
+#endif /* DISPLAYBUFFER */
+
+#endif /* SUNDISPLAY */

 #ifdef DOS
  TPRINT(("Enter Clear_display\n"));
@@ -169,11 +261,82 @@ void clear_display() {

 void init_display2(DLword *display_addr, int display_max)
 {
+#ifdef SUNDISPLAY
+#ifndef DISPLAYBUFFER
+  int mmapstat;
+#endif
+  int fbgattr_result;
+  struct fbtype my_screen;
+  char groups[PIXPG_OVERLAY + 1];
+  struct fbgattr FBattr;
+  struct pixrect *ColorFb;
+#endif /* SUNDISPLAY */

+#ifdef SUNDISPLAY

+  /* For SunOS4.1 Window Security Feature. */
+
+  union wait status;
+
+  /* Window Security is available? */
+  if (!access(SV_ACQUIRE, F_OK))
+    Win_security_p = 1;
+  else
+    Win_security_p = 0;
+
+  if (Win_security_p) {
+    switch (vfork()) {
+      case -1: /* Error */ (void)fprintf(stderr, "init_display: Fork failed.\n"); exit(1);
+
+      case 0: /* Child */
+        (void)execl(SV_ACQUIRE, "sv_acquire", "0", "256", "250", 0);
+        /* should not return */
+        (void)fprintf(stderr, "init_display: exec for sv_acquire failed\n");
+        exit(1);
+
+      default: /* Parent */
+        /* do nothing */
+        break;
+    }
+    (void)wait(&status); /* child dies after changing 6 */
+
+    if (status.w_retcode != 0) {
+      (void)fprintf(stderr, "init_display: failed to set ownership of win devices\n");
+      exit(1);
+    }
+  }
+
+#endif /* SUNDISPLAY */
+
+#ifdef SUNDISPLAY
+  if ((LispWindowFd = win_screennew(&LispScreen)) == -1) {
+    perror("init_display: can't create LispWindow\n");
+    exit(-1);
+  } else {
+#ifdef KBINT
+/* int_io_open(LispWindowFd);  JDS 4/27/94 move to initkbd, to try preventing the
+ * move-mouse-never-get-kbd bug */
+#endif
+    fcntl(LispWindowFd, F_SETFL, fcntl(LispWindowFd, F_GETFL, 0) | O_NONBLOCK);
+  }
+#endif /* SUNDISPLAY */

  DisplayRegion68k = (DLword *)display_addr;

+#ifdef SUNDISPLAY
+  if ((FrameBufferFd = open(LispScreen.scr_fbname, 2)) == -1) {
+    perror("init_display: can't open FrameBuffer\n");
+    exit(-1);
+  }
+
+  /* initialize Display parameters */
+  if (ioctl(FrameBufferFd, FBIOGTYPE, &my_screen) == -1) {
+    perror("init_display: can't find screen parameters\n");
+    exit(-1);
+  }
+  displaywidth = my_screen.fb_width;
+  displayheight = my_screen.fb_height;
+#endif /* SUNDISPLAY */

 #if (defined(XWINDOW) || defined(DOS))
  (currentdsp->device.enter)(currentdsp);
@@ -188,7 +351,146 @@ void init_display2(DLword *display_addr, int display_max)
  DBPRINT(("FBIOGTYPE w x h = %d x %d\n", displaywidth, displayheight));

  DBPRINT(("FBIOGTYPE w x h = %d x %d\n", displaywidth, displayheight));
+#ifdef SUNDISPLAY
+  DBPRINT(("   (real) type  = %d\n", my_screen.fb_type));
+  DBPRINT(("   (real) bpp   = %d\n", my_screen.fb_depth));
+#endif /* SUNDISPLAY */

+#ifdef SUNDISPLAY
+  /** now attempt to use the FBIOGATTR call for more information **/
+
+  fbgattr_result = ioctl(FrameBufferFd, FBIOGATTR, &FBattr);
+  if (fbgattr_result >= 0) {
+    DBPRINT(("FBIOGATTR realtype = %d\n", FBattr.real_type));
+    DBPRINT(("   (real) size = %d x %d\n", FBattr.fbtype.fb_width, FBattr.fbtype.fb_height));
+    DBPRINT(("   (real) type = %d\n", FBattr.fbtype.fb_type));
+    DBPRINT(("   (real) bpp  = %d\n", FBattr.fbtype.fb_depth));
+    DBPRINT(("          emuls= %d %d %d %d\n", FBattr.emu_types[0], FBattr.emu_types[1],
+             FBattr.emu_types[2], FBattr.emu_types[3]));
+  } else { /* fill in defaults */
+    FBattr.real_type = my_screen.fb_type;
+  }
+  DBPRINT(("init_display: FBIOGATTR_result = %d\n", fbgattr_result));
+/* probe for DISPLAY type */
+/**********************************************************************
+ *	         FB-TYPE       REAL-TYPE
+ * 	BW2      2             x
+ *	CG2      3             3
+ *	CG3      8             6
+ *	CG4      2             8
+ *	CG6      8             12
+ *	CG8      6             7
+ *	CG9(GP1) 4             4    ;gpconfig -f -b
+ *	CG9(GP1) 2            13    ;gpconfig gpone0 -f -b cgtwo0
+ *	                            ;We assume This config for GXP model
+ ***********************************************************************/
+/* Medley supports real (or emulated) BW2, so check for that first */
+#ifndef DISPLAYBUFFER
+
+  if ((my_screen.fb_type == FBTYPE_SUN2BW)        /* real or emulated bwtwo */
+      || (my_screen.fb_type == FBTYPE_SUN3COLOR)) /* Sun 3 color? */
+    switch (FBattr.real_type) {
+      case FBTYPE_SUN2BW: DisplayType = SUN2BW; break;
+
+      case FBTYPE_MEMCOLOR: /* memory 24-bit (CG8) */
+      {
+        DisplayType = SUNMEMCOLOR;
+        ColorFb = pr_open("/dev/fb");
+        pr_available_plane_groups(ColorFb, sizeof(groups), groups);
+        if (groups[PIXPG_OVERLAY] && groups[PIXPG_OVERLAY_ENABLE]) {
+          pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
+          pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_SET, 0, 0, 0);
+          pr_set_plane_group(ColorFb, PIXPG_OVERLAY);
+        }
+      } break;
+
+      case FBTYPE_SUN4COLOR:    /* cg4 */
+      case FBTYPE_SUNROP_COLOR: /* cg9(GXP) */
+      {                         /* need to clear overlay plane */
+        DisplayType = SUN4COLOR;
+        ColorFb = pr_open("/dev/fb");
+        pr_available_plane_groups(ColorFb, sizeof(groups), groups);
+        if (groups[PIXPG_OVERLAY] && groups[PIXPG_OVERLAY_ENABLE]) {
+          pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
+          pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_SET, 0, 0, 0);
+          pr_set_plane_group(ColorFb, PIXPG_OVERLAY);
+        }
+        break;
+      }
+
+      default:
+        printf("initdisplay: Unsupported FBreal_type %d\n", FBattr.real_type);
+        DisplayType = (my_screen.fb_type) << 3;
+        /* should be able to proceed, since its an emulated bwtwo */
+    }
+  else {                       /* not currently a SUN2BW, perhaps can emulate it? */
+    if (fbgattr_result >= 0) { /* got gattrs, can try sattr */
+#ifdef DEBUG
+      error("fb bwtwo emulation not implemented, q to proceed\n");
+#endif /* DEBUG */
+    } else {
+      error("Not cgfour or bwtwo, q to attempt to proceed");
+    }
+    printf("initdisplay: Unsupported FBreal_type %d\n", FBattr.real_type);
+    DisplayType = (my_screen.fb_type) << 3;
+    /* try to muddle on */
+  }
+#else /* DISPLAYBUFFER is defined, then: */
+  DisplayRegion68k_end_addr = DisplayRegion68k + DisplayRasterWidth * displayheight;
+  if (my_screen.fb_type == FBTYPE_SUN2BW) /* real or emulated bwtwo */
+    switch (FBattr.real_type) {
+      case FBTYPE_SUN4COLOR: { /* need to clear overlay plane */
+        DisplayType = SUN4COLOR;
+        ColorFb = pr_open("/dev/fb");
+        pr_available_plane_groups(ColorFb, sizeof(groups), groups);
+        if (groups[PIXPG_OVERLAY] && groups[PIXPG_OVERLAY_ENABLE]) {
+          pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
+          pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_CLR, 0, 0, 0);
+          pr_set_plane_group(ColorFb, PIXPG_8BIT_COLOR);
+        }
+        ColorDisplayPixrect = ColorFb;
+        break;
+      }
+
+      default: ColorDisplayPixrect = pr_open("/dev/fb"); break;
+    }
+
+  else if (my_screen.fb_type == FBTYPE_SUN4COLOR) { /* cg3 or cg6 */
+    switch (FBattr.real_type) {
+      case FBTYPE_SUN3COLOR: /* cg3 */
+                             /*	DisplayType = SUN3COLOR; */
+        DisplayType = (FBattr.real_type) << 3;
+        break;
+      case FBTYPE_SUNFAST_COLOR: /* cg6 */
+                                 /*	DisplayType = SUNFASTCOLOR; */
+        DisplayType = (FBattr.real_type) << 3;
+        break;
+      default: /* unknown display */ DisplayType = (FBattr.real_type) << 3; break;
+    } /* end switch */
+    ColorDisplayPixrect = pr_open("/dev/fb");
+  } /* end else if() */
+
+  else
+    ColorDisplayPixrect = pr_open("/dev/fb");
+  DisplayRegionPixrect = mem_point(displaywidth, displayheight, 1, display_addr);
+
+#ifdef DEBUG
+  pr_getcolormap(ColorDisplayPixrect, 0, 2, oldred, oldgreen, oldblue);
+#endif /* DEBUG */
+  DBPRINT(("Color map for color pixrect:\n  0:  R: %d, G: %d, B: %d\n  1:  R: %d, G: %d, B: %d\n",
+           oldred[0], oldgreen[0], oldblue[0], oldred[1], oldgreen[1], oldblue[1]));
+  DBPRINT(("Color depth = %d.\n", ColorDisplayPixrect->pr_depth));
+  pr_putcolormap(ColorDisplayPixrect, 1, 1, &black, &black, &black);
+  pr_putcolormap(ColorDisplayPixrect, 0, 1, &white, &white, &white);
+  pr_putcolormap(ColorDisplayPixrect, 255, 1, &black, &black, &black);
+  pr_putcolormap(ColorDisplayPixrect, (1 << ColorDisplayPixrect->pr_depth) - 1, 1, &black, &black,
+                 &black);
+#endif
+
+  DisplayLockArea.wl_rect.r_width = displaywidth;
+  DisplayLockArea.wl_rect.r_height = displayheight;
+
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  DisplayType = SUN2BW;
@@ -202,6 +504,25 @@ void init_display2(DLword *display_addr, int display_max)
  DBPRINT(("        length : 0x%x\n", DisplayByteSize));
  DBPRINT(("        pg size: 0x%x\n", getpagesize()));

+#ifdef SUNDISPLAY
+#ifndef DISPLAYBUFFER
+  mmapstat = (int)mmap(DisplayRegion68k, DisplayByteSize, PROT_READ | PROT_WRITE,
+#ifdef OS4
+                       MAP_FIXED |
+#endif
+                           MAP_SHARED,
+                       FrameBufferFd, 0);
+
+  DBPRINT(("after mmap: 0x%x\n", mmapstat));
+
+  if (mmapstat == -1) {
+    perror("init_display: ERROR at mmap system call\n");
+    exit(0);
+  }
+#endif /* ifndef DISPLAYBUFFER */
+
+  DBPRINT(("after mem_point\n"));
+#endif /* SUNDISPLAY */

 #ifdef DOS
  (currentdsp->cleardisplay)(currentdsp);
@@ -211,6 +532,11 @@ void init_display2(DLword *display_addr, int display_max)

  DBPRINT(("after clear_display()\n"));

+#if defined(SUNDISPLAY) && !defined(NOPIXRECT)
+  /* initialize pixrect used in pilotbitblt */
+  SrcePixRect = mem_point(0, 0, 1, NULL);
+  DestPixRect = mem_point(0, 0, 1, NULL);
+#endif

  DBPRINT(("exiting init_display\n"));
 }
@@ -223,12 +549,45 @@ void init_display2(DLword *display_addr, int display_max)
 /*									*/
 /************************************************************************/
 void display_before_exit() {
+#ifdef SUNDISPLAY
+  union wait status;
+#endif /* SUNDISPLAY */

 #ifdef TRUECOLOR
  truecolor_before_exit();
 #endif /* TRUECOLOR */

  clear_display();
+#ifdef SUNDISPLAY
+  /*    win_remove( LispWindowFd ); */
+  win_screendestroy(LispWindowFd);
+#ifdef KBINT
+  int_io_close(LispWindowFd);
+#endif
+  close(LispWindowFd);
+
+  if (Win_security_p) {
+    switch (vfork()) {
+      case -1: /* Error */ (void)fprintf(stderr, "display_before_exit: Fork failed.\n"); exit(1);
+
+      case 0: /* Child */
+        (void)execl(SV_RELEASE, "sv_release", 0);
+        /* should not return */
+        (void)fprintf(stderr, "display_before_exit: exec for sv_release failed\n");
+        exit(1);
+
+      default: /* Parent */
+        /* do nothing */
+        break;
+    }
+    (void)wait(&status);
+    if (status.w_retcode != 0) {
+      (void)fprintf(stderr, "display_before_raid: failed to set ownership of win devices\n");
+      exit(1);
+    }
+  }
+
+#endif /* SUNDISPLAY */

 #if defined(XWINDOW) || defined(DOS)
  (currentdsp->device.exit)(currentdsp);
@@ -266,6 +625,12 @@ in_display_segment(baseaddr)
 /************************************************************************/

 void flush_display_buffer() {
+#ifdef SUNDISPLAY
+#ifdef DISPLAYBUFFER
+  pr_rop(ColorDisplayPixrect, 0, 0, displaywidth, displayheight, COPY_PIXRECT_TO_COLOR,
+         DisplayRegionPixrect, 0, 0);
+#endif /* DISPLAYBUFFER */
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  (currentdsp->bitblt_to_screen)(currentdsp, DisplayRegion68k, currentdsp->Visible.x,
@@ -297,6 +662,13 @@ void flush_display_buffer() {

 void flush_display_region(int x, int y, int w, int h)
 {
+#ifdef SUNDISPLAY
+#ifdef DISPLAYBUFFER
+
+  pr_rop(ColorDisplayPixrect, x, y, w, h, COPY_PIXRECT_TO_COLOR, DisplayRegionPixrect, x, y);
+#endif /* DISPLAYBUFFER */
+
+#endif /* SUNDISPLAY */

 #if (defined(XWINDOW) || defined(DOS))
  TPRINT(("Enter flush_display_region x=%d, y=%d, w=%d, h=%d\n", x, y, w, h));
@@ -340,6 +712,13 @@ void flush_display_lineregion(UNSIGNED x, DLword *ybase, UNSIGNED w, UNSIGNED h)
 {
  int y;
  y = ((DLword *)ybase - DisplayRegion68k) / DLWORD_PERLINE;
+#ifdef SUNDISPLAY
+#ifdef DISPLAYBUFFER
+
+  pr_rop(ColorDisplayPixrect, x, y, w, h, COPY_PIXRECT_TO_COLOR, DisplayRegionPixrect, x, y);
+#endif /* DISPLAYBUFFER */
+
+#endif /* SUNDISPLAY */

 #if (defined(XWINDOW) || defined(DOS))
  TPRINT(("Enter flush_display_lineregion x=%d, y=%d, w=%d, h=%d\n", x, y, w, h));
@@ -372,7 +751,9 @@ void flush_display_ptrregion(DLword *ybase, UNSIGNED bitoffset, UNSIGNED w, UNSI
  y = baseoffset / DLWORD_PERLINE;
  x = bitoffset + (BITSPERWORD * (baseoffset - (DLWORD_PERLINE * y)));

-#if   (defined(XWINDOW) || defined(DOS))
+#if (defined(SUNDISPLAY) && defined(DISPLAYBUFFER))
+  pr_rop(ColorDisplayPixrect, x, y, w, h, COPY_PIXRECT_TO_COLOR, DisplayRegionPixrect, x, y);
+#elif (defined(XWINDOW) || defined(DOS))
  TPRINT(("Enter flush_display_ptrregion\n x=%d, y=%d, w=%d, h=%d\n", x, y, w, h));
  (currentdsp->bitblt_to_screen)(currentdsp, DisplayRegion68k, x, y, w, h);
  TPRINT(("Exit flush_display_ptrregion\n"));
--- a/src/initkbd.c
+++ b/src/initkbd.c
@@ -31,6 +31,15 @@
 #include <stk.h>
 #endif /* DOS */

+#ifdef SUNDISPLAY
+#include <sundev/kbd.h>
+#include <sundev/kbio.h>
+#include <sunwindow/window_hs.h>
+#include <sunwindow/cms.h>
+#include <sys/ioctl.h>
+#include <sunwindow/win_ioctl.h>
+#include <pixrect/pixrect_hs.h>
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
 #include <X11/Xlib.h>
@@ -67,6 +76,9 @@ extern MouseInterface currentmouse;
 extern KbdInterface currentkbd;
 extern DspInterface currentdsp;
 #endif /* DOS */
+#ifdef SUNDISPLAY
+extern struct screen LispScreen;
+#endif /* SUNDISPLAY */

 extern int LispWindowFd;
 int LispKbdFd = -1;
@@ -76,6 +88,9 @@ int DebugKBD = NIL;
 FILE *KBlog;

 extern fd_set LispReadFds;
+#ifdef SUNDISPLAY
+struct inputmask LispEventMask;
+#endif /* SUNDISPLAY */

 IOPAGE *IOPage68K;

@@ -199,13 +214,33 @@ u_char DOSLispKeyMap_101[0x80] = {

 void init_keyboard(int flg) /* if 0 init else re-init */
 {
+#ifdef SUNDISPLAY
+  int keytrans;
+#endif

  set_kbd_iopointers();

+#ifdef SUNDISPLAY
+  if ((LispKbdFd = open(LispScreen.scr_kbdname, O_RDWR)) == -1) {
+    fprintf(stderr, "can't open %s\n", LispScreen.scr_kbdname);
+    exit(-1);
+  }
+#endif /* SUNDISPLAY */

  if (flg == 0) { keyboardtype(LispKbdFd); }

-#if   XWINDOW
+#ifdef SUNDISPLAY
+  keytrans = TR_UNTRANS_EVENT; /* keyboard does not encode key */
+  if (ioctl(LispKbdFd, KIOCTRANS, &keytrans) == -1) {
+    fprintf(stderr, "Error at ioctl errno =%d\n", errno);
+    exit(-1);
+  }
+  close(LispKbdFd);
+#ifdef KBINT
+  int_io_open(LispWindowFd); /* from init_dsp, try to prevent mouse-move-no-kbd bug */
+#endif                       /*  KBINT */
+  seteventmask(&LispEventMask);
+#elif XWINDOW
  init_Xevent(currentdsp);

 #elif DOS
@@ -227,7 +262,22 @@ void init_keyboard(int flg) /* if 0 init else re-init */
 /*  ----------------------------------------------------------------*/

 void device_before_exit() {
-#if   DOS
+#ifdef SUNDISPLAY
+  int keytrans;
+
+  if ((LispKbdFd = open(LispScreen.scr_kbdname, O_RDWR)) == -1) {
+    fprintf(stderr, "can't open %s\n", LispScreen.scr_kbdname);
+    exit(-1);
+  }
+
+  keytrans = TR_EVENT; /* keyboard encodes key */
+  if (ioctl(LispKbdFd, KIOCTRANS, &keytrans) == -1) {
+    fprintf(stderr, "Error at ioctl errno =%d\n", errno);
+    exit(-1);
+  }
+  close(LispKbdFd);
+
+#elif DOS
  (currentmouse->device.exit)(currentmouse, currentdsp);
  (currentkbd->device.exit)(currentkbd);
 #endif /* SUNDISPLAY DOS*/
@@ -265,6 +315,24 @@ void set_kbd_iopointers() {

 /*  ----------------------------------------------------------------*/

+#ifdef SUNDISPLAY
+void seteventmask(struct inputmask *eventmask)
+{
+  input_imnull(eventmask);
+  eventmask->im_flags |= IM_ASCII | IM_NEGASCII | IM_NEGEVENT;
+
+  win_setinputcodebit(eventmask, MS_LEFT);
+  win_setinputcodebit(eventmask, MS_MIDDLE);
+  win_setinputcodebit(eventmask, MS_RIGHT);
+  win_setinputcodebit(eventmask, LOC_MOVE);
+  win_unsetinputcodebit(eventmask, LOC_STILL);
+  win_unsetinputcodebit(eventmask, LOC_MOVEWHILEBUTDOWN);
+  win_unsetinputcodebit(eventmask, LOC_WINENTER);
+  win_unsetinputcodebit(eventmask, LOC_WINEXIT);
+
+  win_setinputmask(LispWindowFd, eventmask, eventmask, WIN_NULLLINK);
+}
+#endif /* SUNDISPLAY */

 #define MIN_KEYTYPE 3
 #define KB_AS3000J (7 + MIN_KEYTYPE)
@@ -343,7 +411,7 @@ static u_char *make_X_keymap() {
  XDisplayKeycodes(currentdsp->display_id, &minkey, &maxkey);
  codecount = maxkey + 1 - minkey;
  mapping = XGetKeyboardMapping(currentdsp->display_id, minkey, codecount, &symspercode);
-  XUNLOCK(currentdsp);
+  XUNLOCK;

  for (; *key_sym_pairs != -1;) {
    int reusable = *key_sym_pairs++, code = *key_sym_pairs++, sym = *key_sym_pairs++, xcode;
@@ -432,6 +500,11 @@ void keyboardtype(int fd)
    type = KB_X;
 #elif DOS
    type = KB_DOS;
+#elif SUNDISPLAY
+    if (ioctl(fd, KIOCTYPE, &type) != 0) {
+      error("keyboardtype:IOCTL(KIOCTYPE) fails (cont. w. type-3");
+      type = KB_SUN3;
+    } /* otherwise, type is set */
 #endif /* XWINDOW */
  } /* if end */
  else {
--- a/src/initsout.c
+++ b/src/initsout.c
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include <unistd.h>

 #ifndef DOS
--- a/src/kbdsubrs.c
+++ b/src/kbdsubrs.c
@@ -22,6 +22,11 @@
 #include <sys/select.h>
 #endif /* DOS */

+#ifdef SUNDISPLAY
+#include <sundev/kbd.h>
+#include <sundev/kbio.h>
+#include <sunwindow/window_hs.h>
+#endif /* SUNDISPLAY */

 #include "lispemul.h"

@@ -50,6 +55,9 @@ extern DspInterface currentdsp;
 *
 ****************************************************/

+#ifdef SUNDISPLAY
+extern struct screen LispScreen;
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
 #include <X11/Xlib.h>
@@ -64,13 +72,17 @@ void KB_enable(LispPTR *args) /* args[0] :	ON/OFF flag
                                     */
 {
  if (args[0] == ATOM_T) {
-#if   XWINDOW
+#ifdef SUNDISPLAY
+    FD_SET(LispWindowFd, &LispReadFds);
+#elif XWINDOW
    enable_Xkeyboard(currentdsp);
 #elif DOS
    (currentkbd->device.enter)(currentkbd);
 #endif /* DOS */
  } else if (args[0] == NIL) {
-#if   XWINDOW
+#ifdef SUNDISPLAY
+    FD_CLR(LispWindowFd, &LispReadFds);
+#elif XWINDOW
    disable_Xkeyboard(currentdsp);
 #elif DOS
    (currentkbd->device.exit)(currentkbd);
@@ -104,7 +116,28 @@ void KB_beep(LispPTR *args) /* args[0] :	ON/OFF flag
                                   * args[1] :	frequency
                                   */
 {
-#if   XWINDOW
+#ifdef SUNDISPLAY
+  int keycommand;
+
+  /*	belltime.tv_usec = args[1] & 0xffff;
+          win_bell(LispWindowFd, belltime, 0);
+  */
+  if ((LispKbdFd = open(LispScreen.scr_kbdname, O_RDWR)) == -1)
+    fprintf(stderr, "can't open %s, errno=%d\n", LispScreen.scr_kbdname, errno);
+
+  if (args[0] == ATOM_T) {
+    keycommand = KBD_CMD_BELL; /* Turn on the bell */
+    if (ioctl(LispKbdFd, KIOCCMD, &keycommand) == -1)
+      fprintf(stderr, "Error at ioctl errno =%d\n", errno);
+  } else {
+    keycommand = KBD_CMD_NOBELL; /* Turn off the bell */
+    if (ioctl(LispKbdFd, KIOCCMD, &keycommand) == -1)
+      fprintf(stderr, "Error at ioctl errno =%d\n", errno);
+  }
+
+  close(LispKbdFd);
+
+#elif XWINDOW
  if (args[0] == ATOM_T) beep_Xkeyboard(currentdsp);
 #elif DOS
  if (args[0] == ATOM_T) {
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -38,6 +38,12 @@
 void Mouse_hndlr(void); /* Fields mouse events from driver        */
                        /*  (during servicing of mouse interrupt) */

+#elif SUNDISPLAY
+#include <sunwindow/window_hs.h>
+#include <sunwindow/win_ioctl.h>
+#include <suntool/window.h>
+#include <ctype.h>
+#include <sundev/kbio.h>
 #endif /* DOS */

 #include "lispemul.h"
@@ -115,11 +121,10 @@ extern DLword *EmMouseX68K, *EmMouseY68K, *EmKbdAd068K, *EmRealUtilin68K, *EmUti
 extern DLword *EmKbdAd168K, *EmKbdAd268K, *EmKbdAd368K, *EmKbdAd468K, *EmKbdAd568K;
 extern u_char *SUNLispKeyMap;
 extern int LispWindowFd;
-extern int RS232C_Fd, RS232C_remain_data;
+extern int RS232C_Fd, RS232C_remain_data, XLocked;
 extern fd_set LispIOFds;
 fd_set LispReadFds;
-extern volatile sig_atomic_t XLocked;
-extern volatile sig_atomic_t XNeedSignal;
+int XNeedSignal = 0; /* T if an X interrupt happened while XLOCK asserted */

 extern int LogFileFd;

@@ -173,6 +178,25 @@ typedef struct {
 /*  EmXXXX68K are already swapped, no need for GETWORD */


+#ifdef SUNDISPLAY
+#ifdef OLD_CURSOR
+#define TrackCursor(cx, cy)                          \
+  {                                                  \
+    *CLastUserActionCell68k = MiscStats->secondstmp; \
+    *EmCursorX68K = cx;                              \
+    *EmCursorY68K = cy;                              \
+  }
+#else
+#define TrackCursor(cx, cy)                          \
+  {                                                  \
+    *CLastUserActionCell68k = MiscStats->secondstmp; \
+    taking_mouse_down();                             \
+    taking_mouse_up(cx, cy);                         \
+    *EmCursorX68K = cx;                              \
+    *EmCursorY68K = cy;                              \
+  }
+#endif /* OLD_CURSOR */
+#endif /* SUNDISPLAY */

 /* commented out is some code that would also clobber
        Irq_Stk_Check & Irq_Stk_End to force
@@ -259,6 +283,9 @@ DLword ColorCursor_savebitmap[CURSORWIDTH / COLORPIXELS_IN_DLWORD * CURSORHEIGHT
 void getsignaldata(int sig)
 {
 #ifndef DOS
+#ifdef SUNDISPLAY
+  struct inputevent event;
+#endif /* SUNDISPLAY */
  fd_set rfds, efds;
  u_int iflags;
  int i;
@@ -289,6 +316,19 @@ getmore:
    DBPRINT(("SIGIO: fd mask(r/e) = 0x%x/0x%x.\n", rfds, efds));
      */

+#ifdef SUNDISPLAY
+    if (LispWindowFd >= 0 && FD_ISSET(LispWindowFd, &rfds)) {
+      /* #endif */
+      while (input_readevent(LispWindowFd, &event) >= 0) {
+        /*if(!kb_event( &event )) {goto getmore;};*/
+        if ((KBDEventFlg += kb_event(&event)) > 0) {
+          /* immediately request for IRQ check */
+          Irq_Stk_End = Irq_Stk_Check = 0;
+        }
+      }
+      /* #ifndef KBINT */
+    }
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
    if (FD_ISSET(ConnectionNumber(currentdsp->display_id), &rfds)) {
@@ -340,6 +380,132 @@ getmore:
 #endif /* DOS */
 } /* end getsignaldata */

+#ifdef SUNDISPLAY
+/************************************************************************/
+/*									*/
+/*			    k b _ e v e n t				*/
+/*									*/
+/*	Given an event from the kbd code, return 1 if a key transition	*/
+/*	occurred, 0 if one didn't occur.				*/
+/*									*/
+/************************************************************************/
+extern int for_makeinit;
+
+int kb_event(struct inputevent *event);
+{
+  register u_int upflg;
+  int kn;
+  DLword w, r;
+  KBEVENT *kbevent;
+
+#ifdef INIT
+
+  /* generate some code to check if we are running as an INIT.  Don't
+     needlessly generate this code, and don't return if we aren't
+     running with the -INIT flag turned on.  --was 2/7/89 */
+
+  if (for_makeinit) { return (0); };
+
+#endif
+
+  upflg = event_is_up(event);
+
+#ifdef SHOWKEYSTROKES
+  printf("Key # %d, upflg %d.\n", (unsigned short)event->ie_code, upflg);
+#endif
+
+  switch (((unsigned short)event->ie_code)) {
+    case LOC_MOVE:
+#ifndef OLD_CURSOR
+      if (!ScreenLocked)
+#endif
+      {
+        ScreenLocked = T;
+        MouseMove(event->ie_locx, event->ie_locy);
+        TrackCursor(event->ie_locx, event->ie_locy);
+        ScreenLocked = NIL;
+      }
+      return (0);
+
+    case MS_LEFT: /*mouse_button( MOUSE_LEFT, upflg );*/
+      PUTBASEBIT68K(EmRealUtilin68K, MOUSE_LEFT, upflg);
+      break;
+
+    case MS_MIDDLE: /*mouse_button( MOUSE_MIDDLE, upflg );*/
+      PUTBASEBIT68K(EmRealUtilin68K, MOUSE_MIDDLE, upflg);
+      break;
+
+    case MS_RIGHT: /*mouse_button( MOUSE_RIGHT, upflg );*/
+      PUTBASEBIT68K(EmRealUtilin68K, MOUSE_RIGHT, upflg);
+      break;
+
+    default: /* keystroke */
+      if ((kn = SUNLispKeyMap[((unsigned short)event->ie_code)]) < 255)
+        kb_trans(kn, upflg);
+      else
+        printf("kb_event: unknown key number=%d\n", event->ie_code);
+
+      break;
+  };
+  {
+  do_ring:
+    /* Emxxx do not use GETWORD */
+    if (((*EmKbdAd268K) & 2113) == 0) { /*Ctrl-shift-NEXT*/
+      error("******  EMERGENCY Interrupt ******");
+      (*EmKbdAd268K) = KB_ALLUP;        /*reset*/
+      ((RING *)CTopKeyevent)->read = 0; /* reset queue */
+      ((RING *)CTopKeyevent)->write = MINKEYEVENT;
+      /*return(0);*/
+    } else if (((*EmKbdAd268K) & 2114) == 0) { /* Ctrl-Shift-DEL */
+      (*EmKbdAd268K) = KB_ALLUP;               /*reset*/
+      URaid_req = T;
+      ((RING *)CTopKeyevent)->read = 0; /* reset queue */
+      ((RING *)CTopKeyevent)->write = MINKEYEVENT;
+
+      /*return(0);*/
+    }
+
+#ifdef OS4_TYPE4BUG
+    else if (((*EmKbdAd268K) & 2120) == 0) { /* Ctrl-Shift-Return */
+      error("******  EMERGENCY Interrupt ******");
+      (*EmKbdAd268K) = KB_ALLUP;        /*reset*/
+      ((RING *)CTopKeyevent)->read = 0; /* reset queue */
+      ((RING *)CTopKeyevent)->write = MINKEYEVENT;
+      /*return(0);*/
+    }
+#endif
+
+    r = RING_READ(CTopKeyevent);
+    w = RING_WRITE(CTopKeyevent);
+
+    if (r == w) goto KBnext; /* event queue FULL */
+
+    kbevent = (KBEVENT *)(CTopKeyevent + w);
+
+    /*	RCLK(kbevent->time); */
+
+    kbevent->W0 = (*EmKbdAd068K); /* Emxxxx do not use GETWORD */
+    kbevent->W1 = (*EmKbdAd168K);
+    kbevent->W2 = (*EmKbdAd268K);
+    kbevent->W3 = (*EmKbdAd368K);
+    kbevent->W4 = (*EmKbdAd468K);
+    kbevent->W5 = (*EmKbdAd568K);
+    kbevent->WU = (*EmRealUtilin68K);
+
+    if (r == 0) /* Queue was empty */
+      ((RING *)CTopKeyevent)->read = w;
+    if (w >= MAXKEYEVENT)
+      ((RING *)CTopKeyevent)->write = MINKEYEVENT;
+    else
+      ((RING *)CTopKeyevent)->write = w + KEYEVENTSIZE;
+
+  KBnext:
+    if (*KEYBUFFERING68k == NIL) *KEYBUFFERING68k = ATOM_T;
+
+  } /* if *EmRealUtilin68K end */
+  return (1);
+}
+#endif /* SUNDISPLAY */

 /************************************************************************/
 /*									*/
--- a/src/ldeboot.c
+++ b/src/ldeboot.c
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])

      /* JRB - call fork_Unix here, while we're REALLY small, unless -NF is
              specified, of course... */
-      for (i = 1; i < argc; i++)
+      for (i = 0; i < argc; i++)
        if (!strcmp(argv[i], "-NF")) break;
      if (i == argc) /* -NF not in arguments */
        fork_Unix();
@@ -181,7 +181,7 @@ int main(int argc, char *argv[])

  /* JRB - call fork_Unix here, while we're REALLY small, unless -NF is
          specified, of course... */
-  for (i = 1; i < argc; i++)
+  for (i = 0; i < argc; i++)
    if (!strcmp(argv[i], "-NF")) break;
  if (i == argc) /* -NF not in arguments */
    fork_Unix();
--- a/src/ldsout.c
+++ b/src/ldsout.c
@@ -30,6 +30,9 @@
 #include "byteswapdefs.h"
 #include "initdspdefs.h"

+#ifdef GCC386
+#include "inlnPS2.h"
+#endif /* GCC386 */

 #define IFPAGE_ADDRESS 512
 #define DEFAULT_MAX_SYSOUTSIZE 64 /* in Mbyte */
--- a/src/llcolor.c
+++ b/src/llcolor.c
@@ -12,6 +12,15 @@

 #include <stdio.h>

+#if defined(COLOR) && !defined(NOPIXRECT)
+#include <sunwindow/window_hs.h>
+#include <sunwindow/cms.h>
+#include <sunwindow/win_ioctl.h>
+#include <pixrect/pixrect_hs.h>
+#include <sun/fbio.h>
+#include <pixrect/pr_planegroups.h>
+#include <sys/mman.h>
+#endif /* COLOR && !NOPIXRECT */

 #include <sys/ioctl.h>
 #include <sys/types.h>
--- a/src/llstk.c
+++ b/src/llstk.c
@@ -482,6 +482,9 @@ extern struct cursor CurrentCursor;
 void flip_cursorbar(int n)
 {
  GETWORD(EmCursorBitMap68K + n) = ~(GETWORD(EmCursorBitMap68K + n));
+#ifdef SUNDISPLAY
+  win_setcursor(LispWindowFd, &CurrentCursor);
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  /* JDS 011213 When using current_hot_y, remember fn does 15-it! */
--- a/src/main.c
+++ b/src/main.c
@@ -517,6 +517,9 @@ int main(int argc, char *argv[])

  /* Get OS message to ~/lisp.log and print the message to prompt window */
  if (!for_makeinit) {
+#ifdef SUNDISPLAY
+    mess_init();
+#endif /* SUNDISPLAY */

    init_keyboard(0); /* can't turn on the keyboard yet or you will die
                         in makeinit.  Pilotbitblt will turn it on if
--- a/src/misc7.c
+++ b/src/misc7.c
@@ -32,6 +32,15 @@
 #include "bbtsubdefs.h"
 #include "initdspdefs.h"

+#ifdef SUNDISPLAY
+#include <sunwindow/window_hs.h>
+#include <sunwindow/win_ioctl.h>
+
+#include <suntool/sunview.h>
+#include <signal.h>
+#include <sunwindow/cms_mono.h>
+#include <suntool/canvas.h>
+#endif

 /*************************************************/
 /*  Possible operation fields for FBITMAPBIT     */
@@ -69,6 +78,9 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP
  DBPRINT(("MISC7 args OK.\n"));

  displayflg = n_new_cursorin(base, x, (heightminus1 - y), 1, 1);
+#ifdef SUNDISPLAY
+  if (displayflg) HideCursor;
+#endif /* SUNDISPLAY */

 /* Bitmaps use a positive integer coordinate system with the lower left
   corner pixel at coordinate (0, 0). Storage is allocated in 16-bit words
@@ -88,6 +100,15 @@ LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispP
  default: GETWORDBASEWORD(base, offset) = bmdata | bmmask;
  };

+#ifdef SUNDISPLAY
+#ifdef DISPLAYBUFFER
+  if (in_display_segment(base)) {
+    /* NB: base + offset doesn't need WORDPTR() wrapper */
+    flush_display_ptrregion(base + offset, 0, 16, 1);
+  }
+#endif
+  if (displayflg) ShowCursor;
+#endif /* SUNDISPLAY */

 #ifdef XWINDOW
  if (in_display_segment(base)) {
--- a/src/mkcell.c
+++ b/src/mkcell.c
@@ -41,9 +41,6 @@
 #include "allocmdsdefs.h"
 #include "commondefs.h"
 #include "gchtfinddefs.h"
-#ifdef DTDDEBUG
-#include "testtooldefs.h"
-#endif

 static LispPTR oldoldfree;
 static LispPTR oldfree;
@@ -158,3 +155,45 @@ retry:
  }

 } /* createcell68k end */
+
+/**********************************************************/
+/*  Create a Cell of Specified Type & Set to given Value  */
+/*  Works with 32 bit typed values only.                  */
+/*  (Initially used only by native code)                  */
+/**********************************************************/
+
+LispPTR Create_n_Set_Cell(unsigned int type, LispPTR value) {
+  register struct dtd *dtd68k;
+  register DLword *ptr, *lastptr;
+  register LispPTR newcell;
+
+  dtd68k = (struct dtd *)GetDTD(type);
+
+  if (dtd68k->dtd_size == 0) error("createcell : Attempt to create a cell not declared yet");
+
+retry:
+  if ((newcell = (dtd68k->dtd_free & POINTERMASK)) != NIL) {
+    ptr = Addr68k_from_LADDR(newcell);
+
+    /* replace dtd_free with newcell's top DLword (it may keep next chain)*/
+
+    dtd68k->dtd_free = (*((LispPTR *)ptr)) & POINTERMASK;
+    dtd68k->dtd_oldcnt++;
+    if (dtd68k->dtd_free & 0x8000000) error("bad entry on free chain.");
+
+    /* clear 0  */
+    for (lastptr = ptr + dtd68k->dtd_size; ptr != lastptr; ptr++) { GETWORD(ptr) = 0; }
+
+    /*	IncAllocCnt(1); */
+    GCLOOKUP(newcell, DELREF);
+    (*((LispPTR *)Addr68k_from_LADDR(newcell))) = value;
+    return (newcell);
+
+  } else {
+    dtd68k->dtd_free = initmdspage(alloc_mdspage(dtd68k->dtd_typeentry), dtd68k->dtd_size, NIL);
+    if (dtd68k->dtd_free & 0x8000000) error("bad entry on free chain.");
+
+    goto retry;
+  }
+
+} /* createcell68k end */
--- a/src/mvs.c
+++ b/src/mvs.c
@@ -28,12 +28,14 @@
 #include "lsptypes.h"
 #include "opcodes.h"
 #include "cell.h"
-#include "byteswapdefs.h"

 #include "mvsdefs.h"
 #include "car-cdrdefs.h"
 #include "conspagedefs.h"

+#ifdef GCC386
+#include "inlnPS2.h"
+#endif /* GCC386 */

 /* to optionally swap the fnhead field of a frame */
 #ifdef BIGVM
@@ -67,6 +69,8 @@ newframe:
    fnhead = (struct fnhead *)FuncObj;
    pc = (ByteCode *)PC + 3; /* to skip the miscn opcode we're in now */
  } else {
+    unbind_count = 0; /* different frame */
+
    fnhead = (struct fnhead *)Addr68k_from_LADDR(POINTERMASK & SWA_FNHEAD((int)caller->fnheader));
    pc = (ByteCode *)fnhead + (caller->pc);
  }
@@ -96,9 +100,14 @@ newpc:
        /* BUT 3's not enough for big atoms, so add diff between FN op size & MISCN op size */
        if (caller == immediate_caller) PC = pc + (FN_OPCODE_SIZE - 3);
 #endif /* BIGATOMS */
-
-        else
+        else {
          caller->pc = (UNSIGNED)pc + FN_OPCODE_SIZE - (UNSIGNED)fnhead;
+	  /* skip over FN opcode when we get there */
+	  prevcaller->fast = 0;
+	  caller->mvscase = 1;
+	  caller->nopush = 1;
+	}
+	
        return (make_value_list(arg_count, args));
      }
      break;
@@ -269,26 +278,22 @@ LispPTR make_value_list(int argcount, LispPTR *argarray) {

 void simulate_unbind(FX2 *frame, int unbind_count, FX2 *returner) {
  int unbind;
-  LispPTR *stackptr = (LispPTR *)(Stackspace + frame->nextblock);
+  LispPTR *stack_pointer = (LispPTR *)(Stackspace + frame->nextblock);
  for (unbind = 0; unbind < unbind_count; unbind++) {
-    register int value;
-    register LispPTR *lastpvar;
-    int bindnvalues;
-    for (; ((int)*--stackptr >= 0);)
-      ; /* find the binding mark */
-    value = (int)*stackptr;
-    lastpvar = (LispPTR *)((DLword *)frame + FRAMESIZE + 2 + GetLoWord(value));
-    ;
-    bindnvalues = (~value) >> 16;
-    for (value = bindnvalues; --value >= 0;) { *--lastpvar = 0xffffffff; }
-    /* This line caused \NSMAIL.READ.HEADING to smash memory, */
-    /* so I removed it 21 Jul 91 --JDS.  This was the only	  */
-    /* difference between this function and the UNWIND code   */
-    /* in inlineC.h						  */
-    /*	MAKEFREEBLOCK(stackptr, (DLword *)stackptr-nextblock); */
+    register int num;
+    register LispPTR *ppvar;
+    register int i;
+    register LispPTR value;
+
+    for (; (((int)*--(stack_pointer)) >= 0);)
+      ;                               
+    value = *stack_pointer;
+    num = (~value) >> 16;             
+    ppvar = (LispPTR *)((DLword *)frame + FRAMESIZE + 2 + GetLoWord(value));
+    for (i = num; --i >= 0;) { *--ppvar = 0xffffffff; }         
  }
-  if (returner)
-    returner->fast = 0; /* since we've destroyed contiguity */
+  /* if (returner)	
+    returner->fast = 0; since we've destroyed contiguity */
                        /* in the stack, but that only
                           matters if there's a return. */
 }
--- a/src/return.c
+++ b/src/return.c
@@ -168,8 +168,7 @@ void contextsw(register DLword fxnum, register DLword bytenum, register DLword f
    CHECKFX;
    if (EndSTKP < CurrentStackPTR) error("contextsw:Illegal ESP");
 #endif
-    FastRetCALL;
-    return;
+    FastRetCALL return;
  }

 } /* end contextsw */
--- a/src/testtool.c
+++ b/src/testtool.c
@@ -1241,6 +1241,8 @@ void dtd_chain(DLword type) {

 } /*  dtd_chain end **/

+#ifdef DTDDEBUG
+
 void check_dtd_chain(DLword type)
 {
  register LispPTR next, onext;
@@ -1268,6 +1270,8 @@ void check_dtd_chain(DLword type)
  }
 }

+#endif
+
 /************************************************************************/
 /*									*/
 /*			T R A C E _ F N C A L L				*/
--- a/src/uraid.c
+++ b/src/uraid.c
@@ -35,6 +35,20 @@
 #include <sys/select.h>
 #endif /* DOS */

+#ifdef SUNDISPLAY
+#include <sundev/kbd.h>
+#include <sundev/kbio.h>
+#include <errno.h>
+#ifndef NOPIXRECT
+#include <sunwindow/window_hs.h>
+#include <sunwindow/win_ioctl.h>
+#include <pixrect/pixrect_hs.h>
+#include <sunwindow/win_cursor.h>
+#include <sunwindow/cms.h>
+#include <sys/mman.h>
+extern int Win_security_p;
+#endif /* NOPIXRECT */
+#endif /* SUNDISPLAY */

 #ifdef OS5
 #include <stropts.h>
@@ -135,10 +149,17 @@ v filename              Save the virtual memory on the filename(Not Bootable)

 */
 /************************************************************************/
+#ifndef NOPIXRECT
+extern int black, white;
+extern struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect;
+#endif /* NOPIXRECT */

 extern int DisplayRasterWidth;
 extern unsigned int LispWindowFd, LispKbdFd;
 extern fd_set LispReadFds;
+#ifndef NOPIXRECT
+extern struct pixrect *CursorBitMap, *InvisibleCursorBitMap;
+#endif /* NOPIXRECT */
 extern struct cursor CurrentCursor, InvisibleCursor;
 extern struct screen LispScreen;
 extern int displaywidth, displayheight;
@@ -840,8 +861,17 @@ LispPTR uraid_commands() {
 extern struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect;
 #endif

+#ifdef SUNDISPLAY
+#define SV_ACQUIRE "/bin/sunview1/sv_acquire"
+#define SV_RELEASE "/bin/sunview1/sv_release"
+#endif /* SUNDISPLAY */

 int device_before_raid() {
+#ifdef SUNDISPLAY
+  int size;
+  int keytrans;
+  union wait status;
+#endif /* SUNDISPLAY */
 #ifdef XWINDOW
  sigset_t signals;
 #endif
@@ -855,6 +885,12 @@ int device_before_raid() {
  sigprocmask(SIG_UNBLOCK, &signals, NULL);
 #endif

+#ifdef SUNDISPLAY
+  win_setcursor(LispWindowFd, &InvisibleCursor);
+#ifdef KBINT
+  int_io_close(LispWindowFd);
+#endif
+#endif /* SUNDISPLAY */

 #ifdef MAIKO_ENABLE_ETHERNET
 #ifdef ETHERINT
@@ -867,6 +903,96 @@ int device_before_raid() {
  int_io_close(RS232C_Fd);
 #endif

+#ifdef SUNDISPLAY
+  mess_reset(); /* turn off console-msg handling */
+
+#ifdef FX_AR_124
+  /* For AR 124. Type4 driver bug?? by m.matsuda */
+  {
+    long i;
+    for (i = 0; i < 900000; i++)
+      ;
+  }
+#endif /*  FX_AR_124 */
+
+  if ((LispKbdFd = open(LispScreen.scr_kbdname, O_RDWR)) == -1) {
+    fprintf(stderr, "can't open %s\n", LispScreen.scr_kbdname);
+    return (-1);
+  }
+
+  keytrans = TR_EVENT; /* keyboard encodes key */
+  if (ioctl(LispKbdFd, KIOCTRANS, &keytrans) == -1) {
+    fprintf(stderr, "Error at ioctl errno =%d\n", errno);
+    return (-1);
+  }
+  close(LispKbdFd);
+  close(LispWindowFd);
+
+#ifdef TRUECOLOR
+  truecolor_before_raid();
+#endif /* TRUECOLOR */
+
+#ifndef DISPLAYBUFFER
+  size = ((displaywidth * displayheight / 8 + (getpagesize() - 1)) & -getpagesize());
+
+  if ((HideDisp68k = malloc(size)) == 0) {
+    printf("can't malloc hide space\n");
+    return (-1);
+  }
+
+  copy_region(DisplayRegion68k, HideDisp68k, DisplayRasterWidth, displayheight);
+#endif /* DISPLAYBUFFER */
+
+#ifdef COLOR
+  save_colormap();
+
+#ifndef DISPLAYBUFFER
+  if (Inited_Color) {
+#else
+  if (MonoOrColor == COLOR_SCREEN) {
+#endif /* DISPLAYBUFFER */
+
+    /* save color image */
+    size =
+        ((displaywidth * displayheight + (getpagesize() - 1)) & -getpagesize()); /* 8 bit depth */
+    if ((HideColorDisp68k = malloc(size)) == 0) {
+      printf("can't malloc hide space\n");
+      return (-1);
+    }
+    copy_region(ColorDisplayRegion68k, HideColorDisp68k, DisplayRasterWidth * 8, displayheight);
+  }    /* end if(MonoOrColor) */
+#endif /* COLOR */
+
+  clear_display();
+
+#ifdef DISPLAYBUFFER
+  pr_close(ColorDisplayPixrect);
+  close(FrameBufferFd);
+#endif
+
+  if (Win_security_p) {
+    switch (vfork()) {
+      case -1: /* Error */ (void)fprintf(stderr, "display_before_exit: Fork failed.\n"); exit(1);
+
+      case 0: /* Child */
+        (void)execl(SV_RELEASE, "sv_release", NULL);
+        /* should not return */
+        (void)fprintf(stderr, "display_before_exit: exec for sv_release failed\n");
+        exit(1);
+
+      default: /* Parent */
+        /* do nothing */
+        break;
+    }
+    (void)wait(&status); /* child dies after changing 16 */
+
+    if (status.w_retcode != 0) {
+      (void)fprintf(stderr, "device_before_raid: failed to set ownership of win devices\n");
+      exit(1);
+    }
+  }
+
+#endif /* SUNDISPLAY */

 #if defined(XWINDOW) || defined(DOS)
  (currentdsp->cleardisplay)(currentdsp);
@@ -977,6 +1103,9 @@ int device_after_raid() {

  int_init();

+#ifdef SUNDISPLAY
+  FD_SET(LispWindowFd, &LispReadFds);
+#endif /* SUNDISPLAY */

 #ifdef MAIKO_ENABLE_ETHERNET
  FD_SET(ether_fd, &LispReadFds);
@@ -1016,6 +1145,107 @@ int device_after_raid() {

 static int re_init_display(int lisp_display_addr, int display_max)
 {
+#ifdef SUNDISPLAY
+  int mmapstat, size;
+  struct pixrect *ColorFb;
+  extern struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect;
+  extern int DisplayType;
+
+  union wait status;
+
+  if (Win_security_p) {
+    switch (vfork()) {
+      case -1: /* Error */ (void)fprintf(stderr, "re_init_display: Fork failed.\n"); exit(1);
+
+      case 0: /* Child */
+        (void)execl(SV_ACQUIRE, "sv_acquire", "0", "256", "250", NULL);
+        /* should not return */
+        (void)fprintf(stderr, "re_init_display: exec for sv_acquire failed\n");
+        exit(1);
+
+      default: /* Parent */
+        /* do nothing */
+        break;
+    }
+    (void)wait(&status); /* child dies after changing 6 */
+
+    if (status.w_retcode != 0) {
+      (void)fprintf(stderr, "re_init_display: failed to set ownership of win devices\n");
+      exit(1);
+    }
+  }
+
+  mess_init();
+  if ((LispWindowFd = win_screennew(&LispScreen)) == -1) {
+    fprintf(stderr, "init_display: can't create LispWindow\n");
+    return (-1);
+  } else {
+#ifdef KBINT
+    int_io_open(LispWindowFd);
+    fcntl(LispWindowFd, F_SETFL, fcntl(LispWindowFd, F_GETFL, 0) | O_NONBLOCK);
+
+#ifdef FX_AR_124
+    /* For AR 124. Type4 driver bug?? by m.matsuda */
+    {
+      long i;
+      for (i = 0; i < 900000; i++)
+        ;
+    }
+#endif /* FX_AR_124 */
+
+#endif
+  }
+
+#ifndef DISPLAYBUFFER
+  /* for CGFOUR dev */
+  if (DisplayType == SUN4COLOR) {
+    ColorFb = pr_open("/dev/fb");
+    pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
+    pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_SET, 0, 0, 0);
+    pr_set_plane_group(ColorFb, PIXPG_OVERLAY);
+  }
+#else  /* DISPLAYBUFFER is T */
+/*  ColorDisplayPixrect = pr_open("/dev/fb");
+    pr_putcolormap(ColorDisplayPixrect, 1, 1, &black, &black, &black);
+    pr_putcolormap(ColorDisplayPixrect, 0, 1, &white, &white, &white);
+    pr_putcolormap(ColorDisplayPixrect, 255, 1, &black, &black, &black);
+    pr_putcolormap(ColorDisplayPixrect,
+                   (1<<ColorDisplayPixrect->pr_depth)-1, 1,
+                   &black, &black, &black);
+***/
+#endif /* DISPLAYBUFFER */
+
+  init_cursor();
+
+#ifndef DISPLAYBUFFER
+  size = ((displaywidth * displayheight / 8 + (getpagesize() - 1)) & -getpagesize());
+  mmapstat = (int)mmap(DisplayRegion68k, size, PROT_READ | PROT_WRITE,
+#ifdef OS4
+                       MAP_FIXED |
+#endif /* OS4 */
+
+                           MAP_SHARED,
+                       FrameBufferFd, 0);
+
+  if (mmapstat == -1) {
+    fprintf(stderr, "re_init_display: ERROR at mmap system call\n");
+    fprintf(stderr, "errno = %d\n\n", errno);
+    return (0);
+  }
+
+  copy_region(HideDisp68k, DisplayRegion68k, DisplayRasterWidth, displayheight);
+
+  free(HideDisp68k);
+#endif /* DISPLAYBUFFER */
+
+#ifdef DISPLAYBUFFER
+  ColorDisplayPixrect = pr_open("/dev/fb");
+  flush_display_buffer();
+/*     refresh_CG6; */
+
+#endif /* DISPLAYBUFFER */
+
+#endif /* SUNDISPLAY */

  return (0);
 }
@@ -1024,6 +1254,163 @@ static int re_init_display(int lisp_display_addr, int display_max)

 static int re_init_display(int lisp_display_addr, int display_max)
 {
+#ifdef SUNDISPLAY
+  int mmapstat, size;
+  struct pixrect *ColorFb;
+  struct pixrect *color_source;
+  extern int DisplayType;
+  union wait status;
+
+  if (Win_security_p) {
+    switch (vfork()) {
+      case -1: /* Error */ (void)fprintf(stderr, "re_init_display: Fork failed.\n"); exit(1);
+
+      case 0: /* Child */
+        (void)execl(SV_ACQUIRE, "sv_acquire", "0", "256", "250", NULL);
+        /* should not return */
+        (void)fprintf(stderr, "re_init_display: exec for sv_acquire failed\n");
+        exit(1);
+
+      default: /* Parent */
+        /* do nothing */
+        break;
+    }
+    (void)wait(&status); /* child dies after changing 6 */
+
+    if (status.w_retcode != 0) {
+      (void)fprintf(stderr, "re_init_display: failed to set ownership of win devices\n");
+      exit(1);
+    }
+  }
+
+  mess_init();
+  if ((LispWindowFd = win_screennew(&LispScreen)) == -1) {
+    fprintf(stderr, "init_display: can't create LispWindow\n");
+    return (-1);
+  } else {
+#ifdef KBINT
+    int_io_open(LispWindowFd);
+    fcntl(LispWindowFd, F_SETFL, fcntl(LispWindowFd, F_GETFL, 0) | O_NONBLOCK);
+#endif
+  }
+
+#ifdef DISPLAYBUFFER
+  if ((FrameBufferFd = open(LispScreen.scr_fbname, 2)) == -1) {
+    perror("init_display: can't open FrameBuffer\n");
+    exit(-1);
+  }
+#endif /* DISPLAYBUFFER */
+
+  restore_colormap();
+
+  if (MonoOrColor == MONO_SCREEN) {
+#ifndef DISPLAYBUFFER
+    /* for CGFOUR dev */
+    if (DisplayType == SUN4COLOR) {
+      ColorFb = pr_open("/dev/fb");
+      pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
+      pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_SET, 0, 0, 0);
+      pr_set_plane_group(ColorFb, PIXPG_OVERLAY);
+    }
+#else  /* DISPLAYBUFFER is T */
+/*  ColorDisplayPixrect = pr_open("/dev/fb");
+    pr_putcolormap(ColorDisplayPixrect, 1, 1, &black, &black, &black);
+    pr_putcolormap(ColorDisplayPixrect, 0, 1, &white, &white, &white);
+    pr_putcolormap(ColorDisplayPixrect, 255, 1, &black, &black, &black);
+    pr_putcolormap(ColorDisplayPixrect,
+                   (1<<ColorDisplayPixrect->pr_depth)-1, 1,
+                   &black, &black, &black);
+***/
+#endif /* DISPLAYBUFFER */
+
+    init_cursor();
+
+#ifndef DISPLAYBUFFER
+    size = ((displaywidth * displayheight / 8 + (getpagesize() - 1)) & -getpagesize());
+
+    mmapstat = (int)mmap(DisplayRegion68k, size, PROT_READ | PROT_WRITE,
+#ifdef OS4
+                         MAP_FIXED |
+#endif /* OS4 */
+
+                             MAP_SHARED,
+                         FrameBufferFd, 0);
+    if (Inited_Color)
+      mmapstat = (int)mmap(ColorDisplayRegion68k, Dispcolorsize, PROT_READ | PROT_WRITE,
+#ifdef OS4
+                           MAP_FIXED |
+#endif /* OS4 */
+
+                               MAP_SHARED,
+                           FrameBufferFd, 0x40000);
+
+    if (mmapstat == -1) {
+      fprintf(stderr, "re_init_display: ERROR at mmap system call\n");
+      fprintf(stderr, "errno = %d\n\n", errno);
+      return (0);
+    }
+    /* restore mono image */
+    copy_region(HideDisp68k, DisplayRegion68k, DisplayRasterWidth, displayheight);
+
+    free(HideDisp68k);
+
+    if (Inited_Color) { /* restore color image */
+      copy_region(HideColorDisp68k, ColorDisplayRegion68k, DisplayRasterWidth * 8, displayheight);
+      free(HideColorDisp68k);
+    } /* end if( Inited_Color ) */
+#endif /* DISPLAYBUFFER */
+
+#ifdef DISPLAYBUFFER
+    ColorDisplayPixrect = pr_open("/dev/fb");
+    flush_display_buffer();
+/*     refresh_CG6; */
+#endif /* DISPLAYBUFFER */
+
+  } else { /* MonoOrColor is COLOR_SCREEN */
+    ColorFb = pr_open("/dev/fb");
+#ifdef DISPLAYBUFFER
+    ColorDisplayPixrect = ColorFb;
+#endif /* DISPLAYBUFFER */
+
+    color_source = mem_point(displaywidth, displayheight, 8, ColorDisplayRegion68k);
+    pr_rop(ColorFb, 0, 0, displaywidth, displayheight, PIX_SRC, color_source, 0, 0);
+#ifndef DISPLAYBUFFER
+    pr_set_plane_group(ColorFb, PIXPG_OVERLAY_ENABLE);
+    pr_rop(ColorFb, 0, 0, ColorFb->pr_width, ColorFb->pr_height, PIX_CLR, 0, 0, 0);
+#endif /* DISPLAYBUFFER */
+
+    pr_set_plane_group(ColorFb, PIXPG_8BIT_COLOR);
+    init_cursor();
+    mmapstat = (int)mmap(ColorDisplayRegion68k, Dispcolorsize, PROT_READ | PROT_WRITE,
+#ifdef OS4
+                         MAP_FIXED |
+#endif
+                             MAP_SHARED,
+                         FrameBufferFd, 0x40000);
+    if (mmapstat == -1) {
+      perror("cgfour_init_color_display: ERROR at mmap system call\n");
+      error(
+          "cgfour_init_color_display: ERROR at mmap system call\n You may be able to continue by "
+          "typing 'q'");
+      /*                  printf("MMAP FAIL:BMBASE=0x%x\nNATIVE:= 0x%x\nLISPBASEN:= 0x%x\n",
+                              color_bitmapbase,ColorDisplayRegion68k,Lisp_world);
+      */
+      return (NIL);
+    } /* end if(mmapstat) */
+
+#ifndef DISPLAYBUFFER
+    /* restore mono image */
+    copy_region(HideDisp68k, DisplayRegion68k, DisplayRasterWidth, displayheight);
+
+    free(HideDisp68k);
+#endif /* DISPLAYBUFFER */
+
+    /* restore coloe image */
+    copy_region(HideColorDisp68k, ColorDisplayRegion68k, DisplayRasterWidth * 8, displayheight);
+
+    free(HideColorDisp68k);
+  } /* end if(MonoOrColor) */
+#endif /* SUNDISPLAY */

  return (0);
 }
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -36,6 +36,9 @@
 #define alarm(x) 1
 #endif /* DOS */

+#if defined(SUNDISPLAY) && defined(OLD_CURSOR)
+#include <sunwindow/win_cursor.h>
+#endif

 #include "hdw_conf.h"
 #include "lispemul.h"
@@ -58,6 +61,9 @@
 #include "perrnodefs.h"
 #include "ufsdefs.h"

+#ifdef GCC386
+#include "inlnPS2.h"
+#endif

 /* Error return values from VMEMSAVE */
 #define COMPLETESYSOUT NIL
@@ -313,6 +319,9 @@ LispPTR vmem_save(char *sysout_file_name)
  register int i;
  char tempname[MAXPATHLEN];
  register int rval;
+#ifdef SUNDISPLAY
+  /* DLword *bmptr; */
+#endif
 #ifndef DOS
  extern int ScreenLocked;
  extern DLword *EmCursorX68K;
@@ -323,7 +332,17 @@ LispPTR vmem_save(char *sysout_file_name)

 /* remove cursor image from screen */

-#if   DOS
+#ifdef SUNDISPLAY
+#ifdef OLD_CURSOR
+  win_setcursor(LispWindowFd, &InvisibleCursor);
+#else
+  ScreenLocked = T;
+  taking_mouse_down();
+/*	bmptr = EmCursorBitMap68K;
+    EmCursorBitMap68K= NullCursor;*/
+#endif /* OLD_CURSOR */
+
+#elif DOS
  /*  For DOS, must also take the mouse cursor away (it's  */
  /*  written into the display-region bitmap).	     */
  currentdsp->device.locked++;
@@ -496,7 +515,17 @@ LispPTR vmem_save(char *sysout_file_name)
  }

 /* restore cursor image to screen */
-#if   DOS
+#ifdef SUNDISPLAY
+#ifdef OLD_CURSOR
+  win_setcursor(LispWindowFd, &CurrentCursor);
+#else
+  ScreenLocked = T;
+  /*EmCursorBitMap68K = bmptr ;*/
+  taking_mouse_up(*EmCursorX68K, *EmCursorY68K);
+  ScreenLocked = NIL;
+#endif /* OLD_CURSOR */
+
+#elif DOS
  /* Must also put the mouse back. */
  (currentdsp->mouse_visible)(IOPage68K->dlmousex, IOPage68K->dlmousey);
  currentdsp->device.locked--;
--- a/src/xbbt.c
+++ b/src/xbbt.c
@@ -53,7 +53,7 @@ unsigned long clipping_Xbitblt(DspInterface dsp, DLword *dummy, int x, int y, in
    XPutImage(dsp->display_id, dsp->DisplayWindow, dsp->Copy_GC, &dsp->ScreenBitmap, x, y,
              x - dsp->Visible.x, y - dsp->Visible.y, w, h);
    XFlush(dsp->display_id);
-    XUNLOCK(dsp);
+    XUNLOCK;
    return (1);
  }

@@ -80,7 +80,7 @@ unsigned long clipping_Xbitblt(DspInterface dsp, DLword *dummy, int x, int y, in
    XPutImage(dsp->display_id, dsp->DisplayWindow, dsp->Copy_GC, &dsp->ScreenBitmap, x, y,
              x - dsp->Visible.x, y - dsp->Visible.y, w, h);
    XFlush(dsp->display_id);
-    XUNLOCK(dsp);
+    XUNLOCK;
  }
  return (1);

--- a/src/xc.c
+++ b/src/xc.c
@@ -20,7 +20,6 @@
 /*									*/
 /************************************************************************/

-#include <signal.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -113,7 +112,12 @@ extern MouseInterface currentmouse;
 typedef struct conspage ConsPage;
 typedef ByteCode *InstPtr;

-#if   (DOS && OPDISP)
+#ifdef GCC386
+register InstPtr pccache asm("si");
+register LispPTR *cspcache asm("di");
+register LispPTR tscache asm("bx");
+#include "inlnPS2.h"
+#elif (DOS && OPDISP)
 #include "inlndos.h"
 register InstPtr pccache asm("si");
 register LispPTR *cspcache asm("di");
@@ -142,7 +146,7 @@ register LispPTR tscache asm("bx");
 #define IVARL IVar

 #ifdef XWINDOW
-extern volatile sig_atomic_t Event_Req;       /* != 0 when it's time to check X events
+extern int Event_Req; /* != 0 when it's time to check X events
                                                 on machines that don't get them reliably
                                                 (e.g. Suns running OpenWindows) */
 #endif                /* XWINDOW */
--- a/src/xcursor.c
+++ b/src/xcursor.c
@@ -66,7 +66,7 @@ void Init_XCursor() {
  cursorlist->next = NULL;
  for (i = 0; i < CURSORHEIGHT; i++) cursorlist->bitmap[i] = newbm[i];
  set_Xcursor(currentdsp, (uint8_t *)newbm, 0, 0, &(cursorlist->Xid), 1);
-  DefineCursor(currentdsp, currentdsp->DisplayWindow, &(cursorlist->Xid));
+  DefineCursor(currentdsp->display_id, currentdsp->DisplayWindow, &(cursorlist->Xid));
 } /* end Init_XCursor */

 /************************************************************************/
@@ -120,8 +120,8 @@ void Set_XCursor(int x, int y)
    clp->next = cursorlist;
    cursorlist = clp;
  }
-  DefineCursor(currentdsp, currentdsp->DisplayWindow, &(clp->Xid));
-  XUNLOCK(currentdsp); /* Signals OK now */
+  DefineCursor(currentdsp->display_id, currentdsp->DisplayWindow, &(clp->Xid));
+  XUNLOCK; /* Signals OK now */

 #ifdef NEWXCURSOR
  /* Save the hotspot for later position reporting/setting */
@@ -140,16 +140,16 @@ void Set_XCursor(int x, int y)
 /*									*/
 /************************************************************************/

-void init_Xcursor(DspInterface dsp)
+void init_Xcursor(Display *display, Window window)
 {
  TPRINT(("TRACE: init_Xcursor()\n"));

  XLOCK; /* Take no X signals during this activity (ISC 386) */

-  XAllocNamedColor(dsp->display_id, Colors, "black", &cursor_fore_xcsd, &xced);
-  XAllocNamedColor(dsp->display_id, Colors, "white", &cursor_back_xcsd, &xced);
+  XAllocNamedColor(display, Colors, "black", &cursor_fore_xcsd, &xced);
+  XAllocNamedColor(display, Colors, "white", &cursor_back_xcsd, &xced);

-  XUNLOCK(dsp); /* OK to take signals again */
+  XUNLOCK; /* OK to take signals again */

 } /* end init_Xcursor */

@@ -190,6 +190,6 @@ void set_Xcursor(DspInterface dsp, const uint8_t *bitmap, int hotspot_x, int hot
  XFreePixmap(dsp->display_id, Cursor_msk);

  XFlush(dsp->display_id);
-  XUNLOCK(dsp);
+  XUNLOCK;

 } /* end set_Xcursor */
--- a/src/xinit.c
+++ b/src/xinit.c
@@ -11,7 +11,6 @@
 #include "version.h"

 #include <assert.h>
-#include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -63,8 +62,7 @@ unsigned LispDisplayRequestedWidth, LispDisplayRequestedHeight;

 Colormap Colors;

-volatile sig_atomic_t XLocked = 0; /* non-zero while doing X ops, to avoid signals */
-volatile sig_atomic_t XNeedSignal = 0; /* T if an X interrupt happened while XLOCK asserted */
+int XLocked = 0; /* non-zero while doing X ops, to avoid signals */
 extern fd_set LispReadFds;

 /************************************************************************/
@@ -108,15 +106,13 @@ void lisp_Xexit(DspInterface dsp)
 {
  assert(Lisp_Xinitialized);

-#if defined(I_SETSIG)
+#if defined(OS5) && defined(I_SETSIG)
  ioctl(ConnectionNumber(dsp->display_id), I_SETSIG, 0); /* so no interrupts happen during */
 #endif

-  XLOCK;
  XDestroySubwindows(dsp->display_id, dsp->LispWindow);
  XDestroyWindow(dsp->display_id, dsp->LispWindow);
  XCloseDisplay(dsp->display_id);
-  XUNLOCK(dsp);

  Lisp_Xinitialized = false;
 } /* end lisp_Xexit */
@@ -144,7 +140,7 @@ void Xevent_before_raid(DspInterface dsp)

  XLOCK;
  XFlush(dsp->display_id);
-  XUNLOCK(dsp);
+  XUNLOCK;
 } /* end Xevent_before_raid */

 /************************************************************************/
@@ -162,7 +158,7 @@ void Xevent_after_raid(DspInterface dsp)
                          dsp->Visible.height);
  XLOCK;
  XFlush(dsp->display_id);
-  XUNLOCK(dsp);
+  XUNLOCK;

 } /* end Xevent_after_raid */

@@ -326,11 +322,9 @@ DspInterface X_init(DspInterface dsp, char *lispbitmap, int width_hint, int heig
      dsp->ScreenBitmap.bitmap_bit_order = MSBFirst;
      dsp->ScreenBitmap.bitmap_pad = 32;
      dsp->ScreenBitmap.depth = 1;
-      dsp->ScreenBitmap.bits_per_pixel = 1;
      dsp->ScreenBitmap.bytes_per_line =
          ((dsp->Display.width + (BITSPER_DLWORD - 1)) / BITSPER_DLWORD) * (BITSPER_DLWORD / 8);
      break;
  }
-  XInitImage(&dsp->ScreenBitmap);
  return (dsp);
 }
--- a/src/xlspwin.c
+++ b/src/xlspwin.c
@@ -140,7 +140,7 @@ void Create_LispWindow(DspInterface dsp)
                   save_argc, &szhint, &Lisp_WMhints, &xclasshint);

  XSelectInput(dsp->display_id, dsp->LispWindow, dsp->EnableEventMask);
-  init_Xcursor(dsp);
+  init_Xcursor(dsp->display_id, dsp->LispWindow);

  dsp->DisplayWindow = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow, 0, 0,
                                           dsp->Visible.width, dsp->Visible.height, 0,
@@ -195,7 +195,7 @@ void Create_LispWindow(DspInterface dsp)
                                          dsp->ScrollBarWidth,          /* width */
                                          dsp->Visible.height, dsp->InternalBorderWidth,
                                          BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
-  DefineCursor(dsp, dsp->VerScrollBar, &VertScrollCursor);
+  DefineCursor(dsp->display_id, dsp->VerScrollBar, &VertScrollCursor);
  XMapWindow(dsp->display_id, dsp->VerScrollBar);

  dsp->HorScrollBar = XCreateSimpleWindow(dsp->display_id, dsp->LispWindow,
@@ -203,7 +203,7 @@ void Create_LispWindow(DspInterface dsp)
                                          dsp->Visible.width,                /* width */
                                          dsp->ScrollBarWidth, dsp->InternalBorderWidth,
                                          BlackPixelOfScreen(screen), WhitePixelOfScreen(screen));
-  DefineCursor(dsp, dsp->HorScrollBar, &HorizScrollCursor);
+  DefineCursor(dsp->display_id, dsp->HorScrollBar, &HorizScrollCursor);
  XChangeWindowAttributes(dsp->display_id, dsp->HorScrollBar, CWOverrideRedirect,
                          &Lisp_SetWinAttributes);
  XMapWindow(dsp->display_id, dsp->HorScrollBar);
@@ -237,7 +237,7 @@ void Create_LispWindow(DspInterface dsp)
                                    GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
                                    WhitePixelOfScreen(screen));
  XSetWindowBackgroundPixmap(dsp->display_id, dsp->NWGrav, dsp->GravityOnPixmap);
-  DefineCursor(dsp, dsp->NWGrav, &DefaultCursor);
+  DefineCursor(dsp->display_id, dsp->NWGrav, &DefaultCursor);
  XChangeWindowAttributes(dsp->display_id, dsp->NWGrav, CWOverrideRedirect, &Lisp_SetWinAttributes);
  XClearWindow(dsp->display_id, dsp->NWGrav);
  XMapWindow(dsp->display_id, dsp->NWGrav);
@@ -246,7 +246,7 @@ void Create_LispWindow(DspInterface dsp)
                                    GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
                                    WhitePixelOfScreen(screen));
  XSetWindowBackgroundPixmap(dsp->display_id, dsp->SEGrav, dsp->GravityOffPixmap);
-  DefineCursor(dsp, dsp->SEGrav, &DefaultCursor);
+  DefineCursor(dsp->display_id, dsp->SEGrav, &DefaultCursor);
  XChangeWindowAttributes(dsp->display_id, dsp->SEGrav, CWOverrideRedirect, &Lisp_SetWinAttributes);
  XClearWindow(dsp->display_id, dsp->NWGrav);
  XMapWindow(dsp->display_id, dsp->SEGrav);
@@ -255,7 +255,7 @@ void Create_LispWindow(DspInterface dsp)
                                    GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
                                    WhitePixelOfScreen(screen));
  XSetWindowBackgroundPixmap(dsp->display_id, dsp->SWGrav, dsp->GravityOffPixmap);
-  DefineCursor(dsp, dsp->SWGrav, &DefaultCursor);
+  DefineCursor(dsp->display_id, dsp->SWGrav, &DefaultCursor);
  XClearWindow(dsp->display_id, dsp->NWGrav);
  XMapWindow(dsp->display_id, dsp->SWGrav);

@@ -263,16 +263,16 @@ void Create_LispWindow(DspInterface dsp)
                                    GravSize, dsp->InternalBorderWidth, BlackPixelOfScreen(screen),
                                    WhitePixelOfScreen(screen));
  XSetWindowBackgroundPixmap(dsp->display_id, dsp->NEGrav, dsp->GravityOffPixmap);
-  DefineCursor(dsp, dsp->NEGrav, &DefaultCursor);
+  DefineCursor(dsp->display_id, dsp->NEGrav, &DefaultCursor);
  XClearWindow(dsp->display_id, dsp->NWGrav);
  XMapWindow(dsp->display_id, dsp->NEGrav);

-  /* DefineCursor( dsp, dsp->DisplayWindow, &WaitCursor ); */
+  /* DefineCursor( dsp->display_id, dsp->DisplayWindow, &WaitCursor ); */

  XLOCK;
  XMapWindow(dsp->display_id, dsp->LispWindow);
  XFlush(dsp->display_id);
-  XUNLOCK(dsp);
+  XUNLOCK;
 }

 void lisp_Xvideocolor(int flag)
@@ -303,7 +303,7 @@ void lisp_Xvideocolor(int flag)
  }

  XFlush(currentdsp->display_id);
-  XUNLOCK(currentdsp);
+  XUNLOCK;

 } /* end lisp_Xvideocolor */

@@ -322,7 +322,7 @@ void set_Xmouseposition(int x, int y)
    XWarpPointer(currentdsp->display_id, (Window)NULL, currentdsp->DisplayWindow, 0, 0, 0, 0,
                 dest_x, dest_y);
    XFlush(currentdsp->display_id);
-    XUNLOCK(currentdsp);
+    XUNLOCK;
  }
 } /* end set_Xmouseposition */

--- a/src/xwinman.c
+++ b/src/xwinman.c
@@ -83,7 +83,7 @@ void Set_BitGravity(XButtonEvent *event, DspInterface dsp, Window window, int gr

  XSetWindowBackgroundPixmap(event->display, window, dsp->GravityOnPixmap);
  XClearWindow(event->display, window);
-  XUNLOCK(dsp);
+  XUNLOCK;
 } /* end Set_BitGravity */

 static void lisp_Xconfigure(DspInterface dsp, int x, int y, int lspWinWidth, int lspWinHeight)
@@ -137,7 +137,7 @@ static void lisp_Xconfigure(DspInterface dsp, int x, int y, int lspWinWidth, int
  XMoveResizeWindow(dsp->display_id, dsp->SWGrav, Col2, Row3, GravSize, GravSize);
  Scroll(dsp, dsp->Visible.x, dsp->Visible.y);
  XFlush(dsp->display_id);
-  XUNLOCK(dsp);
+  XUNLOCK;
 } /* end lisp_Xconfigure */

 void enable_Xkeyboard(DspInterface dsp)
@@ -145,7 +145,7 @@ void enable_Xkeyboard(DspInterface dsp)
  XLOCK;
  XSelectInput(dsp->display_id, dsp->DisplayWindow, dsp->EnableEventMask);
  XFlush(dsp->display_id);
-  XUNLOCK(dsp);
+  XUNLOCK;
 }

 void disable_Xkeyboard(DspInterface dsp)
@@ -153,7 +153,7 @@ void disable_Xkeyboard(DspInterface dsp)
  XLOCK;
  XSelectInput(dsp->display_id, dsp->DisplayWindow, dsp->DisableEventMask);
  XFlush(dsp->display_id);
-  XUNLOCK(dsp);
+  XUNLOCK;
 }

 void beep_Xkeyboard(DspInterface dsp)
@@ -165,7 +165,7 @@ void beep_Xkeyboard(DspInterface dsp)
  XLOCK;
  XBell(dsp->display_id, (int)50);
  XFlush(dsp->display_id);
-  XUNLOCK(dsp);
+  XUNLOCK;

 } /* end beep_Xkeyboard */

@@ -237,9 +237,11 @@ void getXsignaldata(DspInterface dsp)
        case EnterNotify: Mouse_Included = TRUE; break;
        case LeaveNotify: Mouse_Included = FALSE; break;
        case Expose:
+          XLOCK;
          (dsp->bitblt_to_screen)(dsp, 0, report.xexpose.x + dsp->Visible.x,
                                  report.xexpose.y + dsp->Visible.y, report.xexpose.width,
                                  report.xexpose.height);
+          XUNLOCK;
          break;
        default: break;
      }
@@ -264,14 +266,14 @@ void getXsignaldata(DspInterface dsp)
        case ButtonPress:
          switch (report.xbutton.button) {
            case Button1:
-              DefineCursor(dsp, dsp->HorScrollBar, &ScrollLeftCursor);
+              DefineCursor(dsp->display_id, dsp->HorScrollBar, &ScrollLeftCursor);
              ScrollLeft(dsp);
              break;
            case Button2:
-              DefineCursor(dsp, dsp->HorScrollBar, &HorizThumbCursor);
+              DefineCursor(dsp->display_id, dsp->HorScrollBar, &HorizThumbCursor);
              break;
            case Button3:
-              DefineCursor(dsp, dsp->HorScrollBar, &ScrollRightCursor);
+              DefineCursor(dsp->display_id, dsp->HorScrollBar, &ScrollRightCursor);
              ScrollRight(dsp);
              break;
            default: break;
@@ -280,14 +282,14 @@ void getXsignaldata(DspInterface dsp)
        case ButtonRelease:
          switch (report.xbutton.button) {
            case Button1:
-              DefineCursor(dsp, report.xany.window, &HorizScrollCursor);
+              DefineCursor(dsp->display_id, report.xany.window, &HorizScrollCursor);
              break;
            case Button2:
              JumpScrollHor(dsp, report.xbutton.x);
-              DefineCursor(dsp, report.xany.window, &HorizScrollCursor);
+              DefineCursor(dsp->display_id, report.xany.window, &HorizScrollCursor);
              break;
            case Button3:
-              DefineCursor(dsp, report.xany.window, &HorizScrollCursor);
+              DefineCursor(dsp->display_id, report.xany.window, &HorizScrollCursor);
              break;
            default: break;
          } /* end switch */
@@ -298,14 +300,14 @@ void getXsignaldata(DspInterface dsp)
        case ButtonPress:
          switch (report.xbutton.button) {
            case Button1:
-              DefineCursor(dsp, report.xany.window, &ScrollUpCursor);
+              DefineCursor(dsp->display_id, report.xany.window, &ScrollUpCursor);
              ScrollUp(dsp);
              break;
            case Button2:
-              DefineCursor(dsp, report.xany.window, &VertThumbCursor);
+              DefineCursor(dsp->display_id, report.xany.window, &VertThumbCursor);
              break;
            case Button3:
-              DefineCursor(dsp, report.xany.window, &ScrollDownCursor);
+              DefineCursor(dsp->display_id, report.xany.window, &ScrollDownCursor);
              ScrollDown(dsp);
              break;
            default: break;
@@ -314,14 +316,14 @@ void getXsignaldata(DspInterface dsp)
        case ButtonRelease:
          switch (report.xbutton.button) {
            case Button1:
-              DefineCursor(dsp, report.xany.window, &VertScrollCursor);
+              DefineCursor(dsp->display_id, report.xany.window, &VertScrollCursor);
              break;
            case Button3:
-              DefineCursor(dsp, report.xany.window, &VertScrollCursor);
+              DefineCursor(dsp->display_id, report.xany.window, &VertScrollCursor);
              break;
            case Button2:
              JumpScrollVer(dsp, report.xbutton.y);
-              DefineCursor(dsp, report.xany.window, &VertScrollCursor);
+              DefineCursor(dsp->display_id, report.xany.window, &VertScrollCursor);
              break;
            default: break;
          } /* end switch */
Author	SHA1	Message	Date
Larry Masinter	d625665cde	WIP still, trying for a fix	2021-05-24 12:26:31 -07:00
Larry Masinter	c0850ddb52	WIP still; now it looks like inlineC.h but it still fails	2021-05-15 16:10:06 -07:00
Larry Masinter	68d4a61bf1	WIP: make variable types in simulate_unbind match OP_unbind	2021-05-15 12:21:06 -07:00