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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 // Convert target address to the code object. Code::GetCodeFromTargetAddress | 72 // Convert target address to the code object. Code::GetCodeFromTargetAddress |
73 // is safe for use during GC where the map might be marked. | 73 // is safe for use during GC where the map might be marked. |
74 Code* result = Code::GetCodeFromTargetAddress(target); | 74 Code* result = Code::GetCodeFromTargetAddress(target); |
75 ASSERT(result->is_inline_cache_stub()); | 75 ASSERT(result->is_inline_cache_stub()); |
76 return result; | 76 return result; |
77 } | 77 } |
78 | 78 |
79 | 79 |
80 void IC::SetTargetAtAddress(Address address, Code* target) { | 80 void IC::SetTargetAtAddress(Address address, Code* target) { |
81 ASSERT(target->is_inline_cache_stub() || target->is_compare_ic_stub()); | 81 ASSERT(target->is_inline_cache_stub() || target->is_compare_ic_stub()); |
| 82 Heap* heap = target->GetHeap(); |
82 Code* old_target = GetTargetAtAddress(address); | 83 Code* old_target = GetTargetAtAddress(address); |
83 #ifdef DEBUG | 84 #ifdef DEBUG |
84 // STORE_IC and KEYED_STORE_IC use Code::extra_ic_state() to mark | 85 // STORE_IC and KEYED_STORE_IC use Code::extra_ic_state() to mark |
85 // ICs as strict mode. The strict-ness of the IC must be preserved. | 86 // ICs as strict mode. The strict-ness of the IC must be preserved. |
86 if (old_target->kind() == Code::STORE_IC || | 87 if (old_target->kind() == Code::STORE_IC || |
87 old_target->kind() == Code::KEYED_STORE_IC) { | 88 old_target->kind() == Code::KEYED_STORE_IC) { |
88 ASSERT(Code::GetStrictMode(old_target->extra_ic_state()) == | 89 ASSERT(Code::GetStrictMode(old_target->extra_ic_state()) == |
89 Code::GetStrictMode(target->extra_ic_state())); | 90 Code::GetStrictMode(target->extra_ic_state())); |
90 } | 91 } |
91 #endif | 92 #endif |
92 Assembler::set_target_address_at(address, target->instruction_start()); | 93 Assembler::set_target_address_at(address, target->instruction_start()); |
93 target->GetHeap()->incremental_marking()->RecordCodeTargetPatch(address, | 94 if (heap->gc_state() == Heap::MARK_COMPACT && |
94 target); | 95 heap->mark_compact_collector()->is_compacting()) { |
| 96 Code* host = heap->isolate()->inner_pointer_to_code_cache()-> |
| 97 GcSafeFindCodeForInnerPointer(address); |
| 98 RelocInfo rinfo(address, RelocInfo::CODE_TARGET, 0, host); |
| 99 heap->mark_compact_collector()->RecordRelocSlot(&rinfo, target); |
| 100 } else { |
| 101 heap->incremental_marking()->RecordCodeTargetPatch(address, target); |
| 102 } |
95 PostPatching(address, target, old_target); | 103 PostPatching(address, target, old_target); |
96 } | 104 } |
97 | 105 |
98 | 106 |
99 InlineCacheHolderFlag IC::GetCodeCacheForObject(Object* object, | 107 InlineCacheHolderFlag IC::GetCodeCacheForObject(Object* object, |
100 JSObject* holder) { | 108 JSObject* holder) { |
101 if (object->IsJSObject()) { | 109 if (object->IsJSObject()) { |
102 return GetCodeCacheForObject(JSObject::cast(object), holder); | 110 return GetCodeCacheForObject(JSObject::cast(object), holder); |
103 } | 111 } |
104 // If the object is a value, we use the prototype map for the cache. | 112 // If the object is a value, we use the prototype map for the cache. |
(...skipping 22 matching lines...) Expand all Loading... |
127 JSObject* IC::GetCodeCacheHolder(Object* object, InlineCacheHolderFlag holder) { | 135 JSObject* IC::GetCodeCacheHolder(Object* object, InlineCacheHolderFlag holder) { |
128 Object* map_owner = (holder == OWN_MAP ? object : object->GetPrototype()); | 136 Object* map_owner = (holder == OWN_MAP ? object : object->GetPrototype()); |
129 ASSERT(map_owner->IsJSObject()); | 137 ASSERT(map_owner->IsJSObject()); |
130 return JSObject::cast(map_owner); | 138 return JSObject::cast(map_owner); |
131 } | 139 } |
132 | 140 |
133 | 141 |
134 } } // namespace v8::internal | 142 } } // namespace v8::internal |
135 | 143 |
136 #endif // V8_IC_INL_H_ | 144 #endif // V8_IC_INL_H_ |
OLD | NEW |