Let OFFSET-CONFLICTS-IN-SB check multiple offsets at a time

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

diff --git a/src/compiler/ppc/parms.lisp b/src/compiler/ppc/parms.lisp
index 2ce0502..c907087 100644 (file)
--- a/src/compiler/ppc/parms.lisp
+++ b/src/compiler/ppc/parms.lisp
@@ -24,11 +24,6 @@
 ;;; object
 (def!constant n-byte-bits 8)
 
-
-;;; The size in bytes of the GENCGC pages. Should be a multiple of the
-;;; architecture code size.
-(def!constant gencgc-page-size 4096)
-
 ;;; flags for the generational garbage collector
 (def!constant pseudo-atomic-interrupted-flag 1)
 (def!constant pseudo-atomic-flag 4)
@@ -90,72 +85,90 @@
 (def!constant float-fast-bit 2)         ; Non-IEEE mode
 
 \f
-;;; Where to put the different spaces.
+;;;; Where to put the different spaces.
+
+;;; 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 linkage-table-space-start #x0a000000)
+  (def!constant linkage-table-space-end   #x0b000000))
 
-(def!constant read-only-space-start #x01000000)
-(def!constant read-only-space-end   #x04ff8000)
+;;; While on gencgc we don't.
+#!+gencgc
+(!gencgc-space-setup #x04000000
+                     #!+linux   #x4f000000
+                     #!+netbsd  #x4f000000
+                     #!+openbsd #x4f000000
+                     #!+darwin  #x10000000)
 
-(def!constant static-space-start    #x08000000)
-(def!constant static-space-end      #x097fff00)
+(def!constant linkage-table-entry-size 16)
 
 #!+linux
 (progn
-  #!+gencgc
-  (progn
-    (def!constant dynamic-space-start #x50000000)
-    (def!constant dynamic-space-end   #x7ffff000))
   #!-gencgc
   (progn
-    (def!constant dynamic-0-space-start #x50000000)
-    (def!constant dynamic-0-space-end   #x67fff000)
-    (def!constant dynamic-1-space-start #x68000000)
-    (def!constant dynamic-1-space-end   #x7ffff000))
+    (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))
+#!+netbsd
+(progn
+  #!-gencgc
+  (progn
+    (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)))
+
+;;; 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
+  (progn
+    (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-space-start #x10000000)
-    (def!constant dynamic-space-end   #x6ffff000))
   #!-gencgc
   (progn
     (def!constant dynamic-0-space-start #x10000000)
     (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)))
 \f
 ;;;; Other miscellaneous constants.
 
-(defenum (:suffix -trap :start 8)
-  halt
-  pending-interrupt
-  error
-  cerror
-  breakpoint
-  fun-end-breakpoint
-  after-breakpoint
-  fixnum-additive-overflow)
-
-(defenum (:prefix object-not- :suffix -trap :start 16)
-  list
-  instance)
-
-(defenum (:prefix trace-table-)
-  normal
-  call-site
-  fun-prologue
-  fun-epilogue)
-
+(defenum (:start 8)
+  halt-trap
+  pending-interrupt-trap
+  error-trap
+  cerror-trap
+  breakpoint-trap
+  fun-end-breakpoint-trap
+  after-breakpoint-trap
+  fixnum-additive-overflow-trap
+  single-step-around-trap
+  single-step-before-trap)
+
+(defenum (:start 24)
+  object-not-list-trap
+  object-not-instance-trap)
 \f
 ;;;; Static symbols.
 
@@ -201,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)