function-lambda-expression: Return the name of a generic function.

[sbcl.git] / src / assembly / alpha / support.lisp

diff --git a/src/assembly/alpha/support.lisp b/src/assembly/alpha/support.lisp
index 3490176..6f676b6 100644 (file)
--- a/src/assembly/alpha/support.lisp
+++ b/src/assembly/alpha/support.lisp
@@ -1,74 +1,68 @@
-;;; -*- Package: ALPHA -*-
-;;;
-;;; **********************************************************************
-;;; This code was written as part of the CMU Common Lisp project at
-;;; Carnegie Mellon University, and has been placed in the public domain.
-;;;
-;;;
-;;; **********************************************************************
-;;;
-;;; This file contains the machine specific support routines needed by
-;;; the file assembler.
-;;;
-(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)
+(defun generate-call-sequence (name style vop)
   (ecase style
-    (:raw
+    ((:raw :none)
      (values
       `((inst li (make-fixup ',name :assembly-routine) temp)
-       (inst jsr lip-tn temp))
+        (inst jsr lip-tn temp))
       '((:temporary (:sc non-descriptor-reg) temp))
      nil))
     (: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)
-           ; here
-           (inst li (make-fixup ',name :assembly-routine) temp1)
-           (inst jsr lip-tn temp1 (make-fixup ',name :assembly-routine))
-           (emit-return-pc lra-label)
-           (note-this-location ,vop :single-value-return)
-           (without-scheduling ()
-             (move ocfp-tn csp-tn)
-             (inst nop))
-           (inst compute-code-from-lra code-tn code-tn
-                 lra-label ,temp)
-           (when cur-nfp
-             (maybe-load-stack-nfp-tn cur-nfp ,nfp-save temp1))))
-       `((: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)
-         (:temporary (:scs (non-descriptor-reg)) temp1)
-         (:save-p t)))))
-    (:none
-     (values
-      `((inst li (make-fixup ',name :assembly-routine) temp)
-       (inst jsr lip-tn temp (make-fixup ',name :assembly-routine)))
-      '((:temporary (:scs (non-descriptor-reg)) temp))
-      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)
+            ; here
+            (inst li (make-fixup ',name :assembly-routine) temp1)
+            (inst jsr lip-tn temp1 (make-fixup ',name :assembly-routine))
+            (emit-return-pc lra-label)
+            (note-this-location ,vop :single-value-return)
+            (without-scheduling ()
+              (move ocfp-tn csp-tn)
+              (inst nop))
+            (inst compute-code-from-lra code-tn code-tn
+                  lra-label ,temp)
+            (when cur-nfp
+              (maybe-load-stack-nfp-tn cur-nfp ,nfp-save temp1))))
+        `((: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)
+          (:temporary (:scs (non-descriptor-reg)) temp1)
+          (:save-p t)))))))
 
-
-(!def-vm-support-routine generate-return-sequence (style)
+(defun generate-return-sequence (style)
   (ecase style
     (:raw
      `((inst ret zero-tn lip-tn)))
     (: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))