X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fhppa%2Fsap.lisp;h=b234b39a5d57a3fa3569cd73f604e49859ca9545;hb=9c510b74eca61bbcc2014dc2b1d02049dff50508;hp=48da0884ead6f36601f17455128f6436ed90c655;hpb=8a19c6876412b8ad1cf729297c2a373d63a0d0ec;p=sbcl.git

diff --git a/src/compiler/hppa/sap.lisp b/src/compiler/hppa/sap.lisp
index 48da088..b234b39 100644
--- a/src/compiler/hppa/sap.lisp
+++ b/src/compiler/hppa/sap.lisp
@@ -1,83 +1,82 @@
-(in-package "SB!VM")
+;;;; the HPPA VM definition of SAP operations
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
 
+(in-package "SB!VM")
 
 ;;;; Moves and coercions:
 
 ;;; Move a tagged SAP to an untagged representation.
-;;;
 (define-vop (move-to-sap)
-  (:args (x :scs (descriptor-reg)))
+  (:args (x :scs (any-reg descriptor-reg)))
   (:results (y :scs (sap-reg)))
   (:note "system area pointer indirection")
   (:generator 1
     (loadw y x sap-pointer-slot other-pointer-lowtag)))
 
-;;;
 (define-move-vop move-to-sap :move
   (descriptor-reg) (sap-reg))
 
-
 ;;; Move an untagged SAP to a tagged representation.
-;;;
 (define-vop (move-from-sap)
-  (:args (x :scs (sap-reg) :to (:eval 1)))
+  (:args (sap :scs (sap-reg) :to :save))
   (:temporary (:scs (non-descriptor-reg)) ndescr)
-  (:results (y :scs (descriptor-reg) :from (:eval 0)))
+  (:results (res :scs (descriptor-reg)))
   (:note "system area pointer allocation")
   (:generator 20
-    (with-fixed-allocation (y ndescr sap-widetag sap-size)
-      (storew x y sap-pointer-slot other-pointer-lowtag))))
-;;;
+    (with-fixed-allocation (res nil ndescr sap-widetag sap-size nil)
+      (storew sap res sap-pointer-slot other-pointer-lowtag))))
+
 (define-move-vop move-from-sap :move
   (sap-reg) (descriptor-reg))
 
-
 ;;; Move untagged sap values.
-;;;
 (define-vop (sap-move)
   (:args (x :target y
-	    :scs (sap-reg)
-	    :load-if (not (location= x y))))
+            :scs (sap-reg)
+            :load-if (not (location= x y))))
   (:results (y :scs (sap-reg)
-	       :load-if (not (location= x y))))
+               :load-if (not (location= x y))))
+  (:note "SAP move")
   (:effects)
   (:affected)
   (:generator 0
     (move x y)))
-;;;
+
 (define-move-vop sap-move :move
   (sap-reg) (sap-reg))
 
-
-;;; Move untagged sap arguments/return-values.
-;;;
-(define-vop (move-sap-argument)
+;;; Move untagged sap args/return-values.
+(define-vop (move-sap-arg)
   (:args (x :target y
-	    :scs (sap-reg))
-	 (fp :scs (any-reg)
-	     :load-if (not (sc-is y sap-reg))))
+            :scs (sap-reg))
+         (fp :scs (any-reg)
+             :load-if (not (sc-is y sap-reg))))
   (:results (y))
+  (:note "SAP argument move")
   (:generator 0
     (sc-case y
       (sap-reg
        (move x y))
       (sap-stack
        (storew x fp (tn-offset y))))))
-;;;
-(define-move-vop move-sap-argument :move-arg
-  (descriptor-reg sap-reg) (sap-reg))
 
+(define-move-vop move-sap-arg :move-arg
+  (descriptor-reg sap-reg) (sap-reg))
 
-;;; Use standard MOVE-ARGUMENT + coercion to move an untagged sap to a
+;;; Use standard MOVE-ARG + coercion to move an untagged sap to a
 ;;; descriptor passing location.
-;;;
-(define-move-vop move-argument :move-arg
+(define-move-vop move-arg :move-arg
   (sap-reg) (descriptor-reg))
-
-
 
 ;;;; SAP-INT and INT-SAP
-
 (define-vop (sap-int)
   (:args (sap :scs (sap-reg) :target int))
   (:arg-types system-area-pointer)
@@ -97,138 +96,131 @@
   (:policy :fast-safe)
   (:generator 1
     (move int sap)))
-
-
 
 ;;;; POINTER+ and POINTER-
-
 (define-vop (pointer+)
   (:translate sap+)
-  (:args (ptr :scs (sap-reg) :target res)
-	 (offset :scs (signed-reg)))
+  (:args (ptr :scs (sap-reg))
+         (offset :scs (signed-reg immediate)))
   (:arg-types system-area-pointer signed-num)
   (:results (res :scs (sap-reg)))
   (:result-types system-area-pointer)
   (:policy :fast-safe)
   (:generator 1
-    (inst add ptr offset res)))
-
-(define-vop (pointer+-c)
-  (:translate sap+)
-  (:args (ptr :scs (sap-reg)))
-  (:info offset)
-  (:arg-types system-area-pointer (:constant (signed-byte 11)))
-  (:results (res :scs (sap-reg)))
-  (:result-types system-area-pointer)
-  (:policy :fast-safe)
-  (:generator 1
-    (inst addi offset ptr res)))
+    (sc-case offset
+      (signed-reg
+        (inst add ptr offset res))
+      (immediate
+        (cond
+          ((and (< (tn-value offset) (ash 1 10))
+                (> (tn-value offset) (- (ash 1 10))))
+            (inst addi (tn-value offset) ptr res))
+          (t
+            (inst li (tn-value offset) res)
+            (inst add ptr res res)))))))
 
 (define-vop (pointer-)
   (:translate sap-)
   (:args (ptr1 :scs (sap-reg))
-	 (ptr2 :scs (sap-reg)))
+         (ptr2 :scs (sap-reg)))
   (:arg-types system-area-pointer system-area-pointer)
   (:policy :fast-safe)
   (:results (res :scs (signed-reg)))
   (:result-types signed-num)
   (:generator 1
     (inst sub ptr1 ptr2 res)))
