X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fload.lisp;h=75cfec5966f5b75abfdd042ccb3ef8c02d1765b5;hb=d40a76606c86722b0aef8179155f9f2840739b72;hp=2a2559b35ef43cbc5770e71c2adf7e221b2db0ca;hpb=3bd7a97d1b11a2b0aee086ef211cae807f3dfc35;p=sbcl.git

diff --git a/src/code/load.lisp b/src/code/load.lisp
index 2a2559b..75cfec5 100644
--- a/src/code/load.lisp
+++ b/src/code/load.lisp
@@ -57,7 +57,7 @@
       ((>= cnt n) res)))
 
 ;;; Like Fast-Read-U-Integer, but the size may be determined at run time.
-(defmacro fast-read-variable-u-integer (n)
+(defmacro fast-read-var-u-integer (n)
   (let ((n-pos (gensym))
 	(n-res (gensym))
 	(n-cnt (gensym)))
@@ -244,9 +244,9 @@
 	(flet ((check-version (variant possible-implementation needed-version)
 		 (when (string= possible-implementation implementation)
 		   (unless (= version needed-version)
-		     (error "~@<~S is in ~A fasl file format version ~D, ~
+		     (error "~@<~S is in ~A fasl file format version ~W, ~
                              but this version of SBCL uses ~
-                             format version ~D.~:@>"
+                             format version ~W.~:@>"
 			    stream
 			    variant
 			    version
@@ -255,9 +255,6 @@
 	  (or (check-version "native code"
 			     +backend-fasl-file-implementation+
 			     +fasl-file-version+)
-	      (check-version "byte code"
-			     (backend-byte-fasl-file-implementation)
-			     +fasl-file-version+)
 	      (error "~S was compiled for implementation ~A, but this is a ~A."
 		     stream
 		     implementation
@@ -300,7 +297,7 @@
 			(svref *fop-names* byte)
 			byte
 			(1- (file-position stream))
-			(svref *fop-functions* byte))))
+			(svref *fop-funs* byte))))
 
 	    ;; Actually execute the fop.
 	    (if (eql byte 3)
@@ -320,7 +317,7 @@
 		(setq *fop-stack-pointer* index)
 		(setf (svref *fop-stack* index)
 		      (svref *current-fop-table* (read-byte stream))))
-	      (funcall (the function (svref *fop-functions* byte))))))))))
+	      (funcall (the function (svref *fop-funs* byte))))))))))
 
 (defun load-as-fasl (stream verbose print)
   ;; KLUDGE: ANSI says it's good to do something with the :PRINT
@@ -390,8 +387,8 @@
 		     (let ((n (svref ,vec i)))
 		       (push (cons (svref *fop-names* i) n) ,lvar)
 		       (incf ,tvar n)))
-		   (setq ,lvar (subseq (sort ,lvar #'(lambda (x y)
-						       (> (cdr x) (cdr y))))
+		   (setq ,lvar (subseq (sort ,lvar (lambda (x y)
+						     (> (cdr x) (cdr y))))
 				       0 10)))))
 
       (breakdown counts total-count *fop-counts*)