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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 // which can be de-referenced during heap iteration. | 142 // which can be de-referenced during heap iteration. |
143 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); | 143 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); |
144 reconstructed_obj_ptr_ = | 144 reconstructed_obj_ptr_ = |
145 reinterpret_cast<Object*>(Assembler::target_pointer_at(pc_)); | 145 reinterpret_cast<Object*>(Assembler::target_pointer_at(pc_)); |
146 return &reconstructed_obj_ptr_; | 146 return &reconstructed_obj_ptr_; |
147 } | 147 } |
148 | 148 |
149 | 149 |
150 void RelocInfo::set_target_object(Object* target, WriteBarrierMode mode) { | 150 void RelocInfo::set_target_object(Object* target, WriteBarrierMode mode) { |
151 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); | 151 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); |
| 152 ASSERT(!target->IsConsString()); |
152 Assembler::set_target_pointer_at(pc_, reinterpret_cast<Address>(target)); | 153 Assembler::set_target_pointer_at(pc_, reinterpret_cast<Address>(target)); |
153 if (mode == UPDATE_WRITE_BARRIER && | 154 if (mode == UPDATE_WRITE_BARRIER && |
154 host() != NULL && | 155 host() != NULL && |
155 target->IsHeapObject()) { | 156 target->IsHeapObject()) { |
156 host()->GetHeap()->incremental_marking()->RecordWrite( | 157 host()->GetHeap()->incremental_marking()->RecordWrite( |
157 host(), &Memory::Object_at(pc_), HeapObject::cast(target)); | 158 host(), &Memory::Object_at(pc_), HeapObject::cast(target)); |
158 } | 159 } |
159 } | 160 } |
160 | 161 |
161 | 162 |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 | 517 |
517 | 518 |
518 void Assembler::set_target_address_at(Address pc, Address target) { | 519 void Assembler::set_target_address_at(Address pc, Address target) { |
519 set_target_pointer_at(pc, target); | 520 set_target_pointer_at(pc, target); |
520 } | 521 } |
521 | 522 |
522 | 523 |
523 } } // namespace v8::internal | 524 } } // namespace v8::internal |
524 | 525 |
525 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ | 526 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ |
OLD | NEW |