-
-
 
 ;;;; mumble-SYSTEM-REF and mumble-SYSTEM-SET
-
 (macrolet ((def-system-ref-and-set
-	  (ref-name set-name sc type size &optional signed)
+          (ref-name set-name sc type size &optional signed)
   (let ((ref-name-c (symbolicate ref-name "-C"))
-	(set-name-c (symbolicate set-name "-C")))
+        (set-name-c (symbolicate set-name "-C")))
     `(progn
        (define-vop (,ref-name)
-	 (:translate ,ref-name)
-	 (:policy :fast-safe)
-	 (:args (object :scs (sap-reg))
-		(offset :scs (signed-reg)))
-	 (:arg-types system-area-pointer signed-num)
-	 (:results (result :scs (,sc)))
-	 (:result-types ,type)
-	 (:generator 5
-	   (inst ,(ecase size
-		    (:byte 'ldbx)
-		    (:short 'ldhx)
-		    (:long 'ldwx)
-		    (:float 'fldx))
-		 offset object result)
-	   ,@(when (and signed (not (eq size :long)))
-	       `((inst extrs result 31 ,(ecase size
-			  (:byte 8)
-			  (:short 16))
-		       result)))))
+         (:translate ,ref-name)
+         (:policy :fast-safe)
+         (:args (object :scs (sap-reg))
+                (offset :scs (signed-reg)))
+         (:arg-types system-area-pointer signed-num)
+         (:results (result :scs (,sc)))
+         (:result-types ,type)
+         (:generator 5
+           (inst ,(ecase size
+                    (:byte 'ldbx)
+                    (:short 'ldhx)
+                    (:long 'ldwx)
+                    (:float 'fldx))
+                 offset object result)
+           ,@(when (and signed (not (eq size :long)))
+               `((inst extrs result 31 ,(ecase size
+                          (:byte 8)
+                          (:short 16))
+                       result)))))
        (define-vop (,ref-name-c)
-	 (:translate ,ref-name)
-	 (:policy :fast-safe)
-	 (:args (object :scs (sap-reg)))
-	 (:arg-types system-area-pointer
-		     (:constant ,(if (eq size :float)
-				     '(signed-byte 5)
-				     '(signed-byte 14))))
-	 (:info offset)
-	 (:results (result :scs (,sc)))
-	 (:result-types ,type)
-	 (:generator 4
-	   (inst ,(ecase size
-		    (:byte 'ldb)
-		    (:short 'ldh)
-		    (:long 'ldw)
-		    (:float 'flds))
-		 offset object result)
-	   ,@(when (and signed (not (eq size :long)))
-	       `((inst extrs result 31 ,(ecase size
-			  (:byte 8)
-			  (:short 16))
-		       result)))))
+         (:translate ,ref-name)
+         (:policy :fast-safe)
+         (:args (object :scs (sap-reg)))
+         (:arg-types system-area-pointer
+                     (:constant ,(if (eq size :float)
+                                     '(signed-byte 5)
+                                     '(signed-byte 14))))
+         (:info offset)
+         (:results (result :scs (,sc)))
+         (:result-types ,type)
+         (:generator 4
+           (inst ,(ecase size
+                    (:byte 'ldb)
+                    (:short 'ldh)
+                    (:long 'ldw)
+                    (:float 'flds))
+                 offset object result)
+           ,@(when (and signed (not (eq size :long)))
+               `((inst extrs result 31 ,(ecase size
+                          (:byte 8)
+                          (:short 16))
+                       result)))))
        (define-vop (,set-name)
-	 (:translate ,set-name)
-	 (:policy :fast-safe)
-	 (:args (object :scs (sap-reg)
-			,@(unless (eq size :float) '(:target sap)))
-		(offset :scs (signed-reg))
-		(value :scs (,sc) :target result))
-	 (:arg-types system-area-pointer signed-num ,type)
-	 (:results (result :scs (,sc)))
-	 (:result-types ,type)
-	 ,@(unless (eq size :float)
-	     '((:temporary (:scs (sap-reg) :from (:argument 0)) sap)))
-	 (:generator 5
-	   ,@(if (eq size :float)
-		 `((inst fstx value offset object)
-		   (unless (location= value result)
-		     (inst funop :copy value result)))
-		 `((inst add object offset sap)
-		   (inst ,(ecase size (:byte 'stb) (:short 'sth) (:long 'stw))
-			 value 0 sap)
-		   (move value result)))))
+         (:translate ,set-name)
+         (:policy :fast-safe)
+         (:args (object :scs (sap-reg)
+                        ,@(unless (eq size :float) '(:target sap)))
+                (offset :scs (signed-reg))
+                (value :scs (,sc) :target result))
+         (:arg-types system-area-pointer signed-num ,type)
+         (:results (result :scs (,sc)))
+         (:result-types ,type)
+         ,@(unless (eq size :float)
+             '((:temporary (:scs (sap-reg) :from (:argument 0)) sap)))
+         (:generator 5
+           ,@(if (eq size :float)
+                 `((inst fstx value offset object)
+                   (unless (location= value result)
+                     (inst funop :copy value result)))
+                 `((inst add object offset sap)
+                   (inst ,(ecase size (:byte 'stb) (:short 'sth) (:long 'stw))
+                         value 0 sap)
+                   (move value result)))))
        (define-vop (,set-name-c)
-	 (:translate ,set-name)
-	 (:policy :fast-safe)
-	 (:args (object :scs (sap-reg))
-		(value :scs (,sc) :target result))
-	 (:arg-types system-area-pointer
-		     (:constant ,(if (eq size :float)
-				     '(signed-byte 5)
-				     '(signed-byte 14)))
-		     ,type)
-	 (:info offset)
-	 (:results (result :scs (,sc)))
-	 (:result-types ,type)
-	 (:generator 5
-	   ,@(if (eq size :float)
-		 `((inst fsts value offset object)
-		   (unless (location= value result)
-		     (inst funop :copy value result)))
-		 `((inst ,(ecase size (:byte 'stb) (:short 'sth) (:long 'stw))
-			 value offset object)
-		   (move value result)))))))))
+         (:translate ,set-name)
+         (:policy :fast-safe)
+         (:args (object :scs (sap-reg))
+                (value :scs (,sc) :target result))
+         (:arg-types system-area-pointer
+                     (:constant ,(if (eq size :float)
+                                     '(signed-byte 5)
+                                     '(signed-byte 14)))
+                     ,type)
+         (:info offset)
+         (:results (result :scs (,sc)))
+         (:result-types ,type)
+         (:generator 5
+           ,@(if (eq size :float)
+                 `((inst fsts value offset object)
+                   (unless (location= value result)
+                     (inst funop :copy value result)))
+                 `((inst ,(ecase size (:byte 'stb) (:short 'sth) (:long 'stw))
+                         value offset object)
+                   (move value result)))))))))
   (def-system-ref-and-set sap-ref-8 %set-sap-ref-8
     unsigned-reg positive-fixnum :byte nil)
   (def-system-ref-and-set signed-sap-ref-8 %set-signed-sap-ref-8
@@ -243,14 +235,14 @@
     signed-reg signed-num :long t)
   (def-system-ref-and-set sap-ref-sap %set-sap-ref-sap
     sap-reg system-area-pointer :long)
+  (def-system-ref-and-set sap-ref-lispobj %set-sap-ref-lispobj
+    descriptor-reg * :long)
   (def-system-ref-and-set sap-ref-single %set-sap-ref-single
     single-reg single-float :float)
   (def-system-ref-and-set sap-ref-double %set-sap-ref-double
     double-reg double-float :float))
-
 
 ;;; Noise to convert normal lisp data objects into SAPs.
-
 (define-vop (vector-sap)
   (:translate vector-sap)
   (:policy :fast-safe)
@@ -258,33 +250,5 @@
   (:results (sap :scs (sap-reg)))
   (:result-types system-area-pointer)
   (:generator 2
-    (inst addi
-	  (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
-	  vector
-	  sap)))
-
-
-;;; Transforms for 64-bit SAP accessors.
-
-;;; FIXME: So these are now commented out on the SPARC, PPC and HPPA
-;;; backends. Did they ever serve a purpose? Could they in future? --
-;;; CSR, 2002-08-10
-#|
-(deftransform sap-ref-64 ((sap offset) (* *))
-  '(logior (ash (sap-ref-32 sap offset) 32)
-	   (sap-ref-32 sap (+ offset 4))))
-
-(deftransform signed-sap-ref-64 ((sap offset) (* *))
-  '(logior (ash (signed-sap-ref-32 sap offset) 32)
-	   (sap-ref-32 sap (+ 4 offset))))
-
-(deftransform %set-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-sap-ref-32 sap offset (ash value -32))
-     (%set-sap-ref-32 sap (+ offset 4) (logand value #xffffffff))))
-
-(deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-signed-sap-ref-32 sap offset (ash value -32))
-     (%set-sap-ref-32 sap (+ 4 offset) (logand value #xffffffff))))
-|#
+    (inst addi (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
+               vector sap)))