projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.7.46:
[sbcl.git]
/
src
/
code
/
target-load.lisp
diff --git
a/src/code/target-load.lisp
b/src/code/target-load.lisp
index
79c2e89
..
2e687c5
100644
(file)
--- a/
src/code/target-load.lisp
+++ b/
src/code/target-load.lisp
@@
-42,7
+42,7
@@
\f
;;;; LOAD itself
\f
;;;; LOAD itself
-(define-condition fasl-header-missing (sb!ext::invalid-fasl)
+(define-condition fasl-header-missing (invalid-fasl)
((fhsss :reader invalid-fasl-fhsss :initarg :fhsss))
(:report
(lambda (condition stream)
((fhsss :reader invalid-fasl-fhsss :initarg :fhsss))
(:report
(lambda (condition stream)
@@
-298,9
+298,12
@@
;;; SB!SYS:GET-DYNAMIC-FOREIGN-SYMBOL-ADDRESS is in foreign.lisp, on
;;; platforms that have dynamic loading
;;; SB!SYS:GET-DYNAMIC-FOREIGN-SYMBOL-ADDRESS is in foreign.lisp, on
;;; platforms that have dynamic loading
+(defun foreign-symbol-address-as-integer-or-nil (foreign-symbol)
+ (or (find-foreign-symbol-in-table foreign-symbol *static-foreign-symbols*)
+ (sb!sys:get-dynamic-foreign-symbol-address foreign-symbol)))
+
(defun foreign-symbol-address-as-integer (foreign-symbol)
(defun foreign-symbol-address-as-integer (foreign-symbol)
- (or (find-foreign-symbol-in-table foreign-symbol *static-foreign-symbols*)
- (sb!sys:get-dynamic-foreign-symbol-address foreign-symbol)
+ (or (foreign-symbol-address-as-integer-or-nil foreign-symbol)
(error "unknown foreign symbol: ~S" foreign-symbol)))
(defun foreign-symbol-address (symbol)
(error "unknown foreign symbol: ~S" foreign-symbol)))
(defun foreign-symbol-address (symbol)