| Index: src/arm/codegen-arm.cc
|
| diff --git a/src/arm/codegen-arm.cc b/src/arm/codegen-arm.cc
|
| index aa297001dc0bbccc365e9645e8f20c2f1f5c7021..aba7fd4d9abc7d0e8d0181f8d08e70a448747379 100644
|
| --- a/src/arm/codegen-arm.cc
|
| +++ b/src/arm/codegen-arm.cc
|
| @@ -29,7 +29,8 @@ double fast_exp_simulator(double x) {
|
| 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();
|
|
|
| @@ -66,8 +67,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);
|
|
|
| #if !defined(USE_SIMULATOR)
|
| return FUNCTION_CAST<UnaryMathFunction>(buffer);
|
| @@ -84,7 +85,8 @@ MemCopyUint8Function CreateMemCopyUint8Function(MemCopyUint8Function stub) {
|
| #else
|
| if (!CpuFeatures::IsSupported(UNALIGNED_ACCESSES)) return stub;
|
| 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 stub;
|
|
|
| MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size));
|
| @@ -225,8 +227,8 @@ MemCopyUint8Function CreateMemCopyUint8Function(MemCopyUint8Function stub) {
|
| 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<MemCopyUint8Function>(buffer);
|
| #endif
|
| }
|
| @@ -240,7 +242,8 @@ MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function(
|
| #else
|
| if (!CpuFeatures::IsSupported(UNALIGNED_ACCESSES)) return stub;
|
| 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 stub;
|
|
|
| MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size));
|
| @@ -311,8 +314,8 @@ MemCopyUint16Uint8Function CreateMemCopyUint16Uint8Function(
|
| CodeDesc desc;
|
| masm.GetCode(&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<MemCopyUint16Uint8Function>(buffer);
|
| #endif
|
| @@ -324,7 +327,8 @@ UnaryMathFunction CreateSqrtFunction() {
|
| return &std::sqrt;
|
| #else
|
| 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::sqrt;
|
|
|
| MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size));
|
| @@ -338,8 +342,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);
|
| #endif
|
| }
|
| @@ -874,7 +878,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 / Assembler::kInstrSize);
|
|
|