X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fntrace.lisp;h=cdf16608c8b0bdbd2ea2332f246fbadb94f4ba4e;hb=aa61c7571b33b86981301f34d3acdb66666f53a3;hp=e775902895fba0c3ae9c77b7d1befae4131b5a95;hpb=db55ad022ec7cc7a2f251918579fdeba7f17dbe0;p=sbcl.git

diff --git a/src/code/ntrace.lisp b/src/code/ntrace.lisp
index e775902..cdf1660 100644
--- a/src/code/ntrace.lisp
+++ b/src/code/ntrace.lisp
@@ -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,12 +125,12 @@
 		(values (fdefinition x) t))))
 	(function x)
 	(t (values (fdefinition x) t)))
-    (case (sb-kernel:get-type res)
-      (#.sb-vm:closure-header-type
-       (values (sb-kernel:%closure-function res)
+    (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-type
+      (#.sb-vm:funcallable-instance-header-widetag
        (values res named-p :funcallable-instance))
       (t (values res named-p :compiled)))))
 
@@ -188,7 +188,7 @@
 	       *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)
@@ -197,14 +197,14 @@
 		  :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))))
 
-;;; 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)
@@ -213,15 +213,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*)))
 
@@ -229,7 +229,7 @@
 
 ;;; 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)
@@ -302,8 +302,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))))
@@ -380,16 +380,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.