X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fforeign.lisp;h=f6a24623ce2fe3de17103999e3fb74112b661c81;hb=5d04a95274c9ddaebbcd6ddffc5d646e2c25598c;hp=86b975268c3e795be63e24b3b891c789e338e41a;hpb=9f409e8f8b0a0530725a13805f2b1b3c121ad46a;p=sbcl.git diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp index 86b9752..f6a2462 100644 --- a/src/code/foreign.lisp +++ b/src/code/foreign.lisp @@ -11,13 +11,13 @@ (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)))) @@ -28,13 +28,16 @@ (declaim (type hash-table *static-foreign-symbols*)) (defvar *static-foreign-symbols* (make-hash-table :test 'equal)) -(declaim +(declaim (ftype (sfunction (string hash-table) (or integer null)) find-foreign-symbol-in-table)) (defun find-foreign-symbol-in-table (name table) (let ((extern (extern-alien-name name))) - (values + (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 @@ -56,19 +59,19 @@ 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*))) (if static - (values static nil) - #!+os-provides-dlopen - (progn - #-sb-xc-host - (values #!-linkage-table - (ensure-dynamic-foreign-symbol-address name) - #!+linkage-table - (ensure-foreign-symbol-linkage name datap) - t) - #+sb-xc-host - (error 'undefined-alien-error :name name)) - #!-os-provides-dlopen - (error 'undefined-alien-error :name name)))) + (values static nil) + #!+os-provides-dlopen + (progn + #-sb-xc-host + (values #!-linkage-table + (ensure-dynamic-foreign-symbol-address name) + #!+linkage-table + (ensure-foreign-symbol-linkage name datap) + t) + #+sb-xc-host + (error 'undefined-alien-error :name name)) + #!-os-provides-dlopen + (error 'undefined-alien-error :name name)))) (defun foreign-symbol-sap (symbol &optional datap) "Returns a SAP corresponding to the foreign symbol. DATAP must be true if the @@ -87,15 +90,19 @@ if the symbol isn't found." ;; 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. (if (and sharedp datap) - (int-sap (sap-ref-word (int-sap addr) 0)) - (int-sap addr)))) + (int-sap (sap-ref-word (int-sap addr) 0)) + (int-sap addr)))) #-sb-xc-host (defun foreign-reinit () #!+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 @@ -112,6 +119,7 @@ if the symbol isn't found." #!+os-provides-dlopen (close-shared-objects)) +(declaim (maybe-inline sap-foreign-symbol)) (defun sap-foreign-symbol (sap) (declare (ignorable sap)) #-sb-xc-host @@ -119,27 +127,25 @@ if the symbol isn't found." (declare (ignorable addr)) #!+linkage-table (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*)) + 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)))))) #!+os-provides-dladdr (with-alien ((info (struct dl-info - (filename c-string) - (base unsigned) - (symbol c-string) - (symbol-address unsigned))) - (dladdr (function unsigned unsigned (* (struct dl-info))) - :extern "dladdr")) + (filename c-string) + (base unsigned) + (symbol c-string) + (symbol-address unsigned))) + (dladdr (function unsigned unsigned (* (struct dl-info))) + :extern "dladdr")) (let ((err (alien-funcall dladdr addr (addr info)))) - (if (zerop err) - nil - (slot info 'symbol)))) + (if (zerop err) + nil + (slot info 'symbol)))) ;; FIXME: Even in the absence of dladdr we could search the ;; static foreign symbols (and *linkage-info*, for that matter). )) @@ -151,9 +157,10 @@ if the symbol isn't found." (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)