X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftarget-disassem.lisp;h=cb8c4761307cc972050e5ab19e08f720c775c18e;hb=079ef9dad558ca07cb8178ef428bf738112174fa;hp=4cb57de837ac0379509dd133d601da6a37b6c640;hpb=f43f136f9b3ff6cae501e850fa67b2183317e212;p=sbcl.git

diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp
index 4cb57de..cb8c476 100644
--- a/src/compiler/target-disassem.lisp
+++ b/src/compiler/target-disassem.lisp
@@ -44,8 +44,9 @@
   (sort insts #'> :key #'specializer-rank))
 
 (defun specialization-error (insts)
-  (error "~@<internal disassembler error: ~2I~_Instructions either aren't related or conflict in some way: ~4I~_~S~:>"
-	 insts))
+  (bug
+   "~@<Instructions either aren't related or conflict in some way: ~4I~_~S~:>"
+   insts))
 
 ;;; Given a list of instructions INSTS, Sees if one of these instructions is a
 ;;; more general form of all the others, in which case they are put into its
@@ -252,7 +253,7 @@
 
 (defstruct (offs-hook (:copier nil))
   (offset 0 :type offset)
-  (function (missing-arg) :type function)
+  (fun (missing-arg) :type function)
   (before-address nil :type (member t nil)))
 
 (defstruct (segment (:conc-name seg-)
@@ -260,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))
@@ -268,78 +269,13 @@
 (def!method print-object ((seg segment) stream)
   (print-unreadable-object (seg stream :type t)
     (let ((addr (sb!sys:sap-int (funcall (seg-sap-maker seg)))))
-      (format stream "#X~X[~D]~:[ (#X~X)~;~*~]~@[ in ~S~]"
+      (format stream "#X~X[~W]~:[ (#X~X)~;~*~]~@[ in ~S~]"
 	      addr
 	      (seg-length seg)
 	      (= (seg-virtual-location seg) addr)
 	      (seg-virtual-location seg)
 	      (seg-code seg)))))
 
-;;; All state during disassembly. We store some seemingly redundant
-;;; information so that we can allow garbage collect during disassembly and
-;;; not get tripped up by a code block being moved...
-(defstruct (disassem-state (:conc-name dstate-)
-			   (:constructor %make-dstate)
-			   (:copier nil))
-  ;; offset of current pos in segment
-  (cur-offs 0 :type offset)		
-  ;; offset of next position
-  (next-offs 0 :type offset)		
-  ;; a sap pointing to our segment
-  (segment-sap (missing-arg) :type sb!sys:system-area-pointer)
-  ;; the current segment					
-  (segment nil :type (or null segment))	
-  ;; what to align to in most cases
-  (alignment sb!vm:n-word-bytes :type alignment) 
-  (byte-order :little-endian
-	      :type (member :big-endian :little-endian))
-  ;; for user code to hang stuff off of
-  (properties nil :type list)
-  (filtered-values (make-array max-filtered-value-index)
-		   :type filtered-value-vector)
-  ;; used for prettifying printing
-  (addr-print-len nil :type (or null (integer 0 20)))
-  (argument-column 0 :type column)
-  ;; to make output look nicer
-  (output-state :beginning		
-		:type (member :beginning
-			      :block-boundary
-			      nil))
-
-  ;; alist of (address . label-number)
-  (labels nil :type list)		
-  ;; same as LABELS slot data, but in a different form
-  (label-hash (make-hash-table) :type hash-table)
-  ;; list of function
-  (fun-hooks nil :type list) 		
-
-  ;; alist of (address . label-number), popped as it's used
-  (cur-labels nil :type list)		; 
-  ;; list of offs-hook, popped as it's used
-  (cur-offs-hooks nil :type list) 	
-
-  ;; for the current location
-  (notes nil :type list)
-
-  ;; currently active source variables
-  (current-valid-locations nil :type (or null (vector bit))))
-(def!method print-object ((dstate disassem-state) stream)
-  (print-unreadable-object (dstate stream :type t)
-    (format stream
-	    "+~D~@[ in ~S~]"
-	    (dstate-cur-offs dstate)
-	    (dstate-segment dstate))))
-
-;;; Return the absolute address of the current instruction in DSTATE.
-(defun dstate-cur-addr (dstate)
-  (the address (+ (seg-virtual-location (dstate-segment dstate))
-		  (dstate-cur-offs dstate))))
-
-;;; Return the absolute address of the next instruction in DSTATE.
-(defun dstate-next-addr (dstate)
-  (the address (+ (seg-virtual-location (dstate-segment dstate))
-		  (dstate-next-offs dstate))))
-
 ;;;; function ops
 
 (defun fun-self (fun)
@@ -354,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
@@ -384,11 +326,14 @@
   (declare (type sb!kernel:code-component code-component))
   (sb!sys:sap-int (sb!kernel:code-instructions code-component)))
 
+;;; unused as of sbcl-0.pre7.129
+#|
 ;;; Return the first function in CODE-COMPONENT.
 (defun code-first-function (code-component)
   (declare (type sb!kernel:code-component code-component))
   (sb!kernel:code-header-ref code-component
 			     sb!vm:code-trace-table-offset-slot))
+|#
 
 (defun segment-offs-to-code-offs (offset segment)
   (sb!sys:without-gcing
@@ -436,8 +381,7 @@
 					 (1- lra-size))))
 		sb!vm:return-pc-header-widetag))
     (unless (null stream)
-      (princ '.lra stream))
-    (incf (dstate-next-offs dstate) lra-size))
+      (note "possible LRA header" dstate)))
   nil)
 
 ;;; Print the fun-header (entry-point) pseudo-instruction at the
