X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=6e343256ad7bc1fef3fda32d0dc493853c5caf28;hb=b28aadc5bd34a0d9fa0ff15c52b2b4164d955831;hp=171431d752c4a83e3e3919536016083d65874ef9;hpb=b0a7abdf2bd6f2d66fcce97196024cdb0e1a1886;p=sbcl.git

diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp
index 171431d..6e34325 100644
--- a/src/compiler/x86/parms.lisp
+++ b/src/compiler/x86/parms.lisp
@@ -35,9 +35,11 @@
 ;;; addressable object
 (def!constant n-byte-bits 8)
 
-;;; The size in bytes of the GENCGC pages. Should be a multiple of the
-;;; architecture code size.
-(def!constant gencgc-page-size 4096)
+;;; 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)
 
@@ -154,8 +156,8 @@
 #!+win32
 (progn
 
-  (def!constant read-only-space-start #x01000000)
-  (def!constant read-only-space-end   #x037ff000)
+  (def!constant read-only-space-start #x02000000)
+  (def!constant read-only-space-end   #x047ff000)
 
   (def!constant static-space-start    #x05000000)
   (def!constant static-space-end      #x07fff000)
@@ -242,8 +244,8 @@
 
 #!+darwin
 (progn
-  (def!constant read-only-space-start #x01000000)
-  (def!constant read-only-space-end   #x04ff8000)
+  (def!constant read-only-space-start #x04000000)
+  (def!constant read-only-space-end   #x07ff8000)
 
   (def!constant static-space-start    #x08000000)
   (def!constant static-space-end      #x097fff00)
@@ -270,8 +272,8 @@
   cerror
   breakpoint
   fun-end-breakpoint
-  single-step-breakpoint
-  #!+win32 context-restore) ;; HACK: The Win32 exception handling system does wrong things with this.
+  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)
@@ -280,7 +282,7 @@
 ;;; for the benefit of anyone doing a lexical search for definitions
 ;;; of these symbols.
 
-(defenum (:prefix object-not- :suffix -trap :start 16)
+(defenum (:prefix object-not- :suffix -trap :start 24)
   list
   instance)
 
@@ -312,8 +314,7 @@
    '(*alien-stack*
 
      ;; interrupt handling
-     *pseudo-atomic-atomic*
-     *pseudo-atomic-interrupted*
+     *pseudo-atomic-bits*
      #!+sb-thread *stop-for-gc-pending*
      #!+sb-thread *free-tls-index*
      #!+sb-thread *tls-index-lock*
@@ -344,8 +345,7 @@
      sb!alien::*enter-alien-callback*
 
      ;; see comments in ../x86-64/parms.lisp
-     sb!pcl::..slot-unbound..
-     )))
+     sb!pcl::..slot-unbound..)))
 
 (defparameter *static-funs*
   '(length