X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmeta-vmdef.lisp;h=a13b893bbd28dcf82c4b1a8b23d8c9bf50207622;hb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;hp=0e2975b360188b07ecb5f5220711514f5e034300;hpb=f4f18b9dcdaf1948947b1747f5bfa766a1a0ee4c;p=sbcl.git

diff --git a/src/compiler/meta-vmdef.lisp b/src/compiler/meta-vmdef.lisp
index 0e2975b..a13b893 100644
--- a/src/compiler/meta-vmdef.lisp
+++ b/src/compiler/meta-vmdef.lisp
@@ -274,7 +274,7 @@
 (defmacro !def-primitive-type (name scs &key (type name))
   (declare (type symbol name) (type list scs))
   (let ((scns (mapcar #'meta-sc-number-or-lose scs))
-	(get-type `(specifier-type ',type)))
+	(ctype-form `(specifier-type ',type)))
     `(progn
        (/show0 "doing !DEF-PRIMITIVE-TYPE, NAME=..")
        (/primitive-print ,(symbol-name name))
@@ -282,9 +282,9 @@
 	 (setf (gethash ',name *backend-meta-primitive-type-names*)
 	       (make-primitive-type :name ',name
 				    :scs ',scns
-				    :type ,get-type)))
+				    :type ,ctype-form)))
        ,(once-only ((n-old `(gethash ',name *backend-primitive-type-names*))
-		    (n-type get-type))
+		    (n-type ctype-form))
 	  `(progn
 	     ;; If the PRIMITIVE-TYPE structure already exists, we
 	     ;; destructively modify it so that existing references in
@@ -458,7 +458,7 @@
   ;; name of the operand (which we bind to the TN)
   (name nil :type symbol)
   ;; the way this operand is used:
-  (kind (required-argument)
+  (kind (missing-arg)
 	:type (member :argument :result :temporary
 		      :more-argument :more-result))
   ;; If true, the name of an operand that this operand is targeted to.
@@ -1607,9 +1607,9 @@
 ;;;
 ;;; :Note {String | NIL}
 ;;;     A short noun-like phrase describing what this VOP "does", i.e.
-;;;     the implementation strategy. If supplied, efficency notes will
+;;;     the implementation strategy. If supplied, efficiency notes will
 ;;;     be generated when type uncertainty prevents :TRANSLATE from
-;;;     working. NIL inhibits any efficency note.
+;;;     working. NIL inhibits any efficiency note.
 ;;;
 ;;; :Arg-Types    {* | PType | (:OR PType*) | (:CONSTANT Type)}*
 ;;; :Result-Types {* | PType | (:OR PType*)}*
@@ -1917,19 +1917,19 @@
 		   (when (and ,tn-var (not (eq ,tn-var :more)))
 		     (,n-bod ,tn-var)))))))))))
 
-;;; Iterate over all the IR2 blocks in the environment Env, in emit order.
-(defmacro do-environment-ir2-blocks ((block-var env &optional result)
-				     &body body)
-  (once-only ((n-env env))
+;;; Iterate over all the IR2 blocks in PHYSENV, in emit order.
+(defmacro do-physenv-ir2-blocks ((block-var physenv &optional result)
+				 &body body)
+  (once-only ((n-physenv physenv))
     (once-only ((n-first `(node-block
 			   (lambda-bind
-			    (environment-function ,n-env)))))
+			    (physenv-function ,n-physenv)))))
       (once-only ((n-tail `(block-info
 			    (component-tail
 			     (block-component ,n-first)))))
 	`(do ((,block-var (block-info ,n-first)
 			  (ir2-block-next ,block-var)))
 	     ((or (eq ,block-var ,n-tail)
-		  (not (eq (ir2-block-environment ,block-var) ,n-env)))
+		  (not (eq (ir2-block-physenv ,block-var) ,n-physenv)))
 	      ,result)
 	   ,@body)))))