X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fforeign.lisp;h=247d09a1d62cba16eb3229c509baec534f319575;hb=51d5b9c8ca4e5e3d302e8ebf49042ac49b92c4e4;hp=5cc3cd38a8fec1915fb543661048a160d33230a0;hpb=1f7bb609de31bba1a85817496ecbde52a07edf14;p=sbcl.git diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp index 5cc3cd3..247d09a 100644 --- a/src/code/foreign.lisp +++ b/src/code/foreign.lisp @@ -11,6 +11,16 @@ (in-package "SB!IMPL") +#!-(or elf mach-o) +(error "Not an ELF or Mach-O platform?") + +(defun extern-alien-name (name) + (handler-case + #!+elf (coerce name 'base-string) + #!+mach-o (concatenate 'base-string "_" name) + (error () + (error "invalid external alien name: ~S" name)))) + ;;; *STATIC-FOREIGN-SYMBOLS* are static as opposed to "dynamic" (not ;;; as opposed to C's "extern"). The table contains symbols known at ;;; the time that the program was built, but not symbols defined in @@ -18,69 +28,91 @@ (declaim (type hash-table *static-foreign-symbols*)) (defvar *static-foreign-symbols* (make-hash-table :test 'equal)) +(declaim + (ftype (sfunction (string hash-table) (or integer null)) find-foreign-symbol-in-table)) (defun find-foreign-symbol-in-table (name table) - (some (lambda (prefix) - (gethash (concatenate 'string prefix name) table)) - #("" "ldso_stub__"))) + (let ((extern (extern-alien-name name))) + (values + (or (gethash 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 +symbol in the linkage table, and never returns an address in the linkage-table." + (or (find-foreign-symbol-in-table name *static-foreign-symbols*) + (find-dynamic-foreign-symbol-address name))) + +(defun foreign-symbol-address (name &optional datap) + "Returns the address of the foreign symbol NAME. DATAP must be true if the +symbol designates a variable (used only on linkage-table platforms). Returns a +secondary value that is true if DATAP was true and the symbol is a dynamic +foreign symbol. -(defun foreign-symbol-address-as-integer-or-nil (name &optional datap) +On linkage-table ports the returned address is always static: either direct +address of a static symbol, or the linkage-table address of a dynamic one. +Dynamic symbols are entered into the linkage-table if they aren't there already. + +On non-linkage-table ports signals an error if the symbol isn't found." (declare (ignorable datap)) - (or (find-foreign-symbol-in-table name *static-foreign-symbols*) - #!+os-provides-dlopen - (progn - #-sb-xc-host - (values #!-linkage-table - (get-dynamic-foreign-symbol-address name) - #!+linkage-table - (ensure-foreign-symbol-linkage name datap) - t)))) - -(defun foreign-symbol-address-as-integer (name &optional datap) - (or (foreign-symbol-address-as-integer-or-nil name datap) - (error "Unknown foreign symbol: ~S" name))) - -(defun foreign-symbol-address (symbol &optional 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)))) + +(defun foreign-symbol-sap (symbol &optional datap) + "Returns a SAP corresponding to the foreign symbol. DATAP must be true if the +symbol designates a variable (used only on linkage-table platforms). May enter +the symbol into the linkage-table. On non-linkage-table ports signals an error +if the symbol isn't found." (declare (ignorable datap)) - (let ((name (sb!vm:extern-alien-name symbol))) - #!-linkage-table - (int-sap (foreign-symbol-address-as-integer name)) - #!+linkage-table - (multiple-value-bind (addr sharedp) - (foreign-symbol-address-as-integer name datap) - #+sb-xc-host - (aver (not sharedp)) - ;; If the address is from linkage-table and refers to data - ;; we need to do a bit of juggling. - (if (and sharedp datap) - ;; FIXME: 64bit badness here - (int-sap (sap-ref-32 (int-sap addr) 0)) - (int-sap addr))))) + #!-linkage-table + (int-sap (foreign-symbol-address symbol)) + #!+linkage-table + (multiple-value-bind (addr sharedp) + (foreign-symbol-address symbol datap) + #+sb-xc-host + (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. + (if (and sharedp datap) + (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 - (linkage-table-reinit)) + (update-linkage-table)) ;;; Cleanups before saving a core #-sb-xc-host (defun foreign-deinit () - ;; KLUDGE: Giving this warning only when non-static foreign symbols - ;; are used would be much nicer, but actually pretty hard: we can - ;; get dynamic symbols thru the runtime as well, so cheking the - ;; list of *shared-objects* is not enough. Eugh & blech. #!+(and os-provides-dlopen (not linkage-table)) - (warn "~@") + (when (dynamic-foreign-symbols-p) + (warn "~@" (list-dynamic-foreign-symbols))) #!+os-provides-dlopen (close-shared-objects)) -(defun foreign-symbol-in-address (sap) +(defun sap-foreign-symbol (sap) (declare (ignorable sap)) #-sb-xc-host (let ((addr (sap-int sap))) @@ -94,7 +126,7 @@ (when (<= table-addr addr (+ table-addr sb!vm:linkage-table-entry-size)) - (return-from foreign-symbol-in-address name)))) + (return-from sap-foreign-symbol name)))) *linkage-info*)) #!+os-provides-dladdr (with-alien ((info (struct dl-info @@ -120,7 +152,7 @@ (dolist (symbol *!initial-foreign-symbols*) (setf (gethash (car symbol) *static-foreign-symbols*) (cdr symbol))) #!+os-provides-dlopen - (setf *runtime-dlhandle* (dlopen-or-lose nil) + (setf *runtime-dlhandle* (dlopen-or-lose) *shared-objects* nil)) #!-os-provides-dlopen