projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.pre7.135:
[sbcl.git]
/
src
/
code
/
load.lisp
diff --git
a/src/code/load.lisp
b/src/code/load.lisp
index
e0ea324
..
cea8927
100644
(file)
--- a/
src/code/load.lisp
+++ b/
src/code/load.lisp
@@
-30,10
+30,9
@@
(write-string semicolons))
(write-char #\space)))
(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)
(when verbose
(load-fresh-line)
(let ((name #-sb-xc-host (file-name stream-we-are-loading-from)
@@
-57,7
+56,7
@@
((>= cnt n) res)))
;;; Like Fast-Read-U-Integer, but the size may be determined at run time.
((>= 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)))
(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)
(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 ~
but this version of SBCL uses ~
- format version ~D.~:@>"
+ format version ~W.~:@>"
stream
variant
version
stream
variant
version
@@
-255,9
+254,6
@@
(or (check-version "native code"
+backend-fasl-file-implementation+
+fasl-file-version+)
(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
(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-names* byte)
byte
(1- (file-position stream))
- (svref *fop-functions* byte))))
+ (svref *fop-funs* byte))))
;; Actually execute the fop.
(if (eql byte 3)
;; 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))))
(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
(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))
;; 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)))
(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*))
(let* ((*fasl-input-stream* stream)
(*current-fop-table* (or (pop *free-fop-tables*) (make-array 1000)))
(*current-fop-table-size* (length *current-fop-table*))
@@
-397,8
+386,8
@@
(let ((n (svref ,vec i)))
(push (cons (svref *fop-names* i) n) ,lvar)
(incf ,tvar n)))
(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*)
0 10)))))
(breakdown counts total-count *fop-counts*)