X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=cb4d029808883ec6a9d7c4e832d908be9b4cf502;hb=d57319a52914c481d89415c0860dc6b7ad90ddce;hp=bf151fa9df2856f15089ab18a500a78d90f3c2d7;hpb=8731c1a7c1a585d190151fa881050fb5e14c0616;p=sbcl.git

diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp
index bf151fa..cb4d029 100644
--- a/src/compiler/x86/parms.lisp
+++ b/src/compiler/x86/parms.lisp
@@ -27,16 +27,14 @@
 ;;; 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)
 
-;;; the number of bits to shift between word addresses and byte addresses
-(def!constant word-shift (1- (integer-length (/ n-word-bits n-byte-bits))))
-
-;;; the number of bytes in a word
-(def!constant n-word-bytes (/ n-word-bits n-byte-bits))
-
 (def!constant float-sign-shift 31)
 
 ;;; comment from CMU CL:
@@ -92,6 +90,10 @@
 (def!constant float-round-to-positive 2)
 (def!constant float-round-to-zero     3)
 
+(def!constant float-precision-24-bit 0)
+(def!constant float-precision-53-bit 2)
+(def!constant float-precision-64-bit 3)
+
 (defconstant-eqx float-rounding-mode     (byte 2 10) #'equalp)
 (defconstant-eqx float-sticky-bits       (byte 6 16) #'equalp)
 (defconstant-eqx float-traps-byte        (byte 6  0) #'equalp)
@@ -131,6 +133,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,38 +157,44 @@
   (def!constant static-space-end      #x07fff000)
 
   (def!constant dynamic-space-start   #x09000000)
-  (def!constant dynamic-space-end     #x29000000)
+  (def!constant dynamic-space-end     #x29000000))
 
-  (def!constant control-stack-start   #x50000000)
-  (def!constant control-stack-end     #x57fff000)
-
-  (def!constant binding-stack-start   #x60000000)
-  (def!constant binding-stack-end     #x67fff000))
-
-#!+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)
+    #!+openbsd #x50000000)
+  (def!constant static-space-end
+    #!+freebsd #x37fff000
+    #!+openbsd #x5ffff000)
+
+  (def!constant dynamic-space-start
+    #!+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)
 
-  (def!constant binding-stack-start   #x38000000)
-  (def!constant binding-stack-end     #x3ffff000)
+  (def!constant dynamic-space-start   #x60000000)
+  (def!constant dynamic-space-end     #x98000000))
 
-  (def!constant control-stack-start
-    #!+freebsd #x40000000
-    #!+openbsd #x48000000)
-  (def!constant control-stack-end
-    #!+freebsd #x47fff000
-    #!+openbsd #x4ffff000)
-  (def!constant dynamic-space-start
-    #!+freebsd #x48000000
-    #!+openbsd #x50000000)
-  (def!constant dynamic-space-end     #x88000000))
 
 ;;; Given that NIL is the first thing allocated in static space, we
 ;;; know its value at compile time:
@@ -222,21 +243,22 @@
 (defvar *allocation-pointer*)
 (defvar *binding-stack-pointer*)
 
-;;; FIXME: *!INITIAL-FDEFN-OBJECTS* and !COLD-INIT probably don't need
-;;; to be in the static symbols table any more. Also, if
-;;; *INTERNAL-GC-TRIGGER* really is not used, we can punt it.
+;;; FIXME: !COLD-INIT probably doesn't need
+;;; to be in the static symbols table any more.
 (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
-    maybe-gc
+    ;; functions that the C code needs to call.  When adding to this list,
+    ;; also add a `frob' form in genesis.lisp finish-symbols.
+    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
     ;; 
@@ -260,9 +282,13 @@
     sb!unix::*interrupt-pending*
     *free-interrupt-context-index*
 
+    *free-tls-index*
+    
     *allocation-pointer*
     *binding-stack-pointer*
-    *internal-gc-trigger*   ; Not used.
+    *binding-stack-start*
+    *control-stack-start*
+    *control-stack-end*
 
     ;; the floating point constants
     *fp-constant-0d0*