0.pre7.55:

[sbcl.git] / src / compiler / alpha / call.lisp

diff --git a/src/compiler/alpha/call.lisp b/src/compiler/alpha/call.lisp
index cedb2df..9b402ae 100644 (file)
--- a/src/compiler/alpha/call.lisp
+++ b/src/compiler/alpha/call.lisp
@@ -49,14 +49,14 @@
 ;;; debugger can find them at a known location.
 (!def-vm-support-routine make-old-fp-save-location (env)
   (specify-save-tn
-   (environment-debug-live-tn (make-normal-tn *fixnum-primitive-type*) env)
+   (physenv-debug-live-tn (make-normal-tn *fixnum-primitive-type*) env)
    (make-wired-tn *fixnum-primitive-type*
                  control-stack-arg-scn
                  ocfp-save-offset)))
 (!def-vm-support-routine make-return-pc-save-location (env)
   (let ((ptype *backend-t-primitive-type*))
     (specify-save-tn
-     (environment-debug-live-tn (make-normal-tn ptype) env)
+     (physenv-debug-live-tn (make-normal-tn ptype) env)
      (make-wired-tn ptype control-stack-arg-scn lra-save-offset))))
 
 ;;; Make a TN for the standard argument count passing location. We
@@ -135,8 +135,8 @@
     (trace-table-entry trace-table-function-prologue)
     (emit-label start-lab)
     ;; Allocate function header.
-    (inst function-header-word)
-    (dotimes (i (1- function-code-offset))
+    (inst simple-fun-header-word)
+    (dotimes (i (1- simple-fun-code-offset))
       (inst lword 0))
     ;; The start of the actual code.
     ;; Compute CODE from the address of this entry point.
@@ -163,7 +163,7 @@
     (trace-table-entry trace-table-function-prologue)
     (move csp-tn res)
     (inst lda csp-tn (* word-bytes (sb-allocated-size 'control-stack)) csp-tn)
-    (when (ir2-environment-number-stack-p callee)
+    (when (ir2-physenv-number-stack-p callee)
       (inst subq nsp-tn (bytes-needed-for-non-descriptor-stack-frame)
            nsp-tn)
       (move nsp-tn nfp))
@@ -779,18 +779,18 @@ default-value-8
                      (do-next-filler)))
                   #!-gengc
                   (inst ldl function
-                        (- (ash closure-function-slot word-shift)
-                           function-pointer-type) lexenv)
+                        (- (ash closure-fun-slot word-shift)
+                           fun-pointer-type) lexenv)
                   #!-gengc
                   (do-next-filler)
                   #!-gengc
                   (inst addq function
-                        (- (ash function-code-offset word-shift)
-                           function-pointer-type) entry-point)
+                        (- (ash simple-fun-code-offset word-shift)
+                           fun-pointer-type) entry-point)
                   #!+gengc
                   (inst ldl entry-point
                         (- (ash closure-entry-point-slot word-shift)
-                           function-pointer-type) lexenv)
+                           fun-pointer-type) lexenv)
                   #!+gengc
                   (do-next-filler)))
           (loop