Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: src/x64/lithium-x64.cc

Issue 6664001: [Isolates] Merge (7083,7111] from bleeding_edge. (Closed)
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/x64/lithium-x64.h ('k') | src/x64/macro-assembler-x64.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 LOperand* left = UseFixed(instr->left(), rax); 1149 LOperand* left = UseFixed(instr->left(), rax);
1150 LOperand* right = UseFixed(instr->right(), rdx); 1150 LOperand* right = UseFixed(instr->right(), rdx);
1151 LInstanceOf* result = new LInstanceOf(left, right); 1151 LInstanceOf* result = new LInstanceOf(left, right);
1152 return MarkAsCall(DefineFixed(result, rax), instr); 1152 return MarkAsCall(DefineFixed(result, rax), instr);
1153 } 1153 }
1154 1154
1155 1155
1156 LInstruction* LChunkBuilder::DoInstanceOfKnownGlobal( 1156 LInstruction* LChunkBuilder::DoInstanceOfKnownGlobal(
1157 HInstanceOfKnownGlobal* instr) { 1157 HInstanceOfKnownGlobal* instr) {
1158 LInstanceOfKnownGlobal* result = 1158 LInstanceOfKnownGlobal* result =
1159 new LInstanceOfKnownGlobal(UseFixed(instr->value(), rax)); 1159 new LInstanceOfKnownGlobal(UseFixed(instr->value(), rax),
1160 FixedTemp(rdi));
1160 return MarkAsCall(DefineFixed(result, rax), instr); 1161 return MarkAsCall(DefineFixed(result, rax), instr);
1161 } 1162 }
1162 1163
1163 1164
1164 LInstruction* LChunkBuilder::DoApplyArguments(HApplyArguments* instr) { 1165 LInstruction* LChunkBuilder::DoApplyArguments(HApplyArguments* instr) {
1165 LOperand* function = UseFixed(instr->function(), rdi); 1166 LOperand* function = UseFixed(instr->function(), rdi);
1166 LOperand* receiver = UseFixed(instr->receiver(), rax); 1167 LOperand* receiver = UseFixed(instr->receiver(), rax);
1167 LOperand* length = UseFixed(instr->length(), rbx); 1168 LOperand* length = UseFixed(instr->length(), rbx);
1168 LOperand* elements = UseFixed(instr->elements(), rcx); 1169 LOperand* elements = UseFixed(instr->elements(), rcx);
1169 LApplyArguments* result = new LApplyArguments(function, 1170 LApplyArguments* result = new LApplyArguments(function,
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
1548 return DefineAsRegister(new LJSArrayLength(array)); 1549 return DefineAsRegister(new LJSArrayLength(array));
1549 } 1550 }
1550 1551
1551 1552
1552 LInstruction* LChunkBuilder::DoFixedArrayLength(HFixedArrayLength* instr) { 1553 LInstruction* LChunkBuilder::DoFixedArrayLength(HFixedArrayLength* instr) {
1553 LOperand* array = UseRegisterAtStart(instr->value()); 1554 LOperand* array = UseRegisterAtStart(instr->value());
1554 return DefineAsRegister(new LFixedArrayLength(array)); 1555 return DefineAsRegister(new LFixedArrayLength(array));
1555 } 1556 }
1556 1557
1557 1558
1558 LInstruction* LChunkBuilder::DoPixelArrayLength(HPixelArrayLength* instr) { 1559 LInstruction* LChunkBuilder::DoExternalArrayLength(
1560 HExternalArrayLength* instr) {
1559 LOperand* array = UseRegisterAtStart(instr->value()); 1561 LOperand* array = UseRegisterAtStart(instr->value());
1560 return DefineAsRegister(new LPixelArrayLength(array)); 1562 return DefineAsRegister(new LExternalArrayLength(array));
1561 } 1563 }
1562 1564
1563 1565
1564 LInstruction* LChunkBuilder::DoValueOf(HValueOf* instr) { 1566 LInstruction* LChunkBuilder::DoValueOf(HValueOf* instr) {
1565 LOperand* object = UseRegister(instr->value()); 1567 LOperand* object = UseRegister(instr->value());
1566 LValueOf* result = new LValueOf(object); 1568 LValueOf* result = new LValueOf(object);
1567 return AssignEnvironment(DefineSameAsFirst(result)); 1569 return AssignEnvironment(DefineSameAsFirst(result));
1568 } 1570 }
1569 1571
1570 1572
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1763 new LLoadFunctionPrototype(UseRegister(instr->function())))); 1765 new LLoadFunctionPrototype(UseRegister(instr->function()))));
1764 } 1766 }
1765 1767
1766 1768
1767 LInstruction* LChunkBuilder::DoLoadElements(HLoadElements* instr) { 1769 LInstruction* LChunkBuilder::DoLoadElements(HLoadElements* instr) {
1768 LOperand* input = UseRegisterAtStart(instr->value()); 1770 LOperand* input = UseRegisterAtStart(instr->value());
1769 return DefineAsRegister(new LLoadElements(input)); 1771 return DefineAsRegister(new LLoadElements(input));
1770 } 1772 }
1771 1773
1772 1774
1773 LInstruction* LChunkBuilder::DoLoadPixelArrayExternalPointer( 1775 LInstruction* LChunkBuilder::DoLoadExternalArrayPointer(
1774 HLoadPixelArrayExternalPointer* instr) { 1776 HLoadExternalArrayPointer* instr) {
1775 LOperand* input = UseRegisterAtStart(instr->value()); 1777 LOperand* input = UseRegisterAtStart(instr->value());
1776 return DefineAsRegister(new LLoadPixelArrayExternalPointer(input)); 1778 return DefineAsRegister(new LLoadExternalArrayPointer(input));
1777 } 1779 }
1778 1780
1779 1781
1780 LInstruction* LChunkBuilder::DoLoadKeyedFastElement( 1782 LInstruction* LChunkBuilder::DoLoadKeyedFastElement(
1781 HLoadKeyedFastElement* instr) { 1783 HLoadKeyedFastElement* instr) {
1782 ASSERT(instr->representation().IsTagged()); 1784 ASSERT(instr->representation().IsTagged());
1783 ASSERT(instr->key()->representation().IsInteger32()); 1785 ASSERT(instr->key()->representation().IsInteger32());
1784 LOperand* obj = UseRegisterAtStart(instr->object()); 1786 LOperand* obj = UseRegisterAtStart(instr->object());
1785 LOperand* key = UseRegisterAtStart(instr->key()); 1787 LOperand* key = UseRegisterAtStart(instr->key());
1786 LLoadKeyedFastElement* result = new LLoadKeyedFastElement(obj, key); 1788 LLoadKeyedFastElement* result = new LLoadKeyedFastElement(obj, key);
1787 return AssignEnvironment(DefineSameAsFirst(result)); 1789 return AssignEnvironment(DefineSameAsFirst(result));
1788 } 1790 }
1789 1791
1790 1792
1791 LInstruction* LChunkBuilder::DoLoadPixelArrayElement( 1793 LInstruction* LChunkBuilder::DoLoadPixelArrayElement(
1792 HLoadPixelArrayElement* instr) { 1794 HLoadPixelArrayElement* instr) {
1795 Abort("Pixel array loads in generated code cause segfaults (danno)");
1793 ASSERT(instr->representation().IsInteger32()); 1796 ASSERT(instr->representation().IsInteger32());
1794 ASSERT(instr->key()->representation().IsInteger32()); 1797 ASSERT(instr->key()->representation().IsInteger32());
1795 LOperand* external_pointer = 1798 LOperand* external_pointer =
1796 UseRegisterAtStart(instr->external_pointer()); 1799 UseRegisterAtStart(instr->external_pointer());
1797 LOperand* key = UseRegisterAtStart(instr->key()); 1800 LOperand* key = UseRegisterAtStart(instr->key());
1798 LLoadPixelArrayElement* result = 1801 LLoadPixelArrayElement* result =
1799 new LLoadPixelArrayElement(external_pointer, key); 1802 new LLoadPixelArrayElement(external_pointer, key);
1800 return DefineSameAsFirst(result); 1803 return DefineSameAsFirst(result);
1801 } 1804 }
1802 1805
(...skipping 21 matching lines...) Expand all
1824 LOperand* key = needs_write_barrier 1827 LOperand* key = needs_write_barrier
1825 ? UseTempRegister(instr->key()) 1828 ? UseTempRegister(instr->key())
1826 : UseRegisterOrConstantAtStart(instr->key()); 1829 : UseRegisterOrConstantAtStart(instr->key());
1827 1830
1828 return AssignEnvironment(new LStoreKeyedFastElement(obj, key, val)); 1831 return AssignEnvironment(new LStoreKeyedFastElement(obj, key, val));
1829 } 1832 }
1830 1833
1831 1834
1832 LInstruction* LChunkBuilder::DoStorePixelArrayElement( 1835 LInstruction* LChunkBuilder::DoStorePixelArrayElement(
1833 HStorePixelArrayElement* instr) { 1836 HStorePixelArrayElement* instr) {
1837 Abort("Pixel array stores in generated code sometimes segfaults (danno)");
1834 ASSERT(instr->value()->representation().IsInteger32()); 1838 ASSERT(instr->value()->representation().IsInteger32());
1835 ASSERT(instr->external_pointer()->representation().IsExternal()); 1839 ASSERT(instr->external_pointer()->representation().IsExternal());
1836 ASSERT(instr->key()->representation().IsInteger32()); 1840 ASSERT(instr->key()->representation().IsInteger32());
1837 1841
1838 LOperand* external_pointer = UseRegister(instr->external_pointer()); 1842 LOperand* external_pointer = UseRegister(instr->external_pointer());
1839 LOperand* val = UseTempRegister(instr->value()); 1843 LOperand* val = UseTempRegister(instr->value());
1840 LOperand* key = UseRegister(instr->key()); 1844 LOperand* key = UseRegister(instr->key());
1841 1845
1842 return new LStorePixelArrayElement(external_pointer, key, val); 1846 return new LStorePixelArrayElement(external_pointer, key, val);
1843 } 1847 }
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
2038 2042
2039 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { 2043 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) {
2040 HEnvironment* outer = current_block_->last_environment()->outer(); 2044 HEnvironment* outer = current_block_->last_environment()->outer();
2041 current_block_->UpdateEnvironment(outer); 2045 current_block_->UpdateEnvironment(outer);
2042 return NULL; 2046 return NULL;
2043 } 2047 }
2044 2048
2045 } } // namespace v8::internal 2049 } } // namespace v8::internal
2046 2050
2047 #endif // V8_TARGET_ARCH_X64 2051 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/lithium-x64.h ('k') | src/x64/macro-assembler-x64.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698