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

MIPS: ARM: Fix erroneous detection of Double result type in Integer32 BinaryOpStubs

Browse Source 
Port r14371 (b5c4a990)

BUG=

Review URL: https://codereview.chromium.org/13973013

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14384 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
palfia@homejinni.com 2013-04-22 22:46:51 +00:00
parent 5d7e335afd
commit c2fbc08b42
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mips/code-stubs-mips.cc
View File

@ -2511,12 +2511,17 @@ void BinaryOpStub::GenerateInt32Stub(MacroAssembler* masm) {
__ Addu(scratch2, scratch1, Operand(0x40000000)); __ Addu(scratch2, scratch1, Operand(0x40000000));
// If not try to return a heap number. // If not try to return a heap number.
__ Branch(&return_heap_number, lt, scratch2, Operand(zero_reg)); __ Branch(&return_heap_number, lt, scratch2, Operand(zero_reg));
// Check for minus zero. Return heap number for minus zero. // Check for minus zero. Return heap number for minus zero if
// double results are allowed; otherwise transition.
Label not_zero; Label not_zero;
__ Branch(&not_zero, ne, scratch1, Operand(zero_reg)); __ Branch(&not_zero, ne, scratch1, Operand(zero_reg));
__ mfc1(scratch2, f11); __ mfc1(scratch2, f11);
__ And(scratch2, scratch2, HeapNumber::kSignMask); __ And(scratch2, scratch2, HeapNumber::kSignMask);
__ Branch(&return_heap_number, ne, scratch2, Operand(zero_reg)); __ Branch(result_type_ <= BinaryOpIC::INT32 ? &transition
: &return_heap_number,
ne,
scratch2,
Operand(zero_reg));
__ bind(&not_zero); __ bind(&not_zero);
// Tag the result and return. // Tag the result and return.
@ -2529,8 +2534,6 @@ void BinaryOpStub::GenerateInt32Stub(MacroAssembler* masm) {
__ bind(&return_heap_number); __ bind(&return_heap_number);
// Return a heap number, or fall through to type transition or runtime // Return a heap number, or fall through to type transition or runtime
// call if we can't. // call if we can't.
if (result_type_ >= ((op_ == Token::DIV) ? BinaryOpIC::NUMBER
: BinaryOpIC::INT32)) {
// We are using FPU registers so s0 is available. // We are using FPU registers so s0 is available.
heap_number_result = s0; heap_number_result = s0;
BinaryOpStub_GenerateHeapResultAllocation(masm, BinaryOpStub_GenerateHeapResultAllocation(masm,
@ -2543,7 +2546,6 @@ void BinaryOpStub::GenerateInt32Stub(MacroAssembler* masm) {
__ mov(v0, heap_number_result); __ mov(v0, heap_number_result);
__ sdc1(f10, FieldMemOperand(v0, HeapNumber::kValueOffset)); __ sdc1(f10, FieldMemOperand(v0, HeapNumber::kValueOffset));
__ Ret(); __ Ret();
}
// A DIV operation expecting an integer result falls through // A DIV operation expecting an integer result falls through
// to type transition. // to type transition.