Index: src/x64/assembler-x64-inl.h |
diff --git a/src/x64/assembler-x64-inl.h b/src/x64/assembler-x64-inl.h |
index f1731af34b6b05b9531755e490771420ef2e1f66..0006481996e3ac3781790cd4b49ae40c6e64790f 100644 |
--- a/src/x64/assembler-x64-inl.h |
+++ b/src/x64/assembler-x64-inl.h |
@@ -7,7 +7,7 @@ |
#include "src/x64/assembler-x64.h" |
-#include "src/cpu.h" |
+#include "src/base/cpu.h" |
#include "src/debug.h" |
#include "src/v8memory.h" |
@@ -196,7 +196,7 @@ void Assembler::set_target_address_at(Address pc, |
ICacheFlushMode icache_flush_mode) { |
Memory::int32_at(pc) = static_cast<int32_t>(target - pc - 4); |
if (icache_flush_mode != SKIP_ICACHE_FLUSH) { |
- CPU::FlushICache(pc, sizeof(int32_t)); |
+ CpuFeatures::FlushICache(pc, sizeof(int32_t)); |
} |
} |
@@ -224,15 +224,15 @@ void RelocInfo::apply(intptr_t delta, ICacheFlushMode icache_flush_mode) { |
if (IsInternalReference(rmode_)) { |
// absolute code pointer inside code object moves with the code object. |
Memory::Address_at(pc_) += static_cast<int32_t>(delta); |
- if (flush_icache) CPU::FlushICache(pc_, sizeof(Address)); |
+ if (flush_icache) CpuFeatures::FlushICache(pc_, sizeof(Address)); |
} else if (IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)) { |
Memory::int32_at(pc_) -= static_cast<int32_t>(delta); |
- if (flush_icache) CPU::FlushICache(pc_, sizeof(int32_t)); |
+ if (flush_icache) CpuFeatures::FlushICache(pc_, sizeof(int32_t)); |
} else if (rmode_ == CODE_AGE_SEQUENCE) { |
if (*pc_ == kCallOpcode) { |
int32_t* p = reinterpret_cast<int32_t*>(pc_ + 1); |
*p -= static_cast<int32_t>(delta); // Relocate entry. |
- if (flush_icache) CPU::FlushICache(p, sizeof(uint32_t)); |
+ if (flush_icache) CpuFeatures::FlushICache(p, sizeof(uint32_t)); |
} |
} |
} |
@@ -310,7 +310,7 @@ void RelocInfo::set_target_object(Object* target, |
ASSERT(!target->IsConsString()); |
Memory::Object_at(pc_) = target; |
if (icache_flush_mode != SKIP_ICACHE_FLUSH) { |
- CPU::FlushICache(pc_, sizeof(Address)); |
+ CpuFeatures::FlushICache(pc_, sizeof(Address)); |
} |
if (write_barrier_mode == UPDATE_WRITE_BARRIER && |
host() != NULL && |
@@ -357,7 +357,7 @@ void RelocInfo::set_target_cell(Cell* cell, |
Address address = cell->address() + Cell::kValueOffset; |
Memory::Address_at(pc_) = address; |
if (icache_flush_mode != SKIP_ICACHE_FLUSH) { |
- CPU::FlushICache(pc_, sizeof(Address)); |
+ CpuFeatures::FlushICache(pc_, sizeof(Address)); |
} |
if (write_barrier_mode == UPDATE_WRITE_BARRIER && |
host() != NULL) { |
@@ -435,8 +435,8 @@ void RelocInfo::set_call_address(Address target) { |
(IsDebugBreakSlot(rmode()) && IsPatchedDebugBreakSlotSequence())); |
Memory::Address_at(pc_ + Assembler::kRealPatchReturnSequenceAddressOffset) = |
target; |
- CPU::FlushICache(pc_ + Assembler::kRealPatchReturnSequenceAddressOffset, |
- sizeof(Address)); |
+ CpuFeatures::FlushICache( |
+ pc_ + Assembler::kRealPatchReturnSequenceAddressOffset, sizeof(Address)); |
if (host() != NULL) { |
Object* target_code = Code::GetCodeFromTargetAddress(target); |
host()->GetHeap()->incremental_marking()->RecordWriteIntoCode( |
@@ -467,14 +467,14 @@ void RelocInfo::Visit(Isolate* isolate, ObjectVisitor* visitor) { |
RelocInfo::Mode mode = rmode(); |
if (mode == RelocInfo::EMBEDDED_OBJECT) { |
visitor->VisitEmbeddedPointer(this); |
- CPU::FlushICache(pc_, sizeof(Address)); |
+ CpuFeatures::FlushICache(pc_, sizeof(Address)); |
} else if (RelocInfo::IsCodeTarget(mode)) { |
visitor->VisitCodeTarget(this); |
} else if (mode == RelocInfo::CELL) { |
visitor->VisitCell(this); |
} else if (mode == RelocInfo::EXTERNAL_REFERENCE) { |
visitor->VisitExternalReference(this); |
- CPU::FlushICache(pc_, sizeof(Address)); |
+ CpuFeatures::FlushICache(pc_, sizeof(Address)); |
} else if (RelocInfo::IsCodeAgeSequence(mode)) { |
visitor->VisitCodeAgeSequence(this); |
} else if (((RelocInfo::IsJSReturn(mode) && |
@@ -494,14 +494,14 @@ void RelocInfo::Visit(Heap* heap) { |
RelocInfo::Mode mode = rmode(); |
if (mode == RelocInfo::EMBEDDED_OBJECT) { |
StaticVisitor::VisitEmbeddedPointer(heap, this); |
- CPU::FlushICache(pc_, sizeof(Address)); |
+ CpuFeatures::FlushICache(pc_, sizeof(Address)); |
} else if (RelocInfo::IsCodeTarget(mode)) { |
StaticVisitor::VisitCodeTarget(heap, this); |
} else if (mode == RelocInfo::CELL) { |
StaticVisitor::VisitCell(heap, this); |
} else if (mode == RelocInfo::EXTERNAL_REFERENCE) { |
StaticVisitor::VisitExternalReference(this); |
- CPU::FlushICache(pc_, sizeof(Address)); |
+ CpuFeatures::FlushICache(pc_, sizeof(Address)); |
} else if (RelocInfo::IsCodeAgeSequence(mode)) { |
StaticVisitor::VisitCodeAgeSequence(heap, this); |
} else if (heap->isolate()->debug()->has_break_points() && |