(vop move node block x y))
(values))
+;;; Determine whether we should emit a single-stepper breakpoint
+;;; around a call / before a vop.
+(defun emit-step-p (node)
+ (if (and (policy node (> insert-step-conditions 1))
+ (typep node 'combination))
+ (combination-step-info node)
+ nil))
+
;;; If there is any CHECK-xxx template for TYPE, then return it,
;;; otherwise return NIL.
(defun type-check-template (type)
(declare (type ctype type))
(multiple-value-bind (check-ptype exact) (primitive-type type)
(if exact
- (primitive-type-check check-ptype)
- (let ((name (hairy-type-check-template-name type)))
- (if name
- (template-or-lose name)
- nil)))))
+ (primitive-type-check check-ptype)
+ (let ((name (hairy-type-check-template-name type)))
+ (if name
+ (template-or-lose name)
+ nil)))))
;;; Emit code in BLOCK to check that VALUE is of the specified TYPE,
;;; yielding the checked result in RESULT. VALUE and result may be of
;;; test.
(defun emit-type-check (node block value result type)
(declare (type tn value result) (type node node) (type ir2-block block)
- (type ctype type))
+ (type ctype type))
(emit-move-template node block (type-check-template type) value result)
(values))
-;;; Allocate an indirect value cell. Maybe do some clever stack
-;;; allocation someday.
-;;;
-;;; FIXME: DO-MAKE-VALUE-CELL is a bad name, since it doesn't make
-;;; clear what's the distinction between it and the MAKE-VALUE-CELL
-;;; VOP, and since the DO- further connotes iteration, which has
-;;; nothing to do with this. Clearer, more systematic names, anyone?
+;;; Allocate an indirect value cell.
(defevent make-value-cell-event "Allocate heap value cell for lexical var.")
-(defun do-make-value-cell (node block value res)
+(defun emit-make-value-cell (node block value res)
(event make-value-cell-event node)
- (vop make-value-cell node block value res))
+ (vop make-value-cell node block value nil res))
\f
;;;; leaf reference
;;; Return the TN that holds the value of THING in the environment ENV.
-(declaim (ftype (function ((or nlx-info lambda-var) physenv) tn)
- find-in-physenv))
+(declaim (ftype (function ((or nlx-info lambda-var clambda) physenv) tn)
+ find-in-physenv))
(defun find-in-physenv (thing physenv)
(or (cdr (assoc thing (ir2-physenv-closure (physenv-info physenv))))
(etypecase thing
- (lambda-var
- ;; I think that a failure of this assertion means that we're
- ;; trying to access a variable which was improperly closed
- ;; over. The PHYSENV describes a physical environment. Every
- ;; variable that a form refers to should either be in its
- ;; physical environment directly, or grabbed from a
- ;; surrounding physical environment when it was closed over.
- ;; The ASSOC expression above finds closed-over variables, so
- ;; if we fell through the ASSOC expression, it wasn't closed
- ;; over. Therefore, it must be in our physical environment
- ;; directly. If instead it is in some other physical
- ;; environment, then it's bogus for us to reference it here
- ;; without it being closed over. -- WHN 2001-09-29
- (aver (eq physenv (lambda-physenv (lambda-var-home thing))))
- (leaf-info thing))
- (nlx-info
- (aver (eq physenv (block-physenv (nlx-info-target thing))))
- (ir2-nlx-info-home (nlx-info-info thing))))
+ (lambda-var
+ ;; I think that a failure of this assertion means that we're
+ ;; trying to access a variable which was improperly closed
+ ;; over. The PHYSENV describes a physical environment. Every
+ ;; variable that a form refers to should either be in its
+ ;; physical environment directly, or grabbed from a
+ ;; surrounding physical environment when it was closed over.
+ ;; The ASSOC expression above finds closed-over variables, so
+ ;; if we fell through the ASSOC expression, it wasn't closed
+ ;; over. Therefore, it must be in our physical environment
+ ;; directly. If instead it is in some other physical
+ ;; environment, then it's bogus for us to reference it here
+ ;; without it being closed over. -- WHN 2001-09-29
+ (aver (eq physenv (lambda-physenv (lambda-var-home thing))))
+ (leaf-info thing))
+ (nlx-info
+ (aver (eq physenv (block-physenv (nlx-info-target thing))))
+ (ir2-nlx-info-home (nlx-info-info thing)))
+ (clambda
+ (aver (xep-p thing))
+ (entry-info-closure-tn (lambda-info thing))))
(bug "~@<~2I~_~S ~_not found in ~_~S~:>" thing physenv)))
;;; If LEAF already has a constant TN, return that, otherwise make a
;;; TN for it.
-(defun constant-tn (leaf)
+(defun constant-tn (leaf boxedp)
(declare (type constant leaf))
- (or (leaf-info leaf)
- (setf (leaf-info leaf)
- (make-constant-tn leaf))))
+ ;; When convenient we can have both a boxed and unboxed TN for
+ ;; constant.
+ (if boxedp
+ (or (constant-boxed-tn leaf)
+ (setf (constant-boxed-tn leaf) (make-constant-tn leaf t)))
+ (or (leaf-info leaf)
+ (setf (leaf-info leaf) (make-constant-tn leaf nil)))))
;;; Return a TN that represents the value of LEAF, or NIL if LEAF
;;; isn't directly represented by a TN. ENV is the environment that
;;; the reference is done in.
-(defun leaf-tn (leaf env)
+(defun leaf-tn (leaf env boxedp)
(declare (type leaf leaf) (type physenv env))
(typecase leaf
(lambda-var
(unless (lambda-var-indirect leaf)
(find-in-physenv leaf env)))
- (constant (constant-tn leaf))
+ (constant (constant-tn leaf boxedp))
(t nil)))
;;; This is used to conveniently get a handle on a constant TN during
;;; IR2 conversion. It returns a constant TN representing the Lisp
;;; object VALUE.
(defun emit-constant (value)
- (constant-tn (find-constant value)))
+ (constant-tn (find-constant value) t))
+
+(defun boxed-ref-p (ref)
+ (let ((dest (lvar-dest (ref-lvar ref))))
+ (cond ((and (basic-combination-p dest) (eq :full (basic-combination-kind dest)))
+ t)
+ ;; Other cases?
+ (t
+ nil))))
;;; Convert a REF node. The reference must not be delayed.
(defun ir2-convert-ref (node block)
(declare (type ref node) (type ir2-block block))
(let* ((lvar (node-lvar node))
- (leaf (ref-leaf node))
- (locs (lvar-result-tns
- lvar (list (primitive-type (leaf-type leaf)))))
- (res (first locs)))
+ (leaf (ref-leaf node))
+ (locs (lvar-result-tns
+ lvar (list (primitive-type (leaf-type leaf)))))
+ (res (first locs)))
(etypecase leaf
(lambda-var
- (let ((tn (find-in-physenv leaf (node-physenv node))))
- (if (lambda-var-indirect leaf)
- (vop value-cell-ref node block tn res)
- (emit-move node block tn res))))
+ (let ((tn (find-in-physenv leaf (node-physenv node)))
+ (indirect (lambda-var-indirect leaf))
+ (explicit (lambda-var-explicit-value-cell leaf)))
+ (cond
+ ((and indirect explicit)
+ (vop value-cell-ref node block tn res))
+ ((and indirect
+ (not (eq (node-physenv node)
+ (lambda-physenv (lambda-var-home leaf)))))
+ (let ((reffer (third (primitive-type-indirect-cell-type
+ (primitive-type (leaf-type leaf))))))
+ (if reffer
+ (funcall reffer node block tn (leaf-info leaf) res)
+ (vop ancestor-frame-ref node block tn (leaf-info leaf) res))))
+ (t (emit-move node block tn res)))))
(constant
- (if (legal-immediate-constant-p leaf)
- (emit-move node block (constant-tn leaf) res)
- (let* ((name (leaf-source-name leaf))
- (name-tn (emit-constant name)))
- (if (policy node (zerop safety))
- (vop fast-symbol-value node block name-tn res)
- (vop symbol-value node block name-tn res)))))
+ (emit-move node block (constant-tn leaf (boxed-ref-p node)) res))
(functional
(ir2-convert-closure node block leaf res))
(global-var
- (let ((unsafe (policy node (zerop safety)))
- (name (leaf-source-name leaf)))
- (ecase (global-var-kind leaf)
- ((:special :global)
- (aver (symbolp name))
- (let ((name-tn (emit-constant name)))
- (if unsafe
- (vop fast-symbol-value node block name-tn res)
- (vop symbol-value node block name-tn res))))
- (:global-function
- (let ((fdefn-tn (make-load-time-constant-tn :fdefinition name)))
- (if unsafe
- (vop fdefn-fun node block fdefn-tn res)
- (vop safe-fdefn-fun node block fdefn-tn res))))))))
+ (ir2-convert-global-var node block leaf res)))
(move-lvar-result node block locs lvar))
(values))
+(defun ir2-convert-global-var (node block leaf res)
+ (let ((unsafe (policy node (zerop safety)))
+ (name (leaf-source-name leaf)))
+ (ecase (global-var-kind leaf)
+ ((:special :unknown)
+ (aver (symbolp name))
+ (let ((name-tn (emit-constant name)))
+ (if (or unsafe (info :variable :always-bound name))
+ (vop fast-symbol-value node block name-tn res)
+ (vop symbol-value node block name-tn res))))
+ (:global
+ (aver (symbolp name))
+ (let ((name-tn (emit-constant name)))
+ (if (or unsafe (info :variable :always-bound name))
+ (vop fast-symbol-global-value node block name-tn res)
+ (vop symbol-global-value node block name-tn res))))
+ (:global-function
+ (cond #-sb-xc-host
+ ((and (info :function :definition name)
+ (info :function :info name))
+ ;; Known functions can be saved without going through fdefns,
+ ;; except during cross-compilation
+ (emit-move node block (make-load-time-constant-tn :known-fun name)
+ res))
+ (t
+ (let ((fdefn-tn (make-load-time-constant-tn :fdefinition name)))
+ (if unsafe
+ (vop fdefn-fun node block fdefn-tn res)
+ (vop safe-fdefn-fun node block fdefn-tn res)))))))))
+
;;; some sanity checks for a CLAMBDA passed to IR2-CONVERT-CLOSURE
(defun assertions-on-ir2-converted-clambda (clambda)
;; This assertion was sort of an experiment. It would be nice and
;; sane and easier to understand things if it were *always* true,
;; but experimentally I observe that it's only *almost* always
;; true. -- WHN 2001-01-02
- #+nil
+ #+nil
(aver (eql (lambda-component clambda)
- (block-component (ir2-block-block ir2-block))))
+ (block-component (ir2-block-block ir2-block))))
;; Check for some weirdness which came up in bug
;; 138, 2002-01-02.
;;
;; when it's caught at dump time, so this assertion tries to catch
;; it here.
(aver (member clambda
- (component-lambdas (lambda-component clambda))))
+ (component-lambdas (lambda-component clambda))))
;; another bug-138-related issue: COMPONENT-NEW-FUNCTIONALS is
;; used as a queue for stuff pending to do in IR1, and now that
;; we're doing IR2 it should've been completely flushed (but
;;; pre-analyzed the top level code, we just leave an empty slot.
(defun ir2-convert-closure (ref ir2-block functional res)
(declare (type ref ref)
- (type ir2-block ir2-block)
- (type functional functional)
- (type tn res))
- (aver (not (eql (functional-kind functional) :deleted)))
- (unless (leaf-info functional)
- (setf (leaf-info functional)
- (make-entry-info :name (functional-debug-name functional))))
- (let ((entry (make-load-time-constant-tn :entry functional))
- (closure (etypecase functional
- (clambda
- (assertions-on-ir2-converted-clambda functional)
- (physenv-closure (get-lambda-physenv functional)))
- (functional
- (aver (eq (functional-kind functional) :toplevel-xep))
- nil))))
-
- (cond (closure
- (let ((this-env (node-physenv ref)))
- (vop make-closure ref ir2-block entry (length closure) res)
- (loop for what in closure and n from 0 do
- (unless (and (lambda-var-p what)
- (null (leaf-refs what)))
- (vop closure-init ref ir2-block
- res
- (find-in-physenv what this-env)
- n)))))
- (t
- (emit-move ref ir2-block entry res))))
+ (type ir2-block ir2-block)
+ (type functional functional)
+ (type tn res))
+ (flet ((prepare ()
+ (aver (not (eql (functional-kind functional) :deleted)))
+ (unless (leaf-info functional)
+ (setf (leaf-info functional)
+ (make-entry-info :name
+ (functional-debug-name functional))))))
+ (let ((closure (etypecase functional
+ (clambda
+ (assertions-on-ir2-converted-clambda functional)
+ (physenv-closure (get-lambda-physenv functional)))
+ (functional
+ (aver (eq (functional-kind functional) :toplevel-xep))
+ nil)))
+ global-var)
+ (cond (closure
+ (prepare)
+ (let* ((physenv (node-physenv ref))
+ (tn (find-in-physenv functional physenv)))
+ (emit-move ref ir2-block tn res)))
+ ;; we're about to emit a reference to a "closure" that's actually
+ ;; an inlinable global function.
+ ((and (global-var-p (setf global-var
+ (functional-inline-expanded functional)))
+ (eq :global-function (global-var-kind global-var)))
+ (ir2-convert-global-var ref ir2-block global-var res))
+ (t
+ ;; if we're here, we should have either a toplevel-xep (some
+ ;; global scope function in a different component) or an external
+ ;; reference to the "closure"'s body.
+ (prepare)
+ (aver (memq (functional-kind functional) '(:external :toplevel-xep)))
+ (let ((entry (make-load-time-constant-tn :entry functional)))
+ (emit-move ref ir2-block entry res))))))
+ (values))
+
+(defun closure-initial-value (what this-env current-fp)
+ (declare (type (or nlx-info lambda-var clambda) what)
+ (type physenv this-env)
+ (type (or tn null) current-fp))
+ ;; If we have an indirect LAMBDA-VAR that does not require an
+ ;; EXPLICIT-VALUE-CELL, and is from this environment (not from being
+ ;; closed over), we need to store the current frame pointer.
+ (if (and (lambda-var-p what)
+ (lambda-var-indirect what)
+ (not (lambda-var-explicit-value-cell what))
+ (eq (lambda-physenv (lambda-var-home what))
+ this-env))
+ current-fp
+ (find-in-physenv what this-env)))
+
+(defoptimizer (%allocate-closures ltn-annotate) ((leaves) node ltn-policy)
+ ltn-policy ; a hack to effectively (DECLARE (IGNORE LTN-POLICY))
+ (when (lvar-dynamic-extent leaves)
+ (let ((info (make-ir2-lvar *backend-t-primitive-type*)))
+ (setf (ir2-lvar-kind info) :delayed)
+ (setf (lvar-info leaves) info)
+ (setf (ir2-lvar-stack-pointer info)
+ (make-stack-pointer-tn)))))
+
+(defoptimizer (%allocate-closures ir2-convert) ((leaves) call 2block)
+ (let ((dx-p (lvar-dynamic-extent leaves)))
+ (collect ((delayed))
+ (when dx-p
+ (vop current-stack-pointer call 2block
+ (ir2-lvar-stack-pointer (lvar-info leaves))))
+ (dolist (leaf (lvar-value leaves))
+ (binding* ((xep (awhen (functional-entry-fun leaf)
+ ;; if the xep's been deleted then we can skip it
+ (if (eq (functional-kind it) :deleted)
+ nil it))
+ :exit-if-null)
+ (nil (aver (xep-p xep)))
+ (entry-info (lambda-info xep) :exit-if-null)
+ (tn (entry-info-closure-tn entry-info) :exit-if-null)
+ (closure (physenv-closure (get-lambda-physenv xep)))
+ (entry (make-load-time-constant-tn :entry xep)))
+ (let ((this-env (node-physenv call))
+ (leaf-dx-p (and dx-p (leaf-dynamic-extent leaf))))
+ (vop make-closure call 2block entry (length closure)
+ leaf-dx-p tn)
+ (loop for what in closure and n from 0 do
+ (unless (and (lambda-var-p what)
+ (null (leaf-refs what)))
+ ;; In LABELS a closure may refer to another closure
+ ;; in the same group, so we must be sure that we
+ ;; store a closure only after its creation.
+ ;;
+ ;; TODO: Here is a simple solution: we postpone
+ ;; putting of all closures after all creations
+ ;; (though it may require more registers).
+ (if (lambda-p what)
+ (delayed (list tn (find-in-physenv what this-env) n))
+ (let ((initial-value (closure-initial-value
+ what this-env nil)))
+ (if initial-value
+ (vop closure-init call 2block
+ tn initial-value n)
+ ;; An initial-value of NIL means to stash
+ ;; the frame pointer... which requires a
+ ;; different VOP.
+ (vop closure-init-from-fp call 2block tn n)))))))))
+ (loop for (tn what n) in (delayed)
+ do (vop closure-init call 2block
+ tn what n))))
(values))
;;; Convert a SET node. If the NODE's LVAR is annotated, then we also
(defun ir2-convert-set (node block)
(declare (type cset node) (type ir2-block block))
(let* ((lvar (node-lvar node))
- (leaf (set-var node))
- (val (lvar-tn node block (set-value node)))
- (locs (if lvar
- (lvar-result-tns
- lvar (list (primitive-type (leaf-type leaf))))
- nil)))
+ (leaf (set-var node))
+ (val (lvar-tn node block (set-value node)))
+ (locs (if lvar
+ (lvar-result-tns
+ lvar (list (primitive-type (leaf-type leaf))))
+ nil)))
(etypecase leaf
(lambda-var
(when (leaf-refs leaf)
- (let ((tn (find-in-physenv leaf (node-physenv node))))
- (if (lambda-var-indirect leaf)
- (vop value-cell-set node block tn val)
- (emit-move node block val tn)))))
+ (let ((tn (find-in-physenv leaf (node-physenv node)))
+ (indirect (lambda-var-indirect leaf))
+ (explicit (lambda-var-explicit-value-cell leaf)))
+ (cond
+ ((and indirect explicit)
+ (vop value-cell-set node block tn val))
+ ((and indirect
+ (not (eq (node-physenv node)
+ (lambda-physenv (lambda-var-home leaf)))))
+ (let ((setter (fourth (primitive-type-indirect-cell-type
+ (primitive-type (leaf-type leaf))))))
+ (if setter
+ (funcall setter node block tn val (leaf-info leaf))
+ (vop ancestor-frame-set node block tn val (leaf-info leaf)))))
+ (t (emit-move node block val tn))))))
(global-var
+ (aver (symbolp (leaf-source-name leaf)))
(ecase (global-var-kind leaf)
- ((:special :global)
- (aver (symbolp (leaf-source-name leaf)))
- (vop set node block (emit-constant (leaf-source-name leaf)) val)))))
+ ((:special)
+ (vop set node block (emit-constant (leaf-source-name leaf)) val))
+ ((:global)
+ (vop %set-symbol-global-value node
+ block (emit-constant (leaf-source-name leaf)) val)))))
(when locs
(emit-move node block val (first locs))
(move-lvar-result node block locs lvar)))
(defun lvar-tn (node block lvar)
(declare (type node node) (type ir2-block block) (type lvar lvar))
(let* ((2lvar (lvar-info lvar))
- (lvar-tn
- (ecase (ir2-lvar-kind 2lvar)
- (:delayed
- (let ((ref (lvar-uses lvar)))
- (leaf-tn (ref-leaf ref) (node-physenv ref))))
- (:fixed
- (aver (= (length (ir2-lvar-locs 2lvar)) 1))
- (first (ir2-lvar-locs 2lvar)))))
- (ptype (ir2-lvar-primitive-type 2lvar)))
+ (lvar-tn
+ (ecase (ir2-lvar-kind 2lvar)
+ (:delayed
+ (let ((ref (lvar-uses lvar)))
+ (leaf-tn (ref-leaf ref) (node-physenv ref) (boxed-ref-p ref))))
+ (:fixed
+ (aver (= (length (ir2-lvar-locs 2lvar)) 1))
+ (first (ir2-lvar-locs 2lvar)))))
+ (ptype (ir2-lvar-primitive-type 2lvar)))
(cond ((eq (tn-primitive-type lvar-tn) ptype) lvar-tn)
- (t
- (let ((temp (make-normal-tn ptype)))
- (emit-move node block lvar-tn temp)
- temp)))))
+ (t
+ (let ((temp (make-normal-tn ptype)))
+ (emit-move node block lvar-tn temp)
+ temp)))))
;;; This is similar to LVAR-TN, but hacks multiple values. We return
;;; TNs holding the values of LVAR with PTYPES as their primitive
;;; move the extra values with no check.
(defun lvar-tns (node block lvar ptypes)
(declare (type node node) (type ir2-block block)
- (type lvar lvar) (list ptypes))
+ (type lvar lvar) (list ptypes))
(let* ((locs (ir2-lvar-locs (lvar-info lvar)))
- (nlocs (length locs)))
+ (nlocs (length locs)))
(aver (= nlocs (length ptypes)))
(mapcar (lambda (from to-type)
;;; an lvar.
;;;
;;; If the lvar isn't annotated (meaning the values are discarded) or
-;;; is unknown-values, the then we make temporaries for each supplied
+;;; is unknown-values, then we make temporaries for each supplied
;;; value, providing a place to compute the result in until we decide
;;; what to do with it (if anything.)
;;;
(mapcar #'make-normal-tn types)
(let ((2lvar (lvar-info lvar)))
(ecase (ir2-lvar-kind 2lvar)
- (:fixed
- (let* ((locs (ir2-lvar-locs 2lvar))
- (nlocs (length locs))
- (ntypes (length types)))
- (if (and (= nlocs ntypes)
- (do ((loc locs (cdr loc))
- (type types (cdr type)))
- ((null loc) t)
- (unless (eq (tn-primitive-type (car loc)) (car type))
- (return nil))))
- locs
- (mapcar (lambda (loc type)
- (if (eq (tn-primitive-type loc) type)
- loc
- (make-normal-tn type)))
- (if (< nlocs ntypes)
- (append locs
- (mapcar #'make-normal-tn
- (subseq types nlocs)))
- locs)
- types))))
- (:unknown
- (mapcar #'make-normal-tn types))))))
+ (:fixed
+ (let* ((locs (ir2-lvar-locs 2lvar))
+ (nlocs (length locs))
+ (ntypes (length types)))
+ (if (and (= nlocs ntypes)
+ (do ((loc locs (cdr loc))
+ (type types (cdr type)))
+ ((null loc) t)
+ (unless (eq (tn-primitive-type (car loc)) (car type))
+ (return nil))))
+ locs
+ (mapcar (lambda (loc type)
+ (if (eq (tn-primitive-type loc) type)
+ loc
+ (make-normal-tn type)))
+ (if (< nlocs ntypes)
+ (append locs
+ (mapcar #'make-normal-tn
+ (subseq types nlocs)))
+ locs)
+ types))))
+ (:unknown
+ (mapcar #'make-normal-tn types))))))
;;; Make the first N standard value TNs, returning them in a list.
(defun make-standard-value-tns (n)
;;; Return a list of TNs wired to the standard value passing
;;; conventions that can be used to receive values according to the
-;;; unknown-values convention. This is used with together
+;;; unknown-values convention. This is used together with
;;; MOVE-LVAR-RESULT for delivering unknown values to a fixed values
;;; lvar.
;;;
(defun move-results-coerced (node block src dest)
(declare (type node node) (type ir2-block block) (list src dest))
(let ((nsrc (length src))
- (ndest (length dest)))
+ (ndest (length dest)))
(mapc (lambda (from to)
- (unless (eq from to)
- (emit-move node block from to)))
- (if (> ndest nsrc)
- (append src (make-list (- ndest nsrc)
- :initial-element (emit-constant nil)))
- src)
- dest))
+ (unless (eq from to)
+ (emit-move node block from to)))
+ (if (> ndest nsrc)
+ (append src (make-list (- ndest nsrc)
+ :initial-element (emit-constant nil)))
+ src)
+ dest))
(values))
;;; Move each SRC TN into the corresponding DEST TN, checking types
(defun move-results-checked (node block src dest types)
(declare (type node node) (type ir2-block block) (list src dest types))
(let ((nsrc (length src))
- (ndest (length dest))
+ (ndest (length dest))
(ntypes (length types)))
(mapc (lambda (from to type)
(if type
(emit-type-check node block from to type)
(emit-move node block from to)))
- (if (> ndest nsrc)
- (append src (make-list (- ndest nsrc)
- :initial-element (emit-constant nil)))
- src)
- dest
+ (if (> ndest nsrc)
+ (append src (make-list (- ndest nsrc)
+ :initial-element (emit-constant nil)))
+ src)
+ dest
(if (> ndest ntypes)
- (append types (make-list (- ndest ntypes)))
- types)))
+ (append types (make-list (- ndest ntypes)))
+ types)))
(values))
;;; If necessary, emit coercion code needed to deliver the RESULTS to
;;; the specified lvar. NODE and BLOCK provide context for emitting
;;; code. Although usually obtained from STANDARD-RESULT-TNs or
-;;; LVAR-RESULT-TNs, RESULTS my be a list of any type or
+;;; LVAR-RESULT-TNs, RESULTS may be a list of any type or
;;; number of TNs.
;;;
;;; If the lvar is fixed values, then move the results into the lvar
;;; values on the stack.
(defun move-lvar-result (node block results lvar)
(declare (type node node) (type ir2-block block)
- (list results) (type (or lvar null) lvar))
+ (list results) (type (or lvar null) lvar))
(when lvar
(let ((2lvar (lvar-info lvar)))
(ecase (ir2-lvar-kind 2lvar)
;;; for emitting any necessary type-checking code.
(defun reference-args (node block args template)
(declare (type node node) (type ir2-block block) (list args)
- (type template template))
+ (type template template))
(collect ((info-args))
(let ((last nil)
- (first nil))
+ (first nil))
(do ((args args (cdr args))
- (types (template-arg-types template) (cdr types)))
- ((null args))
- (let ((type (first types))
- (arg (first args)))
- (if (and (consp type) (eq (car type) ':constant))
- (info-args (lvar-value arg))
- (let ((ref (reference-tn (lvar-tn node block arg) nil)))
- (if last
- (setf (tn-ref-across last) ref)
- (setf first ref))
- (setq last ref)))))
+ (types (template-arg-types template) (cdr types)))
+ ((null args))
+ (let ((type (first types))
+ (arg (first args)))
+ (if (and (consp type) (eq (car type) ':constant))
+ (info-args (lvar-value arg))
+ (let ((ref (reference-tn (lvar-tn node block arg) nil)))
+ (if last
+ (setf (tn-ref-across last) ref)
+ (setf first ref))
+ (setq last ref)))))
(values (the (or tn-ref null) first) (info-args)))))
;;; negated.
(defun ir2-convert-conditional (node block template args info-args if not-p)
(declare (type node node) (type ir2-block block)
- (type template template) (type (or tn-ref null) args)
- (list info-args) (type cif if) (type boolean not-p))
- (aver (= (template-info-arg-count template) (+ (length info-args) 2)))
+ (type template template) (type (or tn-ref null) args)
+ (list info-args) (type cif if) (type boolean not-p))
(let ((consequent (if-consequent if))
- (alternative (if-alternative if)))
- (cond ((drop-thru-p if consequent)
- (emit-template node block template args nil
- (list* (block-label alternative) (not not-p)
- info-args)))
- (t
- (emit-template node block template args nil
- (list* (block-label consequent) not-p info-args))
- (unless (drop-thru-p if alternative)
- (vop branch node block (block-label alternative)))))))
+ (alternative (if-alternative if))
+ (flags (and (consp (template-result-types template))
+ (rest (template-result-types template)))))
+ (aver (= (template-info-arg-count template)
+ (+ (length info-args)
+ (if flags 0 2))))
+ (when not-p
+ (rotatef consequent alternative)
+ (setf not-p nil))
+ (when (drop-thru-p if consequent)
+ (rotatef consequent alternative)
+ (setf not-p t))
+ (cond ((not flags)
+ (emit-template node block template args nil
+ (list* (block-label consequent) not-p
+ info-args))
+ (if (drop-thru-p if alternative)
+ (register-drop-thru alternative)
+ (vop branch node block (block-label alternative))))
+ (t
+ (emit-template node block template args nil info-args)
+ (vop branch-if node block (block-label consequent) flags not-p)
+ (if (drop-thru-p if alternative)
+ (register-drop-thru alternative)
+ (vop branch node block (block-label alternative)))))))
;;; Convert an IF that isn't the DEST of a conditional template.
(defun ir2-convert-if (node block)
(declare (type ir2-block block) (type cif node))
(let* ((test (if-test node))
- (test-ref (reference-tn (lvar-tn node block test) nil))
- (nil-ref (reference-tn (emit-constant nil) nil)))
+ (test-ref (reference-tn (lvar-tn node block test) nil))
+ (nil-ref (reference-tn (emit-constant nil) nil)))
(setf (tn-ref-across test-ref) nil-ref)
(ir2-convert-conditional node block (template-or-lose 'if-eq)
- test-ref () node t)))
-
-;;; Return a list of primitive-types that we can pass to
-;;; LVAR-RESULT-TNS describing the result types we want for a
-;;; template call. We duplicate here the determination of output type
-;;; that was done in initially selecting the template, so we know that
-;;; the types we find are allowed by the template output type
-;;; restrictions.
-(defun find-template-result-types (call template rtypes)
- (declare (type combination call)
- (type template template) (list rtypes))
- (declare (ignore template))
- (let* ((dtype (node-derived-type call))
- (type dtype)
- (types (mapcar #'primitive-type
- (if (values-type-p type)
- (append (values-type-required type)
- (values-type-optional type))
- (list type)))))
- (let ((nvals (length rtypes))
- (ntypes (length types)))
- (cond ((< ntypes nvals)
- (append types
- (make-list (- nvals ntypes)
- :initial-element *backend-t-primitive-type*)))
- ((> ntypes nvals)
- (subseq types 0 nvals))
- (t
- types)))))
-
-;;; Return a list of TNs usable in a CALL to TEMPLATE delivering
-;;; values to LVAR. As an efficiency hack, we pick off the common case
-;;; where the LVAR is fixed values and has locations that satisfy the
-;;; result restrictions. This can fail when there is a type check or a
-;;; values count mismatch.
-(defun make-template-result-tns (call lvar template rtypes)
+ test-ref () node t)))
+
+;;; Return a list of primitive-types that we can pass to LVAR-RESULT-TNS
+;;; describing the result types we want for a template call. We are really
+;;; only interested in the number of results required: in normal case
+;;; TEMPLATE-RESULTS-OK has already checked them.
+(defun find-template-result-types (call rtypes)
+ (let* ((type (node-derived-type call))
+ (types
+ (mapcar #'primitive-type
+ (if (args-type-p type)
+ (append (args-type-required type)
+ (args-type-optional type))
+ (list type))))
+ (primitive-t *backend-t-primitive-type*))
+ (loop for rtype in rtypes
+ for type = (or (pop types) primitive-t)
+ collect type)))
+
+;;; Return a list of TNs usable in a CALL to TEMPLATE delivering values to
+;;; LVAR. As an efficiency hack, we pick off the common case where the LVAR is
+;;; fixed values and has locations that satisfy the result restrictions. This
+;;; can fail when there is a type check or a values count mismatch.
+(defun make-template-result-tns (call lvar rtypes)
(declare (type combination call) (type (or lvar null) lvar)
- (type template template) (list rtypes))
+ (list rtypes))
(let ((2lvar (when lvar (lvar-info lvar))))
(if (and 2lvar (eq (ir2-lvar-kind 2lvar) :fixed))
- (let ((locs (ir2-lvar-locs 2lvar)))
- (if (and (= (length rtypes) (length locs))
- (do ((loc locs (cdr loc))
- (rtype rtypes (cdr rtype)))
- ((null loc) t)
- (unless (operand-restriction-ok
- (car rtype)
- (tn-primitive-type (car loc))
- :t-ok nil)
- (return nil))))
- locs
- (lvar-result-tns
- lvar
- (find-template-result-types call template rtypes))))
- (lvar-result-tns
- lvar
- (find-template-result-types call template rtypes)))))
+ (let ((locs (ir2-lvar-locs 2lvar)))
+ (if (and (= (length rtypes) (length locs))
+ (do ((loc locs (cdr loc))
+ (rtypes rtypes (cdr rtypes)))
+ ((null loc) t)
+ (unless (operand-restriction-ok
+ (car rtypes)
+ (tn-primitive-type (car loc))
+ :t-ok nil)
+ (return nil))))
+ locs
+ (lvar-result-tns
+ lvar
+ (find-template-result-types call rtypes))))
+ (lvar-result-tns
+ lvar
+ (find-template-result-types call rtypes)))))
;;; Get the operands into TNs, make TN-REFs for them, and then call
;;; the template emit function.
(defun ir2-convert-template (call block)
(declare (type combination call) (type ir2-block block))
(let* ((template (combination-info call))
- (lvar (node-lvar call))
- (rtypes (template-result-types template)))
+ (lvar (node-lvar call))
+ (rtypes (template-result-types template)))
(multiple-value-bind (args info-args)
- (reference-args call block (combination-args call) template)
+ (reference-args call block (combination-args call) template)
(aver (not (template-more-results-type template)))
- (if (eq rtypes :conditional)
- (ir2-convert-conditional call block template args info-args
- (lvar-dest lvar) nil)
- (let* ((results (make-template-result-tns call lvar template rtypes))
- (r-refs (reference-tn-list results t)))
- (aver (= (length info-args)
- (template-info-arg-count template)))
- (if info-args
- (emit-template call block template args r-refs info-args)
- (emit-template call block template args r-refs))
- (move-lvar-result call block results lvar)))))
+ (if (template-conditional-p template)
+ (ir2-convert-conditional call block template args info-args
+ (lvar-dest lvar) nil)
+ (let* ((results (make-template-result-tns call lvar rtypes))
+ (r-refs (reference-tn-list results t)))
+ (aver (= (length info-args)
+ (template-info-arg-count template)))
+ (when (and lvar (lvar-dynamic-extent lvar))
+ (vop current-stack-pointer call block
+ (ir2-lvar-stack-pointer (lvar-info lvar))))
+ (when (emit-step-p call)
+ (vop sb!vm::step-instrument-before-vop call block))
+ (if info-args
+ (emit-template call block template args r-refs info-args)
+ (emit-template call block template args r-refs))
+ (move-lvar-result call block results lvar)))))
(values))
;;; We don't have to do much because operand count checking is done by
;;; arguments.
(defoptimizer (%%primitive ir2-convert) ((template info &rest args) call block)
(let* ((template (lvar-value template))
- (info (lvar-value info))
- (lvar (node-lvar call))
- (rtypes (template-result-types template))
- (results (make-template-result-tns call lvar template rtypes))
- (r-refs (reference-tn-list results t)))
+ (info (lvar-value info))
+ (lvar (node-lvar call))
+ (rtypes (template-result-types template))
+ (results (make-template-result-tns call lvar rtypes))
+ (r-refs (reference-tn-list results t)))
(multiple-value-bind (args info-args)
- (reference-args call block (cddr (combination-args call)) template)
+ (reference-args call block (cddr (combination-args call)) template)
(aver (not (template-more-results-type template)))
- (aver (not (eq rtypes :conditional)))
+ (aver (not (template-conditional-p template)))
(aver (null info-args))
(if info
- (emit-template call block template args r-refs info)
- (emit-template call block template args r-refs))
+ (emit-template call block template args r-refs info)
+ (emit-template call block template args r-refs))
(move-lvar-result call block results lvar)))
(values))
+
+(defoptimizer (%%primitive derive-type) ((template info &rest args))
+ (let ((type (template-type (lvar-value template))))
+ (if (fun-type-p type)
+ (fun-type-returns type)
+ *wild-type*)))
\f
;;;; local call
(defun ir2-convert-let (node block fun)
(declare (type combination node) (type ir2-block block) (type clambda fun))
(mapc (lambda (var arg)
- (when arg
- (let ((src (lvar-tn node block arg))
- (dest (leaf-info var)))
- (if (lambda-var-indirect var)
- (do-make-value-cell node block src dest)
- (emit-move node block src dest)))))
- (lambda-vars fun) (basic-combination-args node))
+ (when arg
+ (let ((src (lvar-tn node block arg))
+ (dest (leaf-info var)))
+ (if (and (lambda-var-indirect var)
+ (lambda-var-explicit-value-cell var))
+ (emit-make-value-cell node block src dest)
+ (emit-move node block src dest)))))
+ (lambda-vars fun) (basic-combination-args node))
(values))
;;; Emit any necessary moves into assignment temps for a local call to
;;; OLD-FP. If null, then the call is to the same environment (an
;;; :ASSIGNMENT), so we only move the arguments, and leave the
;;; environment alone.
-(defun emit-psetq-moves (node block fun old-fp)
+;;;
+;;; CLOSURE-FP is for calling a closure that has "implicit" value
+;;; cells (stored in the allocating stack frame), and is the frame
+;;; pointer TN to use for values allocated in the outbound stack
+;;; frame. This is distinct from OLD-FP for the specific case of a
+;;; tail-local-call.
+(defun emit-psetq-moves (node block fun old-fp &optional (closure-fp old-fp))
(declare (type combination node) (type ir2-block block) (type clambda fun)
- (type (or tn null) old-fp))
+ (type (or tn null) old-fp closure-fp))
(let ((actuals (mapcar (lambda (x)
- (when x
- (lvar-tn node block x)))
- (combination-args node))))
+ (when x
+ (lvar-tn node block x)))
+ (combination-args node))))
(collect ((temps)
- (locs))
+ (locs))
(dolist (var (lambda-vars fun))
- (let ((actual (pop actuals))
- (loc (leaf-info var)))
- (when actual
- (cond
- ((lambda-var-indirect var)
- (let ((temp
- (make-normal-tn *backend-t-primitive-type*)))
- (do-make-value-cell node block actual temp)
- (temps temp)))
- ((member actual (locs))
- (let ((temp (make-normal-tn (tn-primitive-type loc))))
- (emit-move node block actual temp)
- (temps temp)))
- (t
- (temps actual)))
- (locs loc))))
+ (let ((actual (pop actuals))
+ (loc (leaf-info var)))
+ (when actual
+ (cond
+ ((and (lambda-var-indirect var)
+ (lambda-var-explicit-value-cell var))
+ (let ((temp
+ (make-normal-tn *backend-t-primitive-type*)))
+ (emit-make-value-cell node block actual temp)
+ (temps temp)))
+ ((member actual (locs))
+ (let ((temp (make-normal-tn (tn-primitive-type loc))))
+ (emit-move node block actual temp)
+ (temps temp)))
+ (t
+ (temps actual)))
+ (locs loc))))
(when old-fp
- (let ((this-1env (node-physenv node))
- (called-env (physenv-info (lambda-physenv fun))))
- (dolist (thing (ir2-physenv-closure called-env))
- (temps (find-in-physenv (car thing) this-1env))
- (locs (cdr thing)))
- (temps old-fp)
- (locs (ir2-physenv-old-fp called-env))))
+ (let ((this-1env (node-physenv node))
+ (called-env (physenv-info (lambda-physenv fun))))
+ (dolist (thing (ir2-physenv-closure called-env))
+ (temps (closure-initial-value (car thing) this-1env closure-fp))
+ (locs (cdr thing)))
+ (temps old-fp)
+ (locs (ir2-physenv-old-fp called-env))))
(values (temps) (locs)))))
;;; function's passing location.
(defun ir2-convert-tail-local-call (node block fun)
(declare (type combination node) (type ir2-block block) (type clambda fun))
- (let ((this-env (physenv-info (node-physenv node))))
+ (let ((this-env (physenv-info (node-physenv node)))
+ (current-fp (make-stack-pointer-tn)))
(multiple-value-bind (temps locs)
- (emit-psetq-moves node block fun (ir2-physenv-old-fp this-env))
+ (emit-psetq-moves node block fun
+ (ir2-physenv-old-fp this-env) current-fp)
+
+ ;; If we're about to emit a move from CURRENT-FP then we need to
+ ;; initialize it.
+ (when (find current-fp temps)
+ (vop current-fp node block current-fp))
(mapc (lambda (temp loc)
- (emit-move node block temp loc))
- temps locs))
+ (emit-move node block temp loc))
+ temps locs))
(emit-move node block
- (ir2-physenv-return-pc this-env)
- (ir2-physenv-return-pc-pass
- (physenv-info
- (lambda-physenv fun)))))
+ (ir2-physenv-return-pc this-env)
+ (ir2-physenv-return-pc-pass
+ (physenv-info
+ (lambda-physenv fun)))))
(values))
(multiple-value-bind (temps locs) (emit-psetq-moves node block fun nil)
(mapc (lambda (temp loc)
- (emit-move node block temp loc))
- temps locs))
+ (emit-move node block temp loc))
+ temps locs))
(values))
;;; Do stuff to set up the arguments to a non-tail local call
(defun ir2-convert-local-call-args (node block fun)
(declare (type combination node) (type ir2-block block) (type clambda fun))
(let ((fp (make-stack-pointer-tn))
- (nfp (make-number-stack-pointer-tn))
- (old-fp (make-stack-pointer-tn)))
+ (nfp (make-number-stack-pointer-tn))
+ (old-fp (make-stack-pointer-tn)))
(multiple-value-bind (temps locs)
- (emit-psetq-moves node block fun old-fp)
+ (emit-psetq-moves node block fun old-fp)
(vop current-fp node block old-fp)
(vop allocate-frame node block
- (physenv-info (lambda-physenv fun))
- fp nfp)
+ (physenv-info (lambda-physenv fun))
+ fp nfp)
(values fp nfp temps (mapcar #'make-alias-tn locs)))))
;;; Handle a non-TR known-values local call. We emit the call, then
;;; move the results to the lvar's destination.
(defun ir2-convert-local-known-call (node block fun returns lvar start)
(declare (type node node) (type ir2-block block) (type clambda fun)
- (type return-info returns) (type (or lvar null) lvar)
- (type label start))
+ (type return-info returns) (type (or lvar null) lvar)
+ (type label start))
(multiple-value-bind (fp nfp temps arg-locs)
(ir2-convert-local-call-args node block fun)
(let ((locs (return-info-locations returns)))
(vop* known-call-local node block
- (fp nfp (reference-tn-list temps nil))
- ((reference-tn-list locs t))
- arg-locs (physenv-info (lambda-physenv fun)) start)
+ (fp nfp (reference-tn-list temps nil))
+ ((reference-tn-list locs t))
+ arg-locs (physenv-info (lambda-physenv fun)) start)
(move-lvar-result node block locs lvar)))
(values))
;;; coercions.
(defun ir2-convert-local-unknown-call (node block fun lvar start)
(declare (type node node) (type ir2-block block) (type clambda fun)
- (type (or lvar null) lvar) (type label start))
+ (type (or lvar null) lvar) (type label start))
(multiple-value-bind (fp nfp temps arg-locs)
(ir2-convert-local-call-args node block fun)
(let ((2lvar (and lvar (lvar-info lvar)))
- (env (physenv-info (lambda-physenv fun)))
- (temp-refs (reference-tn-list temps nil)))
+ (env (physenv-info (lambda-physenv fun)))
+ (temp-refs (reference-tn-list temps nil)))
(if (and 2lvar (eq (ir2-lvar-kind 2lvar) :unknown))
- (vop* multiple-call-local node block (fp nfp temp-refs)
- ((reference-tn-list (ir2-lvar-locs 2lvar) t))
- arg-locs env start)
- (let ((locs (standard-result-tns lvar)))
- (vop* call-local node block
- (fp nfp temp-refs)
- ((reference-tn-list locs t))
- arg-locs env start (length locs))
- (move-lvar-result node block locs lvar)))))
+ (vop* multiple-call-local node block (fp nfp temp-refs)
+ ((reference-tn-list (ir2-lvar-locs 2lvar) t))
+ arg-locs env start)
+ (let ((locs (standard-result-tns lvar)))
+ (vop* call-local node block
+ (fp nfp temp-refs)
+ ((reference-tn-list locs t))
+ arg-locs env start (length locs))
+ (move-lvar-result node block locs lvar)))))
(values))
;;; Dispatch to the appropriate function, depending on whether we have
(defun ir2-convert-local-call (node block)
(declare (type combination node) (type ir2-block block))
(let* ((fun (ref-leaf (lvar-uses (basic-combination-fun node))))
- (kind (functional-kind fun)))
+ (kind (functional-kind fun)))
(cond ((eq kind :let)
- (ir2-convert-let node block fun))
- ((eq kind :assignment)
- (ir2-convert-assignment node block fun))
- ((node-tail-p node)
- (ir2-convert-tail-local-call node block fun))
- (t
- (let ((start (block-label (lambda-block fun)))
- (returns (tail-set-info (lambda-tail-set fun)))
- (lvar (node-lvar node)))
- (ecase (if returns
- (return-info-kind returns)
- :unknown)
- (:unknown
- (ir2-convert-local-unknown-call node block fun lvar start))
- (:fixed
- (ir2-convert-local-known-call node block fun returns
- lvar start)))))))
+ (ir2-convert-let node block fun))
+ ((eq kind :assignment)
+ (ir2-convert-assignment node block fun))
+ ((node-tail-p node)
+ (ir2-convert-tail-local-call node block fun))
+ (t
+ (let ((start (block-trampoline (lambda-block fun)))
+ (returns (tail-set-info (lambda-tail-set fun)))
+ (lvar (node-lvar node)))
+ (ecase (if returns
+ (return-info-kind returns)
+ :unknown)
+ (:unknown
+ (ir2-convert-local-unknown-call node block fun lvar start))
+ (:fixed
+ (ir2-convert-local-known-call node block fun returns
+ lvar start)))))))
(values))
\f
;;;; full call
(declare (type lvar lvar))
(let ((2lvar (lvar-info lvar)))
(if (eq (ir2-lvar-kind 2lvar) :delayed)
- (let ((name (lvar-fun-name lvar t)))
- (aver name)
- (values (make-load-time-constant-tn :fdefinition name) t))
- (let* ((locs (ir2-lvar-locs 2lvar))
- (loc (first locs))
- (function-ptype (primitive-type-or-lose 'function)))
- (aver (and (eq (ir2-lvar-kind 2lvar) :fixed)
- (= (length locs) 1)))
+ (let ((name (lvar-fun-name lvar t)))
+ (aver name)
+ (values (make-load-time-constant-tn :fdefinition name) t))
+ (let* ((locs (ir2-lvar-locs 2lvar))
+ (loc (first locs))
+ (function-ptype (primitive-type-or-lose 'function)))
+ (aver (and (eq (ir2-lvar-kind 2lvar) :fixed)
+ (= (length locs) 1)))
(aver (eq (tn-primitive-type loc) function-ptype))
- (values loc nil)))))
+ (values loc nil)))))
;;; Set up the args to NODE in the current frame, and return a TN-REF
;;; list for the passing locations.
(defun move-tail-full-call-args (node block)
(declare (type combination node) (type ir2-block block))
(let ((args (basic-combination-args node))
- (last nil)
- (first nil))
+ (last nil)
+ (first nil))
(dotimes (num (length args))
(let ((loc (standard-arg-location num)))
- (emit-move node block (lvar-tn node block (elt args num)) loc)
- (let ((ref (reference-tn loc nil)))
- (if last
- (setf (tn-ref-across last) ref)
- (setf first ref))
- (setq last ref))))
+ (emit-move node block (lvar-tn node block (elt args num)) loc)
+ (let ((ref (reference-tn loc nil)))
+ (if last
+ (setf (tn-ref-across last) ref)
+ (setf first ref))
+ (setq last ref))))
first))
;;; Move the arguments into the passing locations and do a (possibly
(defun ir2-convert-tail-full-call (node block)
(declare (type combination node) (type ir2-block block))
(let* ((env (physenv-info (node-physenv node)))
- (args (basic-combination-args node))
- (nargs (length args))
- (pass-refs (move-tail-full-call-args node block))
- (old-fp (ir2-physenv-old-fp env))
- (return-pc (ir2-physenv-return-pc env)))
+ (args (basic-combination-args node))
+ (nargs (length args))
+ (pass-refs (move-tail-full-call-args node block))
+ (old-fp (ir2-physenv-old-fp env))
+ (return-pc (ir2-physenv-return-pc env)))
(multiple-value-bind (fun-tn named)
- (fun-lvar-tn node block (basic-combination-fun node))
+ (fun-lvar-tn node block (basic-combination-fun node))
(if named
- (vop* tail-call-named node block
- (fun-tn old-fp return-pc pass-refs)
- (nil)
- nargs)
- (vop* tail-call node block
- (fun-tn old-fp return-pc pass-refs)
- (nil)
- nargs))))
+ (vop* tail-call-named node block
+ (fun-tn old-fp return-pc pass-refs)
+ (nil)
+ nargs
+ (emit-step-p node))
+ (vop* tail-call node block
+ (fun-tn old-fp return-pc pass-refs)
+ (nil)
+ nargs
+ (emit-step-p node)))))
(values))
(defun ir2-convert-full-call-args (node block)
(declare (type combination node) (type ir2-block block))
(let* ((args (basic-combination-args node))
- (fp (make-stack-pointer-tn))
- (nargs (length args)))
+ (fp (make-stack-pointer-tn))
+ (nargs (length args)))
(vop allocate-full-call-frame node block nargs fp)
(collect ((locs))
(let ((last nil)
- (first nil))
- (dotimes (num nargs)
- (locs (standard-arg-location num))
- (let ((ref (reference-tn (lvar-tn node block (elt args num))
- nil)))
- (if last
- (setf (tn-ref-across last) ref)
- (setf first ref))
- (setq last ref)))
-
- (values fp first (locs) nargs)))))
+ (first nil))
+ (dotimes (num nargs)
+ (locs (standard-arg-location num))
+ (let ((ref (reference-tn (lvar-tn node block (elt args num))
+ nil)))
+ (if last
+ (setf (tn-ref-across last) ref)
+ (setf first ref))
+ (setq last ref)))
+
+ (values fp first (locs) nargs)))))
;;; Do full call when a fixed number of values are desired. We make
;;; STANDARD-RESULT-TNS for our lvar, then deliver the result using
(multiple-value-bind (fp args arg-locs nargs)
(ir2-convert-full-call-args node block)
(let* ((lvar (node-lvar node))
- (locs (standard-result-tns lvar))
- (loc-refs (reference-tn-list locs t))
- (nvals (length locs)))
+ (locs (standard-result-tns lvar))
+ (loc-refs (reference-tn-list locs t))
+ (nvals (length locs)))
(multiple-value-bind (fun-tn named)
- (fun-lvar-tn node block (basic-combination-fun node))
- (if named
- (vop* call-named node block (fp fun-tn args) (loc-refs)
- arg-locs nargs nvals)
- (vop* call node block (fp fun-tn args) (loc-refs)
- arg-locs nargs nvals))
- (move-lvar-result node block locs lvar))))
+ (fun-lvar-tn node block (basic-combination-fun node))
+ (if named
+ (vop* call-named node block (fp fun-tn args) (loc-refs)
+ arg-locs nargs nvals (emit-step-p node))
+ (vop* call node block (fp fun-tn args) (loc-refs)
+ arg-locs nargs nvals (emit-step-p node)))
+ (move-lvar-result node block locs lvar))))
(values))
;;; Do full call when unknown values are desired.
(multiple-value-bind (fp args arg-locs nargs)
(ir2-convert-full-call-args node block)
(let* ((lvar (node-lvar node))
- (locs (ir2-lvar-locs (lvar-info lvar)))
- (loc-refs (reference-tn-list locs t)))
+ (locs (ir2-lvar-locs (lvar-info lvar)))
+ (loc-refs (reference-tn-list locs t)))
(multiple-value-bind (fun-tn named)
- (fun-lvar-tn node block (basic-combination-fun node))
- (if named
- (vop* multiple-call-named node block (fp fun-tn args) (loc-refs)
- arg-locs nargs)
- (vop* multiple-call node block (fp fun-tn args) (loc-refs)
- arg-locs nargs)))))
+ (fun-lvar-tn node block (basic-combination-fun node))
+ (if named
+ (vop* multiple-call-named node block (fp fun-tn args) (loc-refs)
+ arg-locs nargs (emit-step-p node))
+ (vop* multiple-call node block (fp fun-tn args) (loc-refs)
+ arg-locs nargs (emit-step-p node))))))
(values))
;;; stuff to check in PONDER-FULL-CALL
;;;
-;;; There are some things which are intended always to be optimized
-;;; away by DEFTRANSFORMs and such, and so never compiled into full
-;;; calls. This has been a source of bugs so many times that it seems
-;;; worth listing some of them here so that we can check the list
-;;; whenever we compile a full call.
-;;;
-;;; FIXME: It might be better to represent this property by setting a
-;;; flag in DEFKNOWN, instead of representing it by membership in this
-;;; list.
-(defvar *always-optimized-away*
- '(;; This should always be DEFTRANSFORMed away, but wasn't in a bug
- ;; reported to cmucl-imp 2000-06-20.
- %instance-ref
- ;; These should always turn into VOPs, but wasn't in a bug which
- ;; appeared when LTN-POLICY stuff was being tweaked in
- ;; sbcl-0.6.9.16. in sbcl-0.6.0
- data-vector-set
- data-vector-ref))
-
-;;; more stuff to check in PONDER-FULL-CALL
-;;;
;;; These came in handy when troubleshooting cold boot after making
;;; major changes in the package structure: various transforms and
;;; VOPs and stuff got attached to the wrong symbol, so that
;;; a DEFSETF or some such thing elsewhere in the program?
(defun ponder-full-call (node)
(let* ((lvar (basic-combination-fun node))
- (fname (lvar-fun-name lvar t)))
+ (fname (lvar-fun-name lvar t)))
(declare (type (or symbol cons) fname))
#!+sb-show (unless (gethash fname *full-called-fnames*)
- (setf (gethash fname *full-called-fnames*) t))
+ (setf (gethash fname *full-called-fnames*) t))
#!+sb-show (when *show-full-called-fnames-p*
- (/show "converting full call to named function" fname)
- (/show (basic-combination-args node))
- (/show (policy node speed) (policy node safety))
- (/show (policy node compilation-speed))
- (let ((arg-types (mapcar (lambda (lvar)
- (when lvar
- (type-specifier
- (lvar-type lvar))))
- (basic-combination-args node))))
- (/show arg-types)))
+ (/show "converting full call to named function" fname)
+ (/show (basic-combination-args node))
+ (/show (policy node speed) (policy node safety))
+ (/show (policy node compilation-speed))
+ (let ((arg-types (mapcar (lambda (lvar)
+ (when lvar
+ (type-specifier
+ (lvar-type lvar))))
+ (basic-combination-args node))))
+ (/show arg-types)))
;; When illegal code is compiled, all sorts of perverse paths
;; through the compiler can be taken, and it's much harder -- and
;; functions are actually optimized away. Thus, we skip the check
;; in that case.
(unless *failure-p*
- (when (memq fname *always-optimized-away*)
- (/show (policy node speed) (policy node safety))
- (/show (policy node compilation-speed))
- (bug "full call to ~S" fname)))
+ ;; check to see if we know anything about the function
+ (let ((info (info :function :info fname)))
+ ;; if we know something, check to see if the full call was valid
+ (when (and info (ir1-attributep (fun-info-attributes info)
+ always-translatable))
+ (/show (policy node speed) (policy node safety))
+ (/show (policy node compilation-speed))
+ (bug "full call to ~S" fname))))
(when (consp fname)
(aver (legal-fun-name-p fname))
(destructuring-bind (setfoid &rest stem) fname
- (when (eq setfoid 'setf)
- (setf (gethash (car stem) *setf-assumed-fboundp*) t))))))
+ (when (eq setfoid 'setf)
+ (setf (gethash (car stem) *setf-assumed-fboundp*) t))))))
;;; If the call is in a tail recursive position and the return
;;; convention is standard, then do a tail full call. If one or fewer
(defun init-xep-environment (node block fun)
(declare (type bind node) (type ir2-block block) (type clambda fun))
(let ((start-label (entry-info-offset (leaf-info fun)))
- (env (physenv-info (node-physenv node))))
+ (env (physenv-info (node-physenv node))))
(let ((ef (functional-entry-fun fun)))
(cond ((and (optional-dispatch-p ef) (optional-dispatch-more-entry ef))
- ;; Special case the xep-allocate-frame + copy-more-arg case.
- (vop xep-allocate-frame node block start-label t)
- (vop copy-more-arg node block (optional-dispatch-max-args ef)))
- (t
- ;; No more args, so normal entry.
- (vop xep-allocate-frame node block start-label nil)))
+ ;; Special case the xep-allocate-frame + copy-more-arg case.
+ (vop xep-allocate-frame node block start-label t)
+ (vop copy-more-arg node block (optional-dispatch-max-args ef)))
+ (t
+ ;; No more args, so normal entry.
+ (vop xep-allocate-frame node block start-label nil)))
(if (ir2-physenv-closure env)
- (let ((closure (make-normal-tn *backend-t-primitive-type*)))
- (vop setup-closure-environment node block start-label closure)
- (when (getf (functional-plist ef) :fin-function)
- (vop funcallable-instance-lexenv node block closure closure))
- (let ((n -1))
- (dolist (loc (ir2-physenv-closure env))
- (vop closure-ref node block closure (incf n) (cdr loc)))))
- (vop setup-environment node block start-label)))
+ (let ((closure (make-normal-tn *backend-t-primitive-type*)))
+ (vop setup-closure-environment node block start-label closure)
+ (let ((n -1))
+ (dolist (loc (ir2-physenv-closure env))
+ (vop closure-ref node block closure (incf n) (cdr loc)))))
+ (vop setup-environment node block start-label)))
(unless (eq (functional-kind fun) :toplevel)
(let ((vars (lambda-vars fun))
- (n 0))
- (when (leaf-refs (first vars))
- (emit-move node block (make-arg-count-location)
- (leaf-info (first vars))))
- (dolist (arg (rest vars))
- (when (leaf-refs arg)
- (let ((pass (standard-arg-location n))
- (home (leaf-info arg)))
- (if (lambda-var-indirect arg)
- (do-make-value-cell node block pass home)
- (emit-move node block pass home))))
- (incf n))))
+ (n 0))
+ (when (leaf-refs (first vars))
+ (emit-move node block (make-arg-count-location)
+ (leaf-info (first vars))))
+ (dolist (arg (rest vars))
+ (when (leaf-refs arg)
+ (let ((pass (standard-arg-location n))
+ (home (leaf-info arg)))
+ (if (and (lambda-var-indirect arg)
+ (lambda-var-explicit-value-cell arg))
+ (emit-make-value-cell node block pass home)
+ (emit-move node block pass home))))
+ (incf n))))
(emit-move node block (make-old-fp-passing-location t)
- (ir2-physenv-old-fp env)))
+ (ir2-physenv-old-fp env)))
(values))
(defun ir2-convert-bind (node block)
(declare (type bind node) (type ir2-block block))
(let* ((fun (bind-lambda node))
- (env (physenv-info (lambda-physenv fun))))
+ (env (physenv-info (lambda-physenv fun))))
(aver (member (functional-kind fun)
- '(nil :external :optional :toplevel :cleanup)))
+ '(nil :external :optional :toplevel :cleanup)))
(when (xep-p fun)
(init-xep-environment node block fun)
#!+sb-dyncount
(when *collect-dynamic-statistics*
- (vop count-me node block *dynamic-counts-tn*
- (block-number (ir2-block-block block)))))
+ (vop count-me node block *dynamic-counts-tn*
+ (block-number (ir2-block-block block)))))
(emit-move node
- block
- (ir2-physenv-return-pc-pass env)
- (ir2-physenv-return-pc env))
+ block
+ (ir2-physenv-return-pc-pass env)
+ (ir2-physenv-return-pc env))
+
+ #!+unwind-to-frame-and-call-vop
+ (when (and (lambda-allow-instrumenting fun)
+ (not (lambda-inline-expanded fun))
+ (lambda-return fun)
+ (policy fun (>= insert-debug-catch 2)))
+ (vop sb!vm::bind-sentinel node block))
(let ((lab (gen-label)))
(setf (ir2-physenv-environment-start env) lab)
- (vop note-environment-start node block lab)))
+ (vop note-environment-start node block lab)
+ #!+sb-safepoint
+ (unless (policy fun (>= inhibit-safepoints 2))
+ (vop sb!vm::insert-safepoint node block))))
(values))
\f
(defun ir2-convert-return (node block)
(declare (type creturn node) (type ir2-block block))
(let* ((lvar (return-result node))
- (2lvar (lvar-info lvar))
- (lvar-kind (ir2-lvar-kind 2lvar))
- (fun (return-lambda node))
- (env (physenv-info (lambda-physenv fun)))
- (old-fp (ir2-physenv-old-fp env))
- (return-pc (ir2-physenv-return-pc env))
- (returns (tail-set-info (lambda-tail-set fun))))
+ (2lvar (lvar-info lvar))
+ (lvar-kind (ir2-lvar-kind 2lvar))
+ (fun (return-lambda node))
+ (env (physenv-info (lambda-physenv fun)))
+ (old-fp (ir2-physenv-old-fp env))
+ (return-pc (ir2-physenv-return-pc env))
+ (returns (tail-set-info (lambda-tail-set fun))))
+ #!+unwind-to-frame-and-call-vop
+ (when (and (lambda-allow-instrumenting fun)
+ (not (lambda-inline-expanded fun))
+ (policy fun (>= insert-debug-catch 2)))
+ (vop sb!vm::unbind-sentinel node block))
(cond
((and (eq (return-info-kind returns) :fixed)
- (not (xep-p fun)))
+ (not (xep-p fun)))
(let ((locs (lvar-tns node block lvar
- (return-info-types returns))))
- (vop* known-return node block
- (old-fp return-pc (reference-tn-list locs nil))
- (nil)
- (return-info-locations returns))))
+ (return-info-types returns))))
+ (vop* known-return node block
+ (old-fp return-pc (reference-tn-list locs nil))
+ (nil)
+ (return-info-locations returns))))
((eq lvar-kind :fixed)
(let* ((types (mapcar #'tn-primitive-type (ir2-lvar-locs 2lvar)))
- (lvar-locs (lvar-tns node block lvar types))
- (nvals (length lvar-locs))
- (locs (make-standard-value-tns nvals)))
- (mapc (lambda (val loc)
- (emit-move node block val loc))
- lvar-locs
- locs)
- (if (= nvals 1)
- (vop return-single node block old-fp return-pc (car locs))
- (vop* return node block
- (old-fp return-pc (reference-tn-list locs nil))
- (nil)
- nvals))))
+ (lvar-locs (lvar-tns node block lvar types))
+ (nvals (length lvar-locs))
+ (locs (make-standard-value-tns nvals)))
+ (mapc (lambda (val loc)
+ (emit-move node block val loc))
+ lvar-locs
+ locs)
+ (if (= nvals 1)
+ (vop return-single node block old-fp return-pc (car locs))
+ (vop* return node block
+ (old-fp return-pc (reference-tn-list locs nil))
+ (nil)
+ nvals))))
(t
(aver (eq lvar-kind :unknown))
(vop* return-multiple node block
- (old-fp return-pc
- (reference-tn-list (ir2-lvar-locs 2lvar) nil))
- (nil)))))
+ (old-fp return-pc
+ (reference-tn-list (ir2-lvar-locs 2lvar) nil))
+ (nil)))))
(values))
\f
;;;; debugger hooks
+;;;;
+;;;; These are used by the debugger to find the top function on the
+;;;; stack. They return the OLD-FP and RETURN-PC for the current
+;;;; function as multiple values.
+
+(defoptimizer (%caller-frame ir2-convert) (() node block)
+ (let ((ir2-physenv (physenv-info (node-physenv node))))
+ (move-lvar-result node block
+ (list (ir2-physenv-old-fp ir2-physenv))
+ (node-lvar node))))
-;;; This is used by the debugger to find the top function on the
-;;; stack. It returns the OLD-FP and RETURN-PC for the current
-;;; function as multiple values.
-(defoptimizer (sb!kernel:%caller-frame-and-pc ir2-convert) (() node block)
+(defoptimizer (%caller-pc ir2-convert) (() node block)
(let ((ir2-physenv (physenv-info (node-physenv node))))
(move-lvar-result node block
- (list (ir2-physenv-old-fp ir2-physenv)
- (ir2-physenv-return-pc ir2-physenv))
- (node-lvar node))))
+ (list (ir2-physenv-return-pc ir2-physenv))
+ (node-lvar node))))
\f
;;;; multiple values
;;; This is almost identical to IR2-CONVERT-LET. Since LTN annotates
-;;; the lvarinuation for the correct number of values (with the lvar
-;;; user responsible for defaulting), we can just pick them up from
-;;; the lvar.
+;;; the lvar for the correct number of values (with the lvar user
+;;; responsible for defaulting), we can just pick them up from the
+;;; lvar.
(defun ir2-convert-mv-bind (node block)
(declare (type mv-combination node) (type ir2-block block))
(let* ((lvar (first (basic-combination-args node)))
- (fun (ref-leaf (lvar-uses (basic-combination-fun node))))
- (vars (lambda-vars fun)))
+ (fun (ref-leaf (lvar-uses (basic-combination-fun node))))
+ (vars (lambda-vars fun)))
(aver (eq (functional-kind fun) :mv-let))
(mapc (lambda (src var)
- (when (leaf-refs var)
- (let ((dest (leaf-info var)))
- (if (lambda-var-indirect var)
- (do-make-value-cell node block src dest)
- (emit-move node block src dest)))))
- (lvar-tns node block lvar
- (mapcar (lambda (x)
- (primitive-type (leaf-type x)))
- vars))
- vars))
+ (when (leaf-refs var)
+ (let ((dest (leaf-info var)))
+ (if (and (lambda-var-indirect var)
+ (lambda-var-explicit-value-cell var))
+ (emit-make-value-cell node block src dest)
+ (emit-move node block src dest)))))
+ (lvar-tns node block lvar
+ (mapcar (lambda (x)
+ (primitive-type (leaf-type x)))
+ vars))
+ vars))
(values))
;;; Emit the appropriate fixed value, unknown value or tail variant of
(declare (type mv-combination node) (type ir2-block block))
(aver (basic-combination-args node))
(let* ((start-lvar (lvar-info (first (basic-combination-args node))))
- (start (first (ir2-lvar-locs start-lvar)))
- (tails (and (node-tail-p node)
- (lambda-tail-set (node-home-lambda node))))
- (lvar (node-lvar node))
- (2lvar (and lvar (lvar-info lvar))))
+ (start (first (ir2-lvar-locs start-lvar)))
+ (tails (and (node-tail-p node)
+ (lambda-tail-set (node-home-lambda node))))
+ (lvar (node-lvar node))
+ (2lvar (and lvar (lvar-info lvar))))
(multiple-value-bind (fun named)
- (fun-lvar-tn node block (basic-combination-fun node))
+ (fun-lvar-tn node block (basic-combination-fun node))
(aver (and (not named)
- (eq (ir2-lvar-kind start-lvar) :unknown)))
+ (eq (ir2-lvar-kind start-lvar) :unknown)))
(cond
(tails
- (let ((env (physenv-info (node-physenv node))))
- (vop tail-call-variable node block start fun
- (ir2-physenv-old-fp env)
- (ir2-physenv-return-pc env))))
+ (let ((env (physenv-info (node-physenv node))))
+ (vop tail-call-variable node block start fun
+ (ir2-physenv-old-fp env)
+ (ir2-physenv-return-pc env))))
((and 2lvar
- (eq (ir2-lvar-kind 2lvar) :unknown))
- (vop* multiple-call-variable node block (start fun nil)
- ((reference-tn-list (ir2-lvar-locs 2lvar) t))))
+ (eq (ir2-lvar-kind 2lvar) :unknown))
+ (vop* multiple-call-variable node block (start fun nil)
+ ((reference-tn-list (ir2-lvar-locs 2lvar) t))
+ (emit-step-p node)))
(t
- (let ((locs (standard-result-tns lvar)))
- (vop* call-variable node block (start fun nil)
- ((reference-tn-list locs t)) (length locs))
- (move-lvar-result node block locs lvar)))))))
+ (let ((locs (standard-result-tns lvar)))
+ (vop* call-variable node block (start fun nil)
+ ((reference-tn-list locs t)) (length locs)
+ (emit-step-p node))
+ (move-lvar-result node block locs lvar)))))))
;;; Reset the stack pointer to the start of the specified
;;; unknown-values lvar (discarding it and all values globs on top of
;;; it.)
-(defoptimizer (%pop-values ir2-convert) ((lvar) node block)
- (let ((2lvar (lvar-info (lvar-value lvar))))
- (aver (eq (ir2-lvar-kind 2lvar) :unknown))
- (vop reset-stack-pointer node block
- (first (ir2-lvar-locs 2lvar)))))
+(defoptimizer (%pop-values ir2-convert) ((%lvar) node block)
+ (let* ((lvar (lvar-value %lvar))
+ (2lvar (lvar-info lvar)))
+ (cond ((eq (ir2-lvar-kind 2lvar) :unknown)
+ (vop reset-stack-pointer node block
+ (first (ir2-lvar-locs 2lvar))))
+ ((lvar-dynamic-extent lvar)
+ (vop reset-stack-pointer node block
+ (ir2-lvar-stack-pointer 2lvar)))
+ (t (bug "Trying to pop a not stack-allocated LVAR ~S."
+ lvar)))))
+
+(defoptimizer (%nip-values ir2-convert) ((last-nipped last-preserved
+ &rest moved)
+ node block)
+ (let* ( ;; pointer immediately after the nipped block
+ (after (lvar-value last-nipped))
+ (2after (lvar-info after))
+ ;; pointer to the first nipped word
+ (first (lvar-value last-preserved))
+ (2first (lvar-info first))
+
+ (moved-tns (loop for lvar-ref in moved
+ for lvar = (lvar-value lvar-ref)
+ for 2lvar = (lvar-info lvar)
+ ;when 2lvar
+ collect (first (ir2-lvar-locs 2lvar)))))
+ (aver (or (eq (ir2-lvar-kind 2after) :unknown)
+ (lvar-dynamic-extent after)))
+ (aver (eq (ir2-lvar-kind 2first) :unknown))
+ (when *check-consistency*
+ ;; we cannot move stack-allocated DX objects
+ (dolist (moved-lvar moved)
+ (aver (eq (ir2-lvar-kind (lvar-info (lvar-value moved-lvar)))
+ :unknown))))
+ (flet ((nip-aligned (nipped)
+ (vop* %%nip-values node block
+ (nipped
+ (first (ir2-lvar-locs 2first))
+ (reference-tn-list moved-tns nil))
+ ((reference-tn-list moved-tns t)))))
+ (cond ((eq (ir2-lvar-kind 2after) :unknown)
+ (nip-aligned (first (ir2-lvar-locs 2after))))
+ ((lvar-dynamic-extent after)
+ (nip-aligned (ir2-lvar-stack-pointer 2after)))
+ (t
+ (bug "Trying to nip a not stack-allocated LVAR ~S." after))))))
;;; Deliver the values TNs to LVAR using MOVE-LVAR-RESULT.
(defoptimizer (values ir2-convert) ((&rest values) node block)
(let ((tns (mapcar (lambda (x)
- (lvar-tn node block x))
- values)))
+ (lvar-tn node block x))
+ values)))
(move-lvar-result node block tns (node-lvar node))))
;;; In the normal case where unknown values are desired, we use the
;;; optimize this case.
(defoptimizer (values-list ir2-convert) ((list) node block)
(let* ((lvar (node-lvar node))
- (2lvar (and lvar (lvar-info lvar))))
+ (2lvar (and lvar (lvar-info lvar))))
(cond ((and 2lvar
(eq (ir2-lvar-kind 2lvar) :unknown))
(let ((locs (ir2-lvar-locs 2lvar)))
(binding* ((lvar (node-lvar node) :exit-if-null)
(2lvar (lvar-info lvar)))
(ecase (ir2-lvar-kind 2lvar)
- (:fixed (ir2-convert-full-call node block))
+ (:fixed
+ ;; KLUDGE: this is very much unsafe, and can leak random stack values.
+ ;; OTOH, I think the :FIXED case can only happen with (safety 0) in the
+ ;; first place.
+ ;; -PK
+ (loop for loc in (ir2-lvar-locs 2lvar)
+ for idx upfrom 0
+ do (vop sb!vm::more-arg node block
+ (lvar-tn node block context)
+ (emit-constant idx)
+ loc)))
(:unknown
(let ((locs (ir2-lvar-locs 2lvar)))
(vop* %more-arg-values node block
(defoptimizer (%special-bind ir2-convert) ((var value) node block)
(let ((name (leaf-source-name (lvar-value var))))
(vop bind node block (lvar-tn node block value)
- (emit-constant name))))
+ (emit-constant name))))
(defoptimizer (%special-unbind ir2-convert) ((var) node block)
(vop unbind node block))
-(defoptimizer (%dynamic-extent-start ir2-convert) (() node block) node block)
-(defoptimizer (%dynamic-extent-end ir2-convert) (() node block) node block)
-
;;; ### It's not clear that this really belongs in this file, or
;;; should really be done this way, but this is the least violation of
;;; abstraction in the current setup. We don't want to wire
(progn
(labels ((,unbind (vars)
(declare (optimize (speed 2) (debug 0)))
- (dolist (var vars)
- (%primitive bind nil var)
- (makunbound var)))
+ (let ((unbound-marker (%primitive make-unbound-marker)))
+ (dolist (var vars)
+ ;; CLHS says "bound and then made to have no value" -- user
+ ;; should not be able to tell the difference between that and this.
+ (about-to-modify-symbol-value var 'progv)
+ (%primitive bind unbound-marker var))))
(,bind (vars vals)
- (declare (optimize (speed 2) (debug 0)))
+ (declare (optimize (speed 2) (debug 0)
+ (insert-debug-catch 0)))
(cond ((null vars))
((null vals) (,unbind vars))
- (t (%primitive bind
- (car vals)
- (car vars))
- (,bind (cdr vars) (cdr vals))))))
+ (t
+ (let ((val (car vals))
+ (var (car vars)))
+ (about-to-modify-symbol-value var 'progv val t)
+ (%primitive bind val var))
+ (,bind (cdr vars) (cdr vals))))))
(,bind ,vars ,vals))
nil
,@body)
+ ;; Technically ANSI CL doesn't allow declarations at the
+ ;; start of the cleanup form. SBCL happens to allow for
+ ;; them, due to the way the UNWIND-PROTECT ir1 translation
+ ;; is implemented; the cleanup forms are directly spliced
+ ;; into an FLET definition body. And a declaration here
+ ;; actually has exactly the right scope for what we need
+ ;; (ensure that debug instrumentation is not emitted for the
+ ;; cleanup function). -- JES, 2007-06-16
+ (declare (optimize (insert-debug-catch 0)))
(%primitive unbind-to-here ,n-save-bs))))))
\f
;;;; non-local exit
;;; IR2 converted.
(defun ir2-convert-exit (node block)
(declare (type exit node) (type ir2-block block))
- (let ((loc (find-in-physenv (find-nlx-info node)
- (node-physenv node)))
- (temp (make-stack-pointer-tn))
- (value (exit-value node)))
- (vop value-cell-ref node block loc temp)
+ (let* ((nlx (exit-nlx-info node))
+ (loc (find-in-physenv nlx (node-physenv node)))
+ (temp (make-stack-pointer-tn))
+ (value (exit-value node)))
+ (if (nlx-info-safe-p nlx)
+ (vop value-cell-ref node block loc temp)
+ (emit-move node block loc temp))
(if value
- (let ((locs (ir2-lvar-locs (lvar-info value))))
- (vop unwind node block temp (first locs) (second locs)))
- (let ((0-tn (emit-constant 0)))
- (vop unwind node block temp 0-tn 0-tn))))
+ (let ((locs (ir2-lvar-locs (lvar-info value))))
+ (vop unwind node block temp (first locs) (second locs)))
+ (let ((0-tn (emit-constant 0)))
+ (vop unwind node block temp 0-tn 0-tn))))
(values))
;;; dynamic extent. This is done by storing 0 into the indirect value
;;; cell that holds the closed unwind block.
(defoptimizer (%lexical-exit-breakup ir2-convert) ((info) node block)
- (vop value-cell-set node block
- (find-in-physenv (lvar-value info) (node-physenv node))
- (emit-constant 0)))
+ (let ((nlx (lvar-value info)))
+ (when (nlx-info-safe-p nlx)
+ (vop value-cell-set node block
+ (find-in-physenv nlx (node-physenv node))
+ (emit-constant 0)))))
;;; We have to do a spurious move of no values to the result lvar so
;;; that lifetime analysis won't get confused.
(let ((args (basic-combination-args node)))
(check-catch-tag-type (first args))
(vop* throw node block
- ((lvar-tn node block (first args))
- (reference-tn-list
- (ir2-lvar-locs (lvar-info (second args)))
- nil))
- (nil)))
+ ((lvar-tn node block (first args))
+ (reference-tn-list
+ (ir2-lvar-locs (lvar-info (second args)))
+ nil))
+ (nil)))
(move-lvar-result node block () (node-lvar node))
(values))
;;; responsible for building a return-PC object.
(defun emit-nlx-start (node block info tag)
(declare (type node node) (type ir2-block block) (type nlx-info info)
- (type (or lvar null) tag))
+ (type (or lvar null) tag))
(let* ((2info (nlx-info-info info))
- (kind (cleanup-kind (nlx-info-cleanup info)))
- (block-tn (physenv-live-tn
- (make-normal-tn (primitive-type-or-lose 'catch-block))
- (node-physenv node)))
- (res (make-stack-pointer-tn))
- (target-label (ir2-nlx-info-target 2info)))
+ (kind (cleanup-kind (nlx-info-cleanup info)))
+ (block-tn (physenv-live-tn
+ (make-normal-tn (primitive-type-or-lose 'catch-block))
+ (node-physenv node)))
+ (res (make-stack-pointer-tn))
+ (target-label (ir2-nlx-info-target 2info)))
(vop current-binding-pointer node block
- (car (ir2-nlx-info-dynamic-state 2info)))
+ (car (ir2-nlx-info-dynamic-state 2info)))
(vop* save-dynamic-state node block
- (nil)
- ((reference-tn-list (cdr (ir2-nlx-info-dynamic-state 2info)) t)))
+ (nil)
+ ((reference-tn-list (cdr (ir2-nlx-info-dynamic-state 2info)) t)))
(vop current-stack-pointer node block (ir2-nlx-info-save-sp 2info))
(ecase kind
(:catch
(vop make-catch-block node block block-tn
- (lvar-tn node block tag) target-label res))
+ (lvar-tn node block tag) target-label res))
((:unwind-protect :block :tagbody)
(vop make-unwind-block node block block-tn target-label res)))
(ecase kind
((:block :tagbody)
- (do-make-value-cell node block res (ir2-nlx-info-home 2info)))
+ (if (nlx-info-safe-p info)
+ (emit-make-value-cell node block res (ir2-nlx-info-home 2info))
+ (emit-move node block res (ir2-nlx-info-home 2info))))
(:unwind-protect
(vop set-unwind-protect node block block-tn))
(:catch)))
;;; Scan each of ENTRY's exits, setting up the exit for each lexical exit.
(defun ir2-convert-entry (node block)
(declare (type entry node) (type ir2-block block))
- (dolist (exit (entry-exits node))
- (let ((info (find-nlx-info exit)))
- (when (and info
- (member (cleanup-kind (nlx-info-cleanup info))
- '(:block :tagbody)))
- (emit-nlx-start node block info nil))))
+ (let ((nlxes '()))
+ (dolist (exit (entry-exits node))
+ (let ((info (exit-nlx-info exit)))
+ (when (and info
+ (not (memq info nlxes))
+ (member (cleanup-kind (nlx-info-cleanup info))
+ '(:block :tagbody)))
+ (push info nlxes)
+ (emit-nlx-start node block info nil)))))
(values))
;;; Set up the unwind block for these guys.
;;; pointer alone, since the thrown values are still out there.
(defoptimizer (%nlx-entry ir2-convert) ((info-lvar) node block)
(let* ((info (lvar-value info-lvar))
- (lvar (nlx-info-lvar info))
- (2info (nlx-info-info info))
- (top-loc (ir2-nlx-info-save-sp 2info))
- (start-loc (make-nlx-entry-arg-start-location))
- (count-loc (make-arg-count-location))
- (target (ir2-nlx-info-target 2info)))
+ (lvar (node-lvar node))
+ (2info (nlx-info-info info))
+ (top-loc (ir2-nlx-info-save-sp 2info))
+ (start-loc (make-nlx-entry-arg-start-location))
+ (count-loc (make-arg-count-location))
+ (target (ir2-nlx-info-target 2info)))
(ecase (cleanup-kind (nlx-info-cleanup info))
((:catch :block :tagbody)
(move-lvar-result node block locs lvar)))))
(:unwind-protect
(let ((block-loc (standard-arg-location 0)))
- (vop uwp-entry node block target block-loc start-loc count-loc)
- (move-lvar-result
- node block
- (list block-loc start-loc count-loc)
- lvar))))
+ (vop uwp-entry node block target block-loc start-loc count-loc)
+ (move-lvar-result
+ node block
+ (list block-loc start-loc count-loc)
+ lvar))))
#!+sb-dyncount
(when *collect-dynamic-statistics*
(vop count-me node block *dynamic-counts-tn*
- (block-number (ir2-block-block block))))
+ (block-number (ir2-block-block block))))
(vop* restore-dynamic-state node block
- ((reference-tn-list (cdr (ir2-nlx-info-dynamic-state 2info)) nil))
- (nil))
+ ((reference-tn-list (cdr (ir2-nlx-info-dynamic-state 2info)) nil))
+ (nil))
(vop unbind-to-here node block
- (car (ir2-nlx-info-dynamic-state 2info)))))
+ (car (ir2-nlx-info-dynamic-state 2info)))))
\f
;;;; n-argument functions
(macrolet ((def (name)
- `(defoptimizer (,name ir2-convert) ((&rest args) node block)
- (let* ((refs (move-tail-full-call-args node block))
- (lvar (node-lvar node))
- (res (lvar-result-tns
- lvar
- (list (primitive-type (specifier-type 'list))))))
- (vop* ,name node block (refs) ((first res) nil)
- (length args))
- (move-lvar-result node block res lvar)))))
+ `(defoptimizer (,name ir2-convert) ((&rest args) node block)
+ (let* ((refs (move-tail-full-call-args node block))
+ (lvar (node-lvar node))
+ (res (lvar-result-tns
+ lvar
+ (list (primitive-type (specifier-type 'list))))))
+ (when (and lvar (lvar-dynamic-extent lvar))
+ (vop current-stack-pointer node block
+ (ir2-lvar-stack-pointer (lvar-info lvar))))
+ (vop* ,name node block (refs) ((first res) nil)
+ (length args))
+ (move-lvar-result node block res lvar)))))
(def list)
(def list*))
+
+\f
+(defoptimizer (mask-signed-field ir2-convert) ((width x) node block)
+ (block nil
+ (when (constant-lvar-p width)
+ (case (lvar-value width)
+ (#.(- sb!vm:n-word-bits sb!vm:n-fixnum-tag-bits)
+ (when (or (csubtypep (lvar-type x)
+ (specifier-type 'word))
+ (csubtypep (lvar-type x)
+ (specifier-type 'sb!vm:signed-word)))
+ (let* ((lvar (node-lvar node))
+ (temp (make-normal-tn
+ (if (csubtypep (lvar-type x)
+ (specifier-type 'word))
+ (primitive-type-of most-positive-word)
+ (primitive-type-of
+ (- (ash most-positive-word -1))))))
+ (results (lvar-result-tns
+ lvar
+ (list (primitive-type-or-lose 'fixnum)))))
+ (emit-move node block (lvar-tn node block x) temp)
+ (vop sb!vm::move-from-word/fixnum node block
+ temp (first results))
+ (move-lvar-result node block results lvar)
+ (return))))
+ (#.sb!vm:n-word-bits
+ (when (csubtypep (lvar-type x) (specifier-type 'word))
+ (let* ((lvar (node-lvar node))
+ (temp (make-normal-tn
+ (primitive-type-of most-positive-word)))
+ (results (lvar-result-tns
+ lvar
+ (list (primitive-type
+ (specifier-type 'sb!vm:signed-word))))))
+ (emit-move node block (lvar-tn node block x) temp)
+ (vop sb!vm::word-move node block
+ temp (first results))
+ (move-lvar-result node block results lvar)
+ (return))))))
+ (if (template-p (basic-combination-info node))
+ (ir2-convert-template node block)
+ (ir2-convert-full-call node block))))
+
+;; just a fancy identity
+(defoptimizer (%typep-wrapper ir2-convert) ((value variable type) node block)
+ (let* ((lvar (node-lvar node))
+ (results (lvar-result-tns lvar (list (primitive-type-or-lose t)))))
+ (emit-move node block (lvar-tn node block value) (first results))
+ (move-lvar-result node block results lvar)))
\f
;;; Convert the code in a component into VOPs.
(defun ir2-convert (component)
(declare (type component component))
(let (#!+sb-dyncount
- (*dynamic-counts-tn*
- (when *collect-dynamic-statistics*
- (let* ((blocks
- (block-number (block-next (component-head component))))
- (counts (make-array blocks
- :element-type '(unsigned-byte 32)
- :initial-element 0))
- (info (make-dyncount-info
- :for (component-name component)
- :costs (make-array blocks
- :element-type '(unsigned-byte 32)
- :initial-element 0)
- :counts counts)))
- (setf (ir2-component-dyncount-info (component-info component))
- info)
- (emit-constant info)
- (emit-constant counts)))))
+ (*dynamic-counts-tn*
+ (when *collect-dynamic-statistics*
+ (let* ((blocks
+ (block-number (block-next (component-head component))))
+ (counts (make-array blocks
+ :element-type '(unsigned-byte 32)
+ :initial-element 0))
+ (info (make-dyncount-info
+ :for (component-name component)
+ :costs (make-array blocks
+ :element-type '(unsigned-byte 32)
+ :initial-element 0)
+ :counts counts)))
+ (setf (ir2-component-dyncount-info (component-info component))
+ info)
+ (emit-constant info)
+ (emit-constant counts)))))
(let ((num 0))
(declare (type index num))
(do-ir2-blocks (2block component)
- (let ((block (ir2-block-block 2block)))
- (when (block-start block)
- (setf (block-number block) num)
- #!+sb-dyncount
- (when *collect-dynamic-statistics*
- (let ((first-node (block-start-node block)))
- (unless (or (and (bind-p first-node)
- (xep-p (bind-lambda first-node)))
- (eq (lvar-fun-name
- (node-lvar first-node))
- '%nlx-entry))
- (vop count-me
- first-node
- 2block
- #!+sb-dyncount *dynamic-counts-tn* #!-sb-dyncount nil
- num))))
- (ir2-convert-block block)
- (incf num))))))
+ (let ((block (ir2-block-block 2block)))
+ (when (block-start block)
+ (setf (block-number block) num)
+ #!+sb-dyncount
+ (when *collect-dynamic-statistics*
+ (let ((first-node (block-start-node block)))
+ (unless (or (and (bind-p first-node)
+ (xep-p (bind-lambda first-node)))
+ (eq (lvar-fun-name
+ (node-lvar first-node))
+ '%nlx-entry))
+ (vop count-me
+ first-node
+ 2block
+ #!+sb-dyncount *dynamic-counts-tn* #!-sb-dyncount nil
+ num))))
+ #!+sb-safepoint
+ (let ((first-node (block-start-node block)))
+ (unless (or (and (bind-p first-node)
+ (xep-p (bind-lambda first-node)))
+ (and (valued-node-p first-node)
+ (node-lvar first-node)
+ (eq (lvar-fun-name
+ (node-lvar first-node))
+ '%nlx-entry)))
+ (when (and (rest (block-pred block))
+ (block-loop block)
+ (member (loop-kind (block-loop block))
+ '(:natural :strange))
+ (eq block (loop-head (block-loop block)))
+ (policy first-node (< inhibit-safepoints 2)))
+ (vop sb!vm::insert-safepoint first-node 2block))))
+ (ir2-convert-block block)
+ (incf num))))))
(values))
;;; If necessary, emit a terminal unconditional branch to go to the
;;; successor block. If the successor is the component tail, then
-;;; there isn't really any successor, but if the end is an unknown,
-;;; non-tail call, then we emit an error trap just in case the
-;;; function really does return.
+;;; there isn't really any successor, but if the end is a non-tail
+;;; call to a function that's not *known* to never return, then we
+;;; emit an error trap just in case the function really does return.
+;;;
+;;; Trapping after known calls makes it easier to understand type
+;;; derivation bugs at runtime: they show up as nil-fun-returned-error,
+;;; rather than the execution of arbitrary code or error traps.
(defun finish-ir2-block (block)
(declare (type cblock block))
(let* ((2block (block-info block))
- (last (block-last block))
- (succ (block-succ block)))
+ (last (block-last block))
+ (succ (block-succ block)))
(unless (if-p last)
(aver (singleton-p succ))
(let ((target (first succ)))
- (cond ((eq target (component-tail (block-component block)))
- (when (and (basic-combination-p last)
- (eq (basic-combination-kind last) :full))
- (let* ((fun (basic-combination-fun last))
- (use (lvar-uses fun))
- (name (and (ref-p use)
- (leaf-has-source-name-p (ref-leaf use))
- (leaf-source-name (ref-leaf use)))))
- (unless (or (node-tail-p last)
- (info :function :info name)
- (policy last (zerop safety)))
- (vop nil-fun-returned-error last 2block
- (if name
- (emit-constant name)
- (multiple-value-bind (tn named)
- (fun-lvar-tn last 2block fun)
- (aver (not named))
- tn)))))))
- ((not (eq (ir2-block-next 2block) (block-info target)))
- (vop branch last 2block (block-label target)))))))
+ (cond ((eq target (component-tail (block-component block)))
+ (when (and (basic-combination-p last)
+ (or (eq (basic-combination-kind last) :full)
+ (and (eq (basic-combination-kind last) :known)
+ (eq (basic-combination-info last) :full))))
+ (let* ((fun (basic-combination-fun last))
+ (use (lvar-uses fun))
+ (name (and (ref-p use)
+ (leaf-has-source-name-p (ref-leaf use))
+ (leaf-source-name (ref-leaf use))))
+ (ftype (and (info :function :info name) ; only use the FTYPE if
+ (info :function :type name)))) ; NAME was DEFKNOWN
+ (unless (or (node-tail-p last)
+ (policy last (zerop safety))
+ (and (fun-type-p ftype)
+ (eq *empty-type* (fun-type-returns ftype))))
+ (vop nil-fun-returned-error last 2block
+ (if name
+ (emit-constant name)
+ (multiple-value-bind (tn named)
+ (fun-lvar-tn last 2block fun)
+ (aver (not named))
+ tn)))))))
+ ((not (eq (ir2-block-next 2block) (block-info target)))
+ (vop branch last 2block (block-label target)))
+ (t
+ (register-drop-thru target))))))
(values))
(let ((2block (block-info block)))
(do-nodes (node lvar block)
(etypecase node
- (ref
+ (ref
(when lvar
(let ((2lvar (lvar-info lvar)))
;; function REF in a local call is not annotated
(when (and 2lvar (not (eq (ir2-lvar-kind 2lvar) :delayed)))
(ir2-convert-ref node 2block)))))
- (combination
- (let ((kind (basic-combination-kind node)))
- (ecase kind
- (:local
- (ir2-convert-local-call node 2block))
- (:full
- (ir2-convert-full-call node 2block))
- (:known
- (let* ((info (basic-combination-fun-info node))
- (fun (fun-info-ir2-convert info)))
- (cond (fun
- (funcall fun node 2block))
- ((eq (basic-combination-info node) :full)
- (ir2-convert-full-call node 2block))
- (t
- (ir2-convert-template node 2block))))))))
- (cif
- (when (lvar-info (if-test node))
- (ir2-convert-if node 2block)))
- (bind
- (let ((fun (bind-lambda node)))
- (when (eq (lambda-home fun) fun)
- (ir2-convert-bind node 2block))))
- (creturn
- (ir2-convert-return node 2block))
- (cset
- (ir2-convert-set node 2block))
+ (combination
+ (let ((kind (basic-combination-kind node)))
+ (ecase kind
+ (:local
+ (ir2-convert-local-call node 2block))
+ (:full
+ (ir2-convert-full-call node 2block))
+ (:known
+ (let* ((info (basic-combination-fun-info node))
+ (fun (fun-info-ir2-convert info)))
+ (cond (fun
+ (funcall fun node 2block))
+ ((eq (basic-combination-info node) :full)
+ (ir2-convert-full-call node 2block))
+ (t
+ (ir2-convert-template node 2block))))))))
+ (cif
+ (when (lvar-info (if-test node))
+ (ir2-convert-if node 2block)))
+ (bind
+ (let ((fun (bind-lambda node)))
+ (when (eq (lambda-home fun) fun)
+ (ir2-convert-bind node 2block))))
+ (creturn
+ (ir2-convert-return node 2block))
+ (cset
+ (ir2-convert-set node 2block))
(cast
(ir2-convert-cast node 2block))
- (mv-combination
- (cond
+ (mv-combination
+ (cond
((eq (basic-combination-kind node) :local)
(ir2-convert-mv-bind node 2block))
((eq (lvar-fun-name (basic-combination-fun node))
(ir2-convert-throw node 2block))
(t
(ir2-convert-mv-call node 2block))))
- (exit
- (when (exit-entry node)
- (ir2-convert-exit node 2block)))
- (entry
- (ir2-convert-entry node 2block)))))
+ (exit
+ (when (exit-entry node)
+ (ir2-convert-exit node 2block)))
+ (entry
+ (ir2-convert-entry node 2block)))))
(finish-ir2-block block)
projects / sbcl.git / blobdiff