X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fntrace.lisp;h=1c8b58aceb2ec17bfd8321e0d454a2f02499ec12;hb=11214915e9b3151ec66dc3e30e1aa7638c676428;hp=3f724624ef093b84457a07283b5f91a198df950e;hpb=204f2fa9771ad9e55718dc76205afec7d11b3011;p=sbcl.git diff --git a/src/code/ntrace.lisp b/src/code/ntrace.lisp index 3f72462..1c8b58a 100644 --- a/src/code/ntrace.lisp +++ b/src/code/ntrace.lisp @@ -9,7 +9,7 @@ ;;;; provided with absolutely no warranty. See the COPYING and CREDITS ;;;; files for more information. -(in-package "SB-DEBUG") +(in-package "SB-DEBUG") ; (SB-, not SB!, since we're built in warm load.) ;;; FIXME: Why, oh why, doesn't the SB-DEBUG package use the SB-DI ;;; package? That would let us get rid of a whole lot of stupid @@ -81,7 +81,7 @@ ;; list of null environment forms (print-after () :type list)) -;;; This is a list of conses (function-end-cookie . condition-satisfied), +;;; This is a list of conses (fun-end-cookie . condition-satisfied), ;;; which we use to note distinct dynamic entries into functions. When ;;; we enter a traced function, we add a entry to this list holding ;;; the new end-cookie and whether the trace condition was satisfied. @@ -91,8 +91,8 @@ ;;; ;;; This list also helps us synchronize the TRACE facility dynamically ;;; for detecting non-local flow of control. Whenever execution hits a -;;; :FUNCTION-END breakpoint used for TRACE'ing, we look for the -;;; FUNCTION-END-COOKIE at the top of *TRACED-ENTRIES*. If it is not +;;; :FUN-END breakpoint used for TRACE'ing, we look for the +;;; FUN-END-COOKIE at the top of *TRACED-ENTRIES*. If it is not ;;; there, we discard any entries that come before our cookie. ;;; ;;; When we trace using encapsulation, we bind this variable and add @@ -125,17 +125,14 @@ (values (fdefinition x) t)))) (function x) (t (values (fdefinition x) t))) - (if (sb-eval:interpreted-function-p res) - (values res named-p (if (sb-eval:interpreted-function-closure res) - :interpreted-closure :interpreted)) - (case (sb-kernel:get-type res) - (#.sb-vm:closure-header-type - (values (sb-kernel:%closure-function res) - named-p - :compiled-closure)) - (#.sb-vm:funcallable-instance-header-type - (values res named-p :funcallable-instance)) - (t (values res named-p :compiled)))))) + (case (sb-kernel:widetag-of res) + (#.sb-vm:closure-header-widetag + (values (sb-kernel:%closure-fun res) + named-p + :compiled-closure)) + (#.sb-vm:funcallable-instance-header-widetag + (values res named-p :funcallable-instance)) + (t (values res named-p :compiled))))) ;;; When a function name is redefined, and we were tracing that name, ;;; then untrace the old definition and trace the new one. @@ -148,10 +145,10 @@ (trace-1 fname info new-value))))) (push #'trace-redefined-update *setf-fdefinition-hook*) -;;; Annotate some forms to evaluate with pre-converted functions. Each -;;; form is really a cons (exp . function). Loc is the code location -;;; to use for the lexical environment. If Loc is NIL, evaluate in the -;;; null environment. If Form is NIL, just return NIL. +;;; Annotate a FORM to evaluate with pre-converted functions. FORM is +;;; really a cons (EXP . FUNCTION). LOC is the code location to use +;;; for the lexical environment. If LOC is NIL, evaluate in the null +;;; environment. If FORM is NIL, just return NIL. (defun coerce-form (form loc) (when form (let ((exp (car form))) @@ -175,6 +172,7 @@ (declare (ignore frame)) (let ((*current-frame* nil)) (funcall fun))))))))) + (defun coerce-form-list (forms loc) (mapcar #'(lambda (x) (coerce-form x loc)) forms)) @@ -185,30 +183,29 @@ (dolist (entry *traced-entries*) (when (cdr entry) (incf depth))) (format t - "~@V,0T~D: " + "~@V,0T~W: " (+ (mod (* depth *trace-indentation-step*) (- *max-trace-indentation* *trace-indentation-step*)) *trace-indentation-step*) depth))) -;;; Return true if one of the Names appears on the stack below Frame. +;;; Return true if any of the NAMES appears on the stack below FRAME. (defun trace-wherein-p (frame names) (do ((frame (sb-di:frame-down frame) (sb-di:frame-down frame))) ((not frame) nil) - (when (member (sb-di:debug-function-name (sb-di:frame-debug-function - frame)) + (when (member (sb-di:debug-fun-name (sb-di:frame-debug-fun frame)) names :test #'equal) (return t)))) -;;; Handle print and print-after options. +;;; Handle PRINT and PRINT-AFTER options. (defun trace-print (frame forms) (dolist (ele forms) (fresh-line) (print-trace-indentation) - (format t "~S = ~S" (car ele) (funcall (cdr ele) frame)))) + (format t "~@<~S ~_= ~S~:>" (car ele) (funcall (cdr ele) frame)))) -;;; Test a break option, and break if true. +;;; Test a BREAK option, and break if true. (defun trace-maybe-break (info break where frame) (when (and break (funcall (cdr break) frame)) (sb-di:flush-frames-above frame) @@ -217,15 +214,15 @@ where (trace-info-what info))))) -;;; This function discards any invalid cookies on our simulated stack. -;;; Encapsulated entries are always valid, since we bind -;;; *TRACED-ENTRIES* in the encapsulation. +;;; Discard any invalid cookies on our simulated stack. Encapsulated +;;; entries are always valid, since we bind *TRACED-ENTRIES* in the +;;; encapsulation. (defun discard-invalid-entries (frame) (loop (when (or (null *traced-entries*) (let ((cookie (caar *traced-entries*))) (or (not cookie) - (sb-di:function-end-cookie-valid-p frame cookie)))) + (sb-di:fun-end-cookie-valid-p frame cookie)))) (return)) (pop *traced-entries*))) @@ -233,11 +230,12 @@ ;;; Return a closure that can be used for a function start breakpoint ;;; hook function and a closure that can be used as the -;;; FUNCTION-END-COOKIE function. The first communicates the sense of +;;; FUN-END-COOKIE function. The first communicates the sense of ;;; the Condition to the second via a closure variable. (defun trace-start-breakpoint-fun (info) (let (conditionp) (values + #'(lambda (frame bpt) (declare (ignore bpt)) (discard-invalid-entries frame) @@ -249,7 +247,6 @@ (funcall (cdr condition) frame)) (or (not wherein) (trace-wherein-p frame wherein))))) - (when conditionp (let ((sb-kernel:*current-level* 0) (*standard-output* *trace-output*) @@ -306,8 +303,8 @@ frame))))) ;;; This function is called by the trace encapsulation. It calls the -;;; breakpoint hook functions with NIL for the breakpoint and cookie, which -;;; we have cleverly contrived to work for our hook functions. +;;; breakpoint hook functions with NIL for the breakpoint and cookie, +;;; which we have cleverly contrived to work for our hook functions. (defun trace-call (info) (multiple-value-bind (start cookie) (trace-start-breakpoint-fun info) (let ((frame (sb-di:frame-down (sb-di:top-frame)))) @@ -337,14 +334,14 @@ (warn "~S is already TRACE'd, untracing it." function-or-name) (untrace-1 fun)) - (let* ((debug-fun (sb-di:function-debug-function fun)) + (let* ((debug-fun (sb-di:fun-debug-fun fun)) (encapsulated (if (eq (trace-info-encapsulated info) :default) (ecase kind (:compiled nil) (:compiled-closure (unless (functionp function-or-name) - (warn "Tracing shared code for ~S:~% ~S" + (warn "tracing shared code for ~S:~% ~S" function-or-name fun)) nil) @@ -353,7 +350,7 @@ (trace-info-encapsulated info))) (loc (if encapsulated :encapsulated - (sb-di:debug-function-start-location debug-fun))) + (sb-di:debug-fun-start-location debug-fun))) (info (make-trace-info :what function-or-name :named named @@ -384,16 +381,16 @@ (multiple-value-bind (start-fun cookie-fun) (trace-start-breakpoint-fun info) (let ((start (sb-di:make-breakpoint start-fun debug-fun - :kind :function-start)) + :kind :fun-start)) (end (sb-di:make-breakpoint (trace-end-breakpoint-fun info) - debug-fun :kind :function-end - :function-end-cookie cookie-fun))) + debug-fun :kind :fun-end + :fun-end-cookie cookie-fun))) (setf (trace-info-start-breakpoint info) start) (setf (trace-info-end-breakpoint info) end) ;; The next two forms must be in the order in which they ;; appear, since the start breakpoint must run before the - ;; function-end breakpoint's start helper (which calls the + ;; fun-end breakpoint's start helper (which calls the ;; cookie function.) One reason is that cookie function ;; requires that the CONDITIONP shared closure variable be ;; initialized.