summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Froyd <froydnj@cs.rice.edu>2007-05-07 14:03:42 +0000
committerNathan Froyd <froydnj@cs.rice.edu>2007-05-07 14:03:42 +0000
commit5c41b6d95580938db33efd4640c2947b9e51e723 (patch)
tree8bae21403ea089baafb40d6c4319164b8ed933ea
parent906ecd4ef2d10aca23e1081f03c13fe2f932ed89 (diff)
1.0.5.42: fix (setf aref) on single-float vectors
Obvious patch by Christophe, reported by Eric Marsden.
-rw-r--r--src/compiler/x86-64/array.lisp2
-rw-r--r--tests/compiler.pure.lisp3
-rw-r--r--version.lisp-expr2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/x86-64/array.lisp b/src/compiler/x86-64/array.lisp
index 2c6530c16..7b3243369 100644
--- a/src/compiler/x86-64/array.lisp
+++ b/src/compiler/x86-64/array.lisp
@@ -385,7 +385,7 @@
(:generator 5
(move dword-index index)
(inst shr dword-index 1)
- (inst movss (make-ea-for-float-ref object index offset 4) value)
+ (inst movss (make-ea-for-float-ref object dword-index offset 4) value)
(unless (location= result value)
(inst movss result value))))
diff --git a/tests/compiler.pure.lisp b/tests/compiler.pure.lisp
index c3ce69e50..4b3d1de59 100644
--- a/tests/compiler.pure.lisp
+++ b/tests/compiler.pure.lisp
@@ -2248,3 +2248,6 @@
(simple-vector s))
(copy-seq s)))
(vector 1 2 3 4)))))
+
+;;; bug in adding DATA-VECTOR-REF-WITH-OFFSET to x86-64
+(assert (not (mismatch #(1.0f0 2.0f0) (make-array 2 :element-type 'single-float :initial-contents (list 1.0f0 2.0f0)))))
diff --git a/version.lisp-expr b/version.lisp-expr
index a0c4b3058..01665d59b 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
;;; checkins which aren't released. (And occasionally for internal
;;; versions, especially for internal versions off the main CVS
;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.5.41"
+"1.0.5.42"