X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fearly-vm.lisp;h=606b0872105d0dbe548df265932c88c2de183b65;hb=bc46c8bcdd6ac8918df8ea9e9db49808e4924fcf;hp=9654ac4a135c62e44c4b610a1b8582843a2e4142;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/compiler/generic/early-vm.lisp b/src/compiler/generic/early-vm.lisp
index 9654ac4..606b087 100644
--- a/src/compiler/generic/early-vm.lisp
+++ b/src/compiler/generic/early-vm.lisp
@@ -9,37 +9,24 @@
 
 (in-package "SB!VM")
 
-(file-comment
-  "$Header$")
-
-(eval-when (:compile-toplevel :execute :load-toplevel)
-
-(defconstant lowtag-bits 3
-  #!+sb-doc
-  "Number of bits at the low end of a pointer used for type information.")
-
-(defconstant lowtag-mask (1- (ash 1 lowtag-bits))
-  #!+sb-doc
-  "Mask to extract the low tag bits from a pointer.")
-
-(defconstant lowtag-limit (ash 1 lowtag-bits)
-  #!+sb-doc
-  "Exclusive upper bound on the value of the low tag bits from a pointer.")
-
-(defconstant type-bits 8
-  #!+sb-doc
-  "Number of bits used in the header word of a data block to store the type.")
-
-(defconstant type-mask (1- (ash 1 type-bits))
-  #!+sb-doc
-  "Mask to extract the type from a header word.")
-
-); eval-when
-
-;;; FIXME: Couldn't/shouldn't these be DEFCONSTANT instead of DEFPARAMETER?
-(defparameter *target-most-positive-fixnum* (1- (ash 1 29))
+;;; the number of bits at the low end of a pointer used for type
+;;; information
+(defconstant n-lowtag-bits 3)
+;;; a mask to extract the low tag bits from a pointer
+(defconstant lowtag-mask (1- (ash 1 n-lowtag-bits)))
+;;; the exclusive upper bound on the value of the low tag bits from a
+;;; pointer
+(defconstant lowtag-limit (ash 1 n-lowtag-bits))
+
+;;; the number of bits used in the header word of a data block to store
+;;; the type
+(defconstant n-widetag-bits 8)
+;;; a mask to extract the type from a data block header word
+(defconstant widetag-mask (1- (ash 1 n-widetag-bits)))
+
+(defconstant sb!xc:most-positive-fixnum (1- (ash 1 29))
   #!+sb-doc
-  "most-positive-fixnum in the target architecture.")
-(defparameter *target-most-negative-fixnum* (ash -1 29)
+  "the fixnum closest in value to positive infinity")
+(defconstant sb!xc:most-negative-fixnum (ash -1 29)
   #!+sb-doc
-  "most-negative-fixnum in the target architecture.")
+  "the fixnum closest in value to negative infinity")