X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fmips%2Fsupport.lisp;h=cb3a759b7110d0113dd0eff7b95b65f517f02713;hb=c6ca3162c8abd6ae9cce613f5df5778405806e60;hp=c91d8c7d8197c64bb228477d54cc8ff6e88144b8;hpb=4ae1b794a5d6a90794468cf8017f5307f2c30dfe;p=sbcl.git

diff --git a/src/assembly/mips/support.lisp b/src/assembly/mips/support.lisp
index c91d8c7..cb3a759 100644
--- a/src/assembly/mips/support.lisp
+++ b/src/assembly/mips/support.lisp
@@ -1,48 +1,53 @@
+;;;; 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)
      (values
       `((inst jal (make-fixup ',name :assembly-routine))
-	(inst nop))
+        (inst nop))
       `()))
     (: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 ,lra code-tn lra-label ,temp)
-	    (note-next-instruction ,vop :call-site)
-	    (inst j (make-fixup ',name :assembly-routine))
-	    (inst nop)
-	    (emit-return-pc lra-label)
-	    (note-this-location ,vop :single-value-return)
-	    (without-scheduling ()
-	      (move csp-tn ocfp-tn)
-	      (inst nop))
-	    (inst compute-code-from-lra code-tn code-tn
-		  lra-label ,temp)
-	    (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)))))
-    (:none
-     (values
-      `((inst j (make-fixup ',name :assembly-routine))
-	(inst nop))
-      nil))))
-
+        `((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 ,lra code-tn lra-label ,temp)
+            (note-next-instruction ,vop :call-site)
+            (inst j (make-fixup ',name :assembly-routine))
+            (inst nop)
+            (without-scheduling ()
+              (emit-return-pc lra-label)
+              (note-this-location ,vop :single-value-return)
+              (inst move csp-tn ocfp-tn)
+              (inst nop))
+            (inst compute-code-from-lra code-tn code-tn
+                  lra-label ,temp)
+            (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
@@ -51,8 +56,11 @@
        (inst nop)))
     (:full-call
      `((lisp-return (make-random-tn :kind :normal
-				    :sc (sc-or-lose
-					 'descriptor-reg)
-				    :offset lra-offset)
-		    lip-tn :offset 2)))
+                                    :sc (sc-or-lose
+                                         'descriptor-reg)
+                                    :offset lra-offset)
+                    lip-tn :offset 2)))
     (:none)))
+
+(defun return-machine-address (scp)
+  (context-register scp lip-offset))