0.8.16.22:

[sbcl.git] / src / compiler / hppa / sap.lisp

diff --git a/src/compiler/hppa/sap.lisp b/src/compiler/hppa/sap.lisp
index 48da088..ed13310 100644 (file)
--- a/src/compiler/hppa/sap.lisp
+++ b/src/compiler/hppa/sap.lisp
@@ -1,24 +1,29 @@
-(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")
 \f
 ;;;; Moves and coercions:
 
 ;;; Move a tagged SAP to an untagged representation.
-;;;
 (define-vop (move-to-sap)
   (:args (x :scs (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)))
   (:temporary (:scs (non-descriptor-reg)) ndescr)
@@ -27,13 +32,10 @@
   (:generator 20
     (with-fixed-allocation (y ndescr sap-widetag sap-size)
       (storew x y 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)
@@ -44,14 +46,11 @@
   (: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)
@@ -63,21 +62,15 @@
        (move x y))
       (sap-stack
        (storew x fp (tn-offset y))))))
-;;;
-(define-move-vop move-sap-argument :move-arg
+(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))
-
-
 \f
 ;;;; SAP-INT and INT-SAP
-
 (define-vop (sap-int)
   (:args (sap :scs (sap-reg) :target int))
   (:arg-types system-area-pointer)
@@ -97,11 +90,8 @@
   (:policy :fast-safe)
   (:generator 1
     (move int sap)))
-
-
 \f
 ;;;; POINTER+ and POINTER-
-
 (define-vop (pointer+)
   (:translate sap+)
   (:args (ptr :scs (sap-reg) :target res)
@@ -134,11 +124,8 @@
   (:result-types signed-num)
   (:generator 1
     (inst sub ptr1 ptr2 res)))
-
-
 \f
 ;;;; mumble-SYSTEM-REF and mumble-SYSTEM-SET
-
 (macrolet ((def-system-ref-and-set
          (ref-name set-name sc type size &optional signed)
   (let ((ref-name-c (symbolicate ref-name "-C"))
@@ -247,10 +234,8 @@
     single-reg single-float :float)
   (def-system-ref-and-set sap-ref-double %set-sap-ref-double
     double-reg double-float :float))
-
 \f
 ;;; Noise to convert normal lisp data objects into SAPs.
-
 (define-vop (vector-sap)
   (:translate vector-sap)
   (:policy :fast-safe)
@@ -262,14 +247,9 @@
          (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
          vector
          sap)))
-
 \f
 ;;; 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))))
@@ -287,4 +267,3 @@
   '(progn
      (%set-signed-sap-ref-32 sap offset (ash value -32))
      (%set-sap-ref-32 sap (+ 4 offset) (logand value #xffffffff))))
-|#