X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fload.lisp;h=c04b5f9d3452f1adc17888ff18739802617565cb;hb=28d9bb7a509695caaf78d647b6aa1b0f02c0e83a;hp=75cfec5966f5b75abfdd042ccb3ef8c02d1765b5;hpb=d40a76606c86722b0aef8179155f9f2840739b72;p=sbcl.git diff --git a/src/code/load.lisp b/src/code/load.lisp index 75cfec5..c04b5f9 100644 --- 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,7 +55,7 @@ (cnt 1 (1+ cnt))) ((>= cnt n) res))) -;;; Like Fast-Read-U-Integer, but the size may be determined at run time. +;;; 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)) @@ -327,7 +326,7 @@ (declare (ignore print)) (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*)) @@ -356,6 +355,7 @@ (let ((prefixes #!+(or linux freebsd) #("" "ldso_stub__") #!+openbsd #("" "_"))) + (declare (notinline some)) ; to suppress bug 117 bogowarning (some (lambda (prefix) (gethash (concatenate 'string prefix name) table