X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=81718ef2b6251e79bac8af9da5280048ad0859f2;hb=b5703d98da9ebfd688c87e14862ab4e26dc94d14;hp=e342bf8d8d7f596afddc88f913f66e7e3e052a60;hpb=35e306eeebc40ce947247e3df47a63f47d01734d;p=sbcl.git

diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp
index e342bf8..81718ef 100644
--- a/src/compiler/x86/parms.lisp
+++ b/src/compiler/x86/parms.lisp
@@ -116,13 +116,25 @@
 ;;;   * On FreeBSD,
 ;;;     ** The space 0x0E000000-0x10000000 is "Foreign segment".
 ;;;     ** The space 0x20000000-0x30000000 is reserved for shared libs.
-;;; And there have been a few changes since the fork:
+;;; And there have been some changes since the fork from CMU CL:
+;;;   * The OpenBSD port is new since the fork. We started with
+;;;     the FreeBSD address map, which actually worked until the
+;;;     Alpha port patches, for reasons which in retrospect are rather
+;;;     mysterious. After the Alpha port patches were added, the
+;;;     OpenBSD port suffered memory corruption problems. While
+;;;     debugging those, it was discovered that src/runtime/trymap
+;;;     failed for the control stack region #x40000000-#x47fff000.
+;;;     After the control stack was moved upward out of this region
+;;;     (stealing some bytes from dynamic space) the problems went
+;;;     away.
 ;;;   * The FreeBSD STATIC-SPACE-START value was bumped up from
 ;;;     #x28000000 to #x30000000 when FreeBSD ld.so dynamic linking
 ;;;     support was added for FreeBSD ca. 20000910. This was to keep from
-;;;     stomping on an address range that the dynamic libraries want to 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().)
+;;;     stomping on an address range that the dynamic libraries want to
+;;;     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().)
+
 #!+linux
 (progn
 
@@ -155,10 +167,15 @@
   (defconstant binding-stack-start   #x38000000)
   (defconstant binding-stack-end     #x3ffff000)
 
-  (defconstant control-stack-start   #x40000000)
-  (defconstant control-stack-end     #x47fff000)
-
-  (defconstant dynamic-space-start   #x48000000)
+  (defconstant control-stack-start
+    #+freebsd #x40000000
+    #+openbsd #x48000000)
+  (defconstant control-stack-end
+    #+freebsd #x47fff000
+    #+openbsd #x4ffff000)
+  (defconstant dynamic-space-start
+    #+freebsd #x48000000
+    #+openbsd #x50000000)
   (defconstant dynamic-space-end     #x88000000))
 
 ;;; Given that NIL is the first thing allocated in static space, we
@@ -207,8 +224,6 @@
 ;;;     Note these spaces grow from low to high addresses.
 (defvar *allocation-pointer*)
 (defvar *binding-stack-pointer*)
-(defvar *x86-cgc-active-p*) ; FIXME: Document this.
-(defvar *static-blue-bag* nil)
 
 ;;; FIXME: *!INITIAL-FDEFN-OBJECTS* and !COLD-INIT probably don't need
 ;;; to be in the static symbols table any more. Also, if
@@ -221,11 +236,10 @@
     sb!impl::*!initial-fdefn-objects*
 
     ;; functions that the C code needs to call
-    sb!impl::!cold-init
-    sb!impl::maybe-gc
+    maybe-gc
     sb!kernel::internal-error
     sb!di::handle-breakpoint
-    sb!impl::fdefinition-object
+    fdefinition-object
 
     ;; free pointers
     ;; 
@@ -238,17 +252,17 @@
     *initial-dynamic-space-free-pointer*
 
     ;; things needed for non-local exit
-    sb!impl::*current-catch-block*
-    sb!impl::*current-unwind-protect-block*
-    sb!c::*eval-stack-top*
+    *current-catch-block*
+    *current-unwind-protect-block*
+    *eval-stack-top*
     sb!vm::*alien-stack*
 
     ;; interrupt handling
-    sb!impl::*pseudo-atomic-atomic*
-    sb!impl::*pseudo-atomic-interrupted*
+    *pseudo-atomic-atomic*
+    *pseudo-atomic-interrupted*
     sb!unix::*interrupts-enabled*
     sb!unix::*interrupt-pending*
-    sb!impl::*free-interrupt-context-index*
+    *free-interrupt-context-index*
 
     sb!vm::*allocation-pointer*
     sb!vm::*binding-stack-pointer*
@@ -268,29 +282,13 @@
     sb!vm::*fp-constant-lg2*
     sb!vm::*fp-constant-ln2*
 
-    ;; used by gencgc
-    sb!vm::*scavenge-read-only-space*
-
     ;; The ..SLOT-UNBOUND.. symbol is static in order to optimise the
     ;; common slot unbound check.
-    sb!pcl::..slot-unbound..
-
-    ;; spare symbols
-    sb!vm::spare-10
-    sb!vm::spare-9
-    sb!vm::spare-8
-    sb!vm::spare-7
-    sb!vm::spare-6
-    sb!vm::spare-5
-    sb!vm::spare-4
-    sb!vm::spare-3
-    sb!vm::spare-2
-    sb!vm::spare-1
-
-    ;; used by cgc
-    sb!vm::*x86-cgc-active-p*
-    sb!vm::*static-blue-bag*		; must be last or change C code
-    ))
+    ;;
+    ;; FIXME: In SBCL, the CLOS code has become sufficiently tightly
+    ;; integrated into the system that it'd probably make sense to use
+    ;; the ordinary unbound marker for this.
+    sb!pcl::..slot-unbound..))
 
 (defparameter *static-functions*
   '(length