X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fvop.lisp;h=acf1993acc29da78468bc31fdc2895af2078ed2f;hb=34dd23563d2f5cf05c72b971da0d0b065a09bf2a;hp=f609a28e5a154ee2fd30105631ab5db42c6108e1;hpb=d40a76606c86722b0aef8179155f9f2840739b72;p=sbcl.git diff --git a/src/compiler/vop.lisp b/src/compiler/vop.lisp index f609a28..acf1993 100644 --- a/src/compiler/vop.lisp +++ b/src/compiler/vop.lisp @@ -60,13 +60,13 @@ ;;;; IR1 annotations used for IR2 conversion ;;; Block-Info -;;; Holds the IR2-Block structure. If there are overflow blocks, -;;; then this points to the first IR2-Block. The Block-Info of the +;;; Holds the IR2-BLOCK structure. If there are overflow blocks, +;;; then this points to the first IR2-BLOCK. The BLOCK-INFO of the ;;; dummy component head and tail are dummy IR2 blocks that begin ;;; and end the emission order thread. ;;; ;;; Component-Info -;;; Holds the IR2-Component structure. +;;; Holds the IR2-COMPONENT structure. ;;; ;;; Continuation-Info ;;; Holds the IR2-Continuation structure. Continuations whose @@ -146,7 +146,7 @@ ;; assign all the more args one LTN number, and all the more results ;; another LTN number. We can do this, since more operands are ;; referenced simultaneously as far as conflict analysis is - ;; concerned. Note that all these :More TNs will be global TNs. + ;; concerned. Note that all these :MORE TNs will be global TNs. (local-tns (make-array local-tn-limit) :type local-tn-vector) ;; Bit-vectors used during lifetime analysis to keep track of ;; references to local TNs. When indexed by the LTN number, the @@ -159,9 +159,8 @@ :type local-tn-bit-vector) ;; This is similar to the above, but is updated by lifetime flow ;; analysis to have a 1 for LTN numbers of TNs live at the end of - ;; the block. This takes into account all TNs that aren't :Live. - (live-in (make-array local-tn-limit :element-type 'bit - :initial-element 0) + ;; the block. This takes into account all TNs that aren't :LIVE. + (live-in (make-array local-tn-limit :element-type 'bit :initial-element 0) :type local-tn-bit-vector) ;; a thread running through the global-conflicts structures for this ;; block, sorted by TN number @@ -285,12 +284,12 @@ ;; overhead that is eventually stuffed in somehow. (constants (make-array 10 :fill-pointer 0 :adjustable t) :type vector) ;; some kind of info about the component's run-time representation. - ;; This is filled in by the VM supplied Select-Component-Format function. + ;; This is filled in by the VM supplied SELECT-COMPONENT-FORMAT function. format ;; a list of the ENTRY-INFO structures describing all of the entries ;; into this component. Filled in by entry analysis. (entries nil :type list) - ;; Head of the list of :ALIAS TNs in this component, threaded by TN-NEXT. + ;; head of the list of :ALIAS TNs in this component, threaded by TN-NEXT (alias-tns nil :type (or tn null)) ;; SPILLED-VOPS is a hashtable translating from "interesting" VOPs ;; to a list of the TNs spilled at that VOP. This is used when @@ -321,9 +320,8 @@ ;; of the function, a symbol or (SETF ). Otherwise, this is ;; some string that is intended to be informative. (name "" :type (or simple-string list symbol)) - ;; a string representing the argument list that the function was - ;; defined with - (arguments nil :type (or simple-string null)) + ;; the argument list that the function was defined with. + (arguments nil :type list) ;; a function type specifier representing the arguments and results ;; of this function (type 'function :type (or list (member function)))) @@ -422,7 +420,7 @@ ;;; operands to the operation. (defstruct (vop (:constructor make-vop (block node info args results)) (:copier nil)) - ;; VOP-Info structure containing static info about the operation + ;; VOP-INFO structure containing static info about the operation (info nil :type (or vop-info null)) ;; the IR2-Block this VOP is in (block (missing-arg) :type ir2-block) @@ -431,15 +429,15 @@ ;; translation. (next nil :type (or vop null)) (prev nil :type (or vop null)) - ;; heads of the TN-Ref lists for operand TNs, linked using the - ;; Across slot + ;; heads of the TN-REF lists for operand TNs, linked using the + ;; ACROSS slot (args nil :type (or tn-ref null)) (results nil :type (or tn-ref null)) ;; head of the list of write refs for each explicitly allocated - ;; temporary, linked together using the Across slot + ;; temporary, linked together using the ACROSS slot (temps nil :type (or tn-ref null)) - ;; head of the list of all TN-refs for references in this VOP, - ;; linked by the Next-Ref slot. There will be one entry for each + ;; head of the list of all TN-REFs for references in this VOP, + ;; linked by the NEXT-REF slot. There will be one entry for each ;; operand and two (a read and a write) for each temporary. (refs nil :type (or tn-ref null)) ;; stuff that is passed uninterpreted from IR2 conversion to @@ -447,7 +445,7 @@ codegen-info ;; the node that generated this VOP, for keeping track of debug info (node nil :type (or node null)) - ;; Local-TN bit vector representing the set of TNs live after args + ;; LOCAL-TN-BIT-VECTOR representing the set of TNs live after args ;; are read and before results are written. This is only filled in ;; when VOP-INFO-SAVE-P is non-null. (save-set nil :type (or local-tn-bit-vector null))) @@ -466,20 +464,20 @@ (tn (missing-arg) :type tn) ;; Is this is a write reference? (as opposed to a read reference) (write-p nil :type boolean) - ;; the link for a list running through all TN-Refs for this TN of + ;; the link for a list running through all TN-REFs for this TN of ;; the same kind (read or write) (next nil :type (or tn-ref null)) ;; the VOP where the reference happens, or NIL temporarily (vop nil :type (or vop null)) - ;; the link for a list of all TN-Refs in VOP, in reverse order of + ;; the link for a list of all TN-REFs in VOP, in reverse order of ;; reference (next-ref nil :type (or tn-ref null)) - ;; the link for a list of the TN-Refs in VOP of the same kind + ;; the link for a list of the TN-REFs in VOP of the same kind ;; (argument, result, temp) (across nil :type (or tn-ref null)) - ;; If true, this is a TN-Ref also in VOP whose TN we would like + ;; If true, this is a TN-REF also in VOP whose TN we would like ;; packed in the same location as our TN. Read and write refs are - ;; always paired: Target in the read points to the write, and + ;; always paired: TARGET in the read points to the write, and ;; vice-versa. (target nil :type (or null tn-ref)) ;; the load TN allocated for this operand, if any @@ -576,7 +574,7 @@ (def!struct (vop-info (:include template) (:make-load-form-fun ignore-it)) - ;; side-effects of this VOP and side-effects that affect the value + ;; side effects of this VOP and side effects that affect the value ;; of this VOP (effects (missing-arg) :type attributes) (affected (missing-arg) :type attributes) @@ -586,19 +584,19 @@ ;; save-sc will be saved in a TN in the save SC before the VOP ;; and restored after the VOP. This is used by call VOPs. A bit ;; vector representing the live TNs is stored in the VOP-SAVE-SET. - ;; -- If :Force-To-Stack, all such TNs will made into :Environment TNs + ;; -- If :FORCE-TO-STACK, all such TNs will made into :ENVIRONMENT TNs ;; and forced to be allocated in SCs without any save-sc. This is ;; used by NLX entry vops. - ;; -- If :Compute-Only, just compute the save set, don't do any saving. + ;; -- If :COMPUTE-ONLY, just compute the save set, don't do any saving. ;; This is used to get the live variables for debug info. (save-p nil :type (member t nil :force-to-stack :compute-only)) ;; info for automatic emission of move-arg VOPs by representation ;; selection. If NIL, then do nothing special. If non-null, then ;; there must be a more arg. Each more arg is moved to its passing - ;; location using the appropriate representation-specific - ;; move-argument VOP. The first (fixed) argument must be the - ;; control-stack frame pointer for the frame to move into. The first - ;; info arg is the list of passing locations. + ;; location using the appropriate representation-specific MOVE-ARG + ;; VOP. The first (fixed) argument must be the control-stack frame + ;; pointer for the frame to move into. The first info arg is the + ;; list of passing locations. ;; ;; Additional constraints depend on the value: ;; @@ -650,11 +648,12 @@ (temps nil :type (or null (specializable-vector (unsigned-byte 16)))) ;; the order all the refs for this vop should be put in. Each ;; operand is assigned a number in the following ordering: args, - ;; more-args, results, more-results, temps This vector represents + ;; more-args, results, more-results, temps. This vector represents ;; the order the operands should be put into in the next-ref link. (ref-ordering nil :type (or null (specializable-vector (unsigned-byte 8)))) ;; a vector of the various targets that should be done. Each element - ;; encodes the source ref (shifted 8) and the dest ref index. + ;; encodes the source ref (shifted 8, it is also encoded in + ;; MAX-VOP-TN-REFS) and the dest ref index. (targets nil :type (or null (specializable-vector (unsigned-byte 16))))) ;;;; SBs and SCs @@ -930,7 +929,7 @@ (print-unreadable-object (tn stream :type t) ;; KLUDGE: The distinction between PRINT-TN and PRINT-OBJECT on TN is ;; not very mnemonic. -- WHN 20000124 - (print-tn tn stream))) + (print-tn-guts tn stream))) ;;; The GLOBAL-CONFLICTS structure represents the conflicts for global ;;; TNs. Each global TN has a list of these structures, one for each @@ -959,16 +958,16 @@ ;; :READ-ONLY ;; The TN is read, but never written. It starts the block live, ;; and is not killed by the block. Lifetime analysis will promote - ;; :Read-Only TNs to :Live if they are live at the block end. + ;; :READ-ONLY TNs to :LIVE if they are live at the block end. ;; ;; :LIVE ;; The TN is not referenced. It is live everywhere in the block. (kind :read-only :type (member :read :write :read-only :live)) ;; a local conflicts vector representing conflicts with TNs live in - ;; Block. The index for the local TN number of each TN we conflict - ;; with in this block is 1. To find the full conflict set, the :Live - ;; TNs for Block must also be included. This slot is not meaningful - ;; when Kind is :Live. + ;; BLOCK. The index for the local TN number of each TN we conflict + ;; with in this block is 1. To find the full conflict set, the :LIVE + ;; TNs for BLOCK must also be included. This slot is not meaningful + ;; when KIND is :LIVE. (conflicts (make-array local-tn-limit :element-type 'bit :initial-element 0) @@ -977,7 +976,7 @@ (tn (missing-arg) :type tn) ;; thread through all the Global-Conflicts for TN (tn-next nil :type (or global-conflicts null)) - ;; TN's local TN number in Block. :Live TNs don't have local numbers. + ;; TN's local TN number in BLOCK. :LIVE TNs don't have local numbers. (number nil :type (or local-tn-number null))) (defprinter (global-conflicts) tn