0.8.20.1: fun-name fun, debugger debugged

[sbcl.git] / src / code / toplevel.lisp

diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp
index b8cc3a7..7cf0921 100644 (file)
--- a/src/code/toplevel.lisp
+++ b/src/code/toplevel.lisp
@@ -196,7 +196,7 @@ steppers to maintain contextual information.")
                 ((= offset bytes-per-scrub-unit)
                  (look (sap+ ptr bytes-per-scrub-unit) 0 count))
                 (t
-                 (setf (sap-ref-32 ptr offset) 0)
+                 (setf (sap-ref-word ptr offset) 0)
                  (scrub ptr (+ offset sb!vm:n-word-bytes) count))))
         (look (ptr offset count)
           (declare (type system-area-pointer ptr)
@@ -206,11 +206,11 @@ steppers to maintain contextual information.")
           (cond ((>= (sap-int ptr) end-of-stack) 0)
                 ((= offset bytes-per-scrub-unit)
                  count)
-                ((zerop (sap-ref-32 ptr offset))
+                ((zerop (sap-ref-word ptr offset))
                  (look ptr (+ offset sb!vm:n-word-bytes) count))
                 (t
                  (scrub ptr offset (+ count sb!vm:n-word-bytes))))))
-      (declare (type (unsigned-byte 32) csp))
+      (declare (type sb!vm::word csp))
       (scrub (int-sap (- csp initial-offset))
             (* (floor initial-offset sb!vm:n-word-bytes) sb!vm:n-word-bytes)
             0)))
@@ -232,7 +232,7 @@ steppers to maintain contextual information.")
                    (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)
+                   (setf (sap-ref-word loc 0) 0)
                    (scrub ptr (+ offset sb!vm:n-word-bytes) count)))))
         (look (ptr offset count)
           (declare (type system-area-pointer ptr)
@@ -247,7 +247,7 @@ steppers to maintain contextual information.")
                    (look ptr (+ offset sb!vm:n-word-bytes) count))
                   (t
                    (scrub ptr offset (+ count sb!vm:n-word-bytes)))))))
-      (declare (type (unsigned-byte 32) csp))
+      (declare (type sb!vm::word csp))
       (scrub (int-sap (+ csp initial-offset))
             (* (floor initial-offset sb!vm:n-word-bytes) sb!vm:n-word-bytes)
             0))))
@@ -272,9 +272,9 @@ steppers to maintain contextual information.")
    +++, ++, +, ///, //, /, and -."
   (setf - form)
   (let ((results
-        (multiple-value-list
-         (eval-in-lexenv form
-                         (make-null-interactive-lexenv)))))
+         (multiple-value-list
+          (eval-in-lexenv form
+                          (make-null-interactive-lexenv)))))
     (setf /// //
          // /
          / results
@@ -306,10 +306,7 @@ steppers to maintain contextual information.")
 
 ;;; the default system top level function
 (defun toplevel-init ()
-
-  (/show0 "entering TOPLEVEL-INIT")
-  (sb!thread::init-job-control)
-  (sb!thread::get-foreground)
+  (/show0 "entering TOPLEVEL-INIT")  
   (let (;; value of --sysinit option
        (sysinit nil)
        ;; value of --userinit option