X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fhppa%2Fsupport.lisp;h=2a5e4e11f57a183002a4f773a434d550e1a648ca;hb=eaec8176060e89efa39f01017df1f6204e491ecc;hp=18f8b8fdf913d0575751240382ba622e4da0a4fb;hpb=670010e3f3dcd62efaf23f61abdc73950edb88c6;p=sbcl.git

diff --git a/src/assembly/hppa/support.lisp b/src/assembly/hppa/support.lisp
index 18f8b8f..2a5e4e1 100644
--- a/src/assembly/hppa/support.lisp
+++ b/src/assembly/hppa/support.lisp
@@ -1,54 +1,56 @@
-(in-package "SB!VM")
+;;;; the machine-specific support routines needed by the file assembler
+
+;;;; 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")
 
 (!def-vm-support-routine generate-call-sequence (name style vop)
   (ecase style
-    (:raw
+    ((:raw :none)
      (with-unique-names (fixup)
        (values
-	`((let ((fixup (make-fixup ',name :assembly-routine)))
-	    (inst ldil fixup ,fixup)
-	    (inst ble fixup lisp-heap-space ,fixup :nullify t))
-	  (inst nop))
-	`((:temporary (:scs (any-reg) :from (:eval 0) :to (:eval 1))
-		      ,fixup)))))
+        `((let ((fixup (make-fixup ',name :assembly-routine)))
+            (inst ldil fixup ,fixup)
+            (inst ble fixup lisp-heap-space ,fixup :nullify t)))
+        `((:temporary (:scs (any-reg) :from (:eval 0) :to (:eval 1))
+                      ,fixup)))))
     (:full-call
      (let ((temp (make-symbol "TEMP"))
-	   (nfp-save (make-symbol "NFP-SAVE"))
-	   (lra (make-symbol "LRA")))
+           (nfp-save (make-symbol "NFP-SAVE"))
+           (lra (make-symbol "LRA")))
        (values
-	`((let ((lra-label (gen-label))
-		(cur-nfp (current-nfp-tn ,vop)))
-	    (when cur-nfp
-	      (store-stack-tn ,nfp-save cur-nfp))
-	    (inst compute-lra-from-code code-tn lra-label ,temp ,lra)
-	    (note-this-location ,vop :call-site)
-	    (let ((fixup (make-fixup ',name :assembly-routine)))
-	      (inst ldil fixup ,temp)
-	      (inst be fixup lisp-heap-space ,temp :nullify t))
-	    (emit-return-pc lra-label)
-	    (note-this-location ,vop :single-value-return)
-	    (move ocfp-tn csp-tn)
-	    (inst compute-code-from-lra code-tn lra-label ,temp code-tn)
-	    (when cur-nfp
-	      (load-stack-tn cur-nfp ,nfp-save))))
-	`((:temporary (:scs (non-descriptor-reg) :from (:eval 0) :to (:eval 1))
-		      ,temp)
-	  (:temporary (:sc descriptor-reg :offset lra-offset
-			   :from (:eval 0) :to (:eval 1))
-		      ,lra)
-	  (:temporary (:scs (control-stack) :offset nfp-save-offset)
-		      ,nfp-save)
-	  (:save-p :compute-only)))))
-    (:none
-     (with-unique-names (fixup)
-       (values
-	`((let ((fixup (make-fixup ',name :assembly-routine)))
-	    (inst ldil fixup ,fixup)
-	    (inst be fixup lisp-heap-space ,fixup :nullify t)))
-	`((:temporary (:scs (any-reg) :from (:eval 0) :to (:eval 1))
-		      ,fixup)))))))
-
+        `((let ((lra-label (gen-label))
+                (cur-nfp (current-nfp-tn ,vop)))
+            (when cur-nfp
+              (store-stack-tn ,nfp-save cur-nfp))
+            (inst compute-lra-from-code code-tn lra-label ,temp ,lra)
+            (note-next-instruction ,vop :call-site)
+            (let ((fixup (make-fixup ',name :assembly-routine)))
+              (inst ldil fixup ,temp)
+              (inst be fixup lisp-heap-space ,temp :nullify t))
+            (without-scheduling ()
+              (emit-return-pc lra-label)
+              (note-this-location ,vop :single-value-return)
+              (inst move ocfp-tn csp-tn)
+              (inst nop)) ; this nop is here because of emit-return-pc align
+            (inst compute-code-from-lra code-tn lra-label ,temp code-tn)
+            (when cur-nfp
+              (load-stack-tn cur-nfp ,nfp-save))))
+        `((:temporary (:scs (non-descriptor-reg) :from (:eval 0) :to (:eval 1))
+                      ,temp)
+          (:temporary (:sc descriptor-reg :offset lra-offset
+                       :from (:eval 0) :to (:eval 1))
+                      ,lra)
+          (:temporary (:scs (control-stack) :offset nfp-save-offset)
+                      ,nfp-save)
+          (:save-p t)))))))
 
 (!def-vm-support-routine generate-return-sequence (style)
   (ecase style
@@ -56,7 +58,10 @@
      `((inst bv lip-tn :nullify t)))
     (:full-call
      `((lisp-return (make-random-tn :kind :normal
-				    :sc (sc-or-lose 'descriptor-reg)
-				    :offset lra-offset)
-		    :offset 1)))
+                                    :sc (sc-or-lose 'descriptor-reg)
+                                    :offset lra-offset)
+                    :offset 1)))
     (:none)))
+
+(defun return-machine-address (scp)
+  (context-register scp lip-offset))