X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fvm.lisp;h=0330eeca079427ab62831db4b9a5fd20b74e14e2;hb=69e6aef5e6fb3bd682c7a2cbf774034d2ea58ee8;hp=f03179d9c79a791a55e9712711c6cd4429c833bd;hpb=b3403ba11749366786ed574f4cdf51813dff2ff7;p=sbcl.git

diff --git a/src/compiler/alpha/vm.lisp b/src/compiler/alpha/vm.lisp
index f03179d..0330eec 100644
--- a/src/compiler/alpha/vm.lisp
+++ b/src/compiler/alpha/vm.lisp
@@ -117,7 +117,7 @@
       ((null classes)
        (nreverse forms))))
 
-(def!constant kludge-nondeterministic-catch-block-size 7)
+(def!constant kludge-nondeterministic-catch-block-size 6)
 
 (!define-storage-classes
 
@@ -284,14 +284,14 @@
 
 ;;; 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))
     (null
      (sc-number-or-lose 'null ))
     ((or (integer #.sb!xc:most-negative-fixnum #.sb!xc:most-positive-fixnum)
-         system-area-pointer character)
+         character)
      (sc-number-or-lose 'immediate ))
     (symbol
      (if (static-symbol-p value)
@@ -305,6 +305,11 @@
      (if (eql value 0d0)
          (sc-number-or-lose 'fp-double-zero )
          nil))))
+
+(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))))
 
 ;;;; function call parameters
 
@@ -342,7 +347,7 @@
 ;;; 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)))
@@ -355,4 +360,10 @@
       (constant (format nil "Const~D" offset))
       (immediate-constant "Immed"))))
 
+(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)