@@ -481,7 +425,7 @@
 	(alignment (dstate-alignment dstate)))
     (unless (aligned-p location alignment)
       (when stream
-	(format stream "~A~Vt~D~%" '.align
+	(format stream "~A~Vt~W~%" '.align
 		(dstate-argument-column dstate)
 		alignment))
       (incf(dstate-next-offs dstate)
@@ -503,7 +447,7 @@
   (setf (dstate-cur-offs dstate) 0)
   (setf (dstate-cur-labels dstate) (dstate-labels dstate)))
 
-(defun do-offs-hooks (before-address stream dstate)
+(defun call-offs-hooks (before-address stream dstate)
   (declare (type (or null stream) stream)
 	   (type disassem-state dstate))
   (let ((cur-offs (dstate-cur-offs dstate)))
@@ -519,12 +463,12 @@
 			 (not (offs-hook-before-address next-hook))))
 	    (return))
 	  (unless (< hook-offs cur-offs)
-	    (funcall (offs-hook-function next-hook) stream dstate))
+	    (funcall (offs-hook-fun next-hook) stream dstate))
 	  (pop (dstate-cur-offs-hooks dstate))
 	  (unless (= (dstate-next-offs dstate) cur-offs)
 	    (return)))))))
 
-(defun do-fun-hooks (chunk stream dstate)
+(defun call-fun-hooks (chunk stream dstate)
   (let ((hooks (dstate-fun-hooks dstate))
 	(cur-offs (dstate-cur-offs dstate)))
     (setf (dstate-next-offs dstate) cur-offs)
@@ -541,7 +485,8 @@
 	(when (> words 0)
 	  (print-words words stream dstate))
 	(when (> bytes 0)
-	  (print-bytes bytes stream dstate))))
+	  (print-inst bytes stream dstate)))
+      (print-bytes alignment stream dstate))
     (incf (dstate-next-offs dstate) alignment)))
 
 ;;; Iterate through the instructions in SEGMENT, calling FUNCTION for
@@ -565,10 +510,10 @@
 
       (setf (dstate-next-offs dstate) (dstate-cur-offs dstate))
 
-      (do-offs-hooks t stream dstate)
+      (call-offs-hooks t stream dstate)
       (unless (or prefix-p (null stream))
 	(print-current-address stream dstate))
-      (do-offs-hooks nil stream dstate)
+      (call-offs-hooks nil stream dstate)
 
       (unless (> (dstate-next-offs dstate) (dstate-cur-offs dstate))
 	(sb!sys:without-gcing
@@ -578,32 +523,43 @@
 		(sap-ref-dchunk (dstate-segment-sap dstate)
 				(dstate-cur-offs dstate)
 				(dstate-byte-order dstate))))
