X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Fparms.lisp;h=eddee91a3c328d671279a9b999228293e39a4057;hb=230707c1899c1c008f7ce2ad97e2fd04849f7443;hp=c4ea36c7ab7fdf53eb86ca2fe4a7da10d7613a97;hpb=f1bfc1a57bd576e191574b9f42d7610813195e19;p=sbcl.git diff --git a/src/compiler/ppc/parms.lisp b/src/compiler/ppc/parms.lisp index c4ea36c..eddee91 100644 --- a/src/compiler/ppc/parms.lisp +++ b/src/compiler/ppc/parms.lisp @@ -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) @@ -92,18 +100,35 @@ #!+linux (progn - (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)) + #!+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)) + + (def!constant linkage-table-space-start #x0a000000) + (def!constant linkage-table-space-end #x0b000000) + (def!constant linkage-table-entry-size 16)) #!+darwin (progn - ;;; nothing _seems_ to be using these addresses - (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) + #!+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) @@ -144,39 +169,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*)) + (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