X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdebug-int.lisp;h=f610a0c6dc46da8eb27ab7fdc5c676e1b0bf149b;hb=c8af15e61b030c8d4b0e950bc9b7618530044618;hp=7335c682fd0cb1cdda8d12ece643b1b147fc1725;hpb=0b5610d8a220a4b20cbeac958953ca4d67c00038;p=sbcl.git

diff --git a/src/code/debug-int.lisp b/src/code/debug-int.lisp
index 7335c68..f610a0c 100644
--- a/src/code/debug-int.lisp
+++ b/src/code/debug-int.lisp
@@ -1078,7 +1078,7 @@
 				  code (1+ real-lra-slot)))
 		 (setq code (code-header-ref code real-lra-slot))
 ;		 (format t "ccf3 :bogus-lra ~S ~S~%" code pc-offset)
-		 (assert code)))
+		 (aver code)))
 	      (t
 	       ;; Not escaped
 	       (multiple-value-setq (pc-offset code)
@@ -1599,7 +1599,7 @@
 				(push (frob final-arg debug-vars) res))
 			       (:keyword
 				(push (list :keyword
-					    (sb!c::arg-info-keyword info)
+					    (sb!c::arg-info-key info)
 					    (frob final-arg debug-vars))
 				      res))
 			       (:rest
@@ -1700,11 +1700,11 @@
 		       res))
 		(sb!c::more-arg
 		 ;; Just ignore the fact that the next two args are
-		 ;; the more arg context and count, and act like they
+		 ;; the &MORE arg context and count, and act like they
 		 ;; are regular arguments.
 		 nil)
 		(t
-		 ;; keyword arg
+		 ;; &KEY arg
 		 (push (list :keyword
 			     ele
 			     (compiled-debug-function-lambda-list-var
@@ -1994,7 +1994,7 @@
 			 0))
 		 (sc-offset (if deleted 0 (geti)))
 		 (save-sc-offset (if save (geti) nil)))
-	    (assert (not (and args-minimal (not minimal))))
+	    (aver (not (and args-minimal (not minimal))))
 	    (vector-push-extend (make-compiled-debug-var symbol
 							 id
 							 live
@@ -2473,7 +2473,7 @@
 ;;; those variables are invalid.)
 (defun make-valid-lisp-obj (val)
   (/show0 "entering MAKE-VALID-LISP-OBJ, VAL=..")
-  #!+sb-show (%primitive print (sb!impl::hexstr val))
+  #!+sb-show (/hexstr val)
   (if (or
        ;; fixnum
        (zerop (logand val 3))
@@ -2509,16 +2509,14 @@
 (defun sub-access-debug-var-slot (fp sc-offset &optional escaped)
   (declare (type system-area-pointer fp))
   (/show0 "entering SUB-ACCESS-DEBUG-VAR-SLOT, FP,SC-OFFSET,ESCAPED=..")
-  #!+sb-show (%primitive print (sb!impl::hexstr fp))
-  #!+sb-show (%primitive print (sb!impl::hexstr sc-offset))
-  #!+sb-show (%primitive print (sb!impl::hexstr escaped))
+  (/hexstr fp) (/hexstr sc-offset) (/hexstr escaped)
   (macrolet ((with-escaped-value ((var) &body forms)
 	       `(if escaped
 		    (let ((,var (sb!vm:context-register
 				 escaped
 				 (sb!c:sc-offset-offset sc-offset))))
 		      (/show0 "in escaped case, ,VAR value=..")
-		      #!+sb-show (%primitive print (sb!impl::hexstr ,var))
+		      (/hexstr ,var)
 		      ,@forms)
 		    :invalid-value-for-unescaped-register-storage))
 	     (escaped-float-value (format)
@@ -2540,7 +2538,7 @@
        (without-gcing
 	(with-escaped-value (val)
 	  (/show0 "VAL=..")
-	  #!+sb-show (%primitive print (sb!impl::hexstr val))
+	  (/hexstr val)
 	  (make-valid-lisp-obj val))))
       (#.sb!vm:base-char-reg-sc-number
        (/show0 "case of BASE-CHAR-REG-SC-NUMBER")
@@ -3184,7 +3182,7 @@
      (when (code-location-unknown-p what)
        (error "cannot make a breakpoint at an unknown code location: ~S"
 	      what))
-     (assert (eq kind :code-location))
+     (aver (eq kind :code-location))
      (let ((bpt (%make-breakpoint hook-function what kind info)))
        (etypecase what
 	 (interpreted-code-location
@@ -3612,7 +3610,7 @@
 	      offset))
     (let ((breakpoints (breakpoint-data-breakpoints data)))
       (when breakpoints
-	(assert (eq (breakpoint-kind (car breakpoints)) :function-end))
+	(aver (eq (breakpoint-kind (car breakpoints)) :function-end))
 	(handle-function-end-breakpoint-aux breakpoints data context)))))
 
 ;;; Either HANDLE-BREAKPOINT calls this for :FUNCTION-END breakpoints