(in-package "SB!IMPL")
-(defvar *shared-object-lock*) ; initialized in foreign-load.lisp
-
(define-alien-routine arch-write-linkage-table-jmp void
(table-address system-area-pointer)
(real-address system-area-pointer))
(defvar *linkage-info* (make-hash-table :test 'equal :synchronized t))
-(defstruct linkage-info datap address)
-
(defun write-linkage-table-entry (table-address real-address datap)
(/show0 "write-linkage-table-entry")
(let ((reloc (int-sap table-address))
(hash-table-count *linkage-info*)
name))
(write-linkage-table-entry table-address real-address datap)
- (setf (gethash (cons name datap) *linkage-info*)
- (make-linkage-info :address table-address :datap datap))))
+ (setf (gethash (cons name datap) *linkage-info*) table-address)))
;;; Add a foreign linkage entry if none exists, return the address
;;; in the linkage table.
(defun ensure-foreign-symbol-linkage (name datap)
(/show0 "ensure-foreign-symbol-linkage")
- (with-locked-hash-table (*linkage-info*)
- (let ((info (or (gethash (cons name datap) *linkage-info*)
- (link-foreign-symbol name datap))))
- (linkage-info-address info))))
+ (with-locked-system-table (*linkage-info*)
+ (or (gethash (cons name datap) *linkage-info*)
+ (link-foreign-symbol name datap))))
;;; Update the linkage-table. Called during initialization after all
;;; shared libraries have been reopened, and after a previously loaded
;;; FIXME: Should figure out how to write only those entries that need
;;; updating.
(defun update-linkage-table ()
- (dohash ((name-and-datap info) *linkage-info* :locked t)
+ (dohash ((name-and-datap table-address) *linkage-info* :locked t)
(let* ((name (car name-and-datap))
(datap (cdr name-and-datap))
- (table-address (linkage-info-address info))
(real-address
(ensure-dynamic-foreign-symbol-address name datap)))
(aver (and table-address real-address))