X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftoplevel.lisp;h=cd9463c4447c7e01a42ebfb3db6890c8cc6ec992;hb=3b7bcf8ff3727a7f68102f7458805d1bebee5e78;hp=2b285310ec1e728db98fdd12b0a937c1e993e398;hpb=dec94b039e8ec90baf21463df839a6181de606f6;p=sbcl.git diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp index 2b28531..cd9463c 100644 --- a/src/code/toplevel.lisp +++ b/src/code/toplevel.lisp @@ -180,7 +180,7 @@ (look (sap+ ptr bytes-per-scrub-unit) 0 count)) (t (setf (sap-ref-32 ptr offset) 0) - (scrub ptr (+ offset sb!vm:word-bytes) count)))) + (scrub ptr (+ offset sb!vm:n-word-bytes) count)))) (look (ptr offset count) (declare (type system-area-pointer ptr) (type (unsigned-byte 16) offset) @@ -189,14 +189,14 @@ (cond ((= offset bytes-per-scrub-unit) count) ((zerop (sap-ref-32 ptr offset)) - (look ptr (+ offset sb!vm:word-bytes) count)) + (look ptr (+ offset sb!vm:n-word-bytes) count)) (t - (scrub ptr offset (+ count sb!vm:word-bytes)))))) + (scrub ptr offset (+ count sb!vm:n-word-bytes)))))) (let* ((csp (sap-int (sb!c::control-stack-pointer-sap))) (initial-offset (logand csp (1- bytes-per-scrub-unit)))) (declare (type (unsigned-byte 32) csp)) (scrub (int-sap (- csp initial-offset)) - (* (floor initial-offset sb!vm:word-bytes) sb!vm:word-bytes) + (* (floor initial-offset sb!vm:n-word-bytes) sb!vm:n-word-bytes) 0))) #!+x86 ;; (Stack grows downwards.) @@ -206,13 +206,13 @@ (type (unsigned-byte 16) offset) (type (unsigned-byte 20) count) (values (unsigned-byte 20))) - (let ((loc (int-sap (- (sap-int ptr) (+ offset sb!vm:word-bytes))))) + (let ((loc (int-sap (- (sap-int ptr) (+ offset sb!vm:n-word-bytes))))) (cond ((= offset bytes-per-scrub-unit) (look (int-sap (- (sap-int ptr) bytes-per-scrub-unit)) 0 count)) (t ;; need to fix bug in %SET-STACK-REF (setf (sap-ref-32 loc 0) 0) - (scrub ptr (+ offset sb!vm:word-bytes) count))))) + (scrub ptr (+ offset sb!vm:n-word-bytes) count))))) (look (ptr offset count) (declare (type system-area-pointer ptr) (type (unsigned-byte 16) offset) @@ -222,34 +222,34 @@ (cond ((= offset bytes-per-scrub-unit) count) ((zerop (sb!kernel::get-lisp-obj-address (stack-ref loc 0))) - (look ptr (+ offset sb!vm:word-bytes) count)) + (look ptr (+ offset sb!vm:n-word-bytes) count)) (t - (scrub ptr offset (+ count sb!vm:word-bytes))))))) + (scrub ptr offset (+ count sb!vm:n-word-bytes))))))) (let* ((csp (sap-int (sb!c::control-stack-pointer-sap))) (initial-offset (logand csp (1- bytes-per-scrub-unit)))) (declare (type (unsigned-byte 32) csp)) (scrub (int-sap (+ csp initial-offset)) - (* (floor initial-offset sb!vm:word-bytes) sb!vm:word-bytes) + (* (floor initial-offset sb!vm:n-word-bytes) sb!vm:n-word-bytes) 0)))) ;;;; the default toplevel function (defvar / nil #!+sb-doc - "a list of all the values returned by the most recent top-level EVAL") + "a list of all the values returned by the most recent top level EVAL") (defvar // nil #!+sb-doc "the previous value of /") (defvar /// nil #!+sb-doc "the previous value of //") -(defvar * nil #!+sb-doc "the value of the most recent top-level EVAL") +(defvar * nil #!+sb-doc "the value of the most recent top level EVAL") (defvar ** nil #!+sb-doc "the previous value of *") (defvar *** nil #!+sb-doc "the previous value of **") -(defvar + nil #!+sb-doc "the value of the most recent top-level READ") +(defvar + nil #!+sb-doc "the value of the most recent top level READ") (defvar ++ nil #!+sb-doc "the previous value of +") (defvar +++ nil #!+sb-doc "the previous value of ++") (defvar - nil #!+sb-doc "the form currently being evaluated") -(defvar *prompt* "* " - #!+sb-doc - "The top-level prompt string. This also may be a function of no arguments - that returns a simple-string.") + +;;; the top level prompt string, or a function of no arguments that +;;; returns a simple-string +(defvar *prompt* "* ") (defun interactive-eval (form) "Evaluate FORM, returning whatever it returns and adjusting ***, **, *, @@ -285,7 +285,7 @@ (finish-output (symbol-value name))) (values)) -;;; the default system top-level function +;;; the default system top level function (defun toplevel-init () (/show0 "entering TOPLEVEL-INIT") @@ -459,46 +459,52 @@ (let ((* nil) (** nil) (*** nil) (- nil) (+ nil) (++ nil) (+++ nil) - (/// nil) (// nil) (/ nil) - (eof-marker (cons :eof nil))) - (loop - (/show0 "at head of outer LOOP in TOPLEVEL-REPL") - ;; There should only be one TOPLEVEL restart, and it's here, so - ;; restarting at TOPLEVEL always bounces you all the way out here. - (with-simple-restart (toplevel - "Restart at toplevel READ/EVAL/PRINT loop.") - ;; We add a new ABORT restart for every debugger level, so - ;; restarting at ABORT in a nested debugger gets you out to the - ;; innermost enclosing debugger, and only when you're in the - ;; outermost, unnested debugger level does restarting at ABORT - ;; get you out to here. - (with-simple-restart (abort - "Reduce debugger level (leaving debugger).") - (catch 'top-level-catcher + (/// nil) (// nil) (/ nil)) + (/show0 "about to set up restarts in TOPLEVEL-REPL") + ;; There should only be one TOPLEVEL restart, and it's here, so + ;; restarting at TOPLEVEL always bounces you all the way out here. + (with-simple-restart (toplevel + "Restart at toplevel READ/EVAL/PRINT loop.") + ;; We add a new ABORT restart for every debugger level, so + ;; restarting at ABORT in a nested debugger gets you out to the + ;; innermost enclosing debugger, and only when you're in the + ;; outermost, unnested debugger level does restarting at ABORT + ;; get you out to here. + (with-simple-restart (abort "Reduce debugger level (leaving debugger).") + (catch 'toplevel-catcher (sb!unix:unix-sigsetmask 0) ; FIXME: What is this for? - (/show0 "about to enter inner LOOP in TOPLEVEL-REPL") - (loop ; FIXME: Do we need this inner LOOP? - ;; FIXME: It seems bad to have GC behavior depend on scrubbing - ;; the control stack before each interactive command. Isn't - ;; there some way we can convince the GC to just ignore - ;; dead areas of the control stack, so that we don't need to - ;; rely on this half-measure? - (scrub-control-stack) - (unless noprint - (fresh-line) - (princ (if (functionp *prompt*) - (funcall *prompt*) - *prompt*)) - (flush-standard-output-streams)) - (let ((form (read *standard-input* nil eof-marker))) - (if (eq form eof-marker) - (quit) - (let ((results - (multiple-value-list (interactive-eval form)))) - (unless noprint - (dolist (result results) - (fresh-line) - (prin1 result))))))))))))) + (repl noprint)))))) + +(defun repl (noprint) + (/show0 "entering REPL") + (let ((eof-marker (cons :eof nil))) + (loop + ;; FIXME: It seems bad to have GC behavior depend on scrubbing the + ;; control stack before each interactive command. Isn't there some + ;; way we can convince the GC to just ignore dead areas of the + ;; control stack, so that we don't need to rely on this + ;; half-measure? + (/show0 "at head of LOOP") + (scrub-control-stack) + (/show0 "back from SCRUB-CONTROL-STACK") + (unless noprint + (fresh-line) + (/show0 "back from FRESH-LINE") + (princ (if (functionp *prompt*) + (funcall *prompt*) + *prompt*)) + (/show0 "back from PRINC") + (flush-standard-output-streams) + (/show0 "back from FLUSH-STANDARD-OUTPUT-STREAMS")) + (let ((form (read *standard-input* nil eof-marker))) + (/show0 "back from READ") + (if (eq form eof-marker) + (quit) + (let ((results (multiple-value-list (interactive-eval form)))) + (unless noprint + (dolist (result results) + (fresh-line) + (prin1 result))))))))) (defun noprogrammer-debugger-hook-fun (condition old-debugger-hook) (declare (ignore old-debugger-hook)) @@ -512,12 +518,14 @@ (handler-case (progn (format *error-output* - "~@~2%" + "~&~@~2%" (type-of condition) condition) ;; Flush *ERROR-OUTPUT* even before the BACKTRACE, so that - ;; even if we hit an error within BACKTRACE we'll at least - ;; have the CONDITION printed out before we die. + ;; 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.)