| Index: src/mips/macro-assembler-mips.cc
|
| diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc
|
| index 52e80d29f3a767fa1987e578db44f9af38f9531e..ce5cd90d9ca7a63e28ad616a98ad404ff8543d88 100644
|
| --- a/src/mips/macro-assembler-mips.cc
|
| +++ b/src/mips/macro-assembler-mips.cc
|
| @@ -4711,7 +4711,7 @@ int MacroAssembler::ActivationFrameAlignment() {
|
| // environment.
|
| // Note: This will break if we ever start generating snapshots on one Mips
|
| // platform for another Mips platform with a different alignment.
|
| - return OS::ActivationFrameAlignment();
|
| + return base::OS::ActivationFrameAlignment();
|
| #else // V8_HOST_ARCH_MIPS
|
| // If we are using the simulator then we should always align to the expected
|
| // alignment. As the simulator is used to generate snapshots we do not know
|
| @@ -5184,7 +5184,7 @@ void MacroAssembler::CallCFunctionHelper(Register function,
|
|
|
| #if V8_HOST_ARCH_MIPS
|
| if (emit_debug_code()) {
|
| - 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));
|
| @@ -5213,7 +5213,7 @@ void MacroAssembler::CallCFunctionHelper(Register function,
|
| int stack_passed_arguments = CalculateStackPassedWords(
|
| num_reg_arguments, num_double_arguments);
|
|
|
| - if (OS::ActivationFrameAlignment() > kPointerSize) {
|
| + if (base::OS::ActivationFrameAlignment() > kPointerSize) {
|
| lw(sp, MemOperand(sp, stack_passed_arguments * kPointerSize));
|
| } else {
|
| Addu(sp, sp, Operand(stack_passed_arguments * sizeof(kPointerSize)));
|
| @@ -5697,7 +5697,7 @@ CodePatcher::CodePatcher(byte* address,
|
| CodePatcher::~CodePatcher() {
|
| // Indicate that code has changed.
|
| if (flush_cache_ == FLUSH) {
|
| - CPU::FlushICache(address_, size_);
|
| + CpuFeatures::FlushICache(address_, size_);
|
| }
|
|
|
| // Check that the code was patched as expected.
|
|
|