projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.16.26:
[sbcl.git]
/
src
/
compiler
/
target-disassem.lisp
diff --git
a/src/compiler/target-disassem.lisp
b/src/compiler/target-disassem.lisp
index
191636c
..
b4572ef
100644
(file)
--- a/
src/compiler/target-disassem.lisp
+++ b/
src/compiler/target-disassem.lisp
@@
-381,8
+381,7
@@
(1- lra-size))))
sb!vm:return-pc-header-widetag))
(unless (null stream)
(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
nil)
;;; Print the fun-header (entry-point) pseudo-instruction at the
@@
-950,7
+949,7
@@
(file-position f char-offset))
(t
(warn "Source file ~S has been modified; ~@
(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))
file index."
name)
(let ((*read-suppress* t))
@@
-996,7
+995,7
@@
nil)
((> form-number (length mapping-table))
(warn "bogus form-number in form! The source file has probably ~@
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))
(when cache
;; Disable future warnings.
(setf (sfcache-toplevel-form cache) nil))
@@
-1775,7
+1774,7
@@
(setf *assembler-routines-by-addr*
(invert-address-hash sb!fasl:*assembler-routines*))
(setf *assembler-routines-by-addr*
(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
*assembler-routines-by-addr*)))
(gethash address *assembler-routines-by-addr*))
\f
@@
-1908,7
+1907,10
@@
(declare (type disassem-state dstate))
(unless (typep address 'address)
(return-from maybe-note-assembler-routine nil))
(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
(unless (null name)
(note (lambda (stream)
(if note-address-p
@@
-1956,8
+1958,7
@@
assoc-with
(sb!di:debug-var-symbol
(aref (dstate-debug-vars dstate)
assoc-with
(sb!di:debug-var-symbol
(aref (dstate-debug-vars dstate)
- storage-location))
- stream))
+ storage-location))))
dstate)
t)))
\f
dstate)
t)))
\f