X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fforeign.lisp;h=f8fb6b9429444f4f5d0ba8b05647b6db8db887f5;hb=05e28b18c3fc2d697f04fb0393f51ce00147825e;hp=be46641abca9b94464611a23c67bd02e6fa0bf06;hpb=79f4c3de36b3c7d0d41497e2543d3ed6a135cb46;p=sbcl.git diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp index be46641..f8fb6b9 100644 --- a/src/code/foreign.lisp +++ b/src/code/foreign.lisp @@ -127,11 +127,10 @@ if the symbol isn't found." (when (<= sb!vm:linkage-table-space-start addr sb!vm:linkage-table-space-end) - (dohash ((name-and-datap info) *linkage-info* :locked t) - (let ((table-addr (linkage-info-address info))) - (when (and (<= table-addr addr) - (< addr (+ table-addr sb!vm:linkage-table-entry-size))) - (return-from sap-foreign-symbol (car name-and-datap)))))) + (dohash ((name-and-datap table-addr) *linkage-info* :locked t) + (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 (filename c-string) @@ -163,9 +162,7 @@ if the symbol isn't found." (loop for table-address from sb!vm::linkage-table-space-start by sb!vm::linkage-table-entry-size and reference in sb!vm::*required-runtime-c-symbols* - do (setf (gethash reference *linkage-info*) - (make-linkage-info :datap (cdr reference) - :address table-address))) + do (setf (gethash reference *linkage-info*) table-address)) #!+os-provides-dlopen (setf *runtime-dlhandle* (dlopen-or-lose)) #!+os-provides-dlopen