Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: src/arm/assembler-arm-inl.h

Issue 50413004: Removed RelocInfo::target_object_address() and reconstructed_obj_ptr_. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/assembler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 } 130 }
131 131
132 132
133 Handle<Object> RelocInfo::target_object_handle(Assembler* origin) { 133 Handle<Object> RelocInfo::target_object_handle(Assembler* origin) {
134 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); 134 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
135 return Handle<Object>(reinterpret_cast<Object**>( 135 return Handle<Object>(reinterpret_cast<Object**>(
136 Assembler::target_pointer_at(pc_))); 136 Assembler::target_pointer_at(pc_)));
137 } 137 }
138 138
139 139
140 Object** RelocInfo::target_object_address() {
141 // Provide a "natural pointer" to the embedded object,
142 // which can be de-referenced during heap iteration.
143 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
144 reconstructed_obj_ptr_ =
145 reinterpret_cast<Object*>(Assembler::target_pointer_at(pc_));
146 return &reconstructed_obj_ptr_;
147 }
148
149
150 void RelocInfo::set_target_object(Object* target, WriteBarrierMode mode) { 140 void RelocInfo::set_target_object(Object* target, WriteBarrierMode mode) {
151 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); 141 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
152 ASSERT(!target->IsConsString()); 142 ASSERT(!target->IsConsString());
153 Assembler::set_target_pointer_at(pc_, reinterpret_cast<Address>(target)); 143 Assembler::set_target_pointer_at(pc_, reinterpret_cast<Address>(target));
154 if (mode == UPDATE_WRITE_BARRIER && 144 if (mode == UPDATE_WRITE_BARRIER &&
155 host() != NULL && 145 host() != NULL &&
156 target->IsHeapObject()) { 146 target->IsHeapObject()) {
157 host()->GetHeap()->incremental_marking()->RecordWrite( 147 host()->GetHeap()->incremental_marking()->RecordWrite(
158 host(), &Memory::Object_at(pc_), HeapObject::cast(target)); 148 host(), &Memory::Object_at(pc_), HeapObject::cast(target));
159 } 149 }
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 512
523 513
524 void Assembler::set_target_address_at(Address pc, Address target) { 514 void Assembler::set_target_address_at(Address pc, Address target) {
525 set_target_pointer_at(pc, target); 515 set_target_pointer_at(pc, target);
526 } 516 }
527 517
528 518
529 } } // namespace v8::internal 519 } } // namespace v8::internal
530 520
531 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ 521 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_
OLDNEW
« no previous file with comments | « no previous file | src/assembler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698