add :aarch64

Author: k-okada

lisp/l/string.l

@@ -136,10 +136,10 @@
      (if (numberp val)
 	 (sys:poke val self pos type)
 	 (let ((offset (cdr (assoc type
-#-(or :alpha :irix6 :x86_64)
+#-(or :alpha :irix6 :x86_64 :aarch64)
 		 '((:short . 2) (:long . 4) (:byte . 1) (:char . 1)
 		   (:int . 4) (:integer . 4) (:float . 4) (:double . 8))
-#+(or :alpha :irix6 :x86_64)
+#+(or :alpha :irix6 :x86_64 :aarch64)
 		 '((:short . 2) (:long . 8) (:byte . 1) (:char . 1)
 		   (:int . 4) (:integer . 4) (:float . 4) (:double . 8))
 		 ))))

lisp/xwindow/Xeus.l

@@ -170,23 +170,23 @@
  (:GetImage (&key (xy nil) (x 0) (y 0)
 		  (width (- (send self :width) x))
 		  (height (- (send self :height) y))
-#-(or :alpha :irix6 :x86_64)		 
+#-(or :alpha :irix6 :x86_64 :aarch64)
 		  (mask #xffffffff)
-#+(or :alpha :irix6 :x86_64)
+#+(or :alpha :irix6 :x86_64 :aarch64)
 		  (mask #xfffffffffffffff)
 		  (format 2))
 	;; #define XYBitmap      0       /* depth 1, XYFormat */
 	;; #define XYPixmap      1       /* depth == drawable depth */
 	;; #define ZPixmap       2       /* depth == drawable depth */
     (if xy (setq x (aref xy 0) y (aref xy 1)))
     (let* ((ximg (getimage *display* drawable x y width height mask format)) 
-#-(or :alpha :irix6 :x86_64)
+#-(or :alpha :irix6 :x86_64 :aarch64)
 	   (pixsize (/ (sys:peek (+ ximg #x2c) :integer) 8))
-#+(or :alpha :irix6 :x86_64)
+#+(or :alpha :irix6 :x86_64 :aarch64)
 	   (pixsize (/ (sys:peek (+ ximg #x30) :integer) 8))
-#-(or :alpha :irix6 :x86_64)
+#-(or :alpha :irix6 :x86_64 :aarch64)
 	   (rowsize (sys:peek (+ ximg #x28) :integer))
-#+(or :alpha :irix6 :x86_64)
+#+(or :alpha :irix6 :x86_64 :aarch64)
 	   (rowsize (sys:peek (+ ximg #x2c) :integer))
 	   (xoffset (sys:peek (+ ximg 8) :integer))
 	   (ximgdata (sys:peek (+ ximg #x10) :long))

lisp/xwindow/Xevent.l

@@ -107,13 +107,13 @@
     (same-screen	:integer)	;14
     (focus		:integer)	;15
     (alt-state		:integer)	;16
-#-(or :alpha :irix6 :x86_64)
+#-(or :alpha :irix6 :x86_64 :aarch64)
     (pad		:char 28)	;xevent is required to hold 24 longs
 #+:irix6
     (pad		:char 84)
 #+:alpha
     (pad		:char 88)
-#+:x86_64
+#+(or :x86_64 :aarch64)
     (pad		:char 92)      ;xevent is required to hold xx longs at x86-64
 )
 
@@ -179,14 +179,14 @@
 (defun event-root-pos (e)
     (integer-vector (XEvent-x-root e) (XEvent-y-root e)))
 
-#-:x86_64
+#-(or :x86_64 :aarch64)
 (defun event-width (e) (XEvent-x e))
-#-:x86_64
+#-(or :x86_64 :aarch64)
 (defun event-height (e) (XEvent-y e))
-#+:x86_64
+#+(or :x86_64 :aarch64)
 (defun event-width (e) (sys::peek ;; for width of XConfigureEvent
                         (+ (sys::address e) 16 (* 4 14)) :integer))
-#+:x86_64
+#+(or :x86_64 :aarch64)
 (defun event-height (e) (sys::peek  ;; for height of XConfigureEvent
                          (+ (sys::address e) 16 (* 4 15)) :integer))
 
@@ -442,11 +442,11 @@ instead of 12th of motoinNotify events."
   (defun window-main-thread ()
      (sys::thread-no-wait #'window-main-thread2)))
 
-#-(or :alpha :irix6 :x86_64)
+#-(or :alpha :irix6 :x86_64 :aarch64)
 (defun display-fd (&optional (disp *display*))
    (if disp
        (sys:peek (+ disp 8) :long)))
-#+(or :alpha :irix6 :x86_64)
+#+(or :alpha :irix6 :x86_64 :aarch64)
 (defun display-fd (&optional (disp *display*))
    (if disp
        (sys:peek (+ disp 16) :integer)))

lisp/xwindow/Xgraphics.l

@@ -185,9 +185,9 @@
 	      (setq id (LoadQueryFont *display* font))
 	      (if (= id 0)
 		  (prog1 0 (warn "can't load font ~S" font))
-#-(or :alpha :irix6 :x86_64)
+#-(or :alpha :irix6 :x86_64 :aarch64)
 		  (sys:peek (+ id 4) :long)
-#+(or :alpha :irix6 :x86_64)
+#+(or :alpha :irix6 :x86_64 :aarch64)
 		  (sys:peek (+ id 8) :long)
 ))))
 
@@ -228,9 +228,9 @@
 			bitunit 	; bitmap_mad 32?
 			(* width (/ bitunit 8)	; bytes_per_line 'width'?
 		)))
-      #-:x86_64
+      #-(or :x86_64 :aarch64)
       (make-foreign-string addr 64)
-      #+:x86_64
+      #+(or :x86_64 :aarch64)
       (make-foreign-string addr 88)
       ))
 
@@ -257,7 +257,7 @@
 (defparameter *blue-mask* #x00ff0000)
 
 
-#-(or :alpha :irix6 :x86_64)
+#-(or :alpha :irix6 :x86_64 :aarch64)
 (defun set-ximage (ximage data width height
 		   &optional (visual *visual*)
 			 (depth (visual-depth visual))
@@ -279,7 +279,7 @@
        (sys:poke *blue-mask*  ximage 48 :long)
     ximage)
 
-#+:x86_64
+#+(or :x86_64 :aarch64)
 (defun set-ximage (ximage data width height
 		   &optional (visual *visual*)
 			 (depth (visual-depth visual))
@@ -358,9 +358,9 @@
  (:gc () gcid)
  (:copy ()
    (let ((newgc (instance gcontext :create)))
-#-(or :alpha :irix6 :x86_64)
+#-(or :alpha :irix6 :x86_64 :aarch64)
      (CopyGC *display* gcid #xffffffff (send newgc :gc))
-#+(or :alpha :irix6 :x86_64)
+#+(or :alpha :irix6 :x86_64 :aarch64)
      (CopyGC *display* gcid #xffffffffffffffff (send newgc :gc))
      newgc))
  (:function-to-value (f)