0.9.9.5:

	Reduce storage requirements for error trap information:
	... shuffle around ANY-REG and DESCRIPTOR-REG storage classes
	    to make their SC-NUMBERs small, which makes SC-OFFSETs smaller,
	    which cuts down the size of SC-OFFSETs in error trap
	    information from three bytes to one byte;
	... saves ~250KB in core files on PPC/OS X;
	... only applies to RISCy platforms, as x86oid SC-OFFSETs already
	    fit into a single byte due to having a smaller number of
	    registers.

	Bump the fasl file version, too.

diff --git a/src/code/early-fasl.lisp b/src/code/early-fasl.lisp
index b55311d..73c3454 100644 (file)
--- a/src/code/early-fasl.lisp
+++ b/src/code/early-fasl.lisp
@@ -76,7 +76,7 @@
 ;;; versions which break binary compatibility. But it certainly should
 ;;; be incremented for release versions which break binary
 ;;; compatibility.
-(def!constant +fasl-file-version+ 62)
+(def!constant +fasl-file-version+ 63)
 ;;; (record of versions before 2003 deleted in 2003-04-26/0.pre8.107 or so)
 ;;; 38: (2003-01-05) changed names of internal SORT machinery
 ;;; 39: (2003-02-20) in 0.7.12.1 a slot was added to
@@ -130,6 +130,8 @@
 ;;;     to multiple %DEFMUMBLE functions.
 ;;; 62: (2005-12-30) Make the count of FASL header counted strings
 ;;;     a 32-bit value also on 64-bit platforms.
+;;; 63: (2006-01-27) Shuffle storage classes around to reduce the error
+;;;     trap information size on RISCy platforms.
 
 ;;; the conventional file extension for our fasl files
 (declaim (type simple-string *fasl-file-type*))

diff --git a/src/compiler/alpha/vm.lisp b/src/compiler/alpha/vm.lisp
index ab416a3..f03179d 100644 (file)
--- a/src/compiler/alpha/vm.lisp
+++ b/src/compiler/alpha/vm.lisp
@@ -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

diff --git a/src/compiler/hppa/vm.lisp b/src/compiler/hppa/vm.lisp
index a11f5ce..a76d03c 100644 (file)
--- a/src/compiler/hppa/vm.lisp
+++ b/src/compiler/hppa/vm.lisp
@@ -132,19 +132,10 @@
   ;; The control stack.  (Scanned by GC)
   (control-stack control-stack)
 
-  ;; The non-descriptor stacks.
-  (signed-stack non-descriptor-stack) ; (signed-byte 32)
-  (unsigned-stack non-descriptor-stack) ; (unsigned-byte 32)
-  (character-stack non-descriptor-stack) ; non-descriptor characters.
-  (sap-stack non-descriptor-stack) ; System area pointers.
-  (single-stack non-descriptor-stack) ; single-floats
-  (double-stack non-descriptor-stack
-                :element-size 2 :alignment 2) ; double floats.
-  (complex-single-stack non-descriptor-stack :element-size 2)
-  (complex-double-stack non-descriptor-stack :element-size 4 :alignment 2)
-
-
-  ;; **** Things that can go in the integer registers.
+  ;; 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).
@@ -162,6 +153,20 @@
    :save-p t
    :alternate-scs (control-stack))
 
+  ;; The non-descriptor stacks.
+  (signed-stack non-descriptor-stack) ; (signed-byte 32)
+  (unsigned-stack non-descriptor-stack) ; (unsigned-byte 32)
+  (character-stack non-descriptor-stack) ; non-descriptor characters.
+  (sap-stack non-descriptor-stack) ; System area pointers.
+  (single-stack non-descriptor-stack) ; single-floats
+  (double-stack non-descriptor-stack
+                :element-size 2 :alignment 2) ; double floats.
+  (complex-single-stack non-descriptor-stack :element-size 2)
+  (complex-double-stack non-descriptor-stack :element-size 4 :alignment 2)
+
+
+  ;; **** Things that can go in the integer registers.
+
   ;; Non-Descriptor characters
   (character-reg registers
    :locations #.non-descriptor-regs

diff --git a/src/compiler/mips/vm.lisp b/src/compiler/mips/vm.lisp
index cc2d844..854fc35 100644 (file)
--- a/src/compiler/mips/vm.lisp
+++ b/src/compiler/mips/vm.lisp
@@ -132,20 +132,10 @@
   ;; The control stack.  (Scanned by GC)
   (control-stack control-stack)
 
-  ;; The non-descriptor stacks.
-  (signed-stack non-descriptor-stack) ; (signed-byte 32)
-  (unsigned-stack non-descriptor-stack) ; (unsigned-byte 32)
-  (character-stack non-descriptor-stack) ; non-descriptor characters.
-  (sap-stack non-descriptor-stack) ; System area pointers.
-  (single-stack non-descriptor-stack) ; single-floats
-  (double-stack non-descriptor-stack :element-size 2) ; double floats.
-  ;; complex-single-floats
-  (complex-single-stack non-descriptor-stack :element-size 2)
-  ;; complex-double-floats.
-  (complex-double-stack non-descriptor-stack :element-size 4 :alignment 2)
-
-
-  ;; **** Things that can go in the integer registers.
+  ;; 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).
@@ -166,6 +156,21 @@
    :save-p t
    :alternate-scs (control-stack))
 
