CMUCL commit: amd64-dd-branch src (3 files)

[Raymond Toy]

    Date: Monday, November 2, 2009 @ 10:53:00
  Author: rtoy
    Path: /project/cmucl/cvsroot/src
     Tag: amd64-dd-branch

Modified: compiler/amd64/array.lisp tools/comcom.lisp
          tools/cross-scripts/cross-x86-amd64.lisp

compiler/amd64/array.lisp:
o Comment out array vops, which were moved to x87-array.lisp

tools/comcom.lisp:
o Compile up x87-array if :amd64.

tools/cross-scripts/cross-x86-amd64.lisp:
o Load up x87-array.


------------------------------------------+
 compiler/amd64/array.lisp                |    6 +++---
 tools/comcom.lisp                        |    5 +++--
 tools/cross-scripts/cross-x86-amd64.lisp |    3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)


Index: src/compiler/amd64/array.lisp
diff -u src/compiler/amd64/array.lisp:1.2 src/compiler/amd64/array.lisp:1.2.36.1
--- src/compiler/amd64/array.lisp:1.2	Wed Jul 14 16:56:24 2004
+++ src/compiler/amd64/array.lisp	Mon Nov  2 10:53:00 2009
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group at cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/amd64/array.lisp,v 1.2 2004-07-14 20:56:24 cwang Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/amd64/array.lisp,v 1.2.36.1 2009-11-02 15:53:00 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -294,7 +294,7 @@
 
 ;;; And the float variants.
 ;;; 
-
+#||
 (define-vop (data-vector-ref/simple-array-single-float)
   (:note "inline array access")
   (:translate data-vector-ref)
@@ -1068,7 +1068,7 @@
       (unless (location= value-imag result-imag)
 	(inst fstd result-imag))
       (inst fxch value-imag))))
-
+||#
 
 ;;;;
 ;;;; dtc expanded and fixed the following:
Index: src/tools/comcom.lisp
diff -u src/tools/comcom.lisp:1.58 src/tools/comcom.lisp:1.58.12.1
--- src/tools/comcom.lisp:1.58	Wed Nov 12 10:04:25 2008
+++ src/tools/comcom.lisp	Mon Nov  2 10:53:00 2009
@@ -3,7 +3,7 @@
 ;;; **********************************************************************
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/tools/comcom.lisp,v 1.58 2008-11-12 15:04:25 rtoy Rel $")
+  "$Header: /project/cmucl/cvsroot/src/tools/comcom.lisp,v 1.58.12.1 2009-11-02 15:53:00 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -206,7 +206,8 @@
 
 ;; Must come before array.lisp because array.lisp wants to use some
 ;; vops as templates.
-(when (c:target-featurep :x86)
+(when (or (c:target-featurep :x86)
+	  (c:target-featurep :amd64))
   (comf (vmdir (if (c:target-featurep :sse2)
 		   "target:compiler/sse2-array"
 		   "target:compiler/x87-array"))
Index: src/tools/cross-scripts/cross-x86-amd64.lisp
diff -u src/tools/cross-scripts/cross-x86-amd64.lisp:1.1.2.1 src/tools/cross-scripts/cross-x86-amd64.lisp:1.1.2.2
--- src/tools/cross-scripts/cross-x86-amd64.lisp:1.1.2.1	Mon Nov  2 09:29:47 2009
+++ src/tools/cross-scripts/cross-x86-amd64.lisp	Mon Nov  2 10:53:00 2009
@@ -191,6 +191,9 @@
 (load "vm:call")
 (load "vm:nlx")
 (load "vm:values")
+(load (if (target-featurep :sse2)
+	  "vm:sse2-array"
+	  "vm:x87-array"))
 (load "vm:array")
 (load "vm:pred")
 (load "vm:type-vops")