1.0.8.26: More MIPS singlestepper fixes.

diff --git a/src/compiler/mips/call.lisp b/src/compiler/mips/call.lisp
index 7b318e4..578da61 100644 (file)
--- a/src/compiler/mips/call.lisp
+++ b/src/compiler/mips/call.lisp
@@ -789,8 +789,8 @@ default-value-8
                                 (truncate (static-symbol-offset 'sb!impl::*stepping*)
                                           n-word-bytes))
                              other-pointer-lowtag))
-                    ;; If it's not null, trap.
-                    (inst beq stepping step-done-label)
+                    ;; If it's not NIL, trap.
+                    (inst beq stepping null-tn step-done-label)
                     (inst nop)
                     ;; CONTEXT-PC will be pointing here when the
                     ;; interrupt is handled, not after the BREAK.
@@ -1297,13 +1297,13 @@ default-value-8
                 (truncate (static-symbol-offset 'sb!impl::*stepping*)
                           n-word-bytes))
              other-pointer-lowtag))
-    ;; If it's not null, trap.
-    (inst beq stepping DONE)
+    ;; If it's not NIL, trap.
+    (inst beq stepping null-tn DONE)
     (inst nop)
     ;; CONTEXT-PC will be pointing here when the interrupt is handled,
     ;; not after the BREAK.
     (note-this-location vop :step-before-vop)
     ;; CALLEE-REGISTER-OFFSET isn't needed for before-traps, so we
     ;; can just use a bare SINGLE-STEP-BEFORE-TRAP as the code.
-    (inst break single-step-before-trap)
+    (inst break 0 single-step-before-trap)
     DONE))

diff --git a/version.lisp-expr b/version.lisp-expr
index de59784..a43a54b 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.8.25"
+"1.0.8.26"