+  ;; The non-descriptor stacks.
+  (signed-stack non-descriptor-stack) ; (signed-byte 32)
+  (unsigned-stack non-descriptor-stack) ; (unsigned-byte 32)
+  (character-stack non-descriptor-stack) ; non-descriptor characters.
+  (sap-stack non-descriptor-stack) ; System area pointers.
+  (single-stack non-descriptor-stack) ; single-floats
+  (double-stack non-descriptor-stack :element-size 2) ; double floats.
+  ;; complex-single-floats
+  (complex-single-stack non-descriptor-stack :element-size 2)
+  ;; complex-double-floats.
+  (complex-double-stack non-descriptor-stack :element-size 4 :alignment 2)
+
+
+  ;; **** Things that can go in the integer registers.
+
   ;; Non-Descriptor characters
   (character-reg registers
    :locations #.non-descriptor-regs

diff --git a/src/compiler/ppc/vm.lisp b/src/compiler/ppc/vm.lisp
index bfadc74..0de57d5 100644 (file)
--- a/src/compiler/ppc/vm.lisp
+++ b/src/compiler/ppc/vm.lisp
@@ -138,19 +138,10 @@
   ;; The control stack.  (Scanned by GC)
   (control-stack control-stack)
 
-  ;; The non-descriptor stacks.
-  (signed-stack non-descriptor-stack) ; (signed-byte 32)
-  (unsigned-stack non-descriptor-stack) ; (unsigned-byte 32)
-  (character-stack non-descriptor-stack) ; non-descriptor characters.
-  (sap-stack non-descriptor-stack) ; System area pointers.
-  (single-stack non-descriptor-stack) ; single-floats
-  (double-stack non-descriptor-stack
-                :element-size 2 :alignment 2) ; double floats.
-  (complex-single-stack non-descriptor-stack :element-size 2)
-  (complex-double-stack non-descriptor-stack :element-size 4 :alignment 2)
-
-
-  ;; **** Things that can go in the integer registers.
+  ;; 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).
@@ -168,6 +159,20 @@
    :save-p t
    :alternate-scs (control-stack))
 
+  ;; The non-descriptor stacks.
+  (signed-stack non-descriptor-stack) ; (signed-byte 32)
+  (unsigned-stack non-descriptor-stack) ; (unsigned-byte 32)
+  (character-stack non-descriptor-stack) ; non-descriptor characters.
+  (sap-stack non-descriptor-stack) ; System area pointers.
+  (single-stack non-descriptor-stack) ; single-floats
+  (double-stack non-descriptor-stack
+                :element-size 2 :alignment 2) ; double floats.
+  (complex-single-stack non-descriptor-stack :element-size 2)
+  (complex-double-stack non-descriptor-stack :element-size 4 :alignment 2)
+
+
+  ;; **** Things that can go in the integer registers.
+
   ;; Non-Descriptor characters
   (character-reg registers
    :locations #.non-descriptor-regs

diff --git a/src/compiler/sparc/vm.lisp b/src/compiler/sparc/vm.lisp
index bcf7f6d..85595ea 100644 (file)
--- a/src/compiler/sparc/vm.lisp
+++ b/src/compiler/sparc/vm.lisp
@@ -150,6 +150,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) ; (signed-byte 32)
   (unsigned-stack non-descriptor-stack) ; (unsigned-byte 32)
@@ -171,22 +192,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)
-   :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

diff --git a/version.lisp-expr b/version.lisp-expr
index 2867670..cd1b95b 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".)
-"0.9.9.4"
+"0.9.9.5"