Steel Bank Common Lisp

Update of /cvsroot/sbcl/sbcl/src/compiler/ppc
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29413/src/compiler/ppc

Modified Files:
	parms.lisp 
Log Message:
1.0.5.14: make PURIFY a no-op on gencgc

         * Purification doesn't really make any sense with gencgc, since we
           have an uncollected generation with a write barrier these days.
         * Apparently it had also bitrotted on ppc/gencgc between 1.0.0 and
           1.0.4, causing crashes with software doing (SAVE-LISP-AND-DIE
           ... :PURIFY T), for example Maxima. (Reported by Rex Dieter)
         * So make PURIFY a no-op on gencgc, and remove about 600 lines worth of
           #ifdeffed OAOO violations from purify.c.
         * Allows shrinking the static and read-only spaces into something
           sensible (arbitrary value of 1MB selected), and moving all of them
           closer together to reduce the virtual address space footprint.
         * Move + shrink the linkage-table while we're at it.


Index: parms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/ppc/parms.lisp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- parms.lisp	5 Feb 2007 07:23:40 -0000	1.33
+++ parms.lisp	30 Apr 2007 20:55:43 -0000	1.34
@@ -85,13 +85,31 @@
 (def!constant float-fast-bit 2)         ; Non-IEEE mode
 
 
-;;; Where to put the different spaces.
+;;;; Where to put the different spaces.
 
-(def!constant read-only-space-start #x04000000)
-(def!constant read-only-space-end   #x07ff8000)
+;;; On non-gencgc we need large dynamic and static spaces for PURIFY
+#!-gencgc
+(progn
+  (def!constant read-only-space-start #x04000000)
+  (def!constant read-only-space-end   #x07ff8000)
+  (def!constant static-space-start    #x08000000)
+  (def!constant static-space-end      #x097fff00)
 
-(def!constant static-space-start    #x08000000)
-(def!constant static-space-end      #x097fff00)
+  (def!constant linkage-table-space-start #x0a000000)
+  (def!constant linkage-table-space-end   #x0b000000))
+
+;;; While on gencgc we don't.
+#!+gencgc
+(progn
+  (def!constant read-only-space-start #x04000000)
+  (def!constant read-only-space-end   #x040ff000)
+  (def!constant static-space-start    #x04100000)
+  (def!constant static-space-end      #x041ff000)
+
+  (def!constant linkage-table-space-start #x04200000)
+  (def!constant linkage-table-space-end   #x042ff000))
+
+(def!constant linkage-table-entry-size 16)
 
 #!+linux
 (progn
@@ -104,11 +122,7 @@
     (def!constant dynamic-0-space-start #x4f000000)
     (def!constant dynamic-0-space-end   #x66fff000)
     (def!constant dynamic-1-space-start #x67000000)
-    (def!constant dynamic-1-space-end   #x7efff000))
-
-  (def!constant linkage-table-space-start #x0a000000)
-  (def!constant linkage-table-space-end   #x0b000000)
-  (def!constant linkage-table-entry-size 16))
+    (def!constant dynamic-1-space-end   #x7efff000)))
 
 #!+netbsd
 (progn
@@ -121,11 +135,7 @@
     (def!constant dynamic-0-space-start #x4f000000)
     (def!constant dynamic-0-space-end   #x66fff000)
     (def!constant dynamic-1-space-start #x67000000)
-    (def!constant dynamic-1-space-end   #x7efff000))
-
-  (def!constant linkage-table-space-start #x0a000000)
-  (def!constant linkage-table-space-end   #x0b000000)
-  (def!constant linkage-table-entry-size 16))
+    (def!constant dynamic-1-space-end   #x7efff000)))
 
 #!+darwin
 (progn
@@ -139,12 +149,7 @@
     (def!constant dynamic-0-space-end   #x3ffff000)
 
     (def!constant dynamic-1-space-start #x40000000)
-    (def!constant dynamic-1-space-end   #x6ffff000))
-
-
-  (def!constant linkage-table-space-start #x0a000000)
-  (def!constant linkage-table-space-end   #x0b000000)
-  (def!constant linkage-table-entry-size 16))
+    (def!constant dynamic-1-space-end   #x6ffff000)))
 
 ;;;; Other miscellaneous constants.