1.1.13: will be tagged as "sbcl-1.1.13"

[sbcl.git] / src / compiler / ppc / parms.lisp

diff --git a/src/compiler/ppc/parms.lisp b/src/compiler/ppc/parms.lisp
index 1e443b4..c907087 100644 (file)
--- a/src/compiler/ppc/parms.lisp
+++ b/src/compiler/ppc/parms.lisp
@@ -100,23 +100,16 @@
 
 ;;; 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))
+(!gencgc-space-setup #x04000000
+                     #!+linux   #x4f000000
+                     #!+netbsd  #x4f000000
+                     #!+openbsd #x4f000000
+                     #!+darwin  #x10000000)
 
 (def!constant linkage-table-entry-size 16)
 
 #!+linux
 (progn
-  #!+gencgc
-  (progn
-    (def!constant dynamic-space-start #x4f000000)
-    (def!constant dynamic-space-end   #x7efff000))
   #!-gencgc
   (progn
     (def!constant dynamic-0-space-start #x4f000000)
@@ -126,10 +119,6 @@
 
 #!+netbsd
 (progn
-  #!+gencgc
-  (progn
-    (def!constant dynamic-space-start #x4f000000)
-    (def!constant dynamic-space-end   #x7efff000))
   #!-gencgc
   (progn
     (def!constant dynamic-0-space-start #x4f000000)
@@ -137,12 +126,24 @@
     (def!constant dynamic-1-space-start #x67000000)
     (def!constant dynamic-1-space-end   #x7efff000)))
 
-#!+darwin
+;;; Text and data segments start at #x01800000.  Range for randomized
+;;; malloc() starts #x20000000 (MAXDSIZ) after end of data seg and
+;;; extends 256 MB.  Use 512 - 64 MB for dynamic space so we can run
+;;; under default resource limits.
+;;; FIXME: MAXDSIZ is a kernel parameter, and can vary as high as 1GB.
+;;; These parameters should probably be tested under such a configuration,
+;;; as rare as it might or might not be.
+#!+openbsd
 (progn
-  #!+gencgc
+  #!-gencgc
   (progn
-    (def!constant dynamic-space-start #x10000000)
-    (def!constant dynamic-space-end   #x6ffff000))
+    (def!constant dynamic-0-space-start #x4f000000)
+    (def!constant dynamic-0-space-end   #x5cfff000)
+    (def!constant dynamic-1-space-start #x5f000000)
+    (def!constant dynamic-1-space-end   #x6cfff000)))
+
+#!+darwin
+(progn
   #!-gencgc
   (progn
     (def!constant dynamic-0-space-start #x10000000)
@@ -213,10 +214,3 @@
     sb!kernel:two-arg-eqv
     sb!kernel:two-arg-gcd
     sb!kernel:two-arg-lcm))
-
-\f
-;;;; Assembler parameters:
-
-;;; The number of bits per element in the assemblers code vector.
-;;;
-(defparameter *assembly-unit-length* 8)