X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fvm.lisp;h=d16e08aaf707035c02342e0d38d6346b3e4098a6;hb=56a2dbbb9d79a62db99cc4061e50fca74fcf907e;hp=ab416a3600d2d3df6de9a76cd463d5e76e6bcaf3;hpb=f1ffbf976aaa50b7b22f126b97e34afe06a91210;p=sbcl.git

diff --git a/src/compiler/alpha/vm.lisp b/src/compiler/alpha/vm.lisp
index ab416a3..d16e08a 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
 
@@ -139,6 +139,27 @@
   ;; The control stack.  (Scanned by GC)
   (control-stack control-stack)
 
+  ;; We put ANY-REG and DESCRIPTOR-REG early so that their SC-NUMBER
+  ;; is small and therefore the error trap information is smaller.
+  ;; Moving them up here from their previous place down below saves
+  ;; ~250K in core file size.  --njf, 2006-01-27
+
+  ;; Immediate descriptor objects.  Don't have to be seen by GC, but nothing
+  ;; bad will happen if they are.  (fixnums, characters, header values, etc).
+  (any-reg
+   registers
+   :locations #.(append non-descriptor-regs descriptor-regs)
+   :constant-scs (zero immediate)
+   :save-p t
+   :alternate-scs (control-stack))
+
+  ;; Pointer descriptor objects.  Must be seen by GC.
+  (descriptor-reg registers
+   :locations #.descriptor-regs
+   :constant-scs (constant null immediate)
+   :save-p t
+   :alternate-scs (control-stack))
+
   ;; The non-descriptor stacks.
   (signed-stack non-descriptor-stack
                 :element-size 2 :alignment 2) ; (signed-byte 64)
@@ -156,23 +177,6 @@
 
   ;; **** Things that can go in the integer registers.
 
-  ;; Immediate descriptor objects.  Don't have to be seen by GC, but nothing
-  ;; bad will happen if they are.  (fixnums, characters, header values, etc).
-  (any-reg
-   registers
-   :locations #.(append non-descriptor-regs descriptor-regs)
-;   :locations #.non-descriptor-regs
-   :constant-scs (zero immediate)
-   :save-p t
-   :alternate-scs (control-stack))
-
-  ;; Pointer descriptor objects.  Must be seen by GC.
-  (descriptor-reg registers
-                  :locations #.descriptor-regs
-                  :constant-scs (constant null immediate)
-                  :save-p t
-                  :alternate-scs (control-stack))
-
   ;; Non-Descriptor characters
   (character-reg registers
                  :locations #.non-descriptor-regs
@@ -287,7 +291,7 @@
     (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)
@@ -351,4 +355,10 @@
       (constant (format nil "Const~D" offset))
       (immediate-constant "Immed"))))
 
+(!def-vm-support-routine 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)