X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Fparms.lisp;h=c6449783c367e3f3a7009d44b7db6b43c1b44154;hb=3c8b7b5089ae068f3dcdf84d7545562ac33e67be;hp=fce1a511b6a139c8b3cc1fe7b8c7339cc3d17056;hpb=3a0f3612dc2bbf3e4e8e7395bcbbf8cd1791b963;p=sbcl.git

diff --git a/src/compiler/ppc/parms.lisp b/src/compiler/ppc/parms.lisp
index fce1a51..c644978 100644
--- 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,30 +85,57 @@
 (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 #x01000000)
-(def!constant read-only-space-end   #x04ff8000)
+;;; 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
   #!+gencgc
   (progn
-    (def!constant dynamic-space-start #x50000000)
-    (def!constant dynamic-space-end   #x7ffff000))
+    (def!constant dynamic-space-start #x4f000000)
+    (def!constant dynamic-space-end   #x7efff000))
   #!-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-space-start #x4f000000)
+    (def!constant dynamic-space-end   #x7efff000))
+  #!-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)))
 
 #!+darwin
 (progn
@@ -127,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.
 
@@ -144,9 +161,11 @@
   breakpoint
   fun-end-breakpoint
   after-breakpoint
-  fixnum-additive-overflow)
+  fixnum-additive-overflow
+  single-step-around
+  single-step-before)
 
-(defenum (:prefix object-not- :suffix -trap :start 16)
+(defenum (:prefix object-not- :suffix -trap :start 24)
   list
   instance)
 
@@ -169,47 +188,17 @@
 ;;; can be loaded directly out of them by indirecting relative to NIL.
 ;;;
 (defparameter *static-symbols*
-  '(t
-
-    ;; The C startup code must fill these in.
-    *posix-argv*
-
-    ;; functions that the C code needs to call
-    sb!impl::sub-gc
-    sb!kernel::internal-error
-    sb!kernel::control-stack-exhausted-error
-    sb!kernel::undefined-alien-variable-error
-    sb!kernel::undefined-alien-function-error
-    sb!di::handle-breakpoint
-    sb!impl::fdefinition-object
-
-    ;; free pointers
-    *read-only-space-free-pointer*
-    *static-space-free-pointer*
-    *initial-dynamic-space-free-pointer*
-
-    ;; things needed for non-local exit
-    *current-catch-block*
-    *current-unwind-protect-block*
-
-    *binding-stack-start*
-    *control-stack-start*
-    *control-stack-end*
-
-    ;; interrupt handling
-    *free-interrupt-context-index*
-    sb!unix::*interrupts-enabled*
-    sb!unix::*interrupt-pending*
-    *gc-inhibit*
-    *gc-pending*
-
-    *restart-lisp-function*
-
-    ;; CLH: 20060210 Taken from x86-64/parms.lisp per JES' suggestion
-    ;; Needed for callbacks to work across saving cores. see
-    ;; ALIEN-CALLBACK-ASSEMBLER-WRAPPER in c-call.lisp for gory
-    ;; details.
-    sb!alien::*enter-alien-callback*))
+  (append
+   *common-static-symbols*
+   *c-callable-static-symbols*
+   '(
+     #!+gencgc *restart-lisp-function*
+
+     ;; CLH: 20060210 Taken from x86-64/parms.lisp per JES' suggestion
+     ;; Needed for callbacks to work across saving cores. see
+     ;; ALIEN-CALLBACK-ASSEMBLER-WRAPPER in c-call.lisp for gory
+     ;; details.
+     sb!alien::*enter-alien-callback*)))
 
 (defparameter *static-funs*
   '(length