X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=0fd0dca6e35637abfcee460d42d9e7aca5f64846;hb=67f44c921881037d272c5245f0ca2ab74ce1f763;hp=44b50507bd148b316f0461862eff70dc2dba15d9;hpb=46c787a2d562c47d895d33b43de60f0bf6245762;p=sbcl.git

diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp
index 44b5050..0fd0dca 100644
--- a/src/compiler/x86/parms.lisp
+++ b/src/compiler/x86/parms.lisp
@@ -186,7 +186,6 @@
 
 #!+win32
 (progn
-
   (def!constant read-only-space-start #x22000000)
   (def!constant read-only-space-end   #x220ff000)
 
@@ -194,7 +193,7 @@
   (def!constant static-space-end      #x221ff000)
 
   (def!constant dynamic-space-start   #x22300000)
-  (def!constant dynamic-space-end     #x42300000)
+  (def!constant dynamic-space-end     (!configure-dynamic-space-end))
 
   (def!constant linkage-table-space-start #x22200000)
   (def!constant linkage-table-space-end   #x222ff000))
@@ -208,7 +207,7 @@
   (def!constant static-space-end          #x011ff000)
 
   (def!constant dynamic-space-start       #x09000000)
-  (def!constant dynamic-space-end         #x29000000)
+  (def!constant dynamic-space-end         (!configure-dynamic-space-end))
 
   (def!constant linkage-table-space-start #x01200000)
   (def!constant linkage-table-space-end   #x012ff000))
@@ -222,7 +221,7 @@
   (def!constant static-space-end          #x201ff000)
 
   (def!constant dynamic-space-start       #x48000000)
-  (def!constant dynamic-space-end         #xA0000000)
+  (def!constant dynamic-space-end         (!configure-dynamic-space-end))
 
   (def!constant linkage-table-space-start #x20200000)
   (def!constant linkage-table-space-end   #x202ff000))
@@ -236,7 +235,7 @@
   (def!constant static-space-end          #x011ff000)
 
   (def!constant dynamic-space-start       #x58000000)
-  (def!constant dynamic-space-end         #x98000000)
+  (def!constant dynamic-space-end         (!configure-dynamic-space-end))
 
   (def!constant linkage-table-space-start #x01200000)
   (def!constant linkage-table-space-end   #x012ff000))
@@ -250,7 +249,7 @@
   (def!constant static-space-end          #x1b1ff000)
 
   (def!constant dynamic-space-start       #x40000000)
-  (def!constant dynamic-space-end         #x5bfff000)
+  (def!constant dynamic-space-end         (!configure-dynamic-space-end))
 
   (def!constant linkage-table-space-start #x1b200000)
   (def!constant linkage-table-space-end   #x1b2ff000))
@@ -264,7 +263,7 @@
   (def!constant static-space-end          #x201ff000)
 
   (def!constant dynamic-space-start       #x60000000)
-  (def!constant dynamic-space-end         #x98000000)
+  (def!constant dynamic-space-end         (!configure-dynamic-space-end))
 
   ;; In CMUCL: 0xB0000000->0xB1000000
   (def!constant linkage-table-space-start #x20200000)
@@ -280,7 +279,7 @@
   (def!constant static-space-end      #x041ff000)
 
   (def!constant dynamic-space-start #x10000000)
-  (def!constant dynamic-space-end   #x6ffff000)
+  (def!constant dynamic-space-end   (!configure-dynamic-space-end))
 
   (def!constant linkage-table-space-start #x04200000)
   (def!constant linkage-table-space-end   #x042ff000))
@@ -306,7 +305,9 @@
 
 (defenum (:start 24)
   object-not-list-trap
-  object-not-instance-trap)
+  object-not-instance-trap
+  #!+sb-safepoint global-safepoint-trap
+  #!+sb-safepoint csp-safepoint-trap)
 
 ;;;; static symbols
 
@@ -352,9 +353,6 @@
      ;; 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.
@@ -385,3 +383,6 @@
 ;;; FIXME: Is this used? Delete it or document it.
 ;;; cf the sparc PARMS.LISP
 (defparameter *assembly-unit-length* 8)
+
+#!+win32
+(defconstant +win32-tib-arbitrary-field-offset+ #.(+ #xE10 (* 4 63)))