Index: src/ia32/macro-assembler-ia32.cc |
diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc |
index 07bc737c14cb667a8f9254119e8e22915b22ae65..b3cb507640d9ffc52a09189f2652c6ad7e3ab836 100644 |
--- a/src/ia32/macro-assembler-ia32.cc |
+++ b/src/ia32/macro-assembler-ia32.cc |
@@ -992,7 +992,7 @@ void MacroAssembler::EnterExitFrameEpilogue(int argc, bool save_doubles) { |
} |
// Get the required frame alignment for the OS. |
- const int kFrameAlignment = OS::ActivationFrameAlignment(); |
+ const int kFrameAlignment = base::OS::ActivationFrameAlignment(); |
if (kFrameAlignment > 0) { |
ASSERT(IsPowerOf2(kFrameAlignment)); |
and_(esp, -kFrameAlignment); |
@@ -2762,7 +2762,7 @@ void MacroAssembler::Check(Condition cc, BailoutReason reason) { |
void MacroAssembler::CheckStackAlignment() { |
- int frame_alignment = OS::ActivationFrameAlignment(); |
+ int frame_alignment = base::OS::ActivationFrameAlignment(); |
int frame_alignment_mask = frame_alignment - 1; |
if (frame_alignment > kPointerSize) { |
ASSERT(IsPowerOf2(frame_alignment)); |
@@ -2999,7 +2999,7 @@ void MacroAssembler::EmitSeqStringSetCharCheck(Register string, |
void MacroAssembler::PrepareCallCFunction(int num_arguments, Register scratch) { |
- int frame_alignment = OS::ActivationFrameAlignment(); |
+ int frame_alignment = base::OS::ActivationFrameAlignment(); |
if (frame_alignment != 0) { |
// Make stack end at alignment and make room for num_arguments words |
// and the original value of esp. |
@@ -3031,7 +3031,7 @@ void MacroAssembler::CallCFunction(Register function, |
} |
call(function); |
- if (OS::ActivationFrameAlignment() != 0) { |
+ if (base::OS::ActivationFrameAlignment() != 0) { |
mov(esp, Operand(esp, num_arguments * kPointerSize)); |
} else { |
add(esp, Immediate(num_arguments * kPointerSize)); |
@@ -3063,7 +3063,7 @@ CodePatcher::CodePatcher(byte* address, int size) |
CodePatcher::~CodePatcher() { |
// Indicate that code has changed. |
- CPU::FlushICache(address_, size_); |
+ CpuFeatures::FlushICache(address_, size_); |
// Check that the code was patched as expected. |
ASSERT(masm_.pc_ == address_ + size_); |