projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run-program: proper handling of :if-input-does-not-exist NIL.
[sbcl.git]
/
src
/
code
/
foreign.lisp
diff --git
a/src/code/foreign.lisp
b/src/code/foreign.lisp
index
fdf3275
..
a735e76
100644
(file)
--- a/
src/code/foreign.lisp
+++ b/
src/code/foreign.lisp
@@
-16,8
+16,8
@@
(defun extern-alien-name (name)
(handler-case
(defun extern-alien-name (name)
(handler-case
- #!+elf (coerce name 'base-string)
- #!+(or mach-o win32) (concatenate 'base-string "_" name)
+ #!-win32 (coerce name 'base-string)
+ #!+win32 (concatenate 'base-string "_" name)
(error ()
(error "invalid external alien name: ~S" name))))
(error ()
(error "invalid external alien name: ~S" name))))
@@
-34,10
+34,7
@@
(let ((extern (extern-alien-name name)))
(values
(or (gethash extern table)
(let ((extern (extern-alien-name name)))
(values
(or (gethash 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)))))
+ (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
(defun find-foreign-symbol-address (name)
"Returns the address of the foreign symbol NAME, or NIL. Does not enter the
@@
-107,7
+104,7
@@
if the symbol isn't found."
;;; Cleanups before saving a core
#-sb-xc-host
(defun foreign-deinit ()
;;; 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 ~
(when (dynamic-foreign-symbols-p)
(warn "~@<Saving cores with alien definitions referring to non-static ~
foreign symbols is unsupported on this platform: references to ~
@@
-131,9
+128,8
@@
if the symbol isn't found."
sb!vm:linkage-table-space-end)
(dohash ((name-and-datap info) *linkage-info* :locked t)
(let ((table-addr (linkage-info-address info)))
sb!vm:linkage-table-space-end)
(dohash ((name-and-datap info) *linkage-info* :locked t)
(let ((table-addr (linkage-info-address info)))
- (when (<= table-addr
- addr
- (+ table-addr sb!vm:linkage-table-entry-size))
+ (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
(return-from sap-foreign-symbol (car name-and-datap))))))
#!+os-provides-dladdr
(with-alien ((info (struct dl-info
@@
-143,7
+139,10
@@
if the symbol isn't found."
(symbol-address unsigned)))
(dladdr (function unsigned unsigned (* (struct dl-info)))
:extern "dladdr"))
(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))))
(if (zerop err)
nil
(slot info 'symbol))))