| Index: src/mips/macro-assembler-mips.cc
|
| diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc
|
| index 14a1e2fdca778e5a970cd1e65ac4a9918256a19e..cd1d38ee34bab0dfaaa5b155f46d7eecf61a324e 100644
|
| --- a/src/mips/macro-assembler-mips.cc
|
| +++ b/src/mips/macro-assembler-mips.cc
|
| @@ -1498,22 +1498,12 @@ void MacroAssembler::EmitOutOfInt32RangeTruncate(Register result,
|
| }
|
|
|
|
|
| -void MacroAssembler::EmitECMATruncate(Register result,
|
| - FPURegister double_input,
|
| - FPURegister single_scratch,
|
| - Register scratch,
|
| - Register scratch2,
|
| - Register scratch3) {
|
| - ASSERT(!scratch2.is(result));
|
| - ASSERT(!scratch3.is(result));
|
| - ASSERT(!scratch3.is(scratch2));
|
| - ASSERT(!scratch.is(result) &&
|
| - !scratch.is(scratch2) &&
|
| - !scratch.is(scratch3));
|
| - ASSERT(!single_scratch.is(double_input));
|
| -
|
| - Label done;
|
| - Label manual;
|
| +void MacroAssembler::TryInlineTruncateDoubleToI(Register result,
|
| + DoubleRegister double_input,
|
| + Label* done) {
|
| + DoubleRegister single_scratch = kLithiumScratchDouble.low();
|
| + Register scratch = at;
|
| + Register scratch2 = t9;
|
|
|
| // Clear cumulative exception flags and save the FCSR.
|
| cfc1(scratch2, FCSR);
|
| @@ -1529,16 +1519,83 @@ void MacroAssembler::EmitECMATruncate(Register result,
|
| scratch,
|
| kFCSROverflowFlagMask | kFCSRUnderflowFlagMask | kFCSRInvalidOpFlagMask);
|
| // If we had no exceptions we are done.
|
| - Branch(&done, eq, scratch, Operand(zero_reg));
|
| + Branch(done, eq, scratch, Operand(zero_reg));
|
| +}
|
| +
|
| +
|
| +void MacroAssembler::TruncateDoubleToI(Register result,
|
| + DoubleRegister double_input) {
|
| + Label done;
|
| +
|
| + TryInlineTruncateDoubleToI(result, double_input, &done);
|
| +
|
| + // If we fell through then inline version didn't succeed - call stub instead.
|
| + push(ra);
|
| + Subu(sp, sp, Operand(kDoubleSize)); // Put input on stack.
|
| + sdc1(double_input, MemOperand(sp, 0));
|
| +
|
| + DoubleToIStub stub(sp, result, 0, true, true);
|
| + CallStub(&stub);
|
| +
|
| + Addu(sp, sp, Operand(kDoubleSize));
|
| + pop(ra);
|
| +
|
| + bind(&done);
|
| +}
|
| +
|
| +
|
| +void MacroAssembler::TruncateHeapNumberToI(Register result, Register object) {
|
| + Label done;
|
| + DoubleRegister double_scratch = f12;
|
| + ASSERT(!result.is(object));
|
| +
|
| + ldc1(double_scratch,
|
| + MemOperand(object, HeapNumber::kValueOffset - kHeapObjectTag));
|
| + TryInlineTruncateDoubleToI(result, double_scratch, &done);
|
|
|
| - // Load the double value and perform a manual truncation.
|
| - Register input_high = scratch2;
|
| - Register input_low = scratch3;
|
| - Move(input_low, input_high, double_input);
|
| + // If we fell through then inline version didn't succeed - call stub instead.
|
| + push(ra);
|
| + DoubleToIStub stub(object,
|
| + result,
|
| + HeapNumber::kValueOffset - kHeapObjectTag,
|
| + true,
|
| + true);
|
| + CallStub(&stub);
|
| + pop(ra);
|
| +
|
| + bind(&done);
|
| +}
|
| +
|
| +
|
| +void MacroAssembler::TruncateNumberToI(Register object,
|
| + Register result,
|
| + Register heap_number_map,
|
| + Register scratch1,
|
| + Register scratch2,
|
| + Register scratch3,
|
| + Label* not_number) {
|
| + Label done;
|
| + Label not_in_int32_range;
|
| + DoubleRegister double_scratch = f12;
|
| +
|
| + UntagAndJumpIfSmi(result, object, &done);
|
| + JumpIfNotHeapNumber(object, heap_number_map, scratch1, not_number);
|
| + ConvertToInt32(object,
|
| + result,
|
| + scratch1,
|
| + scratch2,
|
| + double_scratch,
|
| + ¬_in_int32_range);
|
| + jmp(&done);
|
| +
|
| + bind(¬_in_int32_range);
|
| + lw(scratch1, FieldMemOperand(object, HeapNumber::kExponentOffset));
|
| + lw(scratch2, FieldMemOperand(object, HeapNumber::kMantissaOffset));
|
| EmitOutOfInt32RangeTruncate(result,
|
| - input_high,
|
| - input_low,
|
| - scratch);
|
| + scratch1,
|
| + scratch2,
|
| + scratch3);
|
| +
|
| bind(&done);
|
| }
|
|
|
| @@ -3266,7 +3323,7 @@ void MacroAssembler::AllocateHeapNumber(Register result,
|
| tagging_mode == TAG_RESULT ? TAG_OBJECT : NO_ALLOCATION_FLAGS);
|
|
|
| // Store heap number map in the allocated object.
|
| - AssertRegisterIsRoot(heap_number_map, Heap::kHeapNumberMapRootIndex);
|
| + AssertIsRoot(heap_number_map, Heap::kHeapNumberMapRootIndex);
|
| if (tagging_mode == TAG_RESULT) {
|
| sw(heap_number_map, FieldMemOperand(result, HeapObject::kMapOffset));
|
| } else {
|
| @@ -3428,7 +3485,6 @@ void MacroAssembler::StoreNumberToDoubleElements(Register value_reg,
|
| Register scratch1,
|
| Register scratch2,
|
| Register scratch3,
|
| - Register scratch4,
|
| Label* fail,
|
| int elements_offset) {
|
| Label smi_value, maybe_nan, have_double_value, is_nan, done;
|
| @@ -3485,25 +3541,11 @@ void MacroAssembler::StoreNumberToDoubleElements(Register value_reg,
|
| Addu(scratch1, scratch1, scratch2);
|
| // scratch1 is now effective address of the double element
|
|
|
| - FloatingPointHelper::Destination destination;
|
| - destination = FloatingPointHelper::kFPURegisters;
|
| -
|
| Register untagged_value = elements_reg;
|
| SmiUntag(untagged_value, value_reg);
|
| - FloatingPointHelper::ConvertIntToDouble(this,
|
| - untagged_value,
|
| - destination,
|
| - f0,
|
| - mantissa_reg,
|
| - exponent_reg,
|
| - scratch4,
|
| - f2);
|
| - if (destination == FloatingPointHelper::kFPURegisters) {
|
| - sdc1(f0, MemOperand(scratch1, 0));
|
| - } else {
|
| - sw(mantissa_reg, MemOperand(scratch1, 0));
|
| - sw(exponent_reg, MemOperand(scratch1, Register::kSizeInBytes));
|
| - }
|
| + mtc1(untagged_value, f2);
|
| + cvt_d_w(f0, f2);
|
| + sdc1(f0, MemOperand(scratch1, 0));
|
| bind(&done);
|
| }
|
|
|
| @@ -3963,7 +4005,6 @@ void MacroAssembler::CallApiFunctionAndReturn(ExternalReference function,
|
| ExternalReference thunk_ref,
|
| Register thunk_last_arg,
|
| int stack_space,
|
| - bool returns_handle,
|
| int return_value_offset_from_fp) {
|
| ExternalReference next_address =
|
| ExternalReference::handle_scope_next_address(isolate());
|
| @@ -3992,14 +4033,6 @@ void MacroAssembler::CallApiFunctionAndReturn(ExternalReference function,
|
| PopSafepointRegisters();
|
| }
|
|
|
| - // The O32 ABI requires us to pass a pointer in a0 where the returned struct
|
| - // (4 bytes) will be placed. This is also built into the Simulator.
|
| - // Set up the pointer to the returned value (a0). It was allocated in
|
| - // EnterExitFrame.
|
| - if (returns_handle) {
|
| - addiu(a0, fp, ExitFrameConstants::kStackSpaceOffset);
|
| - }
|
| -
|
| Label profiler_disabled;
|
| Label end_profiler_check;
|
| bool* is_profiling_flag =
|
| @@ -4039,19 +4072,6 @@ void MacroAssembler::CallApiFunctionAndReturn(ExternalReference function,
|
| Label leave_exit_frame;
|
| Label return_value_loaded;
|
|
|
| - if (returns_handle) {
|
| - Label load_return_value;
|
| -
|
| - // As mentioned above, on MIPS a pointer is returned - we need to
|
| - // dereference it to get the actual return value (which is also a pointer).
|
| - lw(v0, MemOperand(v0));
|
| -
|
| - Branch(&load_return_value, eq, v0, Operand(zero_reg));
|
| - // Dereference returned value.
|
| - lw(v0, MemOperand(v0));
|
| - Branch(&return_value_loaded);
|
| - bind(&load_return_value);
|
| - }
|
| // Load value from ReturnValue.
|
| lw(v0, MemOperand(fp, return_value_offset_from_fp*kPointerSize));
|
| bind(&return_value_loaded);
|
| @@ -4422,15 +4442,6 @@ void MacroAssembler::Assert(Condition cc, BailoutReason reason,
|
| }
|
|
|
|
|
| -void MacroAssembler::AssertRegisterIsRoot(Register reg,
|
| - Heap::RootListIndex index) {
|
| - if (emit_debug_code()) {
|
| - LoadRoot(at, index);
|
| - Check(eq, kRegisterDidNotMatchExpectedRoot, reg, Operand(at));
|
| - }
|
| -}
|
| -
|
| -
|
| void MacroAssembler::AssertFastElements(Register elements) {
|
| if (emit_debug_code()) {
|
| ASSERT(!elements.is(at));
|
| @@ -4623,6 +4634,116 @@ void MacroAssembler::LoadGlobalFunctionInitialMap(Register function,
|
| }
|
|
|
|
|
| +void MacroAssembler::LoadNumber(Register object,
|
| + FPURegister dst,
|
| + Register heap_number_map,
|
| + Register scratch,
|
| + Label* not_number) {
|
| + Label is_smi, done;
|
| +
|
| + UntagAndJumpIfSmi(scratch, object, &is_smi);
|
| + JumpIfNotHeapNumber(object, heap_number_map, scratch, not_number);
|
| +
|
| + ldc1(dst, FieldMemOperand(object, HeapNumber::kValueOffset));
|
| + Branch(&done);
|
| +
|
| + bind(&is_smi);
|
| + mtc1(scratch, dst);
|
| + cvt_d_w(dst, dst);
|
| +
|
| + bind(&done);
|
| +}
|
| +
|
| +
|
| +void MacroAssembler::LoadNumberAsInt32Double(Register object,
|
| + DoubleRegister double_dst,
|
| + Register heap_number_map,
|
| + Register scratch1,
|
| + Register scratch2,
|
| + FPURegister double_scratch,
|
| + Label* not_int32) {
|
| + ASSERT(!scratch1.is(object) && !scratch2.is(object));
|
| + ASSERT(!scratch1.is(scratch2));
|
| + ASSERT(!heap_number_map.is(object) &&
|
| + !heap_number_map.is(scratch1) &&
|
| + !heap_number_map.is(scratch2));
|
| +
|
| + Label done, obj_is_not_smi;
|
| +
|
| + UntagAndJumpIfNotSmi(scratch1, object, &obj_is_not_smi);
|
| + mtc1(scratch1, double_scratch);
|
| + cvt_d_w(double_dst, double_scratch);
|
| + Branch(&done);
|
| +
|
| + bind(&obj_is_not_smi);
|
| + JumpIfNotHeapNumber(object, heap_number_map, scratch1, not_int32);
|
| +
|
| + // Load the number.
|
| + // Load the double value.
|
| + ldc1(double_dst, FieldMemOperand(object, HeapNumber::kValueOffset));
|
| +
|
| + Register except_flag = scratch2;
|
| + EmitFPUTruncate(kRoundToZero,
|
| + scratch1,
|
| + double_dst,
|
| + at,
|
| + double_scratch,
|
| + except_flag,
|
| + kCheckForInexactConversion);
|
| +
|
| + // Jump to not_int32 if the operation did not succeed.
|
| + Branch(not_int32, ne, except_flag, Operand(zero_reg));
|
| + bind(&done);
|
| +}
|
| +
|
| +
|
| +void MacroAssembler::LoadNumberAsInt32(Register object,
|
| + Register dst,
|
| + Register heap_number_map,
|
| + Register scratch1,
|
| + Register scratch2,
|
| + FPURegister double_scratch0,
|
| + FPURegister double_scratch1,
|
| + Label* not_int32) {
|
| + ASSERT(!dst.is(object));
|
| + ASSERT(!scratch1.is(object) && !scratch2.is(object));
|
| + ASSERT(!scratch1.is(scratch2));
|
| +
|
| + Label done, maybe_undefined;
|
| +
|
| + UntagAndJumpIfSmi(dst, object, &done);
|
| +
|
| + JumpIfNotHeapNumber(object, heap_number_map, scratch1, &maybe_undefined);
|
| +
|
| + // Object is a heap number.
|
| + // Convert the floating point value to a 32-bit integer.
|
| + // Load the double value.
|
| + ldc1(double_scratch0, FieldMemOperand(object, HeapNumber::kValueOffset));
|
| +
|
| + Register except_flag = scratch2;
|
| + EmitFPUTruncate(kRoundToZero,
|
| + dst,
|
| + double_scratch0,
|
| + scratch1,
|
| + double_scratch1,
|
| + except_flag,
|
| + kCheckForInexactConversion);
|
| +
|
| + // Jump to not_int32 if the operation did not succeed.
|
| + Branch(not_int32, ne, except_flag, Operand(zero_reg));
|
| + Branch(&done);
|
| +
|
| + bind(&maybe_undefined);
|
| + LoadRoot(at, Heap::kUndefinedValueRootIndex);
|
| + Branch(not_int32, ne, object, Operand(at));
|
| + // |undefined| is truncated to 0.
|
| + li(dst, Operand(Smi::FromInt(0)));
|
| + // Fall through.
|
| +
|
| + bind(&done);
|
| +}
|
| +
|
| +
|
| void MacroAssembler::EnterFrame(StackFrame::Type type) {
|
| addiu(sp, sp, -5 * kPointerSize);
|
| li(t8, Operand(Smi::FromInt(type)));
|
| @@ -4942,13 +5063,11 @@ void MacroAssembler::AssertName(Register object) {
|
| }
|
|
|
|
|
| -void MacroAssembler::AssertRootValue(Register src,
|
| - Heap::RootListIndex root_value_index,
|
| - BailoutReason reason) {
|
| +void MacroAssembler::AssertIsRoot(Register reg, Heap::RootListIndex index) {
|
| if (emit_debug_code()) {
|
| - ASSERT(!src.is(at));
|
| - LoadRoot(at, root_value_index);
|
| - Check(eq, reason, src, Operand(at));
|
| + ASSERT(!reg.is(at));
|
| + LoadRoot(at, index);
|
| + Check(eq, kHeapNumberMapRegisterClobbered, reg, Operand(at));
|
| }
|
| }
|
|
|
| @@ -4958,7 +5077,7 @@ void MacroAssembler::JumpIfNotHeapNumber(Register object,
|
| Register scratch,
|
| Label* on_not_heap_number) {
|
| lw(scratch, FieldMemOperand(object, HeapObject::kMapOffset));
|
| - AssertRegisterIsRoot(heap_number_map, Heap::kHeapNumberMapRootIndex);
|
| + AssertIsRoot(heap_number_map, Heap::kHeapNumberMapRootIndex);
|
| Branch(on_not_heap_number, ne, scratch, Operand(heap_number_map));
|
| }
|
|
|
| @@ -5546,6 +5665,30 @@ void MacroAssembler::TestJSArrayForAllocationMemento(
|
| }
|
|
|
|
|
| +Register GetRegisterThatIsNotOneOf(Register reg1,
|
| + Register reg2,
|
| + Register reg3,
|
| + Register reg4,
|
| + Register reg5,
|
| + Register reg6) {
|
| + RegList regs = 0;
|
| + if (reg1.is_valid()) regs |= reg1.bit();
|
| + if (reg2.is_valid()) regs |= reg2.bit();
|
| + if (reg3.is_valid()) regs |= reg3.bit();
|
| + if (reg4.is_valid()) regs |= reg4.bit();
|
| + if (reg5.is_valid()) regs |= reg5.bit();
|
| + if (reg6.is_valid()) regs |= reg6.bit();
|
| +
|
| + for (int i = 0; i < Register::NumAllocatableRegisters(); i++) {
|
| + Register candidate = Register::FromAllocationIndex(i);
|
| + if (regs & candidate.bit()) continue;
|
| + return candidate;
|
| + }
|
| + UNREACHABLE();
|
| + return no_reg;
|
| +}
|
| +
|
| +
|
| bool AreAliased(Register r1, Register r2, Register r3, Register r4) {
|
| if (r1.is(r2)) return true;
|
| if (r1.is(r3)) return true;
|
|
|