X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdebug-int.lisp;h=62cfa088a83af53a633d6d1980332c3d9ae6db87;hb=6a9bbe6f36179cee92001a1f9ed5ff38be512644;hp=b3bfefe72ffeda311610c7ed195ed64e01e69c18;hpb=35e4dd42b8cd765f88e5946b6aa0e7859b278399;p=sbcl.git

diff --git a/src/code/debug-int.lisp b/src/code/debug-int.lisp
index b3bfefe..62cfa08 100644
--- a/src/code/debug-int.lisp
+++ b/src/code/debug-int.lisp
@@ -828,7 +828,7 @@
 			   "undefined function"))
 			 (:foreign-function
 			  (make-bogus-debug-fun
-			   "foreign function call land"))
+			   (format nil "foreign function call land:")))
 			 ((nil)
 			  (make-bogus-debug-fun
 			   "bogus stack frame"))
@@ -874,7 +874,8 @@
 		       "undefined function"))
 		     (:foreign-function
 		      (make-bogus-debug-fun
-		       "foreign function call land"))
+		       (format nil "foreign function call land: ra=#x~X"
+				   (sap-int ra))))
 		     ((nil)
 		      (make-bogus-debug-fun
 		       "bogus stack frame"))
@@ -1189,8 +1190,7 @@
      (fun-debug-fun (%closure-fun fun)))
     (#.sb!vm:funcallable-instance-header-widetag
      (fun-debug-fun (funcallable-instance-fun fun)))
-    ((#.sb!vm:simple-fun-header-widetag
-      #.sb!vm:closure-fun-header-widetag)
+    (#.sb!vm:simple-fun-header-widetag
       (let* ((name (%simple-fun-name fun))
 	     (component (fun-code-header fun))
 	     (res (find-if
@@ -3236,11 +3236,8 @@
 	  (trap-loc (foreign-symbol-address "fun_end_breakpoint_trap"))
 	  (length (sap- src-end src-start))
 	  (code-object
-	   (%primitive
-	    #!-(and x86 gencgc) sb!c:allocate-code-object
-	    #!+(and x86 gencgc) sb!c::allocate-dynamic-code-object
-	    (1+ bogus-lra-constants)
-	    length))
+	   (%primitive sb!c:allocate-code-object (1+ bogus-lra-constants)
+		       length))
 	  (dst-start (code-instructions code-object)))
      (declare (type system-area-pointer
 		    src-start src-end dst-start trap-loc)
@@ -3290,14 +3287,3 @@
     ;; (There used to be more cases back before sbcl-0.7.0, when
     ;; we did special tricks to debug the IR1 interpreter.)
     ))
-
-(defun print-code-locations (function)
-  (let ((debug-fun (fun-debug-fun function)))
-    (do-debug-fun-blocks (block debug-fun)
-      (do-debug-block-locations (loc block)
-	(fill-in-code-location loc)
-	(format t "~S code location at ~W"
-		(compiled-code-location-kind loc)
-		(compiled-code-location-pc loc))
-	(sb!debug::print-code-location-source-form loc 0)
-	(terpri)))))