From: Christophe Rhodes Date: Tue, 17 Jun 2008 00:04:17 +0000 (+0000) Subject: 1.0.17.38: fix linkage-table address->symbol lookup X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=c25aa56131b52dda80bb06ec8414bd599e42ed03;p=sbcl.git 1.0.17.38: fix linkage-table address->symbol lookup (from Andy Hefner sbcl-devel 2008-06-11) --- diff --git a/NEWS b/NEWS index 516526f..48a7754 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,8 @@ changes in sbcl-1.0.18 relative to 1.0.17: fasl is now deleted. (reported by Attila Lendvai) * bug fix: READ-LINE always returned NIL for the last line in files. (reported by Yoshinori Tahara) + * bug fix: more accurate disassembly annotations of foreign function + calls. (thanks to Andy Hefner) * fixed some bugs revealed by Paul Dietz' test suite: ** NIL is a valid function name (regression at 1.0.13.38) ** FILL on lists was missing its return value (regression at 1.0.12.27) diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp index fdf3275..f6a2462 100644 --- a/src/code/foreign.lisp +++ b/src/code/foreign.lisp @@ -131,9 +131,8 @@ if the symbol isn't found." sb!vm:linkage-table-space-end) (dohash ((name-and-datap info) *linkage-info* :locked t) (let ((table-addr (linkage-info-address info))) - (when (<= table-addr - addr - (+ table-addr sb!vm:linkage-table-entry-size)) + (when (and (<= table-addr addr) + (< addr (+ table-addr sb!vm:linkage-table-entry-size))) (return-from sap-foreign-symbol (car name-and-datap)))))) #!+os-provides-dladdr (with-alien ((info (struct dl-info diff --git a/version.lisp-expr b/version.lisp-expr index 4d3489c..2da6e17 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.17.37" +"1.0.17.38"