X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fx86%2Fparms.lisp;h=a9b972718656d11a49bd291183f21cf5c49263e9;hb=bc46c8bcdd6ac8918df8ea9e9db49808e4924fcf;hp=2a5a9b8f8627abea887a320bbe37ffbb22860abd;hpb=aa2dc9529460ea0d9c99998dc87283fc1a43e808;p=sbcl.git

diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp
index 2a5a9b8..a9b9727 100644
--- a/src/compiler/x86/parms.lisp
+++ b/src/compiler/x86/parms.lisp
@@ -24,21 +24,18 @@
 
 ;;;; machine architecture parameters
 
-(defconstant word-bits 32
-  #!+sb-doc
-  "Number of bits per word where a word holds one lisp descriptor.")
+;;; the number of bits per word, where a word holds one lisp descriptor
+(defconstant n-word-bits 32)
 
-(defconstant byte-bits 8
-  #!+sb-doc
-  "Number of bits per byte where a byte is the smallest addressable object.")
+;;; the number of bits per byte, where a byte is the smallest
+;;; addressable object
+(defconstant n-byte-bits 8)
 
-(defconstant word-shift (1- (integer-length (/ word-bits byte-bits)))
-  #!+sb-doc
-  "Number of bits to shift between word addresses and byte addresses.")
+;;; the number of bits to shift between word addresses and byte addresses
+(defconstant word-shift (1- (integer-length (/ n-word-bits n-byte-bits))))
 
-(defconstant word-bytes (/ word-bits byte-bits)
-  #!+sb-doc
-  "Number of bytes in a word.")
+;;; the number of bytes in a word
+(defconstant n-word-bytes (/ n-word-bits n-byte-bits))
 
 (defconstant float-sign-shift 31)
 
@@ -77,10 +74,10 @@
   (+ (byte-size single-float-significand-byte) 1))
 
 (defconstant double-float-digits
-  (+ (byte-size double-float-significand-byte) word-bits 1))
+  (+ (byte-size double-float-significand-byte) n-word-bits 1))
 
 (defconstant long-float-digits
-  (+ (byte-size long-float-significand-byte) word-bits 1))
+  (+ (byte-size long-float-significand-byte) n-word-bits 1))
 
 ;;; pfw -- from i486 microprocessor programmer's reference manual
 (defconstant float-invalid-trap-bit	   (ash 1 0))
@@ -168,14 +165,14 @@
   (defconstant binding-stack-end     #x3ffff000)
 
   (defconstant control-stack-start
-    #+freebsd #x40000000
-    #+openbsd #x48000000)
+    #!+freebsd #x40000000
+    #!+openbsd #x48000000)
   (defconstant control-stack-end
-    #+freebsd #x47fff000
-    #+openbsd #x4ffff000)
+    #!+freebsd #x47fff000
+    #!+openbsd #x4ffff000)
   (defconstant dynamic-space-start
-    #+freebsd #x48000000
-    #+openbsd #x50000000)
+    #!+freebsd #x48000000
+    #!+openbsd #x50000000)
   (defconstant dynamic-space-end     #x88000000))
 
 ;;; Given that NIL is the first thing allocated in static space, we
@@ -190,7 +187,7 @@
   error
   cerror
   breakpoint
-  function-end-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)
@@ -207,8 +204,8 @@
 (defenum (:prefix trace-table-)
   normal
   call-site
-  function-prologue
-  function-epilogue)
+  fun-prologue
+  fun-epilogue)
 
 ;;;; static symbols
 
@@ -224,8 +221,6 @@
 ;;;     Note these spaces grow from low to high addresses.
 (defvar *allocation-pointer*)
 (defvar *binding-stack-pointer*)
-(defvar *x86-cgc-active-p*) ; FIXME: Document this.
-(defvar *static-blue-bag* nil)
 
 ;;; FIXME: *!INITIAL-FDEFN-OBJECTS* and !COLD-INIT probably don't need
 ;;; to be in the static symbols table any more. Also, if
@@ -238,7 +233,6 @@
     sb!impl::*!initial-fdefn-objects*
 
     ;; functions that the C code needs to call
-    sb!impl::!cold-init
     maybe-gc
     sb!kernel::internal-error
     sb!di::handle-breakpoint
@@ -257,8 +251,7 @@
     ;; things needed for non-local exit
     *current-catch-block*
     *current-unwind-protect-block*
-    *eval-stack-top*
-    sb!vm::*alien-stack*
+    *alien-stack*
 
     ;; interrupt handling
     *pseudo-atomic-atomic*
@@ -267,49 +260,33 @@
     sb!unix::*interrupt-pending*
     *free-interrupt-context-index*
 
-    sb!vm::*allocation-pointer*
-    sb!vm::*binding-stack-pointer*
-    sb!vm::*internal-gc-trigger*   ; Not used.
+    *allocation-pointer*
+    *binding-stack-pointer*
+    *internal-gc-trigger*   ; Not used.
 
     ;; the floating point constants
-    sb!vm::*fp-constant-0d0*
-    sb!vm::*fp-constant-1d0*
-    sb!vm::*fp-constant-0s0*
-    sb!vm::*fp-constant-1s0*
+    *fp-constant-0d0*
+    *fp-constant-1d0*
+    *fp-constant-0f0*
+    *fp-constant-1f0*
     ;; The following are all long-floats.
-    sb!vm::*fp-constant-0l0*
-    sb!vm::*fp-constant-1l0*
-    sb!vm::*fp-constant-pi*
-    sb!vm::*fp-constant-l2t*
-    sb!vm::*fp-constant-l2e*
-    sb!vm::*fp-constant-lg2*
-    sb!vm::*fp-constant-ln2*
-
-    ;; used by gencgc
-    sb!vm::*scavenge-read-only-space*
+    *fp-constant-0l0*
+    *fp-constant-1l0*
+    *fp-constant-pi*
+    *fp-constant-l2t*
+    *fp-constant-l2e*
+    *fp-constant-lg2*
+    *fp-constant-ln2*
 
     ;; The ..SLOT-UNBOUND.. symbol is static in order to optimise the
     ;; common slot unbound check.
-    sb!pcl::..slot-unbound..
-
-    ;; spare symbols
-    sb!vm::spare-10
-    sb!vm::spare-9
-    sb!vm::spare-8
-    sb!vm::spare-7
-    sb!vm::spare-6
-    sb!vm::spare-5
-    sb!vm::spare-4
-    sb!vm::spare-3
-    sb!vm::spare-2
-    sb!vm::spare-1
-
-    ;; used by cgc
-    sb!vm::*x86-cgc-active-p*
-    sb!vm::*static-blue-bag*		; must be last or change C code
-    ))
-
-(defparameter *static-functions*
+    ;;
+    ;; 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..))
+
+(defparameter *static-funs*
   '(length
     sb!kernel:two-arg-+
     sb!kernel:two-arg--