X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=28109303b804f29204f61fae2fa67fb1b81acc6d;hb=f1407e424f1063203af07d2e61ceef58515a4797;hp=7810634cf2f5d8e571763e0b9b6192c7497973db;hpb=bee53328c93be3433477821131ab805557476c8b;p=sbcl.git diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp index 7810634..2810930 100644 --- a/src/code/target-load.lisp +++ b/src/code/target-load.lisp @@ -29,7 +29,7 @@ ;;; 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*) @@ -42,7 +42,8 @@ ;;;; 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)) @@ -96,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 @@ -152,8 +153,6 @@ #!+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 @@ -183,40 +182,20 @@ '(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))))))) ;;; 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. @@ -225,11 +204,9 @@ (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))) @@ -237,8 +214,7 @@ (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 @@ -249,9 +225,6 @@ ;;; 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)) @@ -261,25 +234,10 @@ (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) @@ -289,18 +247,11 @@ (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-dynamic-code-object + box-num + code-length)) (index (+ sb!vm:code-trace-table-offset-slot box-num))) (declare (type index index)) (when *load-code-verbose* @@ -333,7 +284,7 @@ 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 (foreign-symbol) (or (find-foreign-symbol-in-table foreign-symbol *static-foreign-symbols*)