0.pre7.55:

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

diff --git a/src/compiler/alpha/alloc.lisp b/src/compiler/alpha/alloc.lisp
index 68f74e5..71aa412 100644 (file)
--- a/src/compiler/alpha/alloc.lisp
+++ b/src/compiler/alpha/alloc.lisp
@@ -1,22 +1,15 @@
-;;; -*- 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.
-;;;
+;;;; allocation VOPs for the Alpha port
 
-;;;
-;;; **********************************************************************
-;;;
-;;; Allocation VOPs for the Alpha port.
-;;;
-;;; Written by William Lott.
-;;; Converted by Sean Hallgren.
-;;; 
+;;;; 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")
-
-
 \f
 ;;;; LIST and LIST*
 
@@ -74,9 +67,8 @@
 
 (define-vop (list* list-or-list*)
   (:variant t))
-
 \f
-;;;; Special purpose inline allocators.
+;;;; special purpose inline allocators
 
 (define-vop (allocate-code-object)
   (:args (boxed-arg :scs (any-reg))
@@ -115,7 +107,7 @@
   (:generator 37
     (with-fixed-allocation (result temp fdefn-type fdefn-size)
       (storew name result fdefn-name-slot other-pointer-type)
-      (storew null-tn result fdefn-function-slot other-pointer-type)
+      (storew null-tn result fdefn-fun-slot other-pointer-type)
       (inst li (make-fixup "undefined_tramp" :foreign) temp)
       (storew temp result fdefn-raw-addr-slot other-pointer-type))))
 
@@ -128,9 +120,9 @@
     (let ((size (+ length closure-info-offset)))
       (inst li (logior (ash (1- size) type-bits) closure-header-type) temp)
       (pseudo-atomic (:extra (pad-data-block size))
-       (inst bis alloc-tn function-pointer-type result)
-       (storew temp result 0 function-pointer-type))
-      (storew function result closure-function-slot function-pointer-type))))
+       (inst bis alloc-tn fun-pointer-type result)
+       (storew temp result 0 fun-pointer-type))
+      (storew function result closure-fun-slot fun-pointer-type))))
 
 ;;; The compiler likes to be able to directly make value cells.
 ;;; 
@@ -144,7 +136,7 @@
     (storew value result value-cell-value-slot other-pointer-type)))
 
 \f
-;;;; Automatic allocators for primitive objects.
+;;;; automatic allocators for primitive objects
 
 (define-vop (make-unbound-marker)
   (:args)