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

Side by Side Diff: src/ia32/assembler-ia32-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 | « src/hydrogen-instructions.cc ('k') | src/ic.cc » ('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 are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 Handle<Object> RelocInfo::target_object_handle(Assembler* origin) { 134 Handle<Object> RelocInfo::target_object_handle(Assembler* origin) {
135 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); 135 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
136 return Memory::Object_Handle_at(pc_); 136 return Memory::Object_Handle_at(pc_);
137 } 137 }
138 138
139 139
140 void RelocInfo::set_target_object(Object* target, 140 void RelocInfo::set_target_object(Object* target,
141 WriteBarrierMode write_barrier_mode, 141 WriteBarrierMode write_barrier_mode,
142 ICacheFlushMode icache_flush_mode) { 142 ICacheFlushMode icache_flush_mode) {
143 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT); 143 ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
144 ASSERT(!target->IsConsString());
145 Memory::Object_at(pc_) = target; 144 Memory::Object_at(pc_) = target;
146 if (icache_flush_mode != SKIP_ICACHE_FLUSH) { 145 if (icache_flush_mode != SKIP_ICACHE_FLUSH) {
147 CpuFeatures::FlushICache(pc_, sizeof(Address)); 146 CpuFeatures::FlushICache(pc_, sizeof(Address));
148 } 147 }
149 if (write_barrier_mode == UPDATE_WRITE_BARRIER && 148 if (write_barrier_mode == UPDATE_WRITE_BARRIER &&
150 host() != NULL && 149 host() != NULL &&
151 target->IsHeapObject()) { 150 target->IsHeapObject()) {
152 host()->GetHeap()->incremental_marking()->RecordWrite( 151 host()->GetHeap()->incremental_marking()->RecordWrite(
153 host(), &Memory::Object_at(pc_), HeapObject::cast(target)); 152 host(), &Memory::Object_at(pc_), HeapObject::cast(target));
154 } 153 }
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 556
558 Operand::Operand(int32_t disp, RelocInfo::Mode rmode) { 557 Operand::Operand(int32_t disp, RelocInfo::Mode rmode) {
559 // [disp/r] 558 // [disp/r]
560 set_modrm(0, ebp); 559 set_modrm(0, ebp);
561 set_dispr(disp, rmode); 560 set_dispr(disp, rmode);
562 } 561 }
563 562
564 } } // namespace v8::internal 563 } } // namespace v8::internal
565 564
566 #endif // V8_IA32_ASSEMBLER_IA32_INL_H_ 565 #endif // V8_IA32_ASSEMBLER_IA32_INL_H_
OLDNEW
« no previous file with comments | « src/hydrogen-instructions.cc ('k') | src/ic.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698