Reviewers: Jakob,
Description:
[arm] Fix sNaN quietening in the ARM simulator on IA-32.
TEST=msjunit/regress/regress-undefined-nan2
[email protected]
Please review this at https://codereview.chromium.org/802243004/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+22, -29 lines):
M src/arm/simulator-arm.cc
A + test/mjsunit/regress/regress-undefined-nan2.js
Index: src/arm/simulator-arm.cc
diff --git a/src/arm/simulator-arm.cc b/src/arm/simulator-arm.cc
index
544a621df4fc7d539349aa00b0456e6b973cb3e8..209b5d2ae89769db8c5e642affca2812a773c8aa
100644
--- a/src/arm/simulator-arm.cc
+++ b/src/arm/simulator-arm.cc
@@ -1635,13 +1635,10 @@ void Simulator::HandleVList(Instruction* instr) {
ReadW(reinterpret_cast<int32_t>(address), instr),
ReadW(reinterpret_cast<int32_t>(address + 1), instr)
};
- double d;
- memcpy(&d, data, 8);
- set_d_register_from_double(reg, d);
+ set_d_register(reg, reinterpret_cast<uint32_t*>(data));
} else {
- int32_t data[2];
- double d = get_double_from_d_register(reg);
- memcpy(data, &d, 8);
+ uint32_t data[2];
+ get_d_register(reg, data);
WriteW(reinterpret_cast<int32_t>(address), data[0], instr);
WriteW(reinterpret_cast<int32_t>(address + 1), data[1], instr);
}
@@ -3036,7 +3033,9 @@ void Simulator::DecodeTypeVFP(Instruction* instr) {
if (instr->SzValue() == 0x1) {
int m = instr->VFPMRegValue(kDoublePrecision);
int d = instr->VFPDRegValue(kDoublePrecision);
- set_d_register_from_double(d, get_double_from_d_register(m));
+ uint32_t data[2];
+ get_d_register(m, data);
+ set_d_register(d, data);
} else {
int m = instr->VFPMRegValue(kSinglePrecision);
int d = instr->VFPDRegValue(kSinglePrecision);
@@ -3172,12 +3171,10 @@ void Simulator::DecodeTypeVFP(Instruction* instr) {
(instr->Bit(23) == 0x0)) {
// vmov (ARM core register to scalar)
int vd = instr->Bits(19, 16) | (instr->Bit(7) << 4);
- double dd_value = get_double_from_d_register(vd);
- int32_t data[2];
- memcpy(data, &dd_value, 8);
+ uint32_t data[2];
+ get_d_register(vd, data);
data[instr->Bit(21)] = get_register(instr->RtValue());
- memcpy(&dd_value, data, 8);
- set_d_register_from_double(vd, dd_value);
+ set_d_register(vd, data);
} else if ((instr->VLValue() == 0x1) &&
(instr->VCValue() == 0x1) &&
(instr->Bit(23) == 0x0)) {
@@ -3534,16 +3531,13 @@ void
Simulator::DecodeType6CoprocessorIns(Instruction* instr) {
int rn = instr->RnValue();
int vm = instr->VFPMRegValue(kDoublePrecision);
if (instr->HasL()) {
- int32_t data[2];
- double d = get_double_from_d_register(vm);
- memcpy(data, &d, 8);
+ uint32_t data[2];
+ get_d_register(vm, data);
set_register(rt, data[0]);
set_register(rn, data[1]);
} else {
int32_t data[] = { get_register(rt), get_register(rn) };
- double d;
- memcpy(&d, data, 8);
- set_d_register_from_double(vm, d);
+ set_d_register(vm, reinterpret_cast<uint32_t*>(data));
}
}
break;
@@ -3564,14 +3558,11 @@ void
Simulator::DecodeType6CoprocessorIns(Instruction* instr) {
ReadW(address, instr),
ReadW(address + 4, instr)
};
- double val;
- memcpy(&val, data, 8);
- set_d_register_from_double(vd, val);
+ set_d_register(vd, reinterpret_cast<uint32_t*>(data));
} else {
// Store double to memory: vstr.
- int32_t data[2];
- double val = get_double_from_d_register(vd);
- memcpy(data, &val, 8);
+ uint32_t data[2];
+ get_d_register(vd, data);
WriteW(address, data[0], instr);
WriteW(address + 4, data[1], instr);
}
Index: test/mjsunit/regress/regress-undefined-nan2.js
diff --git a/test/mjsunit/regress/regress-449070.js
b/test/mjsunit/regress/regress-undefined-nan2.js
similarity index 56%
copy from test/mjsunit/regress/regress-449070.js
copy to test/mjsunit/regress/regress-undefined-nan2.js
index
7a0f0a838cdd25817ab6a2d8f63c1ef9fbe6e526..9b0a05f8fddfe885d471a112bfa72f0832960ee0
100644
--- a/test/mjsunit/regress/regress-449070.js
+++ b/test/mjsunit/regress/regress-undefined-nan2.js
@@ -1,10 +1,12 @@
// Copyright 2015 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-//
-// Flags: --allow-natives-syntax
-try {
- %NormalizeElements(this);
-} catch(e) {
+function foo(a, i) {
+ var o = [0.5,,1];
+ a[i] = o[i];
}
+var a1 = [0.1,0.1];
+foo(a1, 0);
+foo(a1, 1);
+assertEquals(undefined, a1[1]);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
