X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=56e04413fd10d835a1fb55db22be36c726d4ae86;hb=35b5e97163c45e89659dbd75c91d653b49c758d3;hp=b760221278de8885936417070258e41bc766cd26;hpb=5a1e9fb26baf0171327bd8814cb803d781c67107;p=sbcl.git

diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp
index b760221..56e0441 100644
--- a/src/code/target-load.lisp
+++ b/src/code/target-load.lisp
@@ -42,6 +42,16 @@
 
 ;;;; LOAD itself
 
+(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.
 (defun internal-load (pathname truename if-does-not-exist verbose print
@@ -82,8 +92,10 @@
 			  :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)))
+ 	     (error 'fasl-header-missing
+ 		    :stream (namestring truename)
+ 		    :fhsss first-line
+ 		    :expected fhsss))
 	   (internal-load pathname truename if-does-not-exist verbose print
 			  :source))))))))
 
@@ -154,9 +166,6 @@
   "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
@@ -283,7 +292,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))