| Index: src/ia32/code-stubs-ia32.cc
|
| diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
|
| index 7af000ade22d12dae3930fca061208a6b8580aaf..3cdf851b3fc83231ed22063dfd45e879afc1bf24 100644
|
| --- a/src/ia32/code-stubs-ia32.cc
|
| +++ b/src/ia32/code-stubs-ia32.cc
|
| @@ -5806,6 +5806,83 @@ void ICCompareStub::GenerateHeapNumbers(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| +void ICCompareStub::GenerateStrings(MacroAssembler* masm) {
|
| + ASSERT(state_ == CompareIC::STRINGS);
|
| + Label miss;
|
| +
|
| + // Registers containing left and right operands respectively.
|
| + Register left = edx;
|
| + Register right = eax;
|
| + Register tmp1 = ecx;
|
| + Register tmp2 = ebx;
|
| + Register tmp3 = edi;
|
| +
|
| + // Check that both operands are heap objects.
|
| + __ mov(tmp1, Operand(left));
|
| + STATIC_ASSERT(kSmiTag == 0);
|
| + __ and_(tmp1, Operand(right));
|
| + __ test(tmp1, Immediate(kSmiTagMask));
|
| + __ j(zero, &miss);
|
| +
|
| + // Check that both operands are strings. This leaves the instance
|
| + // types loaded in tmp1 and tmp2.
|
| + __ mov(tmp1, FieldOperand(left, HeapObject::kMapOffset));
|
| + __ mov(tmp2, FieldOperand(right, HeapObject::kMapOffset));
|
| + __ movzx_b(tmp1, FieldOperand(tmp1, Map::kInstanceTypeOffset));
|
| + __ movzx_b(tmp2, FieldOperand(tmp2, Map::kInstanceTypeOffset));
|
| + __ mov(tmp3, tmp1);
|
| + STATIC_ASSERT(kNotStringTag != 0);
|
| + __ or_(tmp3, Operand(tmp2));
|
| + __ test(tmp3, Immediate(kIsNotStringMask));
|
| + __ j(not_zero, &miss);
|
| +
|
| + // Fast check for identical strings.
|
| + NearLabel not_same;
|
| + __ cmp(left, Operand(right));
|
| + __ j(not_equal, ¬_same);
|
| + STATIC_ASSERT(EQUAL == 0);
|
| + STATIC_ASSERT(kSmiTag == 0);
|
| + __ Set(eax, Immediate(Smi::FromInt(EQUAL)));
|
| + __ ret(0);
|
| +
|
| + // Handle not identical strings.
|
| + __ bind(¬_same);
|
| +
|
| + // Check that both strings are symbols. If they are, we're done
|
| + // because we already know they are not identical.
|
| + NearLabel do_compare;
|
| + ASSERT(GetCondition() == equal);
|
| + STATIC_ASSERT(kSymbolTag != 0);
|
| + __ and_(tmp1, Operand(tmp2));
|
| + __ test(tmp1, Immediate(kIsSymbolMask));
|
| + __ j(zero, &do_compare);
|
| + // Make sure eax is non-zero. At this point input operands are
|
| + // guaranteed to be non-zero.
|
| + ASSERT(right.is(eax));
|
| + __ ret(0);
|
| +
|
| + // Check that both strings are sequential ASCII.
|
| + Label runtime;
|
| + __ bind(&do_compare);
|
| + __ JumpIfNotBothSequentialAsciiStrings(left, right, tmp1, tmp2, &runtime);
|
| +
|
| + // Compare flat ASCII strings. Returns when done.
|
| + StringCompareStub::GenerateCompareFlatAsciiStrings(
|
| + masm, left, right, tmp1, tmp2, tmp3);
|
| +
|
| + // Handle more complex cases in runtime.
|
| + __ bind(&runtime);
|
| + __ pop(tmp1); // Return address.
|
| + __ push(left);
|
| + __ push(right);
|
| + __ push(tmp1);
|
| + __ TailCallRuntime(Runtime::kStringCompare, 2, 1);
|
| +
|
| + __ bind(&miss);
|
| + GenerateMiss(masm);
|
| +}
|
| +
|
| +
|
| void ICCompareStub::GenerateObjects(MacroAssembler* masm) {
|
| ASSERT(state_ == CompareIC::OBJECTS);
|
| NearLabel miss;
|
|
|