CMUCL commit: amd64-dd-branch src/compiler/generic (new-genesis.lisp)

[Raymond Toy]

    Date: Monday, November 2, 2009 @ 12:20:09
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/compiler/generic
     Tag: amd64-dd-branch

Modified: new-genesis.lisp

o Need to fill in *FP-CONSTANT-<foo>* static symbols.


------------------+
 new-genesis.lisp |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)


Index: src/compiler/generic/new-genesis.lisp
diff -u src/compiler/generic/new-genesis.lisp:1.88 src/compiler/generic/new-genesis.lisp:1.88.2.1
--- src/compiler/generic/new-genesis.lisp:1.88	Fri Oct  9 23:00:04 2009
+++ src/compiler/generic/new-genesis.lisp	Mon Nov  2 12:20:08 2009
@@ -4,7 +4,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/compiler/generic/new-genesis.lisp,v 1.88 2009-10-10 03:00:04 agoncharov Exp $")
+  "$Header: /project/cmucl/cvsroot/src/compiler/generic/new-genesis.lisp,v 1.88.2.1 2009-11-02 17:20:08 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -903,28 +903,29 @@
 
     (frob *lisp-initialization-functions* *current-init-functions-cons*)
 
-    (when (c:backend-featurep :x86)
+    (when (or (c:backend-featurep :x86)
+	      (c:backend-featurep :amd64))
       (macrolet ((frob (name pkg value)
 		   `(cold-setq (cold-intern (intern ,name ,pkg)) ,value)))
-	(frob "*FP-CONSTANT-0D0*" "X86" (number-to-core 0d0))
-	(frob "*FP-CONSTANT-1D0*" "X86" (number-to-core 1d0))
-	(frob "*FP-CONSTANT-0S0*" "X86" (number-to-core 0s0))
-	(frob "*FP-CONSTANT-1S0*" "X86" (number-to-core 1s0))
+	(frob "*FP-CONSTANT-0D0*" #+x86 "X86" #-x86 "AMD64" (number-to-core 0d0))
+	(frob "*FP-CONSTANT-1D0*" #+x86 "X86" #-x86 "AMD64" (number-to-core 1d0))
+	(frob "*FP-CONSTANT-0S0*" #+x86 "X86" #-x86 "AMD64" (number-to-core 0s0))
+	(frob "*FP-CONSTANT-1S0*" #+x86 "X86" #-x86 "AMD64" (number-to-core 1s0))
 	#+long-float
 	(when (c:backend-featurep :long-float)
-	  (frob "*FP-CONSTANT-0L0*" "X86" (number-to-core 0l0))
-	  (frob "*FP-CONSTANT-1L0*" "X86" (number-to-core 1l0))
-	  (frob "*FP-CONSTANT-PI*" "X86" (number-to-core pi))
-	  (frob "*FP-CONSTANT-L2T*" "X86" (number-to-core (log 10l0 2l0)))
-	  (frob "*FP-CONSTANT-L2E*" "X86"
+	  (frob "*FP-CONSTANT-0L0*" #+x86 "X86" #-x86 "AMD64" (number-to-core 0l0))
+	  (frob "*FP-CONSTANT-1L0*" #+x86 "X86" #-x86 "AMD64" (number-to-core 1l0))
+	  (frob "*FP-CONSTANT-PI*" #+x86 "X86" #-x86 "AMD64" (number-to-core pi))
+	  (frob "*FP-CONSTANT-L2T*" #+x86 "X86" #-x86 "AMD64" (number-to-core (log 10l0 2l0)))
+	  (frob "*FP-CONSTANT-L2E*" #+x86 "X86" #-x86 "AMD64"
 		(number-to-core
 		 (log 2.718281828459045235360287471352662L0 2l0)))
-	  (frob "*FP-CONSTANT-LG2*" "X86" (number-to-core (log 2l0 10l0)))
-	  (frob "*FP-CONSTANT-LN2*" "X86"
+	  (frob "*FP-CONSTANT-LG2*" #+x86 "X86" #-x86 "AMD64" (number-to-core (log 2l0 10l0)))
+	  (frob "*FP-CONSTANT-LN2*" #+x86 "X86" #-x86 "AMD64"
 		(number-to-core
 		 (log 2l0 2.718281828459045235360287471352662L0))))
 	(when (c:backend-featurep :gencgc)
-	  (frob "*SCAVENGE-READ-ONLY-SPACE*" "X86" (cold-intern nil)))))
+	  (frob "*SCAVENGE-READ-ONLY-SPACE*" #+x86 "X86" #-x86 "AMD64" (cold-intern nil)))))
 
     (when (c::backend-featurep :sparc)
       (macrolet ((frob (name pkg value)
@@ -2114,6 +2115,8 @@
     (let ((linux-p (and (or (eq (c:backend-fasl-file-implementation c:*backend*)
 				#.c:x86-fasl-file-implementation)
 			    (eq (c:backend-fasl-file-implementation c:*backend*)
+				#.c:amd64-fasl-file-implementation)
+			    (eq (c:backend-fasl-file-implementation c:*backend*)
 				#.c:alpha-fasl-file-implementation))
 			(c:backend-featurep :linux)))
 	  (freebsd-p (and (eq (c:backend-fasl-file-implementation c:*backend*)