OLD | NEW |
1 // Copyright (c) 1994-2006 Sun Microsystems Inc. | 1 // Copyright (c) 1994-2006 Sun Microsystems Inc. |
2 // All Rights Reserved. | 2 // All Rights Reserved. |
3 // | 3 // |
4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
5 // modification, are permitted provided that the following conditions | 5 // modification, are permitted provided that the following conditions |
6 // are met: | 6 // are met: |
7 // | 7 // |
8 // - Redistributions of source code must retain the above copyright notice, | 8 // - Redistributions of source code must retain the above copyright notice, |
9 // this list of conditions and the following disclaimer. | 9 // this list of conditions and the following disclaimer. |
10 // | 10 // |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 Assembler::set_target_pointer_at(pc_, reinterpret_cast<Address>(target)); | 153 Assembler::set_target_pointer_at(pc_, reinterpret_cast<Address>(target)); |
154 if (mode == UPDATE_WRITE_BARRIER && | 154 if (mode == UPDATE_WRITE_BARRIER && |
155 host() != NULL && | 155 host() != NULL && |
156 target->IsHeapObject()) { | 156 target->IsHeapObject()) { |
157 host()->GetHeap()->incremental_marking()->RecordWrite( | 157 host()->GetHeap()->incremental_marking()->RecordWrite( |
158 host(), &Memory::Object_at(pc_), HeapObject::cast(target)); | 158 host(), &Memory::Object_at(pc_), HeapObject::cast(target)); |
159 } | 159 } |
160 } | 160 } |
161 | 161 |
162 | 162 |
163 Address* RelocInfo::target_reference_address() { | 163 Address RelocInfo::target_reference() { |
164 ASSERT(rmode_ == EXTERNAL_REFERENCE); | 164 ASSERT(rmode_ == EXTERNAL_REFERENCE); |
165 reconstructed_adr_ptr_ = Assembler::target_address_at(pc_); | 165 return Assembler::target_address_at(pc_); |
166 return &reconstructed_adr_ptr_; | |
167 } | 166 } |
168 | 167 |
169 | 168 |
170 Address RelocInfo::target_runtime_entry(Assembler* origin) { | 169 Address RelocInfo::target_runtime_entry(Assembler* origin) { |
171 ASSERT(IsRuntimeEntry(rmode_)); | 170 ASSERT(IsRuntimeEntry(rmode_)); |
172 return target_address(); | 171 return target_address(); |
173 } | 172 } |
174 | 173 |
175 | 174 |
176 void RelocInfo::set_target_runtime_entry(Address target, | 175 void RelocInfo::set_target_runtime_entry(Address target, |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
523 | 522 |
524 | 523 |
525 void Assembler::set_target_address_at(Address pc, Address target) { | 524 void Assembler::set_target_address_at(Address pc, Address target) { |
526 set_target_pointer_at(pc, target); | 525 set_target_pointer_at(pc, target); |
527 } | 526 } |
528 | 527 |
529 | 528 |
530 } } // namespace v8::internal | 529 } } // namespace v8::internal |
531 | 530 |
532 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ | 531 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ |
OLD | NEW |