X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fdebug-dump.lisp;h=9e3630a589d89e5193acbba380ee00f42d19f4eb;hb=8a8a8922802460741d6f8f6c11d71b1f414cf3a7;hp=1f58b672e216c645c61dfaa567deec0b0fe82a12;hpb=85c1cf858999279da6f4f470c4f3c582ad9f2dbf;p=sbcl.git

diff --git a/src/compiler/debug-dump.lisp b/src/compiler/debug-dump.lisp
index 1f58b67..9e3630a 100644
--- a/src/compiler/debug-dump.lisp
+++ b/src/compiler/debug-dump.lisp
@@ -261,6 +261,14 @@
        (let* ((untruename (file-info-untruename file-info))
 	      (dir (pathname-directory untruename)))
 	 (setf (debug-source-name res)
+	       #+sb-xc-host
+	       (let ((src (position "src" dir :test #'string= :from-end t)))
+		 (if src
+		     (format nil "SYS:~{~:@(~A~);~}~:@(~A~).LISP"
+			     (subseq dir src) (pathname-name untruename))
+		     ;; FIXME: just output/stuff-groveled-from-headers.lisp
+		     (namestring untruename)))
+	       #-sb-xc-host
 	       (namestring
 		(if (and dir (eq (first dir) :absolute))
 		    untruename
@@ -525,10 +533,11 @@
 		 (compute-args fun var-locs))))
 
     (if (>= level 2)
-      (multiple-value-bind (blocks tlf-num) (compute-debug-blocks fun var-locs)
-	(setf (compiled-debug-fun-tlf-number dfun) tlf-num)
-	(setf (compiled-debug-fun-blocks dfun) blocks))
-      (setf (compiled-debug-fun-tlf-number dfun) (find-tlf-number fun)))
+	(multiple-value-bind (blocks tlf-num)
+	    (compute-debug-blocks fun var-locs)
+	  (setf (compiled-debug-fun-tlf-number dfun) tlf-num)
+	  (setf (compiled-debug-fun-blocks dfun) blocks))
+	(setf (compiled-debug-fun-tlf-number dfun) (find-tlf-number fun)))
 
     (if (xep-p fun)
 	(setf (compiled-debug-fun-returns dfun) :standard)