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

diff --git a/src/compiler/ppc/parms.lisp b/src/compiler/ppc/parms.lisp
index a782cc8..fce1a51 100644
--- a/src/compiler/ppc/parms.lisp
+++ b/src/compiler/ppc/parms.lisp
@@ -1,6 +1,6 @@
 ;;;; This file contains some parameterizations of various VM
-;;;; attributes for the PPC.  This file is separate from other stuff so 
-;;;; that it can be compiled and loaded earlier. 
+;;;; attributes for the PPC.  This file is separate from other stuff so
+;;;; that it can be compiled and loaded earlier.
 
 ;;;; This software is part of the SBCL system. See the README file for
 ;;;; more information.
@@ -25,6 +25,14 @@
 (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)
+
 (def!constant float-sign-shift 31)
 
 (def!constant single-float-bias 126)
@@ -61,14 +69,14 @@
 (def!constant float-round-to-positive 2)
 (def!constant float-round-to-negative 3)
 
-(defconstant-eqx float-rounding-mode (byte 2 0) #'equalp)	  ; RD
+(defconstant-eqx float-rounding-mode (byte 2 0) #'equalp)         ; RD
 ;;; FIXME I: Beware, all ye who trespass here. Despite its name,
 ;;; FLOAT-STICKY-BITS is not the byte specifier for sticky bits in the
 ;;; floating point control word. It is more like "accrued exceptions"
 ;;; where FLOAT-EXCEPTIONS-BYTE is "current exceptions". Consequently,
 ;;; on architectures where there is no "current exceptions"
 ;;; FLOAT-EXCEPTIONS-BYTE and FLOAT-STICKY-BITS had better be the
-;;; same. 
+;;; same.
 ;;;
 ;;; FIXME II: So, I've now documented this in comments in the PowerPC
 ;;; tree. This may not make it easy to find for when new architectures
@@ -77,9 +85,9 @@
 ;;; CSR, 2002-06-11
 (defconstant-eqx float-sticky-bits (byte 5 25) #'equalp)
 (defconstant-eqx float-traps-byte (byte 5 3) #'equalp)
-(defconstant-eqx float-exceptions-byte (byte 5 25) #'equalp)	  ; cexc
+(defconstant-eqx float-exceptions-byte (byte 5 25) #'equalp)      ; cexc
 
-(def!constant float-fast-bit 2)		; Non-IEEE mode
+(def!constant float-fast-bit 2)         ; Non-IEEE mode
 
 
 ;;; Where to put the different spaces.
@@ -90,26 +98,43 @@
 (def!constant static-space-start    #x08000000)
 (def!constant static-space-end      #x097fff00)
 
-;;; FIXME: this is a gross violation of OAOO, done purely to support
-;;; the #define of DYNAMIC_SPACE_SIZE in validate.c -- CSR, 2002-02-25
-;;; (these numbers should match dynamic-0-*)
-(def!constant dynamic-space-start   #x40000000)
-(def!constant dynamic-space-end     #x47fff000)
-
-;;; nothing _seems_ to be using these addresses 
-(def!constant dynamic-0-space-start #x40000000)
-(def!constant dynamic-0-space-end   #x47fff000)
-(def!constant dynamic-1-space-start #x48000000)
-(def!constant dynamic-1-space-end   #x4ffff000)
-
-#+darwin
+#!+linux
 (progn
-  (def!constant linkage-table-space-start #x50000000)
-  (def!constant linkage-table-space-end   #x51000000)
+  #!+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 linkage-table-space-start #x0a000000)
+  (def!constant linkage-table-space-end   #x0b000000)
   (def!constant linkage-table-entry-size 16))
 
+#!+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))
 
-;;;; Other random constants.
+;;;; Other miscellaneous constants.
 
 (defenum (:suffix -trap :start 8)
   halt
@@ -175,9 +200,16 @@
     *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*))
 
 (defparameter *static-funs*
   '(length
@@ -189,7 +221,7 @@
     sb!kernel:two-arg->
     sb!kernel:two-arg-=
     sb!kernel:two-arg-<=
-    sb!kernel:two-arg->=   
+    sb!kernel:two-arg->=
     sb!kernel:two-arg-/=
     eql
     sb!kernel:%negate