-	   (let ((fun-prefix-p (do-fun-hooks chunk stream dstate)))
+	   (let ((fun-prefix-p (call-fun-hooks chunk stream dstate)))
 	     (if (> (dstate-next-offs dstate) (dstate-cur-offs dstate))
 		 (setf prefix-p fun-prefix-p)
-		 (let ((inst (find-inst chunk ispace)))
-		   (cond ((null inst)
-			  (handle-bogus-instruction stream dstate))
-			 (t
-			  (setf (dstate-next-offs dstate)
-				(+ (dstate-cur-offs dstate)
-				   (inst-length inst)))
-
+	       (let ((inst (find-inst chunk ispace)))
+		 (cond ((null inst)
+			(handle-bogus-instruction stream dstate))
+		       (t
+			(setf (dstate-next-offs dstate)
+			      (+ (dstate-cur-offs dstate)
+				 (inst-length inst)))
+			(let ((orig-next (dstate-next-offs dstate)))
+			  (print-inst (inst-length inst) stream dstate :trailing-space nil)
 			  (let ((prefilter (inst-prefilter inst))
 				(control (inst-control inst)))
 			    (when prefilter
 			      (funcall prefilter chunk dstate))
-
+			    
+			    ;; print any instruction bytes recognized by the prefilter which calls read-suffix
+			    ;; and updates next-offs
+			    (when stream
+			      (let ((suffix-len (- (dstate-next-offs dstate) orig-next)))
+				(when (plusp suffix-len)
+				  (print-inst suffix-len stream dstate :offset (inst-length inst) :trailing-space nil))
+			      (dotimes (i (- *disassem-inst-column-width* (* 2 (+ (inst-length inst) suffix-len))))
+				(write-char #\space stream)))
+			      (write-char #\space stream))
+			      
 			    (funcall function chunk inst)
-
+			      
 			    (setf prefix-p (null (inst-printer inst)))
-
+			    
 			    (when control
-			      (funcall control chunk inst stream dstate))))))
-		 )))))
-
+			      (funcall control chunk inst stream dstate))
+			    ))))))))))
+    
       (setf (dstate-cur-offs dstate) (dstate-next-offs dstate))
-
+      
       (unless (null stream)
 	(unless prefix-p
 	  (print-notes-and-newline stream dstate))
@@ -647,7 +603,7 @@
 	    (incf max)
 	    (setf (cdr label) max)
 	    (setf (gethash (car label) label-hash)
-		  (format nil "L~D" max)))))
+		  (format nil "L~W" max)))))
       (setf (dstate-labels dstate) labels))))
 
 ;;; Get the instruction-space, creating it if necessary.
@@ -750,7 +706,7 @@
 	(when (or (null label-location) (> label-location location))
 	  (return))
 	(unless (< label-location location)
-	  (format stream " L~D:" (cdr next-label)))
+	  (format stream " L~W:" (cdr next-label)))
 	(pop (dstate-cur-labels dstate))))
 
     ;; move to the instruction column
@@ -784,6 +740,17 @@
     (fresh-line stream)
     (setf (dstate-notes dstate) nil)))
 
