(defun load-as-source (stream verbose print)
(maybe-announce-load stream verbose)
(do ((sexpr (read stream nil *eof-object*)
- (read stream nil *eof-object*)))
+ (read stream nil *eof-object*)))
((eq sexpr *eof-object*)
t)
(if print
- (let ((results (multiple-value-list (eval sexpr))))
- (load-fresh-line)
- (format t "~{~S~^, ~}~%" results))
+ (let ((results (multiple-value-list (eval sexpr))))
+ (load-fresh-line)
+ (format t "~{~S~^, ~}~%" results))
(eval sexpr))))
\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.
+;;;
+;;; FIXME: with the addition of the EXTERNAL-FORMAT argument, this
+;;; interface has become truly sucky.
(defun internal-load (pathname truename if-does-not-exist verbose print
- &optional contents)
+ &optional contents external-format)
(declare (type (member nil :error) if-does-not-exist))
(unless truename
(if if-does-not-exist
- (error 'simple-file-error
- :pathname pathname
- :format-control "~S does not exist."
- :format-arguments (list (namestring pathname)))
- (return-from internal-load nil)))
+ (error 'simple-file-error
+ :pathname pathname
+ :format-control "~S does not exist."
+ :format-arguments (list (namestring pathname)))
+ (return-from internal-load nil)))
(let ((*load-truename* truename)
- (*load-pathname* pathname))
+ (*load-pathname* (merge-pathnames pathname)))
(case contents
(:source
(with-open-file (stream truename
- :direction :input
- :if-does-not-exist if-does-not-exist)
- (load-as-source stream verbose print)))
+ :direction :input
+ :if-does-not-exist if-does-not-exist
+ :external-format external-format)
+ (load-as-source stream verbose print)))
(:binary
(with-open-file (stream truename
- :direction :input
- :if-does-not-exist if-does-not-exist
- :element-type '(unsigned-byte 8))
- (load-as-fasl stream verbose print)))
+ :direction :input
+ :if-does-not-exist if-does-not-exist
+ :element-type '(unsigned-byte 8))
+ (load-as-fasl stream verbose print)))
(t
- (let ((first-line (with-open-file (stream truename :direction :input)
- (read-line stream nil)))
- (fhsss *fasl-header-string-start-string*))
- (cond
- ((and first-line
- (>= (length (the simple-string first-line))
- (length fhsss))
- (string= first-line fhsss :end1 (length fhsss)))
- (internal-load pathname truename if-does-not-exist verbose print
- :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)))
- (internal-load pathname truename if-does-not-exist verbose print
- :source))))))))
+ (let* ((fhsss *fasl-header-string-start-string*)
+ (first-line (make-array (length fhsss)
+ :element-type '(unsigned-byte 8)))
+ (read-length
+ (with-open-file (stream truename
+ :direction :input
+ :element-type '(unsigned-byte 8))
+ (read-sequence first-line stream))))
+ (cond
+ ((and (= read-length (length fhsss))
+ (do ((i 0 (1+ i)))
+ ((= i read-length) t)
+ (when (/= (char-code (aref fhsss i)) (aref first-line i))
+ (return))))
+ (internal-load pathname truename if-does-not-exist verbose print
+ :binary))
+ (t
+ (when (string= (pathname-type truename) *fasl-file-type*)
+ (error 'fasl-header-missing
+ :stream (namestring truename)
+ :fhsss first-line
+ :expected fhsss))
+ (internal-load pathname truename if-does-not-exist verbose print
+ :source external-format))))))))
;;; a helper function for INTERNAL-LOAD-DEFAULT-TYPE: Try the default
;;; file type TYPE and return (VALUES PATHNAME TRUENAME) for a match,
;;; 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
;;; the file does not exist.
-(defun internal-load-default-type (pathname if-does-not-exist verbose print)
+(defun internal-load-default-type
+ (pathname if-does-not-exist verbose print external-format)
(declare (type (member nil :error) if-does-not-exist))
(multiple-value-bind (src-pn src-tn)
(try-default-type pathname *load-source-default-type*)
(multiple-value-bind (obj-pn obj-tn)
- (try-default-type pathname *fasl-file-type*)
+ (try-default-type pathname *fasl-file-type*)
(cond
((and obj-tn
- src-tn
- (> (file-write-date src-tn) (file-write-date obj-tn)))
- (restart-case
- (error "The object file ~A is~@
- older than the presumed source:~% ~A."
- (namestring obj-tn)
- (namestring src-tn))
- ;; FIXME: In CMU CL one of these was a CONTINUE case.
- ;; There's not one now. I don't remember how restart-case
- ;; works very well, make sure that it doesn't do anything
- ;; weird when we don't specify the CONTINUE case.
- (source () :report "load source file"
- (internal-load src-pn src-tn if-does-not-exist verbose print
- :source))
- (object () :report "load object file"
- (internal-load src-pn obj-tn if-does-not-exist verbose print
- :binary))))
+ src-tn
+ (> (file-write-date src-tn) (file-write-date obj-tn)))
+ (restart-case
+ (error "The object file ~A is~@
+ older than the presumed source:~% ~A."
+ (namestring obj-tn)
+ (namestring src-tn))
+ (source () :report "load source file"
+ (internal-load src-pn src-tn if-does-not-exist verbose print
+ :source external-format))
+ (object () :report "load object file"
+ (internal-load src-pn obj-tn if-does-not-exist verbose print
+ :binary))))
(obj-tn
- (internal-load obj-pn obj-tn if-does-not-exist verbose print :binary))
+ (internal-load obj-pn obj-tn if-does-not-exist verbose print :binary))
(src-pn
- (internal-load src-pn src-tn if-does-not-exist verbose print :source))
+ (internal-load src-pn src-tn if-does-not-exist
+ verbose print :source external-format))
(t
- (internal-load pathname nil if-does-not-exist verbose print nil))))))
+ (internal-load pathname nil if-does-not-exist
+ verbose print nil external-format))))))
;;; This function mainly sets up special bindings and then calls
;;; sub-functions. We conditionally bind the switches with PROGV so
;;; CL does not correctly record source file information when LOADing a
;;; non-compiled file. Check whether this bug exists in SBCL and fix it if so.
(defun load (filespec
- &key
- (verbose *load-verbose*)
- (print *load-print*)
- (if-does-not-exist t)
- (external-format :default))
+ &key
+ (verbose *load-verbose*)
+ (print *load-print*)
+ (if-does-not-exist t)
+ (external-format :default))
#!+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."))
-
(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
- ;; scope. CMU CL did this, and it seems reasonable, but it
- ;; might not be right; after all, things like (PROCLAIM '(TYPE
- ;; ..)) don't have file scope, and I can't find anything under
- ;; PROCLAIM or COMPILE-FILE or LOAD or OPTIMIZE which
- ;; justifies this behavior. Hmm. -- WHN 2001-04-06
- (sb!c::*policy* sb!c::*policy*)
- ;; The ANSI spec for LOAD says "LOAD binds *READTABLE* and
- ;; *PACKAGE* to the values they held before loading the file."
- (*package* (sane-package))
- (*readtable* *readtable*)
- ;; The old CMU CL LOAD function used an IF-DOES-NOT-EXIST
- ;; argument of (MEMBER :ERROR NIL) type. ANSI constrains us to
- ;; accept a generalized boolean argument value for this
- ;; externally-visible function, but the internal functions
- ;; still use the old convention.
- (internal-if-does-not-exist (if if-does-not-exist :error nil)))
+ ;; KLUDGE: I can't find in the ANSI spec where it says that
+ ;; DECLAIM/PROCLAIM of optimization policy should have file
+ ;; scope. CMU CL did this, and it seems reasonable, but it
+ ;; might not be right; after all, things like (PROCLAIM '(TYPE
+ ;; ..)) don't have file scope, and I can't find anything under
+ ;; PROCLAIM or COMPILE-FILE or LOAD or OPTIMIZE which
+ ;; justifies this behavior. Hmm. -- WHN 2001-04-06
+ (sb!c::*policy* sb!c::*policy*)
+ ;; The ANSI spec for LOAD says "LOAD binds *READTABLE* and
+ ;; *PACKAGE* to the values they held before loading the file."
+ (*package* (sane-package))
+ (*readtable* *readtable*)
+ ;; The old CMU CL LOAD function used an IF-DOES-NOT-EXIST
+ ;; argument of (MEMBER :ERROR NIL) type. ANSI constrains us to
+ ;; accept a generalized boolean argument value for this
+ ;; externally-visible function, but the internal functions
+ ;; still use the old convention.
+ (internal-if-does-not-exist (if if-does-not-exist :error nil)))
;; FIXME: This VALUES wrapper is inherited from CMU CL. Once SBCL
;; gets function return type checking right, we can achieve a
;; similar effect better by adding FTYPE declarations.
(values
(if (streamp filespec)
- (if (or (equal (stream-element-type filespec)
- '(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)))
- (unix-name (unix-namestring ppn t)))
- (if (or unix-name (pathname-type ppn))
- (internal-load ppn
- unix-name
- internal-if-does-not-exist
- verbose
- print)
- (internal-load-default-type
- ppn
- internal-if-does-not-exist
- verbose
- print)))))))
+ (if (or (equal (stream-element-type filespec)
+ '(unsigned-byte 8)))
+ (load-as-fasl filespec verbose print)
+ (load-as-source filespec 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 nil external-format)
+ (internal-load-default-type
+ pathname internal-if-does-not-exist
+ verbose print external-format)))))))
\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.
(declare (fixnum box-num code-length))
(with-fop-stack t
(let ((code (%primitive sb!c:allocate-code-object box-num code-length))
- (index (+ sb!vm:code-trace-table-offset-slot box-num)))
+ (index (+ sb!vm:code-trace-table-offset-slot box-num)))
(declare (type index index))
(setf (%code-debug-info code) (pop-stack))
(dotimes (i box-num)
- (declare (fixnum i))
- (setf (code-header-ref code (decf index)) (pop-stack)))
+ (declare (fixnum i))
+ (setf (code-header-ref code (decf index)) (pop-stack)))
(sb!sys:without-gcing
- (read-n-bytes *fasl-input-stream*
- (code-instructions code)
- 0
- code-length))
+ (read-n-bytes *fasl-input-stream*
+ (code-instructions code)
+ 0
+ code-length))
code)))
;;; Moving native code during a GC or purify is not so trivial on the
(with-fop-stack t
(let ((stuff (list (pop-stack))))
(dotimes (i box-num)
- (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))
+ (declare (fixnum i))
+ (push (pop-stack) stuff))
+ (let* ((dbi (car (last stuff))) ; debug-info
+ (tto (first stuff))) ; trace-table-offset
- (setq stuff (nreverse stuff))
+ (setq stuff (nreverse stuff))
- ;; FIXME: *LOAD-CODE-VERBOSE* should probably be #!+SB-SHOW.
- (when *load-code-verbose*
- (format t "stuff: ~S~%" stuff)
- (format t
- " : ~S ~S ~S ~S~%"
- (sb!c::compiled-debug-info-p dbi)
- (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~%")))
+ ;; FIXME: *LOAD-CODE-VERBOSE* should probably be #!+SB-SHOW.
+ (when *load-code-verbose*
+ (format t "stuff: ~S~%" stuff)
+ (format t
+ " : ~S ~S ~S ~S~%"
+ (sb!c::compiled-debug-info-p dbi)
+ (sb!c::debug-info-p dbi)
+ (sb!c::compiled-debug-info-name dbi)
+ tto)
+ (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)))
- (index (+ sb!vm:code-trace-table-offset-slot box-num)))
- (declare (type index index))
- (when *load-code-verbose*
- (format t
- " obj addr=~X~%"
- (sb!kernel::get-lisp-obj-address code)))
- (setf (%code-debug-info code) (pop stuff))
- (dotimes (i box-num)
- (declare (fixnum i))
- (setf (code-header-ref code (decf index)) (pop stuff)))
- (sb!sys:without-gcing
- (read-n-bytes *fasl-input-stream*
- (code-instructions code)
- 0
- code-length))
- code)))))
+ (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*
+ (format t
+ " obj addr=~X~%"
+ (sb!kernel::get-lisp-obj-address code)))
+ (setf (%code-debug-info code) (pop stuff))
+ (dotimes (i box-num)
+ (declare (fixnum i))
+ (setf (code-header-ref code (decf index)) (pop stuff)))
+ (sb!sys:without-gcing
+ (read-n-bytes *fasl-input-stream*
+ (code-instructions code)
+ 0
+ code-length))
+ code)))))
\f
;;;; linkage fixups
-;;; how we learn about assembler routines and foreign symbols at startup
+;;; how we learn about assembler routines at startup
(defvar *!initial-assembler-routines*)
-(defvar *!initial-foreign-symbols*)
+
(defun !loader-cold-init ()
+ (/show0 "/!loader-cold-init")
(dolist (routine *!initial-assembler-routines*)
- (setf (gethash (car routine) *assembler-routines*) (cdr routine)))
- (dolist (symbol *!initial-foreign-symbols*)
- (setf (gethash (car symbol) *static-foreign-symbols*) (cdr symbol))))
-
-(declaim (ftype (function (string) sb!vm:word)
- foreign-symbol-address-as-integer))
-
-
-;;; SB!SYS:GET-DYNAMIC-FOREIGN-SYMBOL-ADDRESS is in foreign.lisp, on
-;;; platforms that have dynamic loading
-(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)
- (error "unknown foreign symbol: ~S" foreign-symbol)))
-
-(defun foreign-symbol-address (symbol)
- (int-sap (foreign-symbol-address-as-integer
- (sb!vm:extern-alien-name symbol))))
+ (setf (gethash (car routine) *assembler-routines*) (cdr routine))))
projects / sbcl.git / blobdiff