Index: src/x64/codegen-x64.cc |
diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc |
index 0f939d98dff22b5d2d0736d7d26bf69a834a6b94..d30ca498f04c249fef010713138fdfd5ac98b67a 100644 |
--- a/src/x64/codegen-x64.cc |
+++ b/src/x64/codegen-x64.cc |
@@ -35,7 +35,8 @@ void StubRuntimeCallHelper::AfterCall(MacroAssembler* masm) const { |
UnaryMathFunction CreateExpFunction() { |
if (!FLAG_fast_math) return &std::exp; |
size_t actual_size; |
- byte* buffer = static_cast<byte*>(OS::Allocate(1 * KB, &actual_size, true)); |
+ byte* buffer = |
+ static_cast<byte*>(base::OS::Allocate(1 * KB, &actual_size, true)); |
if (buffer == NULL) return &std::exp; |
ExternalReference::InitializeMathExpData(); |
@@ -57,8 +58,8 @@ UnaryMathFunction CreateExpFunction() { |
masm.GetCode(&desc); |
ASSERT(!RelocInfo::RequiresRelocation(desc)); |
- CPU::FlushICache(buffer, actual_size); |
- OS::ProtectCode(buffer, actual_size); |
+ CpuFeatures::FlushICache(buffer, actual_size); |
+ base::OS::ProtectCode(buffer, actual_size); |
return FUNCTION_CAST<UnaryMathFunction>(buffer); |
} |
@@ -66,9 +67,8 @@ UnaryMathFunction CreateExpFunction() { |
UnaryMathFunction CreateSqrtFunction() { |
size_t actual_size; |
// Allocate buffer in executable space. |
- byte* buffer = static_cast<byte*>(OS::Allocate(1 * KB, |
- &actual_size, |
- true)); |
+ byte* buffer = |
+ static_cast<byte*>(base::OS::Allocate(1 * KB, &actual_size, true)); |
if (buffer == NULL) return &std::sqrt; |
MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size)); |
@@ -81,8 +81,8 @@ UnaryMathFunction CreateSqrtFunction() { |
masm.GetCode(&desc); |
ASSERT(!RelocInfo::RequiresRelocation(desc)); |
- CPU::FlushICache(buffer, actual_size); |
- OS::ProtectCode(buffer, actual_size); |
+ CpuFeatures::FlushICache(buffer, actual_size); |
+ base::OS::ProtectCode(buffer, actual_size); |
return FUNCTION_CAST<UnaryMathFunction>(buffer); |
} |
@@ -92,9 +92,8 @@ typedef double (*ModuloFunction)(double, double); |
// Define custom fmod implementation. |
ModuloFunction CreateModuloFunction() { |
size_t actual_size; |
- byte* buffer = static_cast<byte*>(OS::Allocate(Assembler::kMinimalBufferSize, |
- &actual_size, |
- true)); |
+ byte* buffer = static_cast<byte*>( |
+ base::OS::Allocate(Assembler::kMinimalBufferSize, &actual_size, true)); |
CHECK(buffer); |
Assembler masm(NULL, buffer, static_cast<int>(actual_size)); |
// Generated code is put into a fixed, unmovable, buffer, and not into |
@@ -170,7 +169,7 @@ ModuloFunction CreateModuloFunction() { |
CodeDesc desc; |
masm.GetCode(&desc); |
- OS::ProtectCode(buffer, actual_size); |
+ base::OS::ProtectCode(buffer, actual_size); |
// Call the function from C++ through this pointer. |
return FUNCTION_CAST<ModuloFunction>(buffer); |
} |
@@ -665,7 +664,7 @@ void Code::PatchPlatformCodeAge(Isolate* isolate, |
uint32_t young_length = isolate->code_aging_helper()->young_sequence_length(); |
if (age == kNoAgeCodeAge) { |
isolate->code_aging_helper()->CopyYoungSequenceTo(sequence); |
- CPU::FlushICache(sequence, young_length); |
+ CpuFeatures::FlushICache(sequence, young_length); |
} else { |
Code* stub = GetCodeAgeStub(isolate, age, parity); |
CodePatcher patcher(sequence, young_length); |