Fix transcendental cache on ARM in optimized code.
R=jkummerow@chromium.org BUG=v8:2234 TEST=regress-2234.js Review URL: https://chromiumcodereview.appspot.com/10695205 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12086 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
7337068605
commit
022ba0588a
@ -3403,23 +3403,23 @@ void TranscendentalCacheStub::Generate(MacroAssembler* masm) {
|
||||
ExternalReference(RuntimeFunction(), masm->isolate());
|
||||
__ TailCallExternalReference(runtime_function, 1, 1);
|
||||
} else {
|
||||
if (!CpuFeatures::IsSupported(VFP3)) UNREACHABLE();
|
||||
ASSERT(CpuFeatures::IsSupported(VFP3));
|
||||
CpuFeatures::Scope scope(VFP3);
|
||||
|
||||
Label no_update;
|
||||
Label skip_cache;
|
||||
|
||||
// Call C function to calculate the result and update the cache.
|
||||
// Register r0 holds precalculated cache entry address; preserve
|
||||
// it on the stack and pop it into register cache_entry after the
|
||||
// call.
|
||||
__ push(cache_entry);
|
||||
// r0: precalculated cache entry address.
|
||||
// r2 and r3: parts of the double value.
|
||||
// Store r0, r2 and r3 on stack for later before calling C function.
|
||||
__ Push(r3, r2, cache_entry);
|
||||
GenerateCallCFunction(masm, scratch0);
|
||||
__ GetCFunctionDoubleResult(d2);
|
||||
|
||||
// Try to update the cache. If we cannot allocate a
|
||||
// heap number, we return the result without updating.
|
||||
__ pop(cache_entry);
|
||||
__ Pop(r3, r2, cache_entry);
|
||||
__ LoadRoot(r5, Heap::kHeapNumberMapRootIndex);
|
||||
__ AllocateHeapNumber(r6, scratch0, scratch1, r5, &no_update);
|
||||
__ vstr(d2, FieldMemOperand(r6, HeapNumber::kValueOffset));
|
||||
|
41
test/mjsunit/regress/regress-2234.js
Normal file
41
test/mjsunit/regress/regress-2234.js
Normal file
@ -0,0 +1,41 @@
|
||||
// Copyright 2012 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
|
||||
|
||||
function test(i) {
|
||||
// Overwrite random parts of the transcendental cache.
|
||||
Math.sin(i / 1779 * Math.PI);
|
||||
// Check whether the first cache line has been accidentally overwritten
|
||||
// with incorrect key.
|
||||
assertEquals(0, Math.sin(0));
|
||||
}
|
||||
|
||||
for (i = 0; i < 10000; ++i) {
|
||||
test(i);
|
||||
if (i == 0) %OptimizeFunctionOnNextCall(test);
|
||||
}
|
Loading…
Reference in New Issue
Block a user