X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fparms.lisp;h=91ebb636b63af8a310f124cb3559c7db0f0b25a5;hb=bef0d9c1274819ee3fb886401209662bace136ce;hp=eed4cfedf030a2583f54d26742ea3bd952ced652;hpb=b0a7abdf2bd6f2d66fcce97196024cdb0e1a1886;p=sbcl.git

diff --git a/src/compiler/x86-64/parms.lisp b/src/compiler/x86-64/parms.lisp
index eed4cfe..91ebb63 100644
--- a/src/compiler/x86-64/parms.lisp
+++ b/src/compiler/x86-64/parms.lisp
@@ -35,10 +35,6 @@
 ;;; 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)
-
 (def!constant float-sign-shift 31)
 
 ;;; comment from CMU CL:
@@ -101,19 +97,21 @@
 ;;; would be possible, but probably not worth the time and code bloat
 ;;; it would cause. -- JES, 2005-12-11
 
-(def!constant read-only-space-start     #x20000000)
-(def!constant read-only-space-end       #x27ff0000)
+(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)
 
-(def!constant static-space-start        #x40000000)
-(def!constant static-space-end          #x47fff000)
+  (def!constant dynamic-space-start   #x1000000000)
+  (def!constant dynamic-space-end     #x11ffff0000)
 
-(def!constant dynamic-space-start   #x1000000000)
-(def!constant dynamic-space-end     #x11ffff0000)
+  (def!constant linkage-table-space-start #x60000000)
+  (def!constant linkage-table-space-end   #x63fff000)
 
-(def!constant linkage-table-space-start #x60000000)
-(def!constant linkage-table-space-end   #x63fff000)
+  (def!constant linkage-table-entry-size 16))
 
-(def!constant linkage-table-entry-size 16)
 
 ;;;; other miscellaneous constants
 
@@ -124,7 +122,8 @@
   cerror
   breakpoint
   fun-end-breakpoint
-  single-step-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)
@@ -133,7 +132,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)
 
@@ -166,8 +165,7 @@
    '(*alien-stack*
 
      ;; interrupt handling
-     *pseudo-atomic-atomic*
-     *pseudo-atomic-interrupted*
+     *pseudo-atomic-bits*
 
      #!+sb-thread *stop-for-gc-pending*