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

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

Issue 7322012: Fix compilation on ARM and x64. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
Index: src/x64/assembler-x64-inl.h
diff --git a/src/x64/assembler-x64-inl.h b/src/x64/assembler-x64-inl.h
index e76a66fba3ce399ca125ee2bc8ad11676ed86a76..cbe2753210d2c31975d6a11ae0cf2237a78edc79 100644
--- a/src/x64/assembler-x64-inl.h
+++ b/src/x64/assembler-x64-inl.h
@@ -244,8 +244,9 @@ void RelocInfo::set_target_address(Address target, Code* code) {
Assembler::set_target_address_at(pc_, target);
Object* target_code = Code::GetCodeFromTargetAddress(target);
if (code != NULL) {
+ // TODO(gc) We do not compact code pages.
code->GetHeap()->incremental_marking()->RecordWrite(
- code, HeapObject::cast(target_code));
+ code, NULL, HeapObject::cast(target_code));
}
} else {
Memory::Address_at(pc_) = target;
@@ -284,11 +285,11 @@ Address* RelocInfo::target_reference_address() {
void RelocInfo::set_target_object(Object* target, Code* code) {
ASSERT(IsCodeTarget(rmode_) || rmode_ == EMBEDDED_OBJECT);
- *reinterpret_cast<Object**>(pc_) = target;
+ Memory::Object_at(pc_) = target;
CPU::FlushICache(pc_, sizeof(Address));
if (code != NULL && target->IsHeapObject()) {
code->GetHeap()->incremental_marking()->RecordWrite(
- code, HeapObject::cast(target));
+ code, &Memory::Object_at(pc_), HeapObject::cast(target));
}
}
@@ -316,7 +317,8 @@ void RelocInfo::set_target_cell(JSGlobalPropertyCell* cell, Code* code) {
Memory::Address_at(pc_) = address;
CPU::FlushICache(pc_, sizeof(Address));
if (code != NULL) {
- code->GetHeap()->incremental_marking()->RecordWrite(code, cell);
+ code->GetHeap()->incremental_marking()->RecordWrite(
+ code, &Memory::Object_at(pc_), cell);
}
}
« no previous file with comments | « src/incremental-marking.h ('k') | src/x64/code-stubs-x64.h » ('j') | src/x64/code-stubs-x64.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698