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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 ICacheFlushMode icache_flush_mode) { | 131 ICacheFlushMode icache_flush_mode) { |
132 DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); | 132 DCHECK(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); |
133 Assembler::set_target_address_at(isolate_, pc_, host_, | 133 Assembler::set_target_address_at(isolate_, pc_, host_, |
134 reinterpret_cast<Address>(target), | 134 reinterpret_cast<Address>(target), |
135 icache_flush_mode); | 135 icache_flush_mode); |
136 if (write_barrier_mode == UPDATE_WRITE_BARRIER && | 136 if (write_barrier_mode == UPDATE_WRITE_BARRIER && |
137 host() != NULL && | 137 host() != NULL && |
138 target->IsHeapObject()) { | 138 target->IsHeapObject()) { |
139 host()->GetHeap()->incremental_marking()->RecordWriteIntoCode( | 139 host()->GetHeap()->incremental_marking()->RecordWriteIntoCode( |
140 host(), this, HeapObject::cast(target)); | 140 host(), this, HeapObject::cast(target)); |
| 141 host()->GetHeap()->RecordWriteIntoCode(host(), this, target); |
141 } | 142 } |
142 } | 143 } |
143 | 144 |
144 | 145 |
145 Address RelocInfo::target_external_reference() { | 146 Address RelocInfo::target_external_reference() { |
146 DCHECK(rmode_ == EXTERNAL_REFERENCE); | 147 DCHECK(rmode_ == EXTERNAL_REFERENCE); |
147 return Assembler::target_address_at(pc_, host_); | 148 return Assembler::target_address_at(pc_, host_); |
148 } | 149 } |
149 | 150 |
150 | 151 |
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
601 Assembler::FlushICache(isolate, pc, 4 * kInstrSize); | 602 Assembler::FlushICache(isolate, pc, 4 * kInstrSize); |
602 } | 603 } |
603 } | 604 } |
604 } | 605 } |
605 | 606 |
606 | 607 |
607 } // namespace internal | 608 } // namespace internal |
608 } // namespace v8 | 609 } // namespace v8 |
609 | 610 |
610 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ | 611 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ |
OLD | NEW |