(in-package "SB!IMPL")
-#!-(or elf mach-o)
-(error "Not an ELF or Mach-O platform?")
+#!-(or elf mach-o win32)
+(error "Not an ELF, Mach-O, or Win32 platform?")
(defun extern-alien-name (name)
(handler-case
#!+elf (coerce name 'base-string)
- #!+mach-o (concatenate 'base-string "_" name)
+ #!+(or mach-o win32) (concatenate 'base-string "_" name)
(error ()
(error "invalid external alien name: ~S" name))))
(let ((extern (extern-alien-name name)))
(values
(or (gethash extern table)
- (gethash (concatenate 'base-string "ldso_stub__" extern) table)))))
+ (gethash (concatenate 'base-string
+ #!+(and darwin (or x86 x86-64 ppc)) "_ldso_stub__"
+ #!-(and darwin (or x86 x86-64 ppc)) "ldso_stub__"
+ extern) table)))))
(defun find-foreign-symbol-address (name)
"Returns the address of the foreign symbol NAME, or NIL. Does not enter the
#!+os-provides-dlopen
(reopen-shared-objects)
#!+linkage-table
- (update-linkage-table))
+ ;; Don't warn about undefined aliens on startup. The same core can
+ ;; reasonably be expected to work with different versions of the
+ ;; same library.
+ (handler-bind ((style-warning #'muffle-warning))
+ (update-linkage-table)))
;;; Cleanups before saving a core
#-sb-xc-host
(defun foreign-deinit ()
- #!+(and os-provides-dlopen (not linkage-table))
+ #!+(and os-provides-dlopen (or (not linkage-table) win32))
(when (dynamic-foreign-symbols-p)
(warn "~@<Saving cores with alien definitions referring to non-static ~
foreign symbols is unsupported on this platform: references to ~
#!+os-provides-dlopen
(close-shared-objects))
+(declaim (maybe-inline sap-foreign-symbol))
(defun sap-foreign-symbol (sap)
(declare (ignorable sap))
#-sb-xc-host
(when (<= sb!vm:linkage-table-space-start
addr
sb!vm:linkage-table-space-end)
- (maphash (lambda (name-and-datap info)
- (let ((table-addr (linkage-info-address info)))
- (when (<= table-addr
- addr
- (+ table-addr sb!vm:linkage-table-entry-size))
- (return-from sap-foreign-symbol (car name-and-datap)))))
- *linkage-info*))
+ (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))))))
#!+os-provides-dladdr
(with-alien ((info (struct dl-info
(filename c-string)
(defun !foreign-cold-init ()
(dolist (symbol *!initial-foreign-symbols*)
(setf (gethash (car symbol) *static-foreign-symbols*) (cdr symbol)))
+ #!+(and os-provides-dlopen (not win32))
+ (setf *runtime-dlhandle* (dlopen-or-lose))
#!+os-provides-dlopen
- (setf *runtime-dlhandle* (dlopen-or-lose)
- *shared-objects* nil))
+ (setf *shared-objects* nil))
#!-os-provides-dlopen
(define-unsupported-fun load-shared-object)