AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix load/store of external float arrays on ARM

Browse Source 
BUG=1323
TEST=mjsunit/regress/regress-1323.js, run with simulator=arm

Review URL: http://codereview.chromium.org/6822054

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7590 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jkummerow@chromium.org 2011-04-12 15:20:26 +00:00
parent c0aa591bbb
commit 1d774ac5ca
2 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/arm/lithium-codegen-arm.cc
View File

@ -2564,15 +2564,11 @@ void LCodeGen::DoLoadKeyedSpecializedArrayElement(
Register key = ToRegister(instr->key());
ExternalArrayType array_type = instr->array_type();
if (array_type == kExternalFloatArray) {
if (CpuFeatures::IsSupported(VFP3)) {
CpuFeatures::Scope scope(VFP3);
DwVfpRegister result(ToDoubleRegister(instr->result()));
__ add(scratch0(), external_pointer, Operand(key, LSL, 2));
__ vldr(result, scratch0(), 0);
} else {
Register result(ToRegister(instr->result()));
__ ldr(result, MemOperand(external_pointer, key, LSL, 2));
}
CpuFeatures::Scope scope(VFP3);
DwVfpRegister result(ToDoubleRegister(instr->result()));
__ add(scratch0(), external_pointer, Operand(key, LSL, 2));
__ vldr(result.low(), scratch0(), 0);
__ vcvt_f64_f32(result, result.low());
} else {
Register result(ToRegister(instr->result()));
switch (array_type) {
@ -3272,15 +3268,11 @@ void LCodeGen::DoStoreKeyedSpecializedArrayElement(
Register key = ToRegister(instr->key());
ExternalArrayType array_type = instr->array_type();
if (array_type == kExternalFloatArray) {
if (CpuFeatures::IsSupported(VFP3)) {
CpuFeatures::Scope scope(VFP3);
DwVfpRegister value(ToDoubleRegister(instr->value()));
__ add(scratch0(), external_pointer, Operand(key, LSL, 2));
__ vstr(value, scratch0(), 0);
} else {
Register value(ToRegister(instr->value()));
__ str(value, MemOperand(external_pointer, key, LSL, 2));
}
CpuFeatures::Scope scope(VFP3);
DwVfpRegister value(ToDoubleRegister(instr->value()));
__ add(scratch0(), external_pointer, Operand(key, LSL, 2));
__ vcvt_f32_f64(double_scratch0().low(), value);
__ vstr(double_scratch0().low(), scratch0(), 0);
} else {
Register value(ToRegister(instr->value()));
switch (array_type) {

50
test/mjsunit/regress/regress-1323.js Normal file
View File

@ -0,0 +1,50 @@
// Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Flags: --allow-natives-syntax
// Regression test for load/store operating with wrong number of bits.
function get(a, index) {
return a[index];
}
var a = new Float32Array(2);
a[0] = 2.5;
a[1] = 3.5;
for (var i = 0; i < 5; i++) get(a, 0);
%OptimizeFunctionOnNextCall(get);
assertEquals(2.5, get(a, 0));
assertEquals(3.5, get(a, 1));
function set(a, index, value) {
a[index] = value;
}
for (var i = 0; i < 5; i++) set(a, 0, 4.5);
%OptimizeFunctionOnNextCall(set);
set(a, 0, 4.5);
assertEquals(4.5, a[0]);
assertEquals(3.5, a[1]);