X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftoplevel.lisp;h=aae8fac6c2d3757d50e966d189b6572afa27bbf6;hb=1e9966d5f24709d227e20911b4e1ddd27c87a00e;hp=3afa9ad6ccaf26e316189daeaac6d16952b34bb8;hpb=9c1a7443146bba92c2430689981bd46c66551c35;p=sbcl.git diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp index 3afa9ad..aae8fac 100644 --- a/src/code/toplevel.lisp +++ b/src/code/toplevel.lisp @@ -26,7 +26,6 @@ ;;; FIXME: These could be converted to DEFVARs. (declaim (special *gc-inhibit* *need-to-collect-garbage* - *gc-notify-stream* *before-gc-hooks* *after-gc-hooks* #!+x86 *pseudo-atomic-atomic* #!+x86 *pseudo-atomic-interrupted* @@ -88,7 +87,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") @@ -115,7 +114,7 @@ (error-error "Help! " *current-error-depth* " nested errors. " - "KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.") + "SB-KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.") (progn ,@forms) t) (t @@ -173,7 +172,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) @@ -205,7 +205,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) @@ -350,8 +351,10 @@ (push (pop-option) reversed-evals)) ((string= option "--load") (pop-option) - (push (concatenate 'string "(LOAD \"" (pop-option) "\")") - reversed-evals)) + (push + ;; FIXME: see BUG 296 + (concatenate 'string "(|LOAD| \"" (pop-option) "\")") + reversed-evals)) ((string= option "--noprint") (pop-option) (setf noprint t)) @@ -361,10 +364,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)) @@ -402,14 +405,10 @@ possible-init-file-names) (/show0 "leaving PROBE-INIT-FILES")))) (let* ((sbcl-home (posix-getenv "SBCL_HOME")) - (sysinit-truename (if sbcl-home - (probe-init-files sysinit - (concatenate 'string - sbcl-home - "/sbclrc")) - (probe-init-files sysinit - "/etc/sbclrc" - "/usr/local/etc/sbclrc"))) + (sysinit-truename + (probe-init-files sysinit + (concatenate 'string sbcl-home "/sbclrc") + "/etc/sbclrc")) (user-home (or (posix-getenv "HOME") (error "The HOME environment variable is unbound, ~ so user init file can't be found."))) @@ -479,15 +478,6 @@ ;; (classic CMU CL error message: "You're certainly a clever child.":-) (critically-unreachable "after TOPLEVEL-REPL")))) -;;; halt-on-failures and prompt-on-failures modes, suitable for -;;; noninteractive and interactive use respectively -(defun disable-debugger () - (setf *debugger-hook* 'noprogrammer-debugger-hook-fun - *debug-io* *error-output*)) -(defun enable-debugger () - (setf *debugger-hook* nil - *debug-io* *query-io*)) - ;;; read-eval-print loop for the default system toplevel (defun toplevel-repl (noprint) (/show0 "entering TOPLEVEL-REPL") @@ -516,7 +506,7 @@ (abort "~@") (catch 'toplevel-catcher - #!-sunos (sb!unix:unix-sigsetmask 0) ; FIXME: What is this for? + (sb!unix::warn-when-signals-masked) ;; in the event of a control-stack-exhausted-error, we should ;; have unwound enough stack by the time we get here that this ;; is now possible @@ -559,6 +549,7 @@ (loop ;; (See comment preceding the definition of SCRUB-CONTROL-STACK.) (scrub-control-stack) + (sb!thread::get-foreground) (unless noprint (funcall *repl-prompt-fun* *standard-output*) ;; (Should *REPL-PROMPT-FUN* be responsible for doing its own @@ -576,59 +567,6 @@ (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) - (declare (ignore old-debugger-hook)) - (flet ((failure-quit (&key recklessly-p) - (/show0 "in FAILURE-QUIT (in --disable-debugger debugger hook)") - (quit :unix-status 1 :recklessly-p recklessly-p))) - ;; This HANDLER-CASE is here mostly to stop output immediately - ;; (and fall through to QUIT) when there's an I/O error. Thus, - ;; when we're run under a shell script or something, we can die - ;; cleanly when the script dies (and our pipes are cut), instead - ;; of falling into ldb or something messy like that. - (handler-case - (progn - (format *error-output* - "~&~@~2%" - (type-of condition) - condition) - ;; Flush *ERROR-OUTPUT* even before the BACKTRACE, so that - ;; even if we hit an error within BACKTRACE (e.g. a bug in - ;; the debugger's own frame-walking code, or a bug in a user - ;; PRINT-OBJECT method) we'll at least have the CONDITION - ;; printed out before we die. - (finish-output *error-output*) - ;; (Where to truncate the BACKTRACE is of course arbitrary, but - ;; it seems as though we should at least truncate it somewhere.) - (sb!debug:backtrace 128 *error-output*) - (format - *error-output* - "~%unhandled condition in --disable-debugger mode, quitting~%") - (finish-output *error-output*) - (failure-quit)) - (condition () - ;; We IGNORE-ERRORS here because even %PRIMITIVE PRINT can - ;; fail when our output streams are blown away, as e.g. when - ;; we're running under a Unix shell script and it dies somehow - ;; (e.g. because of a SIGINT). In that case, we might as well - ;; just give it up for a bad job, and stop trying to notify - ;; the user of anything. - ;; - ;; Actually, the only way I've run across to exercise the - ;; problem is to have more than one layer of shell script. - ;; I have a shell script which does - ;; time nice -10 sh make.sh "$1" 2>&1 | tee make.tmp - ;; and the problem occurs when I interrupt this with Ctrl-C - ;; under Linux 2.2.14-5.0 and GNU bash, version 1.14.7(1). - ;; I haven't figured out whether it's bash, time, tee, Linux, or - ;; what that is responsible, but that it's possible at all - ;; means that we should IGNORE-ERRORS here. -- WHN 2001-04-24 - (ignore-errors - (%primitive print - "Argh! error within --disable-debugger error handling")) - (failure-quit :recklessly-p t))))) ;;; a convenient way to get into the assembly-level debugger (defun %halt ()