X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsparc%2Fvm.lisp;h=cf1041d19b2bdca8924722b4fd3b66584ad02007;hb=9cc049e3ccf2650dbb867b6f651626cf67a5a993;hp=fd64d6ec225a7fe1c17908c6e7682197ec2369cf;hpb=ec2616d216958a608581802c47496c0194478dc8;p=sbcl.git

diff --git a/src/compiler/sparc/vm.lisp b/src/compiler/sparc/vm.lisp
index fd64d6e..cf1041d 100644
--- a/src/compiler/sparc/vm.lisp
+++ b/src/compiler/sparc/vm.lisp
@@ -19,7 +19,7 @@
 (macrolet ((defreg (name offset)
 	       (let ((offset-sym (symbolicate name "-OFFSET")))
 		 `(eval-when (:compile-toplevel :load-toplevel :execute)
-		   (defconstant ,offset-sym ,offset)
+		   (def!constant ,offset-sym ,offset)
 		   (setf (svref *register-names* ,offset-sym)
 		        ,(symbol-name name)))))
 
@@ -99,7 +99,7 @@
 							 "-SC-NUMBER"))))
 		(list* `(define-storage-class ,sc-name ,index
 			  ,@(cdr class))
-		       `(defconstant ,constant-name ,index)
+		       `(def!constant ,constant-name ,index)
                        ;; (The CMU CL version of this macro did
                        ;;   `(EXPORT ',CONSTANT-NAME)
                        ;; here, but in SBCL we try to have package
@@ -118,7 +118,7 @@
 ;;; and seems to be working so far    -dan
 ;;;
 ;;; arbitrarily taken for alpha, too. - Christophe
-(defconstant sb!vm::kludge-nondeterministic-catch-block-size 7)
+(def!constant sb!vm::kludge-nondeterministic-catch-block-size 7)
 
 (!define-storage-classes
 
@@ -271,11 +271,8 @@
 
   ;; A catch or unwind block.
   (catch-block control-stack :element-size sb!vm::kludge-nondeterministic-catch-block-size))
-
-
 
-;;;; Make some random tns for important registers.
-
+;;;; Make some miscellaneous TNs for important registers.
 (macrolet ((defregtn (name sc)
 	       (let ((offset-sym (symbolicate name "-OFFSET"))
 		     (tn-sym (symbolicate name "-TN")))
@@ -294,10 +291,8 @@
   (defregtn cfp any-reg)
   (defregtn ocfp any-reg)
   (defregtn nsp any-reg))
-
-
 
-;;; If value can be represented as an immediate constant, then return the
+;;; If VALUE can be represented as an immediate constant, then return the
 ;;; appropriate SC number, otherwise return NIL.
 (!def-vm-support-routine immediate-constant-sc (value)
   (typecase value
@@ -311,33 +306,30 @@
      (if (static-symbol-p value)
 	 (sc-number-or-lose 'immediate)
 	 nil))))
-
 
 ;;;; function call parameters
 
 ;;; the SC numbers for register and stack arguments/return values.
-(defconstant register-arg-scn (meta-sc-number-or-lose 'descriptor-reg))
-(defconstant immediate-arg-scn (meta-sc-number-or-lose 'any-reg))
-(defconstant control-stack-arg-scn (meta-sc-number-or-lose 'control-stack))
+(def!constant register-arg-scn (meta-sc-number-or-lose 'descriptor-reg))
+(def!constant immediate-arg-scn (meta-sc-number-or-lose 'any-reg))
+(def!constant control-stack-arg-scn (meta-sc-number-or-lose 'control-stack))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 
   ;; offsets of special stack frame locations
-  (defconstant ocfp-save-offset 0)
-  (defconstant lra-save-offset 1)
-  (defconstant nfp-save-offset 2)
+  (def!constant ocfp-save-offset 0)
+  (def!constant lra-save-offset 1)
+  (def!constant nfp-save-offset 2)
 
   ;; the number of arguments/return values passed in registers.
-  ;;
-  (defconstant register-arg-count 6)
+  (def!constant register-arg-count 6)
 
   ;; names to use for the argument registers.
-  ;; 
   (defparameter register-arg-names '(a0 a1 a2 a3 a4 a5))
-); eval-when (:compile-toplevel :load-toplevel :execute)
+) ; EVAL-WHEN
 
 
-;;; a list of TN's describing the register arguments.
+;;; a list of TN's describing the register arguments
 (defparameter *register-arg-tns*
   (mapcar (lambda (n)
 	    (make-random-tn :kind :normal
@@ -346,8 +338,7 @@
 	  *register-arg-offsets*))
 
 ;;; This is used by the debugger.
-(defconstant single-value-return-byte-offset 8)
-
+(def!constant single-value-return-byte-offset 8)
 
 ;;; This function is called by debug output routines that want a
 ;;; pretty name for a TN's location. It returns a thing that can be