X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fvop.lisp;h=32ba37b52258a0abc5b3784cd8b2e67a4f31894a;hb=57e21c4b62e8c1a1ee7ef59ed2abb0c864fb06bc;hp=2c2e387b6047543c65ea3b48b2f206f7cd1ccf84;hpb=581e3d62de8cb37e13ad9db63e5537c0f962be28;p=sbcl.git diff --git a/src/compiler/vop.lisp b/src/compiler/vop.lisp index 2c2e387..32ba37b 100644 --- a/src/compiler/vop.lisp +++ b/src/compiler/vop.lisp @@ -47,7 +47,7 @@ (scs nil :type list) ;; the Lisp type equivalent to this type. If this type could never be ;; returned by PRIMITIVE-TYPE, then this is the NIL (or empty) type - (type (missing-arg) :type ctype) + (specifier (missing-arg) :type type-specifier) ;; the template used to check that an object is of this type. This is a ;; template of one argument and one result, both of primitive-type T. If ;; the argument is of the correct type, then it is delivered into the @@ -68,9 +68,9 @@ ;;; COMPONENT-INFO ;;; Holds the IR2-COMPONENT structure. ;;; -;;; CONTINUATION-INFO -;;; Holds the IR2-CONTINUATION structure. Continuations whose -;;; values aren't used won't have any. +;;; LVAR-INFO +;;; Holds the IR2-LVAR structure. LVARs whose values aren't used +;;; won't have any. XXX ;;; ;;; CLEANUP-INFO ;;; If non-null, then a TN in which the affected dynamic @@ -111,22 +111,21 @@ ;; the IR2-BLOCK's number, which differs from BLOCK's BLOCK-NUMBER ;; if any blocks are split. This is assigned by lifetime analysis. (number nil :type (or index null)) - ;; information about unknown-values continuations that is used by - ;; stack analysis to do stack simulation. An UNKNOWN-VALUES - ;; continuation is PUSHED if its DEST is in another block. - ;; Similarly, a continuation is POPPED if its DEST is in this block - ;; but has its uses elsewhere. The continuations are in the order - ;; that are pushed/popped in the block. Note that the args to a - ;; single MV-COMBINATION appear reversed in POPPED, since we must - ;; effectively pop the last argument first. All pops must come - ;; before all pushes (although internal MV uses may be interleaved.) - ;; POPPED is computed by LTN, and PUSHED is computed by stack - ;; analysis. + ;; information about unknown-values LVARs that is used by stack + ;; analysis to do stack simulation. An UNKNOWN-VALUES LVAR is PUSHED + ;; if its DEST is in another block. Similarly, a LVAR is POPPED if + ;; its DEST is in this block but has its uses elsewhere. The LVARs + ;; are in the order that are pushed/popped in the block. Note that + ;; the args to a single MV-COMBINATION appear reversed in POPPED, + ;; since we must effectively pop the last argument first. All pops + ;; must come before all pushes (although internal MV uses may be + ;; interleaved.) POPPED is computed by LTN, and PUSHED is computed + ;; by stack analysis. (pushed () :type list) (popped () :type list) ;; the result of stack analysis: lists of all the unknown-values - ;; continuations on the stack at the block start and end, topmost - ;; continuation first. + ;; LVARs on the stack at the block start and end, topmost LVAR + ;; first. (start-stack () :type list) (end-stack () :type list) ;; the first and last VOP in this block. If there are none, both @@ -150,8 +149,8 @@ (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 - ;; index for a TN is non-zero in Written if it is ever written in - ;; the block, and in Live-Out if the first reference is a read. + ;; index for a TN is non-zero in WRITTEN if it is ever written in + ;; the block, and in LIVE-OUT if the first reference is a read. (written (make-array local-tn-limit :element-type 'bit :initial-element 0) :type local-tn-bit-vector) @@ -180,45 +179,44 @@ (local-tn-count :test (not (zerop local-tn-count))) (%label :test %label)) -;;; An IR2-CONTINUATION structure is used to annotate continuations -;;; that are used as a function result continuation or that receive MVs. -(defstruct (ir2-continuation - (:constructor make-ir2-continuation (primitive-type)) +;;; An IR2-LVAR structure is used to annotate LVARs that are used as a +;;; function result LVARs or that receive MVs. +(defstruct (ir2-lvar + (:constructor make-ir2-lvar (primitive-type)) (:copier nil)) - ;; If this is :DELAYED, then this is a single value continuation for - ;; which the evaluation of the use is to be postponed until the - ;; evaluation of destination. This can be done for ref nodes or - ;; predicates whose destination is an IF. + ;; If this is :DELAYED, then this is a single value LVAR for which + ;; the evaluation of the use is to be postponed until the evaluation + ;; of destination. This can be done for ref nodes or predicates + ;; whose destination is an IF. ;; - ;; If this is :FIXED, then this continuation has a fixed number of - ;; values, with the TNs in LOCS. + ;; If this is :FIXED, then this LVAR has a fixed number of values, + ;; with the TNs in LOCS. ;; - ;; If this is :UNKNOWN, then this is an unknown-values continuation, - ;; using the passing locations in LOCS. + ;; If this is :UNKNOWN, then this is an unknown-values LVAR, using + ;; the passing locations in LOCS. ;; - ;; If this is :UNUSED, then this continuation should never actually - ;; be used as the destination of a value: it is only used - ;; tail-recursively. + ;; If this is :UNUSED, then this LVAR should never actually be used + ;; as the destination of a value: it is only used tail-recursively. (kind :fixed :type (member :delayed :fixed :unknown :unused)) - ;; The primitive-type of the first value of this continuation. This - ;; is primarily for internal use during LTN, but it also records the + ;; The primitive-type of the first value of this LVAR. This is + ;; primarily for internal use during LTN, but it also records the ;; type restriction on delayed references. In multiple-value ;; contexts, this is null to indicate that it is meaningless. This - ;; is always (primitive-type (continuation-type cont)), which may be - ;; more restrictive than the tn-primitive-type of the value TN. This - ;; is becase the value TN must hold any possible type that could be - ;; computed (before type checking.) + ;; is always (primitive-type (lvar-type cont)), which may be more + ;; restrictive than the tn-primitive-type of the value TN. This is + ;; becase the value TN must hold any possible type that could be + ;; computed (before type checking.) XXX (primitive-type nil :type (or primitive-type null)) - ;; Locations used to hold the values of the continuation. If the - ;; number of values if fixed, then there is one TN per value. If the - ;; number of values is unknown, then this is a two-list of TNs - ;; holding the start of the values glob and the number of values. - ;; Note that since type checking is the responsibility of the values - ;; receiver, these TNs primitive type is only based on the proven - ;; type information. + ;; Locations used to hold the values of the LVAR. If the number of + ;; values if fixed, then there is one TN per value. If the number of + ;; values is unknown, then this is a two-list of TNs holding the + ;; start of the values glob and the number of values. Note that + ;; since type checking is the responsibility of the values receiver, + ;; these TNs primitive type is only based on the proven type + ;; information. (locs nil :type list)) -(defprinter (ir2-continuation) +(defprinter (ir2-lvar) kind primitive-type locs) @@ -242,6 +240,8 @@ ;; CONSTANT-TNs are non-packed TNs that represent constants. ;; :CONSTANT TNs may eventually be converted to :CACHED-CONSTANT ;; normal TNs. + ;; + ;; FIXME: What is :CACHED-CONSTANT? (normal-tns nil :type (or tn null)) (restricted-tns nil :type (or tn null)) (wired-tns nil :type (or tn null)) @@ -307,9 +307,10 @@ ;;; An ENTRY-INFO condenses all the information that the dumper needs ;;; to create each XEP's function entry data structure. ENTRY-INFO -;;; structures are somtimes created before they are initialized, since -;;; IR2 conversion may need to compile a forward reference. In this -;;; case the slots aren't actually initialized until entry analysis runs. +;;; structures are sometimes created before they are initialized, +;;; since IR2 conversion may need to compile a forward reference. In +;;; this case the slots aren't actually initialized until entry +;;; analysis runs. (defstruct (entry-info (:copier nil)) ;; Does this function have a non-null closure environment? (closure-p nil :type boolean) @@ -498,7 +499,7 @@ ;; the arg/result type restrictions. We compute this from the ;; PRIMITIVE-TYPE restrictions to make life easier for IR1 phases ;; that need to anticipate LTN's template selection. - (type (missing-arg) :type fun-type) + (type (missing-arg) :type ctype) ;; lists of restrictions on the argument and result types. A ;; restriction may take several forms: ;; -- The restriction * is no restriction at all. @@ -879,7 +880,7 @@ ;; wired TNs. (primitive-type nil :type (or primitive-type null)) ;; If this TN represents a variable or constant, then this is the - ;; corresponding Leaf. + ;; corresponding LEAF. (leaf nil :type (or leaf null)) ;; thread that links TNs together so that we can find them (next nil :type (or tn null)) @@ -895,7 +896,7 @@ ;; If a local TN, the block relative number for this TN. Global TNs ;; whose liveness changes within a block are also assigned a local ;; number during the conflicts analysis of that block. If the TN has - ;; no local number within the block, then this is Nil. + ;; no local number within the block, then this is NIL. (local-number nil :type (or local-tn-number null)) ;; If this object is a local TN, this slot is a bit-vector with 1 ;; for the local-number of every TN that we conflict with.