X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Ftarget-load.lisp;h=0c8e9b6784483b37cccc34a2f7bbacb404c46629;hb=89eb73c035f05ae53b1148ef8a83e1d4030b2dd8;hp=fe2bd032dc2000f1b8d525c37d7b02e506fcd401;hpb=35e306eeebc40ce947247e3df47a63f47d01734d;p=sbcl.git diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp index fe2bd03..0c8e9b6 100644 --- a/src/code/target-load.lisp +++ b/src/code/target-load.lisp @@ -11,21 +11,19 @@ ;;;; 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 @@ -40,7 +38,7 @@ (let ((results (multiple-value-list (eval sexpr)))) (load-fresh-line) (format t "~{~S~^, ~}~%" results)) - (eval sexpr)))) + (eval sexpr)))) ;;;; LOAD itself @@ -73,17 +71,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 @@ -109,7 +106,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 @@ -186,28 +183,37 @@ '(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))) + (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 pn + (internal-load ppn file internal-if-does-not-exist verbose print))) - (let ((tn (probe-file pn))) - (if (or tn (pathname-type pn)) - (internal-load pn + (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 - pn + ppn internal-if-does-not-exist verbose print))))))))) @@ -219,22 +225,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)) @@ -245,29 +256,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) @@ -300,7 +297,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 @@ -316,14 +316,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)))