Trivial code cleanups

[sbcl.git] / src / compiler / x86-64 / parms.lisp

diff --git a/src/compiler/x86-64/parms.lisp b/src/compiler/x86-64/parms.lisp
index eed4cfe..3bb0851 100644 (file)
--- a/src/compiler/x86-64/parms.lisp
+++ b/src/compiler/x86-64/parms.lisp
@@ -20,7 +20,7 @@
 ;;; and register specs, we use the Intel convention. But whenever we
 ;;; are talking about stuff the rest of the lisp system might be
 ;;; interested in, we use ``word'' to mean the size of a descriptor
-;;; object, which is 32 bits.
+;;; object, which is 64 bits.
 \f
 ;;;; machine architecture parameters
 
@@ -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)
 
@@ -101,47 +103,38 @@
 ;;; 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)
+;;; The default dynamic space size is lower on OpenBSD to allow SBCL to
+;;; run under the default 512M data size limit.
 
-(def!constant static-space-start        #x40000000)
-(def!constant static-space-end          #x47fff000)
+(!gencgc-space-setup #x20000000
+                     #x1000000000
 
-(def!constant dynamic-space-start   #x1000000000)
-(def!constant dynamic-space-end     #x11ffff0000)
+                     ;; :default-dynamic-space-size
+                     #!+openbsd #x1bcf0000
 
-(def!constant linkage-table-space-start #x60000000)
-(def!constant linkage-table-space-end   #x63fff000)
+                     ;; :alignment
+                     #!+win32 #!+win32 nil #x10000)
 
 (def!constant linkage-table-entry-size 16)
+
 \f
 ;;;; other miscellaneous constants
 
-(defenum (:suffix -trap :start 8)
-  halt
-  pending-interrupt
-  error
-  cerror
-  breakpoint
-  fun-end-breakpoint
-  single-step-breakpoint)
-;;; 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 16)
-  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
+  #!+sb-safepoint global-safepoint-trap
+  #!+sb-safepoint csp-safepoint-trap)
 \f
 ;;;; static symbols
 
@@ -166,13 +159,7 @@
    '(*alien-stack*
 
      ;; interrupt handling
-     *pseudo-atomic-atomic*
-     *pseudo-atomic-interrupted*
-
-     #!+sb-thread *stop-for-gc-pending*
-
-     #!+sb-thread *free-tls-index*
-     #!+sb-thread *tls-index-lock*
+     *pseudo-atomic-bits*
 
      *allocation-pointer*
      *binding-stack-pointer*