projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.13.49
[sbcl.git]
/
src
/
code
/
target-load.lisp
diff --git
a/src/code/target-load.lisp
b/src/code/target-load.lisp
index
56e0441
..
560ba0e
100644
(file)
--- a/
src/code/target-load.lisp
+++ b/
src/code/target-load.lisp
@@
-165,7
+165,7
@@
#!+sb-doc
"Load the file given by FILESPEC into the Lisp environment, returning
T on success."
#!+sb-doc
"Load the file given by FILESPEC into the Lisp environment, returning
T on success."
-
+ (declare (ignore external-format))
(let ((*load-depth* (1+ *load-depth*))
;; KLUDGE: I can't find in the ANSI spec where it says that
;; DECLAIM/PROCLAIM of optimization policy should have file
(let ((*load-depth* (1+ *load-depth*))
;; KLUDGE: I can't find in the ANSI spec where it says that
;; DECLAIM/PROCLAIM of optimization policy should have file
@@
-261,7
+261,7
@@
tto)
(format t " loading to the dynamic space~%"))
tto)
(format t " loading to the dynamic space~%"))
- (let ((code (%primitive sb!c:allocate-dynamic-code-object
+ (let ((code (%primitive sb!c:allocate-code-object
box-num
code-length))
(index (+ sb!vm:code-trace-table-offset-slot box-num)))
box-num
code-length))
(index (+ sb!vm:code-trace-table-offset-slot box-num)))
@@
-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)