0.8.16.6:

[sbcl.git] / src / compiler / target-disassem.lisp

diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp
index 6e07407..b4572ef 100644 (file)
--- a/src/compiler/target-disassem.lisp
+++ b/src/compiler/target-disassem.lisp
@@ -949,7 +949,7 @@
                                  (file-position f char-offset))
                                 (t
                                  (warn "Source file ~S has been modified; ~@
-                                        using form offset instead of ~
+                                         using form offset instead of ~
                                          file index."
                                        name)
                                  (let ((*read-suppress* t))
@@ -995,7 +995,7 @@
           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-toplevel-form cache) nil))
@@ -1774,7 +1774,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*))
 \f
@@ -1907,7 +1907,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