X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=11de3e3c729586e8db3d74eb0e9ed37bbfee3992;hb=755ff8f53315160fcb2d92207dfe24ae7ed4d4c6;hp=f7eae58c04d96e1f02bb4d990d3d89f64f52bd89;hpb=0af84c9c90b1277be6863df8f28f1f0e5512323c;p=sbcl.git diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp index f7eae58..11de3e3 100644 --- a/src/code/target-load.lisp +++ b/src/code/target-load.lisp @@ -11,27 +11,25 @@ ;;;; provided with absolutely no warranty. See the COPYING and CREDITS ;;;; files for more information. -(in-package "SB!IMPL") +(in-package "SB!FASL") (defvar *load-source-default-type* "lisp" #!+sb-doc "The source file types which LOAD looks for by default.") +(declaim (type (or pathname null) *load-truename* *load-pathname*)) (defvar *load-truename* nil #!+sb-doc "the TRUENAME of the file that LOAD is currently loading") - (defvar *load-pathname* nil #!+sb-doc "the defaulted pathname that LOAD is currently loading") - -(declaim (type (or pathname null) *load-truename* *load-pathname*)) ;;;; LOAD-AS-SOURCE ;;; 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*) @@ -40,11 +38,12 @@ (let ((results (multiple-value-list (eval sexpr)))) (load-fresh-line) (format t "~{~S~^, ~}~%" results)) - (eval sexpr)))) + (eval sexpr)))) ;;;; LOAD itself -;;; a helper function for LOAD: Load the stuff in a file when we have the name. +;;; 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)) @@ -73,17 +72,16 @@ (t (let ((first-line (with-open-file (stream truename :direction :input) (read-line stream nil))) - (fhs sb!c:*fasl-header-string-start-string*)) + (fhsss *fasl-header-string-start-string*)) (cond ((and first-line (>= (length (the simple-string first-line)) - (length fhs)) - (string= first-line fhs :end1 (length fhs))) + (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) - sb!c:*backend-fasl-file-type*) + (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 @@ -99,7 +97,7 @@ ;;; 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 @@ -109,7 +107,7 @@ (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 sb!c:*backend-fasl-file-type*) + (try-default-type pathname *fasl-file-type*) (cond ((and obj-tn src-tn @@ -142,8 +140,6 @@ ;;; take effect. If the compiler is loaded, we make the ;;; compiler-policy local to LOAD by binding it to itself. ;;; -;;; FIXME: ANSI specifies a &KEY :EXTERNAL-FORMAT argument. -;;; ;;; FIXME: Daniel Barlow's ilsb.tar ILISP-for-SBCL patches contain an ;;; implementation of "DEFUN SOURCE-FILE" which claims, in a comment, that CMU ;;; CL does not correctly record source file information when LOADing a @@ -152,23 +148,13 @@ &key (verbose *load-verbose*) (print *load-print*) - (if-does-not-exist t)) + (if-does-not-exist t) + (external-format :default)) #!+sb-doc - "Loads the file given by FILESPEC into the Lisp environment, returning - T on success. These options are defined: - - :IF-DOES-NOT-EXIST - What should we do if the file can't be located? If true (the - default), signal an error. If NIL, simply return NIL. - - :VERBOSE - If true, print a line describing each file loaded. The default - is *LOAD-VERBOSE*. - - :PRINT - If true, print information about loaded values. When loading the - source, the result of evaluating each top-level form is printed. - The default is *LOAD-PRINT*." + "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 @@ -198,31 +184,20 @@ '(unsigned-byte 8))) (load-as-fasl filespec verbose print) (load-as-source filespec verbose print)) - (let ((pn (merge-pathnames (pathname filespec) - *default-pathname-defaults*))) - (if (wild-pathname-p pn) - (let ((files (directory pn))) - #!+high-security - (when (null files) - (error 'file-error :pathname filespec)) - (dolist (file files t) - (internal-load pn - file - internal-if-does-not-exist - verbose - print))) - (let ((tn (probe-file pn))) - (if (or tn (pathname-type pn)) - (internal-load pn - tn - internal-if-does-not-exist - verbose - print) - (internal-load-default-type - pn - 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))))))) ;;; 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. @@ -231,22 +206,27 @@ (declare (fixnum box-num code-length)) (with-fop-stack t (let ((code (%primitive sb!c:allocate-code-object box-num code-length)) - (index (+ #!-gengc sb!vm:code-trace-table-offset-slot - #!+gengc sb!vm:code-debug-info-slot - box-num))) + (index (+ sb!vm:code-trace-table-offset-slot box-num))) (declare (type index index)) - #!-gengc (setf (%code-debug-info code) (pop-stack)) + (setf (%code-debug-info code) (pop-stack)) (dotimes (i box-num) (declare (fixnum i)) (setf (code-header-ref code (decf index)) (pop-stack))) (sb!sys:without-gcing - (read-n-bytes *fasl-file* + (read-n-bytes *fasl-input-stream* (code-instructions code) 0 - #!-gengc code-length - #!+gengc (* code-length sb!vm:word-bytes))) + code-length)) code))) +;;; Moving native code during a GC or purify is not so trivial on the +;;; x86 port. +;;; +;;; Our strategy for allowing the loading of x86 native code into the +;;; dynamic heap requires that the addresses of fixups be saved for +;;; 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. #!+x86 (defun load-code (box-num code-length) (declare (fixnum box-num code-length)) @@ -257,29 +237,15 @@ (push (pop-stack) stuff)) (let* ((dbi (car (last stuff))) ; debug-info (tto (first stuff)) ; trace-table-offset - (load-to-dynamic-space - (or *enable-dynamic-space-code* - ;; definitely byte-compiled code? - (and *load-byte-compiled-code-to-dynamic-space* - (sb!c::debug-info-p dbi) - (not (sb!c::compiled-debug-info-p dbi))) - ;; or a x86 top level form? - (and *load-x86-tlf-to-dynamic-space* - (sb!c::compiled-debug-info-p dbi) - (string= (sb!c::compiled-debug-info-name dbi) - "top-level form")))) ) + ;; 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)) (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) @@ -312,7 +278,10 @@ (declare (fixnum i)) (setf (code-header-ref code (decf index)) (pop stuff))) (sb!sys:without-gcing - (read-n-bytes *fasl-file* (code-instructions code) 0 code-length)) + (read-n-bytes *fasl-input-stream* + (code-instructions code) + 0 + code-length)) code))))) ;;;; linkage fixups @@ -328,14 +297,12 @@ (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 (gethash foreign-symbol *static-foreign-symbols*) - (gethash (concatenate 'simple-string - #!+linux "ldso_stub__" - #!+openbsd "_" - #!+freebsd "ldso_stub__" - foreign-symbol) - *static-foreign-symbols*) + (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)))