| OLD | NEW |
| 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 1720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1731 } | 1731 } |
| 1732 | 1732 |
| 1733 | 1733 |
| 1734 LInstruction* LChunkBuilder::DoLoadGlobalGeneric(HLoadGlobalGeneric* instr) { | 1734 LInstruction* LChunkBuilder::DoLoadGlobalGeneric(HLoadGlobalGeneric* instr) { |
| 1735 LOperand* global_object = UseFixed(instr->global_object(), r0); | 1735 LOperand* global_object = UseFixed(instr->global_object(), r0); |
| 1736 LLoadGlobalGeneric* result = new LLoadGlobalGeneric(global_object); | 1736 LLoadGlobalGeneric* result = new LLoadGlobalGeneric(global_object); |
| 1737 return MarkAsCall(DefineFixed(result, r0), instr); | 1737 return MarkAsCall(DefineFixed(result, r0), instr); |
| 1738 } | 1738 } |
| 1739 | 1739 |
| 1740 | 1740 |
| 1741 LInstruction* LChunkBuilder::DoStoreGlobal(HStoreGlobal* instr) { | 1741 LInstruction* LChunkBuilder::DoStoreGlobalCell(HStoreGlobalCell* instr) { |
| 1742 if (instr->check_hole_value()) { | 1742 if (instr->check_hole_value()) { |
| 1743 LOperand* temp = TempRegister(); | 1743 LOperand* temp = TempRegister(); |
| 1744 LOperand* value = UseRegister(instr->value()); | 1744 LOperand* value = UseRegister(instr->value()); |
| 1745 return AssignEnvironment(new LStoreGlobal(value, temp)); | 1745 return AssignEnvironment(new LStoreGlobalCell(value, temp)); |
| 1746 } else { | 1746 } else { |
| 1747 LOperand* value = UseRegisterAtStart(instr->value()); | 1747 LOperand* value = UseRegisterAtStart(instr->value()); |
| 1748 return new LStoreGlobal(value, NULL); | 1748 return new LStoreGlobalCell(value, NULL); |
| 1749 } | 1749 } |
| 1750 } | 1750 } |
| 1751 | 1751 |
| 1752 | 1752 |
| 1753 LInstruction* LChunkBuilder::DoStoreGlobalGeneric(HStoreGlobalGeneric* instr) { |
| 1754 LOperand* global_object = UseFixed(instr->global_object(), r1); |
| 1755 LOperand* value = UseFixed(instr->value(), r0); |
| 1756 LStoreGlobalGeneric* result = |
| 1757 new LStoreGlobalGeneric(global_object, value); |
| 1758 return MarkAsCall(result, instr); |
| 1759 } |
| 1760 |
| 1761 |
| 1753 LInstruction* LChunkBuilder::DoLoadContextSlot(HLoadContextSlot* instr) { | 1762 LInstruction* LChunkBuilder::DoLoadContextSlot(HLoadContextSlot* instr) { |
| 1754 LOperand* context = UseRegisterAtStart(instr->value()); | 1763 LOperand* context = UseRegisterAtStart(instr->value()); |
| 1755 return DefineAsRegister(new LLoadContextSlot(context)); | 1764 return DefineAsRegister(new LLoadContextSlot(context)); |
| 1756 } | 1765 } |
| 1757 | 1766 |
| 1758 | 1767 |
| 1759 LInstruction* LChunkBuilder::DoStoreContextSlot(HStoreContextSlot* instr) { | 1768 LInstruction* LChunkBuilder::DoStoreContextSlot(HStoreContextSlot* instr) { |
| 1760 LOperand* context; | 1769 LOperand* context; |
| 1761 LOperand* value; | 1770 LOperand* value; |
| 1762 if (instr->NeedsWriteBarrier()) { | 1771 if (instr->NeedsWriteBarrier()) { |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2061 env->Drop(instr->pop_count()); | 2070 env->Drop(instr->pop_count()); |
| 2062 for (int i = 0; i < instr->values()->length(); ++i) { | 2071 for (int i = 0; i < instr->values()->length(); ++i) { |
| 2063 HValue* value = instr->values()->at(i); | 2072 HValue* value = instr->values()->at(i); |
| 2064 if (instr->HasAssignedIndexAt(i)) { | 2073 if (instr->HasAssignedIndexAt(i)) { |
| 2065 env->Bind(instr->GetAssignedIndexAt(i), value); | 2074 env->Bind(instr->GetAssignedIndexAt(i), value); |
| 2066 } else { | 2075 } else { |
| 2067 env->Push(value); | 2076 env->Push(value); |
| 2068 } | 2077 } |
| 2069 } | 2078 } |
| 2070 | 2079 |
| 2071 ASSERT(env->length() == instr->environment_length()); | |
| 2072 | |
| 2073 // If there is an instruction pending deoptimization environment create a | 2080 // If there is an instruction pending deoptimization environment create a |
| 2074 // lazy bailout instruction to capture the environment. | 2081 // lazy bailout instruction to capture the environment. |
| 2075 if (pending_deoptimization_ast_id_ == instr->ast_id()) { | 2082 if (pending_deoptimization_ast_id_ == instr->ast_id()) { |
| 2076 LInstruction* result = new LLazyBailout; | 2083 LInstruction* result = new LLazyBailout; |
| 2077 result = AssignEnvironment(result); | 2084 result = AssignEnvironment(result); |
| 2078 instruction_pending_deoptimization_environment_-> | 2085 instruction_pending_deoptimization_environment_-> |
| 2079 set_deoptimization_environment(result->environment()); | 2086 set_deoptimization_environment(result->environment()); |
| 2080 ClearInstructionPendingDeoptimizationEnvironment(); | 2087 ClearInstructionPendingDeoptimizationEnvironment(); |
| 2081 return result; | 2088 return result; |
| 2082 } | 2089 } |
| (...skipping 21 matching lines...) Expand all Loading... |
| 2104 | 2111 |
| 2105 | 2112 |
| 2106 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2113 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
| 2107 HEnvironment* outer = current_block_->last_environment()->outer(); | 2114 HEnvironment* outer = current_block_->last_environment()->outer(); |
| 2108 current_block_->UpdateEnvironment(outer); | 2115 current_block_->UpdateEnvironment(outer); |
| 2109 return NULL; | 2116 return NULL; |
| 2110 } | 2117 } |
| 2111 | 2118 |
| 2112 | 2119 |
| 2113 } } // namespace v8::internal | 2120 } } // namespace v8::internal |
| OLD | NEW |