| Index: src/ia32/codegen-ia32.cc
|
| diff --git a/src/ia32/codegen-ia32.cc b/src/ia32/codegen-ia32.cc
|
| index fbd5b89060c5fac6cf46f0d0567bd9f5e1579b7f..1484b0f95a376a2be889a2952d50f3422697098c 100644
|
| --- a/src/ia32/codegen-ia32.cc
|
| +++ b/src/ia32/codegen-ia32.cc
|
| @@ -37,7 +37,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();
|
|
|
| @@ -64,8 +65,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);
|
| }
|
|
|
| @@ -73,9 +74,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));
|
| // esp[1 * kPointerSize]: raw double input
|
| @@ -94,8 +94,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);
|
| }
|
|
|
| @@ -189,7 +189,8 @@ class LabelConverter {
|
| MemMoveFunction CreateMemMoveFunction() {
|
| 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 NULL;
|
| MacroAssembler masm(NULL, buffer, static_cast<int>(actual_size));
|
| LabelConverter conv(buffer);
|
| @@ -504,8 +505,8 @@ MemMoveFunction CreateMemMoveFunction() {
|
| CodeDesc desc;
|
| 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);
|
| // TODO(jkummerow): It would be nice to register this code creation event
|
| // with the PROFILE / GDBJIT system.
|
| return FUNCTION_CAST<MemMoveFunction>(buffer);
|
| @@ -1005,7 +1006,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);
|
|
|