X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdebug-int.lisp;h=a7856e97bb7e116e0aa34515c6cdf00aa1ab3b8e;hb=212ef8043aeaceaa627f2924e04554fbc37b8ee1;hp=ae9439d3b830dd11f09241e7bd8fe650336c6a9a;hpb=95a6db7329b91dd90d165dd4057b9b5098d34aa2;p=sbcl.git

diff --git a/src/code/debug-int.lisp b/src/code/debug-int.lisp
index ae9439d..a7856e9 100644
--- a/src/code/debug-int.lisp
+++ b/src/code/debug-int.lisp
@@ -1112,9 +1112,8 @@
 	  (without-gcing
 	   (let* ((component-ptr (component-ptr-from-pc
 				  (sb!vm:context-pc context)))
-		  (code (if (sap= component-ptr (int-sap #x0))
-			    nil ; FIXME: UNLESS might be clearer than IF.
-			    (component-from-component-ptr component-ptr))))
+		  (code (unless (sap= component-ptr (int-sap #x0))
+			  (component-from-component-ptr component-ptr))))
 	     (when (null code)
 	       (return (values code 0 context)))
 	     (let* ((code-header-len (* (get-header-data code)
@@ -1127,8 +1126,10 @@
 	       (unless (<= 0 pc-offset
 			   (* (code-header-ref code sb!vm:code-code-size-slot)
 			      sb!vm:word-bytes))
-		 ;; We were in an assembly routine. Therefore, use the LRA as
-		 ;; the pc.
+		 ;; We were in an assembly routine. Therefore, use the
+		 ;; LRA as the pc.
+		 ;;
+		 ;; FIXME: Should this be WARN or ERROR or what?
 		 (format t "** pc-offset ~S not in code obj ~S?~%"
 			 pc-offset code))
 	       (return
@@ -1204,8 +1205,7 @@
 		  (elsewhere-p
 		   (>= pc (sb!c::compiled-debug-function-elsewhere-pc
 			   (svref function-map 0)))))
-	      ;; FIXME: I don't think SB!C is the home package of INDEX.
-	      (declare (type sb!c::index i))
+	      (declare (type sb!int:index i))
 	      (loop
 		(when (or (= i len)
 			  (< pc (if elsewhere-p