X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fparms.lisp;h=91ebb636b63af8a310f124cb3559c7db0f0b25a5;hb=085501b44cc1cbdd9e260139d30b383372ddd1b8;hp=1a685042884c3ba1cbadb93ef3a909d4ae67e21f;hpb=47eb330ef0f3b99d24c0e24d897b757f16950c4b;p=sbcl.git

diff --git a/src/compiler/x86-64/parms.lisp b/src/compiler/x86-64/parms.lisp
index 1a68504..91ebb63 100644
--- a/src/compiler/x86-64/parms.lisp
+++ b/src/compiler/x86-64/parms.lisp
@@ -89,19 +89,29 @@
 
 ;;; where to put the different spaces.
 
-(def!constant read-only-space-start     #x20000000)
-(def!constant read-only-space-end       #x27ff0000)
+;;; Currently the read-only and static spaces must be located in low
+;;; memory (certainly under the 4GB limit, very probably under 2GB
+;;; limit). This is due to the inability of using immediate values of
+;;; more than 32 bits (31 bits if you take sign extension into
+;;; account) in any other instructions except MOV. Removing this limit
+;;; would be possible, but probably not worth the time and code bloat
+;;; it would cause. -- JES, 2005-12-11
 
-(def!constant static-space-start        #x40000000)
-(def!constant static-space-end          #x47fff000)
+(progn
+  (def!constant read-only-space-start     #x20000000)
+  (def!constant read-only-space-end       #x27ff0000)
 
-(def!constant dynamic-space-start   #x1000000000)
-(def!constant dynamic-space-end     #x11ffff0000)
+  (def!constant static-space-start        #x40000000)
+  (def!constant static-space-end          #x47fff000)
 
-(def!constant linkage-table-space-start #x60000000)
-(def!constant linkage-table-space-end   #x63fff000)
+  (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-entry-size 16))
 
-(def!constant linkage-table-entry-size 16)
 
 ;;;; other miscellaneous constants
 
@@ -112,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)
@@ -121,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)
 
@@ -147,74 +158,46 @@
 (defvar *allocation-pointer*)
 (defvar *binding-stack-pointer*)
 
-;;; FIXME: !COLD-INIT probably doesn't need
-;;; to be in the static symbols table any more.
-;;;
-;;; FIXME: some of these symbols are shared by all backends,
-;;; and should be factored out into a common file.
 (defparameter *static-symbols*
-  '(t
-
-    ;; The C startup code must fill these in.
-    *posix-argv*
-
-    ;; functions that the C code needs to call.  When adding to this list,
-    ;; also add a `frob' form in genesis.lisp finish-symbols.
-    sub-gc
-    sb!kernel::internal-error
-    sb!kernel::control-stack-exhausted-error
-    sb!kernel::undefined-alien-variable-error
-    sb!kernel::undefined-alien-function-error
-    sb!kernel::memory-fault-error
-    sb!di::handle-breakpoint
-    fdefinition-object
-
-    ;; free pointers
-    ;;
-    ;; Note that these are FIXNUM word counts, not (as one might
-    ;; expect) byte counts or SAPs. The reason seems to be that by
-    ;; representing them this way, we can avoid consing bignums.
-    ;; -- WHN 2000-10-02
-    *read-only-space-free-pointer*
-    *static-space-free-pointer*
-    *initial-dynamic-space-free-pointer*
-
-    ;; things needed for non-local exit
-    *current-catch-block*
-    *current-unwind-protect-block*
-    *alien-stack*
-
-    ;; interrupt handling
-    *pseudo-atomic-atomic*
-    *pseudo-atomic-interrupted*
-    sb!unix::*interrupts-enabled*
-    sb!unix::*interrupt-pending*
-    *free-interrupt-context-index*
-    *gc-inhibit*
-    #!+sb-thread *stop-for-gc-pending*
-    *gc-pending*
-
-    *free-tls-index*
-
-    *allocation-pointer*
-    *binding-stack-pointer*
-    *binding-stack-start*
-    *control-stack-start*
-    *control-stack-end*
-
-    ;; the floating point constants
-    *fp-constant-0d0*
-    *fp-constant-1d0*
-    *fp-constant-0f0*
-    *fp-constant-1f0*
-
-    ;; The ..SLOT-UNBOUND.. symbol is static in order to optimise the
-    ;; common slot unbound check.
-    ;;
-    ;; FIXME: In SBCL, the CLOS code has become sufficiently tightly
-    ;; integrated into the system that it'd probably make sense to use
-    ;; the ordinary unbound marker for this.
-    sb!pcl::..slot-unbound..))
+  (append
+   *common-static-symbols*
+   *c-callable-static-symbols*
+   '(*alien-stack*
+
+     ;; 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*
+
+     ;; the floating point constants
+     *fp-constant-0d0*
+     *fp-constant-1d0*
+     *fp-constant-0f0*
+     *fp-constant-1f0*
+
+     ;; For GC-AND-SAVE
+     *restart-lisp-function*
+
+     ;; Needed for callbacks to work across saving cores. see
+     ;; ALIEN-CALLBACK-ASSEMBLER-WRAPPER in c-call.lisp for gory
+     ;; details.
+     sb!alien::*enter-alien-callback*
+
+     ;; The ..SLOT-UNBOUND.. symbol is static in order to optimise the
+     ;; common slot unbound check.
+     ;;
+     ;; FIXME: In SBCL, the CLOS code has become sufficiently tightly
+     ;; integrated into the system that it'd probably make sense to
+     ;; use the ordinary unbound marker for this.
+     ;;
+     ;; FIXME II: if it doesn't make sense, why is this X86-ish only?
+     sb!pcl::..slot-unbound..)))
 
 (defparameter *static-funs*
   '(length