| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 1617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1628 __ push(r1); | 1628 __ push(r1); |
| 1629 } else { | 1629 } else { |
| 1630 VisitForStackValue(expression); | 1630 VisitForStackValue(expression); |
| 1631 } | 1631 } |
| 1632 } | 1632 } |
| 1633 | 1633 |
| 1634 | 1634 |
| 1635 void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { | 1635 void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
| 1636 Comment cmnt(masm_, "[ ObjectLiteral"); | 1636 Comment cmnt(masm_, "[ ObjectLiteral"); |
| 1637 | 1637 |
| 1638 int depth = 1; | 1638 expr->BuildConstantProperties(isolate()); |
| 1639 expr->BuildConstantProperties(isolate(), &depth); | |
| 1640 Handle<FixedArray> constant_properties = expr->constant_properties(); | 1639 Handle<FixedArray> constant_properties = expr->constant_properties(); |
| 1641 __ ldr(r3, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); | 1640 __ ldr(r3, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
| 1642 __ ldr(r3, FieldMemOperand(r3, JSFunction::kLiteralsOffset)); | 1641 __ ldr(r3, FieldMemOperand(r3, JSFunction::kLiteralsOffset)); |
| 1643 __ mov(r2, Operand(Smi::FromInt(expr->literal_index()))); | 1642 __ mov(r2, Operand(Smi::FromInt(expr->literal_index()))); |
| 1644 __ mov(r1, Operand(constant_properties)); | 1643 __ mov(r1, Operand(constant_properties)); |
| 1645 int flags = expr->fast_elements() | 1644 int flags = expr->fast_elements() |
| 1646 ? ObjectLiteral::kFastElements | 1645 ? ObjectLiteral::kFastElements |
| 1647 : ObjectLiteral::kNoFlags; | 1646 : ObjectLiteral::kNoFlags; |
| 1648 flags |= expr->has_function() | 1647 flags |= expr->has_function() |
| 1649 ? ObjectLiteral::kHasFunction | 1648 ? ObjectLiteral::kHasFunction |
| 1650 : ObjectLiteral::kNoFlags; | 1649 : ObjectLiteral::kNoFlags; |
| 1651 __ mov(r0, Operand(Smi::FromInt(flags))); | 1650 __ mov(r0, Operand(Smi::FromInt(flags))); |
| 1652 int properties_count = constant_properties->length() / 2; | 1651 int properties_count = constant_properties->length() / 2; |
| 1653 if ((FLAG_track_double_fields && expr->may_store_doubles()) || | 1652 if ((FLAG_track_double_fields && expr->may_store_doubles()) || |
| 1654 depth > 1 || Serializer::enabled() || | 1653 expr->depth() > 1 || Serializer::enabled() || |
| 1655 flags != ObjectLiteral::kFastElements || | 1654 flags != ObjectLiteral::kFastElements || |
| 1656 properties_count > FastCloneShallowObjectStub::kMaximumClonedProperties) { | 1655 properties_count > FastCloneShallowObjectStub::kMaximumClonedProperties) { |
| 1657 __ Push(r3, r2, r1, r0); | 1656 __ Push(r3, r2, r1, r0); |
| 1658 __ CallRuntime(Runtime::kCreateObjectLiteral, 4); | 1657 __ CallRuntime(Runtime::kCreateObjectLiteral, 4); |
| 1659 } else { | 1658 } else { |
| 1660 FastCloneShallowObjectStub stub(properties_count); | 1659 FastCloneShallowObjectStub stub(properties_count); |
| 1661 __ CallStub(&stub); | 1660 __ CallStub(&stub); |
| 1662 } | 1661 } |
| 1663 | 1662 |
| 1664 // If result_saved is true the result is on top of the stack. If | 1663 // If result_saved is true the result is on top of the stack. If |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1763 context()->PlugTOS(); | 1762 context()->PlugTOS(); |
| 1764 } else { | 1763 } else { |
| 1765 context()->Plug(r0); | 1764 context()->Plug(r0); |
| 1766 } | 1765 } |
| 1767 } | 1766 } |
| 1768 | 1767 |
| 1769 | 1768 |
| 1770 void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { | 1769 void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
| 1771 Comment cmnt(masm_, "[ ArrayLiteral"); | 1770 Comment cmnt(masm_, "[ ArrayLiteral"); |
| 1772 | 1771 |
| 1773 int depth = 1; | 1772 expr->BuildConstantElements(isolate()); |
| 1774 expr->BuildConstantElements(isolate(), &depth); | |
| 1775 ZoneList<Expression*>* subexprs = expr->values(); | 1773 ZoneList<Expression*>* subexprs = expr->values(); |
| 1776 int length = subexprs->length(); | 1774 int length = subexprs->length(); |
| 1777 Handle<FixedArray> constant_elements = expr->constant_elements(); | 1775 Handle<FixedArray> constant_elements = expr->constant_elements(); |
| 1778 ASSERT_EQ(2, constant_elements->length()); | 1776 ASSERT_EQ(2, constant_elements->length()); |
| 1779 ElementsKind constant_elements_kind = | 1777 ElementsKind constant_elements_kind = |
| 1780 static_cast<ElementsKind>(Smi::cast(constant_elements->get(0))->value()); | 1778 static_cast<ElementsKind>(Smi::cast(constant_elements->get(0))->value()); |
| 1781 bool has_fast_elements = IsFastObjectElementsKind(constant_elements_kind); | 1779 bool has_fast_elements = IsFastObjectElementsKind(constant_elements_kind); |
| 1782 Handle<FixedArrayBase> constant_elements_values( | 1780 Handle<FixedArrayBase> constant_elements_values( |
| 1783 FixedArrayBase::cast(constant_elements->get(1))); | 1781 FixedArrayBase::cast(constant_elements->get(1))); |
| 1784 | 1782 |
| 1785 __ ldr(r3, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); | 1783 __ ldr(r3, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
| 1786 __ ldr(r3, FieldMemOperand(r3, JSFunction::kLiteralsOffset)); | 1784 __ ldr(r3, FieldMemOperand(r3, JSFunction::kLiteralsOffset)); |
| 1787 __ mov(r2, Operand(Smi::FromInt(expr->literal_index()))); | 1785 __ mov(r2, Operand(Smi::FromInt(expr->literal_index()))); |
| 1788 __ mov(r1, Operand(constant_elements)); | 1786 __ mov(r1, Operand(constant_elements)); |
| 1789 if (has_fast_elements && constant_elements_values->map() == | 1787 if (has_fast_elements && constant_elements_values->map() == |
| 1790 isolate()->heap()->fixed_cow_array_map()) { | 1788 isolate()->heap()->fixed_cow_array_map()) { |
| 1791 FastCloneShallowArrayStub stub( | 1789 FastCloneShallowArrayStub stub( |
| 1792 FastCloneShallowArrayStub::COPY_ON_WRITE_ELEMENTS, | 1790 FastCloneShallowArrayStub::COPY_ON_WRITE_ELEMENTS, |
| 1793 DONT_TRACK_ALLOCATION_SITE, | 1791 DONT_TRACK_ALLOCATION_SITE, |
| 1794 length); | 1792 length); |
| 1795 __ CallStub(&stub); | 1793 __ CallStub(&stub); |
| 1796 __ IncrementCounter( | 1794 __ IncrementCounter( |
| 1797 isolate()->counters()->cow_arrays_created_stub(), 1, r1, r2); | 1795 isolate()->counters()->cow_arrays_created_stub(), 1, r1, r2); |
| 1798 } else if (depth > 1 || Serializer::enabled() || | 1796 } else if (expr->depth() > 1 || Serializer::enabled() || |
| 1799 length > FastCloneShallowArrayStub::kMaximumClonedLength) { | 1797 length > FastCloneShallowArrayStub::kMaximumClonedLength) { |
| 1800 __ Push(r3, r2, r1); | 1798 __ Push(r3, r2, r1); |
| 1801 __ CallRuntime(Runtime::kCreateArrayLiteral, 3); | 1799 __ CallRuntime(Runtime::kCreateArrayLiteral, 3); |
| 1802 } else { | 1800 } else { |
| 1803 ASSERT(IsFastSmiOrObjectElementsKind(constant_elements_kind) || | 1801 ASSERT(IsFastSmiOrObjectElementsKind(constant_elements_kind) || |
| 1804 FLAG_smi_only_arrays); | 1802 FLAG_smi_only_arrays); |
| 1805 FastCloneShallowArrayStub::Mode mode = | 1803 FastCloneShallowArrayStub::Mode mode = |
| 1806 FastCloneShallowArrayStub::CLONE_ANY_ELEMENTS; | 1804 FastCloneShallowArrayStub::CLONE_ANY_ELEMENTS; |
| 1807 AllocationSiteMode allocation_site_mode = FLAG_track_allocation_sites | 1805 AllocationSiteMode allocation_site_mode = FLAG_track_allocation_sites |
| 1808 ? TRACK_ALLOCATION_SITE : DONT_TRACK_ALLOCATION_SITE; | 1806 ? TRACK_ALLOCATION_SITE : DONT_TRACK_ALLOCATION_SITE; |
| (...skipping 3156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4965 ASSERT(Memory::uint32_at(interrupt_address_pointer) == | 4963 ASSERT(Memory::uint32_at(interrupt_address_pointer) == |
| 4966 reinterpret_cast<uint32_t>( | 4964 reinterpret_cast<uint32_t>( |
| 4967 isolate->builtins()->OsrAfterStackCheck()->entry())); | 4965 isolate->builtins()->OsrAfterStackCheck()->entry())); |
| 4968 return OSR_AFTER_STACK_CHECK; | 4966 return OSR_AFTER_STACK_CHECK; |
| 4969 } | 4967 } |
| 4970 | 4968 |
| 4971 | 4969 |
| 4972 } } // namespace v8::internal | 4970 } } // namespace v8::internal |
| 4973 | 4971 |
| 4974 #endif // V8_TARGET_ARCH_ARM | 4972 #endif // V8_TARGET_ARCH_ARM |
| OLD | NEW |