0.7.3.18:

[sbcl.git] / src / compiler / vmdef.lisp

diff --git a/src/compiler/vmdef.lisp b/src/compiler/vmdef.lisp
index c7fa197..d4e0595 100644 (file)
--- a/src/compiler/vmdef.lisp
+++ b/src/compiler/vmdef.lisp
@@ -31,9 +31,9 @@
 (defun sc-number-or-lose (x)
   (the sc-number (sc-number (sc-or-lose x))))
 
-;;; Like the non-meta versions, but go for the meta-compile-time info.
-;;; These should not be used after load time, since compiling the compiler
-;;; changes the definitions.
+;;; This is like the non-meta versions, except we go for the
+;;; meta-compile-time info. These should not be used after load time,
+;;; since compiling the compiler changes the definitions.
 (defun meta-sc-or-lose (x)
   (the sc
        (or (gethash x *backend-meta-sc-names*)
@@ -45,7 +45,7 @@
 (defun meta-sc-number-or-lose (x)
   (the sc-number (sc-number (meta-sc-or-lose x))))
 \f
-;;;; side-effect classes
+;;;; side effect classes
 
 (def-boolean-attribute vop
   any)
@@ -100,7 +100,9 @@
   ;; We need the EVAL-WHEN because %EMIT-GENERIC-VOP (below)
   ;; uses #.MAX-VOP-TN-REFS, not just MAX-VOP-TN-REFS.
   ;; -- AL 20010218
-  (defconstant max-vop-tn-refs 256))
+  ;;
+  ;; See also the description of VOP-INFO-TARGETS. -- APD, 2002-01-30
+  (def!constant max-vop-tn-refs 256))
 
 (defvar *vop-tn-refs* (make-array max-vop-tn-refs :initial-element nil))
 (defvar *using-vop-tn-refs* nil)
@@ -111,7 +113,7 @@
 
 (pushnew 'flush-vop-tn-refs *before-gc-hooks*)
 
-(defconstant sc-bits (integer-length (1- sc-number-limit)))
+(def!constant sc-bits (integer-length (1- sc-number-limit)))
 
 (defun emit-generic-vop (node block template args results &optional info)
   (%emit-generic-vop node block template args results info))
@@ -152,6 +154,9 @@
                                            (ash temp (- (1+ sc-bits))))
                             (make-restricted-tn nil (ash temp -1))))
                     (write-ref (reference-tn tn t)))
+                ;; KLUDGE: These formulas must be consistent with those in
+                ;; COMPUTE-REF-ORDERING, and this is currently
+               ;; maintained by hand. -- WHN 2002-01-30, paraphrasing APD
                (setf (aref refs index) (reference-tn tn nil))
                (setf (aref refs (1+ index)) write-ref)
                (if prev
@@ -208,7 +213,7 @@
                                                 (primitive-type-type
                                                  type)))
                                              (rest x))))
-                         (:constant `(constant-argument ,(third x)))))))
+                         (:constant `(constant-arg ,(third x)))))))
             `(,@(mapcar #'frob types)
               ,@(when more-types
                   `(&rest ,(frob more-types)))))))