X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsparc%2Fparms.lisp;h=e377082663dfdc87a09df04367b5ed587932c6ce;hb=eda83f00e869193cb69826be5fa1086b95d12ff7;hp=55b5c267bbc640fa29570e6b59fbd7e6160b17ef;hpb=3c36067afdc35afa7d4a6dd381f8cba456c88f34;p=sbcl.git

diff --git a/src/compiler/sparc/parms.lisp b/src/compiler/sparc/parms.lisp
index 55b5c26..e377082 100644
--- a/src/compiler/sparc/parms.lisp
+++ b/src/compiler/sparc/parms.lisp
@@ -22,6 +22,12 @@
 ;;; number of bits per byte where a byte is the smallest addressable object
 (def!constant n-byte-bits 8)
 
+;;; flags for the generational garbage collector
+(def!constant pseudo-atomic-interrupted-flag 1)
+(def!constant pseudo-atomic-flag
+    ;; Must be (ash 1 (1- sb-vm:n-lowtag-bits)) for cheneygc ALLOCATION.
+    4)
+
 (def!constant float-sign-shift 31)
 
 (def!constant single-float-bias 126)
@@ -90,12 +96,12 @@
 ;;;; Description of the target address space.
 
 ;;; Where to put the different spaces.  Must match the C code!
-#!+linux
+#!+(and linux cheneygc)
 (progn
   (def!constant linkage-table-space-start #x0f800000)
   (def!constant linkage-table-space-end   #x10000000)
 
-  (def!constant read-only-space-start     #x10000000)
+  (def!constant read-only-space-start     #x11000000)
   (def!constant read-only-space-end       #x15000000)
 
   (def!constant static-space-start        #x28000000)
@@ -107,12 +113,26 @@
   (def!constant dynamic-1-space-start #x40000000)
   (def!constant dynamic-1-space-end   #x48000000))
 
-#!+sunos ; might as well start by trying the same numbers
+#!+(and linux gencgc) ; sensibly small read-only and static spaces
+(progn
+  (def!constant linkage-table-space-start #x0f800000)
+  (def!constant linkage-table-space-end   #x10000000)
+
+  (def!constant read-only-space-start     #x11000000)
+  (def!constant read-only-space-end       #x110ff000)
+
+  (def!constant static-space-start        #x11100000)
+  (def!constant static-space-end          #x111ff000)
+
+  (def!constant dynamic-space-start       #x30000000)
+  (def!constant dynamic-space-end         (!configure-dynamic-space-end)))
+
+#!+(and sunos cheneygc) ; might as well start by trying the same numbers
 (progn
   (def!constant linkage-table-space-start #x0f800000)
   (def!constant linkage-table-space-end   #x10000000)
 
-  (def!constant read-only-space-start     #x10000000)
+  (def!constant read-only-space-start     #x11000000)
   (def!constant read-only-space-end       #x15000000)
 
   (def!constant static-space-start        #x28000000)
@@ -124,22 +144,36 @@
   (def!constant dynamic-1-space-start     #x40000000)
   (def!constant dynamic-1-space-end       #x48000000))
 
+#!+(and sunos gencgc) ; sensibly small read-only and static spaces
+(progn
+  (def!constant linkage-table-space-start #x0f800000)
+  (def!constant linkage-table-space-end   #x10000000)
+
+  (def!constant read-only-space-start     #x11000000)
+  (def!constant read-only-space-end       #x110ff000)
+
+  (def!constant static-space-start        #x11100000)
+  (def!constant static-space-end          #x111ff000)
+
+  (def!constant dynamic-space-start       #x30000000)
+  (def!constant dynamic-space-end         (!configure-dynamic-space-end)))
+
 #!+netbsd ; Need a gap at 0x4000000 for shared libraries
 (progn
   (def!constant linkage-table-space-start #x0f800000)
   (def!constant linkage-table-space-end   #x10000000)
 
-  (def!constant read-only-space-start     #x10000000)
+  (def!constant read-only-space-start     #x11000000)
   (def!constant read-only-space-end       #x15000000)
 
   (def!constant static-space-start        #x18000000)
   (def!constant static-space-end          #x1c000000)
 
-  (def!constant dynamic-0-space-start     #x20000000)
-  (def!constant dynamic-0-space-end       #x38000000)
+  (def!constant dynamic-0-space-start     #x48000000)
+  (def!constant dynamic-0-space-end       #x5ffff000)
 
-  (def!constant dynamic-1-space-start     #x48000000)
-  (def!constant dynamic-1-space-end       #x60000000))
+  (def!constant dynamic-1-space-start     #x60000000)
+  (def!constant dynamic-1-space-end       #x77fff000))
 
 ;; Size of one linkage-table entry in bytes. See comment in
 ;; src/runtime/sparc-arch.c
@@ -148,26 +182,21 @@
 
 ;;;; other random constants.
 
-(defenum (:suffix -trap :start 8)
-  halt
-  pending-interrupt
-  error
-  cerror
-  breakpoint
-  fun-end-breakpoint
-  after-breakpoint
-  single-step-around
-  single-step-before)
-
-(defenum (:prefix object-not- :suffix -trap :start 24)
-  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
+  single-step-around-trap
+  single-step-before-trap
+  #!+gencgc allocation-trap)
+
+(defenum (:start 24)
+  object-not-list-trap
+  object-not-instance-trap)
 
 ;;;; static symbols.
 
@@ -183,21 +212,14 @@
   (append
    *common-static-symbols*
    *c-callable-static-symbols*
-   '()))
+   '(#!+gencgc *restart-lisp-function*)))
 
 (defparameter *static-funs*
   '(length
     two-arg-+ two-arg-- two-arg-* two-arg-/ two-arg-< two-arg-> two-arg-=
     two-arg-<= two-arg->= two-arg-/= eql %negate
     two-arg-and two-arg-ior two-arg-xor two-arg-eqv
-    two-arg-gcd two-arg-lcm
-    ))
-
-;;;; Assembler parameters:
-
-;;; The number of bits per element in the assemblers code vector.
-(defparameter *assembly-unit-length* 8)
-
+    two-arg-gcd two-arg-lcm))
 
 ;;;; Pseudo-atomic trap number