+;;; Print NUM instruction bytes to STREAM as hex values.
+(defun print-inst (num stream dstate &key (offset 0) (trailing-space t))
+  (let ((sap (dstate-segment-sap dstate))
+	(start-offs (+ offset (dstate-cur-offs dstate))))
+    (dotimes (offs num)
+      (format stream "~2,'0x" (sb!sys:sap-ref-8 sap (+ offs start-offs))))
+    (when trailing-space
+      (dotimes (i (- *disassem-inst-column-width* (* 2 num)))
+	(write-char #\space stream))
+      (write-char #\space stream))))
+
 ;;; Disassemble NUM bytes to STREAM as simple `BYTE' instructions.
 (defun print-bytes (num stream dstate)
   (declare (type offset num)
@@ -855,7 +822,7 @@
       ((null fun))
     (let ((offset (code-offs-to-segment-offs (fun-offset fun) segment)))
       (when (<= 0 offset length)
-	(push (make-offs-hook :offset offset :function #'fun-header-hook)
+	(push (make-offs-hook :offset offset :fun #'fun-header-hook)
 	      (seg-hooks segment))))))
 
 ;;; A SAP-MAKER is a no-argument function that returns a SAP.
@@ -908,7 +875,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))
@@ -958,7 +925,7 @@
       (let ((fun-offset (sb!kernel:get-closure-length fun)))
 	;; There is function header fun-offset words from the
 	;; code header.
-	(format t "Fun-header ~S at offset ~D (words): ~S~A => ~S~%"
+	(format t "Fun-header ~S at offset ~W (words): ~S~A => ~S~%"
 		fun
 		fun-offset
 		(sb!kernel:code-header-ref
@@ -973,13 +940,13 @@
 (defstruct (source-form-cache (:conc-name sfcache-)
 			      (:copier nil))
   (debug-source nil :type (or null sb!di:debug-source))
-  (top-level-form-index -1 :type fixnum)
-  (top-level-form nil :type list)
+  (toplevel-form-index -1 :type fixnum)
+  (toplevel-form nil :type list)
   (form-number-mapping-table nil :type (or null (vector list)))
   (last-location-retrieved nil :type (or null sb!di:code-location))
   (last-form-retrieved -1 :type fixnum))
 
-(defun get-top-level-form (debug-source tlf-index)
+(defun get-toplevel-form (debug-source tlf-index)
   (let ((name (sb!di:debug-source-name debug-source)))
     (ecase (sb!di:debug-source-from debug-source)
       (:file
@@ -1005,7 +972,8 @@
 				  (file-position f char-offset))
 				 (t
 				  (warn "Source file ~S has been modified; ~@
-					 using form offset instead of file index."
+                                         using form offset instead of ~
+                                         file index."
 					name)
 				  (let ((*read-suppress* t))
 				    (dotimes (i local-tlf-index) (read f)))))
@@ -1025,41 +993,41 @@
   (and cache
        (and (eq (sb!di:code-location-debug-source loc)
 		(sfcache-debug-source cache))
-	    (eq (sb!di:code-location-top-level-form-offset loc)
-		(sfcache-top-level-form-index cache)))))
+	    (eq (sb!di:code-location-toplevel-form-offset loc)
+		(sfcache-toplevel-form-index cache)))))
 
 (defun get-source-form (loc context &optional cache)
   (let* ((cache-valid (cache-valid loc cache))
-	 (tlf-index (sb!di:code-location-top-level-form-offset loc))
+	 (tlf-index (sb!di:code-location-toplevel-form-offset loc))
 	 (form-number (sb!di:code-location-form-number loc))
-	 (top-level-form
+	 (toplevel-form
 	  (if cache-valid
-	      (sfcache-top-level-form cache)
-	      (get-top-level-form (sb!di:code-location-debug-source loc)
+	      (sfcache-toplevel-form cache)
+	      (get-toplevel-form (sb!di:code-location-debug-source loc)
 				  tlf-index)))
 	 (mapping-table
 	  (if cache-valid
 	      (sfcache-form-number-mapping-table cache)
-	      (sb!di:form-number-translations top-level-form tlf-index))))
+	      (sb!di:form-number-translations toplevel-form tlf-index))))
     (when (and (not cache-valid) cache)
       (setf (sfcache-debug-source cache) (sb!di:code-location-debug-source loc)
-	    (sfcache-top-level-form-index cache) tlf-index
-	    (sfcache-top-level-form cache) top-level-form
+	    (sfcache-toplevel-form-index cache) tlf-index
+	    (sfcache-toplevel-form cache) toplevel-form
 	    (sfcache-form-number-mapping-table cache) mapping-table))
-    (cond ((null top-level-form)
+    (cond ((null toplevel-form)
 	   nil)
 	  ((> form-number (length mapping-table))
 	   (warn "bogus form-number in form!  The source file has probably ~@
-		  been changed too much to cope with.")
+                  been changed too much to cope with.")
 	   (when cache
 	     ;; Disable future warnings.
-	     (setf (sfcache-top-level-form cache) nil))
+	     (setf (sfcache-toplevel-form cache) nil))
 	   nil)
 	  (t
 	   (when cache
 	     (setf (sfcache-last-location-retrieved cache) loc)
 	     (setf (sfcache-last-form-retrieved cache) form-number))
-	   (sb!di:source-path-context top-level-form
+	   (sb!di:source-path-context toplevel-form
 				      (aref mapping-table form-number)
 				      context)))))
 
@@ -1074,11 +1042,11 @@
       (values nil nil)
       (values (get-source-form loc context cache) t)))
 
-;;;; stuff to use debugging-info to augment the disassembly
+;;;; stuff to use debugging info to augment the disassembly
 
 (defun code-fun-map (code)
   (declare (type sb!kernel:code-component code))
-  (sb!di::get-debug-info-fun-map (sb!kernel:%code-debug-info code)))
+  (sb!c::compiled-debug-info-fun-map (sb!kernel:%code-debug-info code)))
 
 (defstruct (location-group (:copier nil))
   (locations #() :type (vector (or list fixnum))))
@@ -1166,7 +1134,7 @@
 				      :debug-vars debug-vars))
 	   (let ((debug-var (aref debug-vars debug-var-offset)))
 	     #+nil
-	     (format t ";;; At offset ~D: ~S~%" debug-var-offset debug-var)
+	     (format t ";;; At offset ~W: ~S~%" debug-var-offset debug-var)
 	     (let* ((sc-offset
 		     (sb!di::compiled-debug-var-sc-offset debug-var))
 		    (sb-name
@@ -1174,7 +1142,7 @@
 		      (sb!c:sc-sb (aref sc-vec
 					(sb!c:sc-offset-scn sc-offset))))))
 	       #+nil
-	       (format t ";;; SET: ~S[~D]~%"
+	       (format t ";;; SET: ~S[~W]~%"
 		       sb-name (sb!c:sc-offset-offset sc-offset))
 	       (unless (null sb-name)
 		 (let ((group (cdr (assoc sb-name groups))))
@@ -1232,8 +1200,8 @@
   (let ((last-block-pc -1))
     (flet ((add-hook (pc fun &optional before-address)
 	     (push (make-offs-hook
-		    :offset pc ;; ##### FIX to account for non-zero offs in code
-		    :function fun
+		    :offset pc ;; ### FIX to account for non-zero offs in code
+		    :fun fun
 		    :before-address before-address)
 		   (seg-hooks segment))))
       (handler-case
@@ -1266,7 +1234,7 @@
 			      (when stream
 				(unless at-block-begin
 				  (terpri stream))
-				(format stream ";;; [~D] "
+				(format stream ";;; [~W] "
 					(sb!di:code-location-form-number
 					 loc))
 				(prin1-short form stream)
@@ -1299,24 +1267,24 @@
 	  (storage-info-for-debug-fun debug-fun))
     (add-source-tracking-hooks segment debug-fun sfcache)
     (let ((kind (sb!di:debug-fun-kind debug-fun)))
-      (flet ((anh (n)
+      (flet ((add-new-hook (n)
 	       (push (make-offs-hook
 		      :offset 0
-		      :function (lambda (stream dstate)
-				  (declare (ignore stream))
-				  (note n dstate)))
+		      :fun (lambda (stream dstate)
+			     (declare (ignore stream))
+			     (note n dstate)))
 		     (seg-hooks segment))))
 	(case kind
 	  (:external)
 	  ((nil)
-	   (anh "no-arg-parsing entry point"))
+	   (add-new-hook "no-arg-parsing entry point"))
 	  (t
-	   (anh (lambda (stream)
-		  (format stream "~S entry point" kind)))))))))
+	   (add-new-hook (lambda (stream)
+			   (format stream "~S entry point" kind)))))))))
 
 ;;; Return a list of the segments of memory containing machine code
 ;;; instructions for FUNCTION.
-(defun get-function-segments (function)
+(defun get-fun-segments (function)
   (declare (type compiled-function function))
   (let* ((code (fun-code function))
 	 (fun-map (code-fun-map code))
@@ -1347,7 +1315,7 @@
 	       (let ((name (sb!c::compiled-debug-fun-name fmap-entry))
 		     (kind (sb!c::compiled-debug-fun-kind fmap-entry)))
 		 #+nil
-		 (format t ";;; SAW ~S ~S ~S,~S ~D,~D~%"
+		 (format t ";;; SAW ~S ~S ~S,~S ~W,~W~%"
 			 name kind first-block-seen-p nil-block-seen-p
 			 last-offset
 			 (sb!c::compiled-debug-fun-start-pc fmap-entry))
@@ -1363,8 +1331,7 @@
 			(when first-block-seen-p
 			  (setf nil-block-seen-p t))))
 		 (setf last-debug-fun
-		       (sb!di::make-compiled-debug-fun fmap-entry code))
-		 )))))
+		       (sb!di::make-compiled-debug-fun fmap-entry code)))))))
 	(let ((max-offset (code-inst-area-length code)))
 	  (when (and first-block-seen-p last-debug-fun)
 	    (add-seg last-offset
@@ -1372,7 +1339,8 @@
 		     last-debug-fun))
 	  (if (null segments)
 	      (let ((offs (fun-insts-offset function)))
-		(make-code-segment code offs (- max-offset offs)))
+		(list 
+		 (make-code-segment code offs (- max-offset offs))))
 	      (nreverse segments)))))))
 
 ;;; Return a list of the segments of memory containing machine code
@@ -1385,7 +1353,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))
@@ -1500,21 +1468,23 @@
       (dolist (seg segments)
 	(disassemble-segment seg stream dstate)))))
 
-;;;; top-level functions
+;;;; top level functions
 
 ;;; Disassemble the machine code instructions for FUNCTION.
-(defun disassemble-function (function &key
-				      (stream *standard-output*)
-				      (use-labels t))
-  (declare (type compiled-function function)
+(defun disassemble-fun (fun &key
+			    (stream *standard-output*)
+			    (use-labels t))
+  (declare (type compiled-function fun)
 	   (type stream stream)
 	   (type (member t nil) use-labels))
   (let* ((dstate (make-dstate))
-	 (segments (get-function-segments function)))
+	 (segments (get-fun-segments fun)))
     (when use-labels
       (label-segments segments dstate))
     (disassemble-segments segments stream dstate)))
 
+;;; FIXME: We probably don't need this any more now that there are
+;;; no interpreted functions, only compiled ones.
 (defun compile-function-lambda-expr (function)
   (declare (type function function))
   (multiple-value-bind (lambda closurep name)
@@ -1524,11 +1494,9 @@
       (error "can't compile a lexical closure"))
     (compile nil lambda)))
 
-(defun compiled-function-or-lose (thing &optional (name thing))
-  (cond ((or (symbolp thing)
-	     (and (listp thing)
-		  (eq (car thing) 'setf)))
-	 (compiled-function-or-lose (fdefinition thing) thing))
+(defun compiled-fun-or-lose (thing &optional (name thing))
+  (cond ((legal-fun-name-p thing)
+	 (compiled-fun-or-lose (fdefinition thing) thing))
 	((functionp thing)
 	 thing)
 	((and (listp thing)
@@ -1549,9 +1517,9 @@
 	   (type (or (member t) stream) stream)
 	   (type (member t nil) use-labels))
   (pprint-logical-block (*standard-output* nil :per-line-prefix "; ")
-    (disassemble-function (compiled-function-or-lose object)
-			  :stream stream
-			  :use-labels use-labels)
+    (disassemble-fun (compiled-fun-or-lose object)
+		     :stream stream
+		     :use-labels use-labels)
     nil))
 
 ;;; Disassembles the given area of memory starting at ADDRESS and
@@ -1565,7 +1533,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))
@@ -1829,7 +1797,7 @@
     (setf *assembler-routines-by-addr*
 	  (invert-address-hash sb!fasl:*assembler-routines*))
     (setf *assembler-routines-by-addr*
-	  (invert-address-hash sb!fasl:*static-foreign-symbols*
+	  (invert-address-hash sb!sys:*static-foreign-symbols*
 			       *assembler-routines-by-addr*)))
   (gethash address *assembler-routines-by-addr*))
 
@@ -1840,7 +1808,7 @@
 (defun sap-ref-int (sap offset length byte-order)
   (declare (type sb!sys:system-area-pointer sap)
 	   (type (unsigned-byte 16) offset)
-	   (type (member 1 2 4) length)
+	   (type (member 1 2 4 8) length)
 	   (type (member :little-endian :big-endian) byte-order)
 	   (optimize (speed 3) (safety 0)))
   (ecase length
@@ -1858,14 +1826,31 @@
 	   (+ (sb!sys:sap-ref-8 sap offset)
 	      (ash (sb!sys:sap-ref-8 sap (+ 1 offset)) 8)
 	      (ash (sb!sys:sap-ref-8 sap (+ 2 offset)) 16)
-	      (ash (sb!sys:sap-ref-8 sap (+ 3 offset)) 24))))))
+	      (ash (sb!sys:sap-ref-8 sap (+ 3 offset)) 24))))
+    (8 (if (eq byte-order :big-endian)
+	   (+ (ash (sb!sys:sap-ref-8 sap offset) 56)
+	      (ash (sb!sys:sap-ref-8 sap (+ 1 offset)) 48)
+	      (ash (sb!sys:sap-ref-8 sap (+ 2 offset)) 40)
+	      (ash (sb!sys:sap-ref-8 sap (+ 3 offset)) 32)
+	      (ash (sb!sys:sap-ref-8 sap (+ 4 offset)) 24)
+	      (ash (sb!sys:sap-ref-8 sap (+ 5 offset)) 16)
+	      (ash (sb!sys:sap-ref-8 sap (+ 6 offset)) 8)
+	      (sb!sys:sap-ref-8 sap (+ 7 offset)))
+	   (+ (sb!sys:sap-ref-8 sap offset)
+	      (ash (sb!sys:sap-ref-8 sap (+ 1 offset)) 8)
+	      (ash (sb!sys:sap-ref-8 sap (+ 2 offset)) 16)
+	      (ash (sb!sys:sap-ref-8 sap (+ 3 offset)) 24)
+	      (ash (sb!sys:sap-ref-8 sap (+ 4 offset)) 32)
+	      (ash (sb!sys:sap-ref-8 sap (+ 5 offset)) 40)
+	      (ash (sb!sys:sap-ref-8 sap (+ 6 offset)) 48)
+	      (ash (sb!sys:sap-ref-8 sap (+ 7 offset)) 56))))))
 
 (defun read-suffix (length dstate)
-  (declare (type (member 8 16 32) length)
+  (declare (type (member 8 16 32 64) length)
 	   (type disassem-state dstate)
 	   (optimize (speed 3) (safety 0)))
-  (let ((length (ecase length (8 1) (16 2) (32 4))))
-    (declare (type (unsigned-byte 3) length))
+  (let ((length (ecase length (8 1) (16 2) (32 4) (64 8))))
+    (declare (type (unsigned-byte 4) length))
     (prog1
       (sap-ref-int (dstate-segment-sap dstate)
 		   (dstate-next-offs dstate)
@@ -1962,7 +1947,10 @@
   (declare (type disassem-state dstate))
   (unless (typep address 'address)
     (return-from maybe-note-assembler-routine nil))
-  (let ((name (find-assembler-routine address)))
+  (let ((name (or
+	       #!+linkage-table
+	       (sb!sys:foreign-symbol-in-address (sb!sys:int-sap address))
+	       (find-assembler-routine address))))
     (unless (null name)
       (note (lambda (stream)
 	      (if note-address-p
@@ -2010,8 +1998,7 @@
 		      assoc-with
 		      (sb!di:debug-var-symbol
 		       (aref (dstate-debug-vars dstate)
-			     storage-location))
-		      stream))
+			     storage-location))))
 	    dstate)
       t)))
 
@@ -2060,6 +2047,7 @@
 	       (let ((num (pop lengths)))
 		 (print-notes-and-newline stream dstate)
 		 (print-current-address stream dstate)
+		 (print-inst num stream dstate)
 		 (print-bytes num stream dstate)
 		 (incf (dstate-cur-offs dstate) num)
 		 (when note