X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsparc%2Fparms.lisp;h=402db7ce6e28bc7e23b8d3c57e16d63322c608e5;hb=96aa790ea1d70810e862665c3c8be4ce405a964c;hp=cd388a8a18793340dcb3d1fae46111433f84a1b2;hpb=5e1fcdac979db9a6aebe69531229355def8c0f90;p=sbcl.git

diff --git a/src/compiler/sparc/parms.lisp b/src/compiler/sparc/parms.lisp
index cd388a8..402db7c 100644
--- a/src/compiler/sparc/parms.lisp
+++ b/src/compiler/sparc/parms.lisp
@@ -73,10 +73,10 @@
 (def!constant float-round-to-positive 2)
 (def!constant float-round-to-negative 3)
 
-(defconstant-eqx float-rounding-mode (byte 2 30) #'equalp)	  ; RD 
-(defconstant-eqx float-sticky-bits (byte 5 5) #'equalp)	  ; aexc
-(defconstant-eqx float-traps-byte (byte 5 23) #'equalp)	  ; TEM
-(defconstant-eqx float-exceptions-byte (byte 5 0) #'equalp)	  ; cexc
+(defconstant-eqx float-rounding-mode (byte 2 30) #'equalp)        ; RD
+(defconstant-eqx float-sticky-bits (byte 5 5) #'equalp)   ; aexc
+(defconstant-eqx float-traps-byte (byte 5 23) #'equalp)   ; TEM
+(defconstant-eqx float-exceptions-byte (byte 5 0) #'equalp)       ; cexc
 
 ;;; According to the SPARC doc (as opposed to FPU doc), the fast mode
 ;;; bit (EFM) is "reserved", and should always be zero.  However, for
@@ -94,23 +94,16 @@
 (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)
   (def!constant static-space-end          #x2c000000)
 
-  ;; From alpha/parms.lisp:
-  ;; this is used in PURIFY as part of a sloppy check to see if a pointer
-  ;; is in dynamic space.  Chocolate brownie for the first person to fix it
-  ;; -dan 20010502
-  (def!constant dynamic-space-start   #x30000000)
-  (def!constant dynamic-space-end     #x38000000)
-
   (def!constant dynamic-0-space-start #x30000000)
   (def!constant dynamic-0-space-end   #x38000000)
-  
+
   (def!constant dynamic-1-space-start #x40000000)
   (def!constant dynamic-1-space-end   #x48000000))
 
@@ -118,22 +111,36 @@
 (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)
   (def!constant static-space-end          #x2c000000)
 
-  (def!constant dynamic-space-start       #x30000000)
-  (def!constant dynamic-space-end         #x38000000)
-
   (def!constant dynamic-0-space-start     #x30000000)
   (def!constant dynamic-0-space-end       #x38000000)
-  
+
   (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)
@@ -141,24 +148,20 @@
 
 ;;;; 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)
 
 ;;;; static symbols.
 
@@ -171,38 +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-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