Simplify (and robustify) regular PACKing

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

diff --git a/src/compiler/mips/vm.lisp b/src/compiler/mips/vm.lisp
index 65e0515..cf90976 100644 (file)
--- a/src/compiler/mips/vm.lisp
+++ b/src/compiler/mips/vm.lisp
@@ -70,10 +70,10 @@
   (defreg lip 31) ; Lisp interior pointer
 
   (defregset non-descriptor-regs
-      nl0 nl1 nl2 nl3 nl4 cfunc nargs)
+      nl0 nl1 nl2 nl3 nl4 cfunc nargs nfp)
 
   (defregset descriptor-regs
-      a0 a1 a2 a3 a4 a5 fdefn lexenv nfp ocfp lra l0 l1)
+      a0 a1 a2 a3 a4 a5 fdefn lexenv ocfp lra l0 l1)
 
   (defregset *register-arg-offsets*
       a0 a1 a2 a3 a4 a5)
@@ -108,14 +108,13 @@
                 (list* `(define-storage-class ,sc-name ,index
                           ,@(cdr class))
                        `(def!constant ,constant-name ,index)
-                       `(export ',constant-name)
                        forms)))
        (index 0 (1+ index))
        (classes classes (cdr classes)))
       ((null classes)
        (nreverse forms))))
 
-(def!constant kludge-nondeterministic-catch-block-size 7)
+(def!constant kludge-nondeterministic-catch-block-size 6)
 
 (!define-storage-classes
 
@@ -296,7 +295,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))
@@ -314,6 +313,10 @@
     (character
      (sc-number-or-lose 'immediate))))
 
+(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))))
 \f
 ;;;; Function Call Parameters
 
@@ -359,7 +362,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)))
@@ -372,6 +375,10 @@
       (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) (ignore node))
   (values :default nil))
+
+(defun primitive-type-indirect-cell-type (ptype)
+  (declare (ignore ptype))
+  nil)