0.7.11.10:

[sbcl.git] / src / code / load.lisp

diff --git a/src/code/load.lisp b/src/code/load.lisp
index e0ea324..a818cbf 100644 (file)
--- a/src/code/load.lisp
+++ b/src/code/load.lisp
@@ -30,10 +30,9 @@
       (write-string semicolons))
     (write-char #\space)))
 
-;;; If VERBOSE, output (to *STANDARD-OUTPUT*) a message about how we're
-;;; loading from STREAM-WE-ARE-LOADING-FROM.
-;;; FIXME: non-mnemonic name
-(defun do-load-verbose (stream-we-are-loading-from verbose)
+;;; If VERBOSE, output (to *STANDARD-OUTPUT*) a message about how
+;;; we're loading from STREAM-WE-ARE-LOADING-FROM.
+(defun maybe-announce-load (stream-we-are-loading-from verbose)
   (when verbose
     (load-fresh-line)
     (let ((name #-sb-xc-host (file-name stream-we-are-loading-from)
@@ -46,8 +45,8 @@
 
 #!-sb-fluid (declaim (inline read-byte))
 
-;;;    Expands into code to read an N-byte unsigned integer using
-;;; fast-read-byte.
+;;; This expands into code to read an N-byte unsigned integer using
+;;; FAST-READ-BYTE.
 (defmacro fast-read-u-integer (n)
   (declare (optimize (speed 0)))
   (do ((res '(fast-read-byte)
@@ -56,8 +55,8 @@
        (cnt 1 (1+ cnt)))
       ((>= cnt n) res)))
 
-;;; Like Fast-Read-U-Integer, but the size may be determined at run time.
-(defmacro fast-read-variable-u-integer (n)
+;;; like FAST-READ-U-INTEGER, but the size may be determined at run time
+(defmacro fast-read-var-u-integer (n)
   (let ((n-pos (gensym))
        (n-res (gensym))
        (n-cnt (gensym)))
@@ -244,9 +243,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 +254,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 +296,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 +316,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
@@ -328,16 +324,9 @@
   ;; don't. (CMU CL did, but implemented it in a non-ANSI way, and I
   ;; just disabled that instead of rewriting it.) -- WHN 20000131
   (declare (ignore print))
-
-  ;; FIXME: In sbcl-0.6.12.8 the OpenBSD implementation of FILE-LENGTH
-  ;; broke because changed handling of Unix stat(2) stuff couldn't
-  ;; deal with OpenBSD's 64-bit size slot. Once that's fixed, this
-  ;; code can be restored.
-  #!-openbsd
   (when (zerop (file-length stream))
     (error "attempt to load an empty FASL file:~%  ~S" (namestring stream)))
-
-  (do-load-verbose stream verbose)
+  (maybe-announce-load stream verbose)
   (let* ((*fasl-input-stream* stream)
         (*current-fop-table* (or (pop *free-fop-tables*) (make-array 1000)))
         (*current-fop-table-size* (length *current-fop-table*))
@@ -364,14 +353,14 @@
 ;;; code for foreign symbol lookup should be here.
 (defun find-foreign-symbol-in-table (name table)
   (let ((prefixes
-         #!+(or linux freebsd) #("" "ldso_stub__")
-        #!+openbsd #("" "_")))    
+         #!+(or osf1 sunos linux freebsd) #("" "ldso_stub__")
+        #!+openbsd #("")))
+    (declare (notinline some)) ; to suppress bug 117 bogowarning
     (some (lambda (prefix)
            (gethash (concatenate 'string prefix name)
                     table
                     nil))
          prefixes)))
-
 \f
 ;;;; stuff for debugging/tuning by collecting statistics on FOPs (?)
 
@@ -397,8 +386,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*)