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

Unified Diff: src/ia32/assembler-ia32-inl.h

Issue 7015043: Fix the GC branch so it compiles and runs on 64 bit. (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/
Patch Set: '' Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/flag-definitions.h ('k') | src/ia32/code-stubs-ia32.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ia32/assembler-ia32-inl.h
===================================================================
--- src/ia32/assembler-ia32-inl.h (revision 7889)
+++ src/ia32/assembler-ia32-inl.h (working copy)
@@ -89,14 +89,13 @@
void RelocInfo::set_target_address(Address target, Code* code) {
+ Assembler::set_target_address_at(pc_, target);
ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY);
if (code != NULL && IsCodeTarget(rmode_)) {
Object* target_code = Code::GetCodeFromTargetAddress(target);
- // TODO(gc) ISOLATES MERGE code should have heap.
code->GetHeap()->incremental_marking()->RecordWrite(
code, HeapObject::cast(target_code));
}
- Assembler::set_target_address_at(pc_, target);
}
@@ -123,7 +122,6 @@
Memory::Object_at(pc_) = target;
CPU::FlushICache(pc_, sizeof(Address));
if (code != NULL && target->IsHeapObject()) {
- // TODO(gc) ISOLATES MERGE code object should have heap() accessor.
code->GetHeap()->incremental_marking()->RecordWrite(
code, HeapObject::cast(target));
}
@@ -159,7 +157,6 @@
Memory::Address_at(pc_) = address;
CPU::FlushICache(pc_, sizeof(Address));
if (code != NULL) {
- // TODO(gc) ISOLATES MERGE code object should have heap() accessor.
code->GetHeap()->incremental_marking()->RecordWrite(code, cell);
}
}
« no previous file with comments | « src/flag-definitions.h ('k') | src/ia32/code-stubs-ia32.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698