X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fvm.lisp;h=c9eeb6de5b0aa2ffc7150b6d928c8cc4cd75612b;hb=872175cd9cb5b4966a36d4bd92421cc407a0355b;hp=94c5c8bd8357ef952cdcbdf44452c6c54506b738;hpb=77360ee4a1f94c41b807be7ad0e8687199fceef1;p=sbcl.git

diff --git a/src/compiler/x86/vm.lisp b/src/compiler/x86/vm.lisp
index 94c5c8b..c9eeb6d 100644
--- a/src/compiler/x86/vm.lisp
+++ b/src/compiler/x86/vm.lisp
@@ -30,7 +30,11 @@
 	     (let ((offset-sym (symbolicate name "-OFFSET"))
 		   (names-vector (symbolicate "*" size "-REGISTER-NAMES*")))
 	       `(progn
-		  (defconstant ,offset-sym ,offset)
+		  (eval-when (:compile-toplevel :load-toplevel :execute)
+                    ;; EVAL-WHEN is necessary because stuff like #.EAX-OFFSET
+                    ;; (in the same file) depends on compile-time evaluation
+                    ;; of the DEFCONSTANT. -- AL 20010224
+		    (defconstant ,offset-sym ,offset))
 		  (setf (svref ,names-vector ,offset-sym)
 			,(symbol-name name)))))
 	   ;; FIXME: It looks to me as though DEFREGSET should also
@@ -372,8 +376,6 @@
 		  :offset 31))		; Offset doesn't get used.
 |#
 
-;;; IMMEDIATE-CONSTANT-SC
-;;;
 ;;; 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)
@@ -416,8 +418,6 @@
 (defconstant cfp-offset ebp-offset)	; pfw - needed by stuff in /code
 					; related to signal context stuff
 
-;;; SINGLE-VALUE-RETURN-BYTE-OFFSET
-;;;
 ;;; This is used by the debugger.
 (defconstant single-value-return-byte-offset 2)
 
@@ -453,4 +453,5 @@
 ;;; the symbol table (for example, prepending an underscore).
 (defun extern-alien-name (name)
   (declare (type simple-string name))
+  ;; On the X86 we don't do anything.
   name)