Use new MAP-RESTARTS in FIND-RESTART, COMPUTE-RESTARTS; fix FIND-RESTART

[sbcl.git] / src / compiler / ppc / vm.lisp

diff --git a/src/compiler/ppc/vm.lisp b/src/compiler/ppc/vm.lisp
index cac0428..720f8b3 100644 (file)
--- a/src/compiler/ppc/vm.lisp
+++ b/src/compiler/ppc/vm.lisp
@@ -273,7 +273,7 @@
 \f
 ;;; If VALUE can be represented as an immediate constant, then return the
 ;;; appropriate SC number, otherwise return NIL.
-(!def-vm-support-routine immediate-constant-sc (value)
+(defun immediate-constant-sc (value)
   (typecase value
     ((integer 0 0)
      (sc-number-or-lose 'zero))
@@ -287,7 +287,7 @@
          (sc-number-or-lose 'immediate)
          nil))))
 
-(!def-vm-support-routine boxed-immediate-sc-p (sc)
+(defun boxed-immediate-sc-p (sc)
   (or (eql sc (sc-number-or-lose 'zero))
       (eql sc (sc-number-or-lose 'null))
       (eql sc (sc-number-or-lose 'immediate))))
@@ -344,7 +344,7 @@
 \f
 ;;; This function is called by debug output routines that want a pretty name
 ;;; for a TN's location.  It returns a thing that can be printed with PRINC.
-(!def-vm-support-routine location-print-name (tn)
+(defun location-print-name (tn)
   (declare (type tn tn))
   (let ((sb (sb-name (sc-sb (tn-sc tn))))
         (offset (tn-offset tn)))
@@ -357,7 +357,7 @@
       (constant (format nil "Const~D" offset))
       (immediate-constant "Immed"))))
 
-(!def-vm-support-routine combination-implementation-style (node)
+(defun combination-implementation-style (node)
   (declare (type sb!c::combination node))
   (flet ((valid-funtype (args result)
            (sb!c::valid-fun-use node
@@ -369,7 +369,7 @@
          ((or (valid-funtype '(fixnum fixnum) '*)
               (valid-funtype '((signed-byte 32) (signed-byte 32)) '*)
               (valid-funtype '((unsigned-byte 32) (unsigned-byte 32)) '*))
-          (values :direct nil))
+          (values :maybe nil))
          (t (values :default nil))))
       (logbitp
        (cond