X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftarget-disassem.lisp;h=4b73b0b42777786d9adfe73b5e7d4b0f2536eb9a;hb=1b650be8b800cf96e2c268ae317fb26d0bf36827;hp=453edf1a54446bc569793b045e2a13951d72c622;hpb=8a19c6876412b8ad1cf729297c2a373d63a0d0ec;p=sbcl.git

diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp
index 453edf1..4b73b0b 100644
--- a/src/compiler/target-disassem.lisp
+++ b/src/compiler/target-disassem.lisp
@@ -261,7 +261,7 @@
 		    (:copier nil))
   (sap-maker (missing-arg)
 	     :type (function () sb!sys:system-area-pointer))
-  (length 0 :type length)
+  (length 0 :type disassem-length)
   (virtual-location 0 :type address)
   (storage-info nil :type (or null storage-info))
   (code nil :type (or null sb!kernel:code-component))
@@ -290,9 +290,15 @@
   (declare (type compiled-function fun))
   (sb!kernel:%simple-fun-next fun))
 
-(defun fun-address (function)
-  (declare (type compiled-function function))
-  (- (sb!kernel:get-lisp-obj-address function) sb!vm:fun-pointer-lowtag))
+(defun fun-address (fun)
+  (declare (type compiled-function fun))
+  (ecase (sb!kernel:widetag-of fun)
+    (#.sb!vm:simple-fun-header-widetag
+     (- (sb!kernel:get-lisp-obj-address fun) sb!vm:fun-pointer-lowtag))
+    (#.sb!vm:closure-header-widetag
+     (fun-address (sb!kernel:%closure-fun fun)))
+    (#.sb!vm:funcallable-instance-header-widetag
+     (fun-address (sb!kernel:funcallable-instance-fun fun)))))
 
 ;;; the offset of FUNCTION from the start of its code-component's
 ;;; instruction area
@@ -847,7 +853,7 @@
 		     debug-fun source-form-cache
 		     hooks)
   (declare (type (function () sb!sys:system-area-pointer) sap-maker)
-	   (type length length)
+	   (type disassem-length length)
 	   (type (or null address) virtual-location)
 	   (type (or null sb!di:debug-fun) debug-fun)
 	   (type (or null source-form-cache) source-form-cache))
@@ -1325,7 +1331,7 @@
 			  (length (code-inst-area-length code)))
   (declare (type sb!kernel:code-component code)
 	   (type offset start-offset)
-	   (type length length))
+	   (type disassem-length length))
   (let ((segments nil))
     (when code
       (let ((fun-map (code-fun-map code))
@@ -1467,9 +1473,7 @@
     (compile nil lambda)))
 
 (defun compiled-fun-or-lose (thing &optional (name thing))
-  (cond ((or (symbolp thing)
-	     (and (listp thing)
-		  (eq (car thing) 'setf)))
+  (cond ((legal-fun-name-p thing)
 	 (compiled-fun-or-lose (fdefinition thing) thing))
 	((functionp thing)
 	 thing)
@@ -1507,7 +1511,7 @@
 			   code-component
 			   (use-labels t))
   (declare (type (or address sb!sys:system-area-pointer) address)
-	   (type length length)
+	   (type disassem-length length)
 	   (type stream stream)
 	   (type (or null sb!kernel:code-component) code-component)
 	   (type (member t nil) use-labels))
@@ -1952,8 +1956,7 @@
 		      assoc-with
 		      (sb!di:debug-var-symbol
 		       (aref (dstate-debug-vars dstate)
-			     storage-location))
-		      stream))
+			     storage-location))))
 	    dstate)
       t)))