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

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

Issue 395713002: Allow embedding of ConsString objects into code. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Addressed moar comments by Yang Guo. Created 6 years, 5 months 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/arm64/assembler-arm64-inl.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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); 159 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
160 return Handle<Object>(reinterpret_cast<Object**>( 160 return Handle<Object>(reinterpret_cast<Object**>(
161 Assembler::target_address_at(pc_, host_))); 161 Assembler::target_address_at(pc_, host_)));
162 } 162 }
163 163
164 164
165 void RelocInfo::set_target_object(Object* target, 165 void RelocInfo::set_target_object(Object* target,
166 WriteBarrierMode write_barrier_mode, 166 WriteBarrierMode write_barrier_mode,
167 ICacheFlushMode icache_flush_mode) { 167 ICacheFlushMode icache_flush_mode) {
168 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); 168 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
169 ASSERT(!target->IsConsString());
170 Assembler::set_target_address_at(pc_, host_, 169 Assembler::set_target_address_at(pc_, host_,
171 reinterpret_cast<Address>(target), 170 reinterpret_cast<Address>(target),
172 icache_flush_mode); 171 icache_flush_mode);
173 if (write_barrier_mode == UPDATE_WRITE_BARRIER && 172 if (write_barrier_mode == UPDATE_WRITE_BARRIER &&
174 host() != NULL && 173 host() != NULL &&
175 target->IsHeapObject()) { 174 target->IsHeapObject()) {
176 host()->GetHeap()->incremental_marking()->RecordWrite( 175 host()->GetHeap()->incremental_marking()->RecordWrite(
177 host(), &Memory::Object_at(pc_), HeapObject::cast(target)); 176 host(), &Memory::Object_at(pc_), HeapObject::cast(target));
178 } 177 }
179 } 178 }
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 if (icache_flush_mode != SKIP_ICACHE_FLUSH) { 569 if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
571 CpuFeatures::FlushICache(pc, 2 * kInstrSize); 570 CpuFeatures::FlushICache(pc, 2 * kInstrSize);
572 } 571 }
573 } 572 }
574 } 573 }
575 574
576 575
577 } } // namespace v8::internal 576 } } // namespace v8::internal
578 577
579 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_ 578 #endif // V8_ARM_ASSEMBLER_ARM_INL_H_
OLDNEW
« no previous file with comments | « no previous file | src/arm64/assembler-arm64-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698