(defun extern-alien-name (name)
(handler-case
- #!+(or elf (and mach-o (not dlshim))) (coerce name 'base-string)
- #!+(or (and mach-o dlshim) win32) (concatenate 'base-string "_" name)
+ (coerce name 'base-string)
(error ()
(error "invalid external alien name: ~S" name))))
(let ((extern (extern-alien-name name)))
(values
(or (gethash extern table)
- (gethash (concatenate 'base-string
- #!+(and mach-o dlshim) "_ldso_stub_"
- #!+(and mach-o (not dlshim)) "ldso_stub__"
- #!-mach-o "ldso_stub__"
- extern) table)))))
+ (gethash (concatenate 'base-string "ldso_stub__" extern) table)))))
(defun find-foreign-symbol-address (name)
"Returns the address of the foreign symbol NAME, or NIL. Does not enter the
On non-linkage-table ports signals an error if the symbol isn't found."
(declare (ignorable datap))
- (let ((static (find-foreign-symbol-in-table name *static-foreign-symbols*)))
+ #!+sb-dynamic-core
+ (values (ensure-foreign-symbol-linkage name datap) t)
+ #!-sb-dynamic-core
+ (let ((static (find-foreign-symbol-in-table name *static-foreign-symbols*)))
(if static
(values static nil)
#!+os-provides-dlopen
#!+linkage-table
(multiple-value-bind (addr sharedp)
(foreign-symbol-address symbol datap)
- #+sb-xc-host
- (aver (not sharedp))
+ #+sb-xc-host #!-sb-dynamic-core (aver (not sharedp)) ()
;; If the address is from linkage-table and refers to data
;; we need to do a bit of juggling. It is not the address of the
;; variable, but the address where the real address is stored.
;;; Cleanups before saving a core
#-sb-xc-host
(defun foreign-deinit ()
- #!+(and os-provides-dlopen (or (not linkage-table) win32))
+ #!+(and os-provides-dlopen (not linkage-table))
(when (dynamic-foreign-symbols-p)
(warn "~@<Saving cores with alien definitions referring to non-static ~
foreign symbols is unsupported on this platform: references to ~
(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)
(symbol-address unsigned)))
(dladdr (function unsigned unsigned (* (struct dl-info)))
:extern "dladdr"))
- (let ((err (alien-funcall dladdr addr (addr info))))
+ (let ((err (without-gcing
+ ;; On eg. Darwin GC can could otherwise interrupt
+ ;; the call while dladdr is holding a lock.
+ (alien-funcall dladdr addr (addr info)))))
(if (zerop err)
nil
(slot info 'symbol))))
#-sb-xc-host
(defun !foreign-cold-init ()
+ #!-sb-dynamic-core
(dolist (symbol *!initial-foreign-symbols*)
(setf (gethash (car symbol) *static-foreign-symbols*) (cdr symbol)))
- #!+(and os-provides-dlopen (not win32))
+ #!+sb-dynamic-core
+ (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*) table-address))
+ #!+os-provides-dlopen
(setf *runtime-dlhandle* (dlopen-or-lose))
#!+os-provides-dlopen
(setf *shared-objects* nil))