X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=56a139eda2f9317d71788abc6a5d4abcbf32bc8e;hb=6cc71ab8ffad49f43895ad0a1df6885c81876687;hp=48a96c45370fa1588d2182b3ee096587b84c3a57;hpb=8fa3b333d2b37f45c3702f478f784b8c6f491080;p=sbcl.git

diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp
index 48a96c4..56a139e 100644
--- a/src/code/target-load.lisp
+++ b/src/code/target-load.lisp
@@ -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,29 +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)))
-		(unix-name (unix-namestring ppn t)))
-	   (if (or unix-name (pathname-type ppn))
-	       (internal-load ppn
-			      unix-name
+	 (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
-		ppn
-		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.
@@ -244,13 +234,7 @@
 	(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))
 
@@ -263,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*
@@ -303,7 +280,7 @@
   (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))