;;; Load a text file.
(defun load-as-source (stream verbose print)
- (do-load-verbose stream verbose)
+ (maybe-announce-load stream verbose)
(do ((sexpr (read stream nil *eof-object*)
(read stream nil *eof-object*)))
((eq sexpr *eof-object*)
\f
;;;; LOAD itself
-;;; a helper function for LOAD: Load the stuff in a file when we have the name.
+(define-condition fasl-header-missing (invalid-fasl)
+ ((fhsss :reader invalid-fasl-fhsss :initarg :fhsss))
+ (:report
+ (lambda (condition stream)
+ (format stream "~@<File ~S has a fasl file type, but no fasl header:~%~
+ Expected ~S, but got ~S.~:@>"
+ (invalid-fasl-stream condition)
+ (invalid-fasl-expected condition)
+ (invalid-fasl-fhsss condition)))))
+
+;;; a helper function for LOAD: Load the stuff in a file when we have
+;;; the name.
(defun internal-load (pathname truename if-does-not-exist verbose print
&optional contents)
(declare (type (member nil :error) if-does-not-exist))
:binary))
(t
(when (string= (pathname-type truename) *fasl-file-type*)
- (error "File has a fasl file type, but no fasl file header:~% ~S"
- (namestring truename)))
+ (error 'fasl-header-missing
+ :stream (namestring truename)
+ :fhsss first-line
+ :expected fhsss))
(internal-load pathname truename if-does-not-exist verbose print
:source))))))))
;;; possible types are ".lisp" and ".cl", and both "foo.lisp" and
;;; "foo.cl" exist?)
(defun try-default-type (pathname type)
- (let ((pn (make-pathname :type type :defaults pathname)))
+ (let ((pn (translate-logical-pathname (make-pathname :type type :defaults pathname))))
(values pn (probe-file pn))))
;;; a helper function for LOAD: Handle the case of INTERNAL-LOAD where
#!+sb-doc
"Load the file given by FILESPEC into the Lisp environment, returning
T on success."
- (unless (eq external-format :default)
- (error "Non-:DEFAULT EXTERNAL-FORMAT values are not supported."))
-
+ (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
'(unsigned-byte 8)))
(load-as-fasl filespec verbose print)
(load-as-source filespec verbose print))
- (let (;; FIXME: MERGE-PATHNAMES doesn't work here for
- ;; FILESPEC="TEST:Load-Test" and
- ;; (LOGICAL-PATHNAME-TRANSLATIONS "TEST")
- ;; = (("**;*.*.*" "/foo/bar/**/*.*")).
- ;; Physicalizing the pathname before merging
- ;; is a workaround, but the ANSI spec talks about
- ;; MERGE-PATHNAMES accepting (and returning)
- ;; logical pathnames, so a true fix would probably
- ;; include fixing MERGE-PATHNAMES, then probably
- ;; revisiting this code.
- (ppn (physicalize-pathname (pathname filespec))))
- (if (wild-pathname-p ppn)
- (let ((files (directory ppn)))
- #!+high-security
- (when (null files)
- (error 'file-error :pathname filespec))
- (dolist (file files t)
- (internal-load ppn
- file
- internal-if-does-not-exist
- verbose
- print)))
- (let ((tn (probe-file ppn)))
- (if (or tn (pathname-type ppn))
- (internal-load ppn
- tn
- internal-if-does-not-exist
- verbose
- print)
- (internal-load-default-type
- ppn
- internal-if-does-not-exist
- verbose
- print)))))))))
+ (let* ((pathname (pathname filespec))
+ (physical-pathname (translate-logical-pathname pathname))
+ (probed-file (probe-file physical-pathname)))
+ (if (or probed-file
+ (pathname-type physical-pathname))
+ (internal-load physical-pathname
+ probed-file
+ internal-if-does-not-exist
+ verbose
+ print)
+ (internal-load-default-type pathname
+ internal-if-does-not-exist
+ verbose
+ print)))))))
\f
;;; Load a code object. BOX-NUM objects are popped off the stack for
;;; the boxed storage section, then SIZE bytes of code are read in.
;;; all these code objects. After a purify these fixups can be
;;; dropped. In CMU CL, this policy was enabled with
;;; *ENABLE-DYNAMIC-SPACE-CODE*; in SBCL it's always used.
-;;;
-;;; A little analysis of the header information is used to determine
-;;; if a code object is byte compiled, or native code.
#!+x86
(defun load-code (box-num code-length)
(declare (fixnum box-num code-length))
(declare (fixnum i))
(push (pop-stack) stuff))
(let* ((dbi (car (last stuff))) ; debug-info
- (tto (first stuff)) ; trace-table-offset
- ;; Old CMU CL code had maybe-we-shouldn't-load-to-dyn-space
- ;; pussyfooting around here, apparently dating back to the
- ;; stone age of the X86 port, but in SBCL we always load
- ;; to dynamic space. FIXME: So now this "variable" could go
- ;; away entirely.
- (load-to-dynamic-space t))
+ (tto (first stuff))) ; trace-table-offset
(setq stuff (nreverse stuff))
- ;; Check that tto is always a list for byte-compiled
- ;; code. Could be used an alternate check.
- (when (and (typep tto 'list)
- (not (and (sb!c::debug-info-p dbi)
- (not (sb!c::compiled-debug-info-p dbi)))))
- ;; FIXME: What is this for?
- (format t "* tto list on non-bc code: ~S~% ~S ~S~%"
- stuff dbi tto))
-
;; FIXME: *LOAD-CODE-VERBOSE* should probably be #!+SB-SHOW.
(when *load-code-verbose*
(format t "stuff: ~S~%" stuff)
(sb!c::debug-info-p dbi)
(sb!c::compiled-debug-info-name dbi)
tto)
- (if load-to-dynamic-space
- (format t " loading to the dynamic space~%")
- (format t " loading to the static space~%")))
+ (format t " loading to the dynamic space~%"))
- (let ((code
- (if load-to-dynamic-space
- (%primitive sb!c:allocate-dynamic-code-object
- box-num
- code-length)
- (%primitive sb!c:allocate-code-object
- box-num
- code-length)))
+ (let ((code (%primitive sb!c:allocate-code-object
+ box-num
+ code-length))
(index (+ sb!vm:code-trace-table-offset-slot box-num)))
(declare (type index index))
(when *load-code-verbose*
(dolist (symbol *!initial-foreign-symbols*)
(setf (gethash (car symbol) *static-foreign-symbols*) (cdr symbol))))
-(declaim (ftype (function (string) sb!vm:word)
+(declaim (ftype (function (string) (unsigned-byte #.sb!vm:n-machine-word-bits))
foreign-symbol-address-as-integer))
-;;; sb!sys:get-dynamic-foreign-symbol-address is in foreign.lisp, on
+;;; 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)
- (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)