0.pre7.56:

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

diff --git a/src/compiler/alpha/call.lisp b/src/compiler/alpha/call.lisp
index cedb2df..371ea18 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))
@@ -543,7 +543,7 @@ default-value-8
       (when cur-nfp
        (inst addq cur-nfp (bytes-needed-for-non-descriptor-stack-frame)
              nsp-tn)))
-    (inst subq return-pc-temp (- other-pointer-type word-bytes) lip)
+    (inst subq return-pc-temp (- other-pointer-lowtag word-bytes) lip)
     (move ocfp-temp cfp-tn)
     (inst ret zero-tn lip 1)
     (trace-table-entry trace-table-normal)))
@@ -760,11 +760,11 @@ default-value-8
                     (constant
                      (inst ldl name-pass
                            (- (ash (tn-offset name) word-shift)
-                              other-pointer-type) code-tn)
+                              other-pointer-lowtag) code-tn)
                      (do-next-filler)))
                   (inst ldl entry-point
                         (- (ash fdefn-raw-addr-slot word-shift)
-                           other-pointer-type) name-pass)
+                           other-pointer-lowtag) name-pass)
                   (do-next-filler))
                 `((sc-case arg-fun
                     (descriptor-reg (move arg-fun lexenv))
@@ -775,22 +775,22 @@ default-value-8
                     (constant
                      (inst ldl lexenv
                            (- (ash (tn-offset arg-fun) word-shift)
-                              other-pointer-type) code-tn)
+                              other-pointer-lowtag) code-tn)
                      (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-lowtag) 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-lowtag) entry-point)
                   #!+gengc
                   (inst ldl entry-point
                         (- (ash closure-entry-point-slot word-shift)
-                           function-pointer-type) lexenv)
+                           fun-pointer-lowtag) lexenv)
                   #!+gengc
                   (do-next-filler)))
           (loop
@@ -1119,7 +1119,7 @@ default-value-8
       ;; We need to do this atomically.
       (pseudo-atomic ()
        ;; Allocate a cons (2 words) for each item.
-       (inst bis alloc-tn list-pointer-type result)
+       (inst bis alloc-tn list-pointer-lowtag result)
        (move result dst)
        (inst sll count 1 temp)
        (inst addq alloc-tn temp alloc-tn)
@@ -1128,7 +1128,7 @@ default-value-8
        ;; Store the current cons in the cdr of the previous cons.
        (emit-label loop)
        (inst addq dst (* 2 word-bytes) dst)
-       (storew dst dst -1 list-pointer-type)
+       (storew dst dst -1 list-pointer-lowtag)
 
        (emit-label enter)
        ;; Grab one value.
@@ -1136,14 +1136,14 @@ default-value-8
        (inst addq context word-bytes context)
 
        ;; Store the value in the car (in delay slot)
-       (storew temp dst 0 list-pointer-type)
+       (storew temp dst 0 list-pointer-lowtag)
 
        ;; Decrement count, and if != zero, go back for more.
        (inst subq count (fixnumize 1) count)
        (inst bne count loop)
 
        ;; NIL out the last cons.
-       (storew null-tn dst 1 list-pointer-type))
+       (storew null-tn dst 1 list-pointer-lowtag))
       (emit-label done))))
 
 ;;; Return the location and size of the &MORE arg glob created by