X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=b15bb061d708bf5427da2e5c4f23a8c277041ce8;hb=e73a30c901ab234291aefc9f1e73507650628892;hp=8e3ee8ff10b6cea46e2b9b2d8b6d5822ff439add;hpb=e365f2f7a9c66d307b48fee70778f4eaa84bdcc0;p=sbcl.git

diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp
index 8e3ee8f..b15bb06 100644
--- a/src/compiler/x86/parms.lisp
+++ b/src/compiler/x86/parms.lisp
@@ -27,6 +27,10 @@
 ;;; the number of bits per word, where a word holds one lisp descriptor
 (def!constant n-word-bits 32)
 
+;;; the natural width of a machine word (as seen in e.g. register width,
+;;; address space)
+(def!constant n-machine-word-bits 32)
+
 ;;; the number of bits per byte, where a byte is the smallest
 ;;; addressable object
 (def!constant n-byte-bits 8)
@@ -131,6 +135,19 @@
 ;;;     use. (They want to use this address range even if we try to
 ;;;     reserve it with a call to validate() as the first operation in
 ;;;     main().)
+;;;   * For NetBSD 2.0, the following ranges are used by normal
+;;;     executables and mmap:
+;;;     ** Executables are (by default) loaded at 0x08048000.
+;;;     ** The break for the sbcl runtime seems to end around 0x08400000
+;;;     We set read only space around 0x20000000, static
+;;;     space around 0x30000000, all ending below 0x37fff000
+;;;     ** ld.so and other mmap'ed stuff like shared libs start around
+;;;        0x48000000
+;;;     We set dynamic space between 0x60000000 and 0x98000000
+;;;     ** Bottom of the stack is typically not below 0xb0000000
+;;;     FYI, this can be looked at with the "pmap" program, and if you
+;;;     set the top-down mmap allocation option in the kernel (not yet
+;;;     the default), all bets are totally off!
 
 #!+linux
 (progn
@@ -142,31 +159,43 @@
   (def!constant static-space-end      #x07fff000)
 
   (def!constant dynamic-space-start   #x09000000)
-  (def!constant dynamic-space-end     #x29000000)
-
-  (def!constant alternate-signal-stack-start #x58000000))
+  (def!constant dynamic-space-end     #x29000000))
 
-#!+bsd
+#!+(or freebsd openbsd)
 (progn
 
-  (def!constant read-only-space-start #x10000000)
-  (def!constant read-only-space-end   #x1ffff000)
+  (def!constant read-only-space-start
+    #!+freebsd #x10000000
+    #!+openbsd #x40000000)
+  (def!constant read-only-space-end
+    #!+freebsd #x1ffff000
+    #!+openbsd #x47fff000)
 
   (def!constant static-space-start
     #!+freebsd #x30000000
-    #!+openbsd #x28000000)
-  (def!constant static-space-end      #x37fff000)
+    #!+openbsd #x50000000)
+  (def!constant static-space-end
+    #!+freebsd #x37fff000
+    #!+openbsd #x5ffff000)
 
   (def!constant dynamic-space-start
-    #!+freebsd                             #x48000000
-    #!+openbsd                             #x50000000)
-  (def!constant dynamic-space-end          #x88000000)
-  (def!constant alternate-signal-stack-start
-      #!+freebsd #x44000000
-      #!+openbsd #x4c000000))
+    #!+freebsd  #x48000000
+    #!+openbsd  #x80000000)
+  (def!constant dynamic-space-end
+    #!+freebsd #x88000000
+    #!+openbsd #xA0000000))
 
+#!+netbsd
+(progn
+
+  (def!constant read-only-space-start #x20000000)
+  (def!constant read-only-space-end   #x2ffff000)
+
+  (def!constant static-space-start    #x30000000)
+  (def!constant static-space-end      #x37fff000)
 
-;;; don't need alternate-signal-stack-end : it's -start+SIGSTKSZ
+  (def!constant dynamic-space-start   #x60000000)
+  (def!constant dynamic-space-end     #x98000000))
 
 
 ;;; Given that NIL is the first thing allocated in static space, we
@@ -226,11 +255,12 @@
 
     ;; functions that the C code needs to call.  When adding to this list,
     ;; also add a `frob' form in genesis.lisp finish-symbols.
-    maybe-gc
+    sub-gc
     sb!kernel::internal-error
     sb!kernel::control-stack-exhausted-error
     sb!di::handle-breakpoint
     fdefinition-object
+    #!+sb-thread sb!thread::handle-thread-exit
 
     ;; free pointers
     ;; 
@@ -255,12 +285,12 @@
     *free-interrupt-context-index*
 
     *free-tls-index*
-    sb!thread::*foreground-thread-stack*
     
     *allocation-pointer*
     *binding-stack-pointer*
     *binding-stack-start*
     *control-stack-start*
+    *control-stack-end*
 
     ;; the floating point constants
     *fp-constant-0d0*