Revision: 4491
Author: [email protected]
Date: Mon Apr 26 04:06:37 2010
Log: Fix a bug where a GC at an unlucky moment caused a wrong
calculation on ARM.
Review URL: http://codereview.chromium.org/1733016
http://code.google.com/p/v8/source/detail?r=4491
Added:
/branches/bleeding_edge/test/mjsunit/binary-op-newspace.js
Modified:
/branches/bleeding_edge/src/arm/codegen-arm.cc
=======================================
--- /dev/null
+++ /branches/bleeding_edge/test/mjsunit/binary-op-newspace.js Mon Apr 26
04:06:37 2010
@@ -0,0 +1,45 @@
+// Copyright 2010 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.
+
+/**
+ * @fileoverview Check that a mod where the stub code hits a failure
+ * in heap number allocation still works.
+ */
+
+// Flags: --max-new-space-size=65536
+
+function f(x) {
+ return x % 3;
+}
+
+function test() {
+ for (var i = 0; i < 10000; i++) {
+ assertEquals(-1 / 0, 1 / f(-3));
+ }
+}
+
+test();
=======================================
--- /branches/bleeding_edge/src/arm/codegen-arm.cc Sun Apr 25 03:31:52 2010
+++ /branches/bleeding_edge/src/arm/codegen-arm.cc Mon Apr 26 04:06:37 2010
@@ -6365,8 +6365,7 @@
Register lhs,
Register rhs,
const Builtins::JavaScript& builtin) {
- Label slow, slow_pop_2_first, do_the_call;
- Label r0_is_smi, r1_is_smi, finished_loading_r0, finished_loading_r1;
+ Label slow, slow_reverse, do_the_call;
bool use_fp_registers = CpuFeatures::IsSupported(VFP3) && Token::MOD !=
op_;
ASSERT((lhs.is(r0) && rhs.is(r1)) || (lhs.is(r1) && rhs.is(r0)));
@@ -6375,7 +6374,7 @@
// Smi-smi case (overflow).
// Since both are Smis there is no heap number to overwrite, so
allocate.
// The new heap number is in r5. r6 and r7 are scratch.
- __ AllocateHeapNumber(r5, r6, r7, &slow);
+ __ AllocateHeapNumber(r5, r6, r7, lhs.is(r0) ? &slow_reverse : &slow);
// If we have floating point hardware, inline ADD, SUB, MUL, and DIV,
// using registers d7 and d6 for the double values.
@@ -6405,11 +6404,15 @@
// We branch here if at least one of r0 and r1 is not a Smi.
__ bind(not_smi);
+ // After this point we have the left hand side in r1 and the right hand
side
+ // in r0.
if (lhs.is(r0)) {
__ Swap(r0, r1, ip);
}
if (ShouldGenerateFPCode()) {
+ Label r0_is_smi, r1_is_smi, finished_loading_r0, finished_loading_r1;
+
if (runtime_operands_type_ == BinaryOpIC::DEFAULT) {
switch (op_) {
case Token::ADD:
@@ -6427,7 +6430,7 @@
if (mode_ == NO_OVERWRITE) {
// In the case where there is no chance of an overwritable float we
may as
// well do the allocation immediately while r0 and r1 are untouched.
- __ AllocateHeapNumber(r5, r6, r7, &slow);
+ __ AllocateHeapNumber(r5, r6, r7, &slow);
}
// Move r0 to a double in r2-r3.
@@ -6578,6 +6581,14 @@
__ pop(pc);
}
}
+
+
+ if (lhs.is(r0)) {
+ __ b(&slow);
+ __ bind(&slow_reverse);
+ __ Swap(r0, r1, ip);
+ }
+
// We jump to here if something goes wrong (one param is not a number of
any
// sort or new-space allocation fails).
__ bind(&slow);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
