1.0.32.12: Fix slot-value on specialized parameters in SVUC methods

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

diff --git a/src/compiler/sparc/parms.lisp b/src/compiler/sparc/parms.lisp
index 59b24ca..402db7c 100644 (file)
--- a/src/compiler/sparc/parms.lisp
+++ b/src/compiler/sparc/parms.lisp
@@ -95,7 +95,7 @@
   (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)
@@ -112,7 +112,7 @@
   (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,6 +124,23 @@
   (def!constant dynamic-1-space-start     #x40000000)
   (def!constant dynamic-1-space-end       #x48000000))
 
+#!+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     #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     #x48000000)
+  (def!constant dynamic-0-space-end       #x5ffff000)
+
+  (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
 (def!constant linkage-table-entry-size 16)
@@ -131,24 +148,20 @@
 \f
 ;;;; other random constants.
 
-(defenum (:suffix -trap :start 8)
-  halt
-  pending-interrupt
-  error
-  cerror
-  breakpoint
-  fun-end-breakpoint
-  after-breakpoint)
-
-(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
+  single-step-around-trap
+  single-step-before-trap)
+
+(defenum (:start 24)
+  object-not-list-trap
+  object-not-instance-trap)
 \f
 ;;;; static symbols.
 
@@ -161,39 +174,10 @@
 ;;; 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*
-    sb!impl::*!initial-fdefn-objects*
-
-    ;; functions that the C code needs to call
-    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!di::handle-fun-end-breakpoint
-
-    ;; 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*
-    ))
+  (append
+   *common-static-symbols*
+   *c-callable-static-symbols*
+   '()))
 
 (defparameter *static-funs*
   '(length