X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftoplevel.lisp;h=3f5359470e4626c0ac6e50f2b2f117a0833f2425;hb=245101f127d61e28b9c864c720eb17973469a904;hp=4bb67abbe6376adb4312b1dd73c82a44888ec87a;hpb=1419c1d2d50f039be46a8667351b7738ac4965e4;p=sbcl.git diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp index 4bb67ab..3f53594 100644 --- a/src/code/toplevel.lisp +++ b/src/code/toplevel.lisp @@ -25,8 +25,7 @@ ;;; specials initialized by !COLD-INIT ;;; FIXME: These could be converted to DEFVARs. -(declaim (special *gc-inhibit* *already-maybe-gcing* - *need-to-collect-garbage* +(declaim (special *gc-inhibit* *need-to-collect-garbage* *gc-notify-stream* *before-gc-hooks* *after-gc-hooks* #!+x86 *pseudo-atomic-atomic* @@ -47,7 +46,7 @@ ;;; by QUIT) is caught and any final processing and return codes are ;;; handled appropriately. (defmacro handling-end-of-the-world (&body body) - (let ((caught (gensym "CAUGHT"))) + (with-unique-names (caught) `(let ((,caught (catch '%end-of-the-world (/show0 "inside CATCH '%END-OF-THE-WORLD") ,@body))) @@ -89,7 +88,7 @@ (error-error "Help! " *current-error-depth* " nested errors. " - "KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.") + "SB-KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.") t) (t (/show0 "returning normally from INFINITE-ERROR-PROTECTOR") @@ -116,7 +115,7 @@ (error-error "Help! " *current-error-depth* " nested errors. " - "KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.") + "SB-KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.") (progn ,@forms) t) (t @@ -174,7 +173,8 @@ (let* ((csp (sap-int (sb!c::control-stack-pointer-sap))) (initial-offset (logand csp (1- bytes-per-scrub-unit))) (end-of-stack - (- sb!vm::*control-stack-end* sb!c:*backend-page-size*))) + (- (sb!vm:fixnumize sb!vm:*control-stack-end*) + sb!c:*backend-page-size*))) (labels ((scrub (ptr offset count) (declare (type system-area-pointer ptr) @@ -206,7 +206,8 @@ #!+stack-grows-downward-not-upward (let* ((csp (sap-int (sb!c::control-stack-pointer-sap))) - (end-of-stack (+ sb!vm::*control-stack-start* sb!c:*backend-page-size*)) + (end-of-stack (+ (sb!vm:fixnumize sb!vm:*control-stack-start*) + sb!c:*backend-page-size*)) (initial-offset (logand csp (1- bytes-per-scrub-unit)))) (labels ((scrub (ptr offset count) @@ -298,12 +299,22 @@ (/show0 "entering TOPLEVEL-INIT") (setf sb!thread::*session-lock* (sb!thread:make-mutex :name "the terminal")) (sb!thread::get-foreground) - (let ((sysinit nil) ; value of --sysinit option - (userinit nil) ; value of --userinit option - (reversed-evals nil) ; values of --eval options, in reverse order; and - ; also --load options, translated into --eval - (noprint nil) ; Has a --noprint option been seen? - (options (rest *posix-argv*))) ; skipping program name + (let (;; value of --sysinit option + (sysinit nil) + ;; value of --userinit option + (userinit nil) + ;; values of --eval options, in reverse order; and also any + ;; other options (like --load) which're translated into --eval + ;; + ;; The values are stored as strings, so that they can be + ;; passed to READ only after their predecessors have been + ;; EVALed, so that things work when e.g. REQUIRE in one EVAL + ;; form creates a package referred to in the next EVAL form. + (reversed-evals nil) + ;; Has a --noprint option been seen? + (noprint nil) + ;; everything in *POSIX-ARGV* except for argv[0]=programname + (options (rest *posix-argv*))) (declare (type list options)) @@ -338,22 +349,11 @@ (setf userinit (pop-option)))) ((string= option "--eval") (pop-option) - (let ((eval-as-string (pop-option))) - (with-input-from-string (eval-stream eval-as-string) - (let* ((eof-marker (cons :eof :eof)) - (eval (read eval-stream nil eof-marker)) - (eof (read eval-stream nil eof-marker))) - (cond ((eq eval eof-marker) - (error "unable to parse ~S" - eval-as-string)) - ((not (eq eof eof-marker)) - (error "more than one expression in ~S" - eval-as-string)) - (t - (push eval reversed-evals))))))) + (push (pop-option) reversed-evals)) ((string= option "--load") (pop-option) - (push `(load ,(pop-option)) reversed-evals)) + (push (concatenate 'string "(LOAD \"" (pop-option) "\")") + reversed-evals)) ((string= option "--noprint") (pop-option) (setf noprint t)) @@ -363,10 +363,10 @@ ((string= option "--noprogrammer") (warn "treating deprecated --noprogrammer as --disable-debugger") (pop-option) - (push '(disable-debugger) reversed-evals)) + (push "(DISABLE-DEBUGGER)" reversed-evals)) ((string= option "--disable-debugger") (pop-option) - (push '(disable-debugger) reversed-evals)) + (push "(DISABLE-DEBUGGER)" reversed-evals)) ((string= option "--end-toplevel-options") (pop-option) (return)) @@ -387,7 +387,7 @@ (return))))))) (/show0 "done with LOOP WHILE OPTIONS DO in TOPLEVEL-INIT") - ;; Excise all the options that we processed, so that only + ;; Delete all the options that we processed, so that only ;; user-level options are left visible to user code. (setf (rest *posix-argv*) options) @@ -444,10 +444,23 @@ ;; Process --eval options. (/show0 "handling --eval options in TOPLEVEL-INIT") - (dolist (eval (reverse reversed-evals)) + (dolist (expr-as-string (reverse reversed-evals)) (/show0 "handling one --eval option in TOPLEVEL-INIT") - (eval eval) - (flush-standard-output-streams))) + (let ((expr (with-input-from-string (eval-stream + expr-as-string) + (let* ((eof-marker (cons :eof :eof)) + (result (read eval-stream nil eof-marker)) + (eof (read eval-stream nil eof-marker))) + (cond ((eq result eof-marker) + (error "unable to parse ~S" + expr-as-string)) + ((not (eq eof eof-marker)) + (error "more than one expression in ~S" + expr-as-string)) + (t + result)))))) + (eval expr) + (flush-standard-output-streams)))) (continue () :report "Continue anyway (skipping to toplevel read/eval/print loop)." @@ -510,7 +523,7 @@ ;; have unwound enough stack by the time we get here that this ;; is now possible (sb!kernel::protect-control-stack-guard-page 1) - (repl noprint) + (funcall *repl-fun* noprint) (critically-unreachable "after REPL"))))))) ;;; Our default REPL prompt is the minimal traditional one. @@ -539,30 +552,32 @@ (defvar *repl-prompt-fun* #'repl-prompt-fun "a function of one argument STREAM for the toplevel REPL to call: Prompt the user for input.") +(defvar *repl-fun* #'repl-fun + "a function of one argument NOPRINT that provides the REPL for the system. + Assumes that *standard-input* and *standard-output* are setup.") -(defun repl (noprint) +(defun repl-fun (noprint) (/show0 "entering REPL") - (let ((eof-marker (cons :eof nil))) - (loop - ;; (See comment preceding the definition of SCRUB-CONTROL-STACK.) - (scrub-control-stack) + (loop + ;; (See comment preceding the definition of SCRUB-CONTROL-STACK.) + (scrub-control-stack) + (unless noprint + (funcall *repl-prompt-fun* *standard-output*) + ;; (Should *REPL-PROMPT-FUN* be responsible for doing its own + ;; FORCE-OUTPUT? I can't imagine a valid reason for it not to + ;; be done here, so leaving it up to *REPL-PROMPT-FUN* seems + ;; odd. But maybe there *is* a valid reason in some + ;; circumstances? perhaps some deadlock issue when being driven + ;; by another process or something...) + (force-output *standard-output*)) + (let* ((form (funcall *repl-read-form-fun* + *standard-input* + *standard-output*)) + (results (multiple-value-list (interactive-eval form)))) (unless noprint - (funcall *repl-prompt-fun* *standard-output*) - ;; (Should *REPL-PROMPT-FUN* be responsible for doing its own - ;; FORCE-OUTPUT? I can't imagine a valid reason for it not to - ;; be done here, so leaving it up to *REPL-PROMPT-FUN* seems - ;; odd. But maybe there *is* a valid reason in some - ;; circumstances? perhaps some deadlock issue when being driven - ;; by another process or something...) - (force-output *standard-output*)) - (let* ((form (funcall *repl-read-form-fun* - *standard-input* - *standard-output*)) - (results (multiple-value-list (interactive-eval form)))) - (unless noprint - (dolist (result results) - (fresh-line) - (prin1 result))))))) + (dolist (result results) + (fresh-line) + (prin1 result)))))) ;;; suitable value for *DEBUGGER-HOOK* for a noninteractive Unix-y program (defun noprogrammer-debugger-hook-fun (condition old-debugger-hook)