1.0.26.3: cleanup accesses to *STEPPING* on MIPS and HPPA

diff --git a/src/compiler/hppa/call.lisp b/src/compiler/hppa/call.lisp
index 1edc572..02d93ae 100644 (file)
--- a/src/compiler/hppa/call.lisp
+++ b/src/compiler/hppa/call.lisp
@@ -774,12 +774,7 @@ default-value-8
                 (insert-step-instrumenting (callable-tn)
                   ;; Conditionally insert a conditional trap:
                   (when step-instrumenting
-                    ;; Get the symbol-value of SB!IMPL::*STEPPING*
-                    (loadw stepping null-tn
-                           (+ symbol-value-slot
-                              (truncate (static-symbol-offset 'sb!impl::*stepping*)
-                                        n-word-bytes))
-                           other-pointer-lowtag)
+                    (load-symbol-value stepping sb!impl::*stepping*)
                     ;; If it's not NIL, trap.
                     ;(inst comb := stepping null-tn step-done-label)
                     (inst comb := null-tn null-tn step-done-label :nullify t)
@@ -1255,12 +1250,7 @@ default-value-8
   (:policy :fast-safe)
   (:vop-var vop)
   (:generator 3
-    ;; Get the symbol-value of SB!IMPL::*STEPPING*
-    (loadw stepping null-tn
-           (+ symbol-value-slot
-              (truncate (static-symbol-offset 'sb!impl::*stepping*)
-                        n-word-bytes))
-           other-pointer-lowtag)
+    (load-symbol-value stepping sb!impl::*stepping*)
     ;; If it's not NIL, trap.
     (inst comb := stepping null-tn DONE :nullify t)
     ;; CONTEXT-PC will be pointing here when the interrupt is handled,

diff --git a/src/compiler/mips/call.lisp b/src/compiler/mips/call.lisp
index 97057d8..38f1528 100644 (file)
--- a/src/compiler/mips/call.lisp
+++ b/src/compiler/mips/call.lisp
@@ -783,12 +783,7 @@ default-value-8
                 (insert-step-instrumenting (callable-tn)
                   ;; Conditionally insert a conditional trap:
                   (when step-instrumenting
-                    ;; Get the symbol-value of SB!IMPL::*STEPPING*
-                    (inst lw stepping null-tn
-                          (- (+ symbol-value-slot
-                                (truncate (static-symbol-offset 'sb!impl::*stepping*)
-                                          n-word-bytes))
-                             other-pointer-lowtag))
+                    (load-symbol-value stepping sb!impl::*stepping*)
                     ;; If it's not NIL, trap.
                     (inst beq stepping null-tn step-done-label)
                     (inst nop)
@@ -1288,12 +1283,7 @@ default-value-8
   (:policy :fast-safe)
   (:vop-var vop)
   (:generator 3
-    ;; Get the symbol-value of SB!IMPL::*STEPPING*
-    (inst lw stepping null-tn
-          (- (+ symbol-value-slot
-                (truncate (static-symbol-offset 'sb!impl::*stepping*)
-                          n-word-bytes))
-             other-pointer-lowtag))
+    (load-symbol-value stepping sb!impl::*stepping*)
     ;; If it's not NIL, trap.
     (inst beq stepping null-tn DONE)
     (inst nop)

diff --git a/tests/step.impure.lisp b/tests/step.impure.lisp
index 0f5e874..55be2ad 100644 (file)
--- a/tests/step.impure.lisp
+++ b/tests/step.impure.lisp
@@ -271,8 +271,7 @@
   (handler-bind ((step-condition #'sb-impl::invoke-stepper))
     (test-step-out)))
 
-(with-test (:name :step-start-from-break
-            :fails-on :mips)
+(with-test (:name :step-start-from-break)
   (handler-bind ((step-condition #'sb-impl::invoke-stepper))
     (test-step-start-from-break)))
 

diff --git a/version.lisp-expr b/version.lisp-expr
index fd0fbf7..27e6b38 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.26.2"
+"1.0.26.3"