X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fparms.lisp;h=4d4cebbbaf0e8a9006ddb816aa6570468f009cbe;hb=fa2c3ba871c9818e5768fd8f6092ddda83a93a1f;hp=0c4af9dc44735024387dc7857c78f5de60f2ea8b;hpb=0f234877047c56ca945fe54e9e77a9cc2c8141cb;p=sbcl.git

diff --git a/src/compiler/x86-64/parms.lisp b/src/compiler/x86-64/parms.lisp
index 0c4af9d..4d4cebb 100644
--- a/src/compiler/x86-64/parms.lisp
+++ b/src/compiler/x86-64/parms.lisp
@@ -35,6 +35,12 @@
 ;;; addressable object
 (def!constant n-byte-bits 8)
 
+;;; The minimum immediate offset in a memory-referencing instruction.
+(def!constant minimum-immediate-offset (- (expt 2 31)))
+
+;;; The maximum immediate offset in a memory-referencing instruction.
+(def!constant maximum-immediate-offset (1- (expt 2 31)))
+
 (def!constant float-sign-shift 31)
 
 ;;; comment from CMU CL:
@@ -97,71 +103,42 @@
 ;;; would be possible, but probably not worth the time and code bloat
 ;;; it would cause. -- JES, 2005-12-11
 
-#!+linux
 (progn
   (def!constant read-only-space-start     #x20000000)
-  (def!constant read-only-space-end       #x27ff0000)
+  (def!constant read-only-space-end       #x200ff000)
 
-  (def!constant static-space-start        #x40000000)
-  (def!constant static-space-end          #x47fff000)
+  (def!constant static-space-start        #x20100000)
+  (def!constant static-space-end          #x201ff000)
 
-  (def!constant dynamic-space-start   #x1000000000)
-  (def!constant dynamic-space-end     #x11ffff0000)
+  (def!constant dynamic-space-start       #x1000000000)
+  #!-openbsd
+  (def!constant dynamic-space-end         (!configure-dynamic-space-end #x11ffff0000))
+  #!+openbsd
+  ;; This is lower on OpenBSD to allow SBCL to run under the default
+  ;; 512M data size limit.
+  (def!constant dynamic-space-end         (!configure-dynamic-space-end #x101bcf0000))
 
-  (def!constant linkage-table-space-start #x60000000)
-  (def!constant linkage-table-space-end   #x63fff000)
+  (def!constant linkage-table-space-start #x20200000)
+  (def!constant linkage-table-space-end   #x202ff000)
 
   (def!constant linkage-table-entry-size 16))
 
-#!+darwin
-(progn
-  (def!constant read-only-space-start     #x20000000)
-  (def!constant read-only-space-end       #x27ff0000)
-
-  (def!constant static-space-start        #x40000000)
-  (def!constant static-space-end          #x47fff000)
-
-  #+nil  (def!constant dynamic-space-start   #x1000000000)
-  #+nil  (def!constant dynamic-space-end     #x11ffff0000)
-
-  (def!constant dynamic-space-start   #x50000000)
-  (def!constant dynamic-space-end     #x5fff0000)
-
-  (def!constant linkage-table-space-start #x60000000)
-  (def!constant linkage-table-space-end   #x63fff000)
-
-  (def!constant linkage-table-entry-size 16))
-
-
 
 ;;;; other miscellaneous constants
 
-(defenum (:suffix -trap :start 8)
-  halt
-  pending-interrupt
-  error
-  cerror
-  breakpoint
-  fun-end-breakpoint
-  single-step-around
-  single-step-before)
-;;; FIXME: It'd be nice to replace all the DEFENUMs with something like
-;;;   (WITH-DEF-ENUM (:START 8)
-;;;     (DEF-ENUM HALT-TRAP)
-;;;     (DEF-ENUM PENDING-INTERRUPT-TRAP)
-;;;     ..)
-;;; for the benefit of anyone doing a lexical search for definitions
-;;; of these symbols.
-
-(defenum (:prefix object-not- :suffix -trap :start 24)
-  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
+  single-step-around-trap
+  single-step-before-trap)
+
+(defenum (:start 24)
+  object-not-list-trap
+  object-not-instance-trap)
 
 ;;;; static symbols
 
@@ -188,11 +165,6 @@
      ;; interrupt handling
      *pseudo-atomic-bits*
 
-     #!+sb-thread *stop-for-gc-pending*
-
-     #!+sb-thread *free-tls-index*
-     #!+sb-thread *tls-index-lock*
-
      *allocation-pointer*
      *binding-stack-pointer*
 
@@ -205,6 +177,9 @@
      ;; For GC-AND-SAVE
      *restart-lisp-function*
 
+     ;; For the UNWIND-TO-FRAME-AND-CALL VOP
+     *unwind-to-frame-function*
+
      ;; Needed for callbacks to work across saving cores. see
      ;; ALIEN-CALLBACK-ASSEMBLER-WRAPPER in c-call.lisp for gory
      ;; details.