Index: src/mips/simulator-mips.cc |
diff --git a/src/mips/simulator-mips.cc b/src/mips/simulator-mips.cc |
index 37bf79fe00b8d4fb8d07b3a94bc89e3acd241223..f329703517886f0564bfe47a9d8df567c48b29bf 100644 |
--- a/src/mips/simulator-mips.cc |
+++ b/src/mips/simulator-mips.cc |
@@ -12,7 +12,6 @@ |
#if V8_TARGET_ARCH_MIPS |
#include "src/assembler.h" |
-#include "src/cpu.h" |
#include "src/disasm.h" |
#include "src/globals.h" // Need the BitCast. |
#include "src/mips/constants-mips.h" |
@@ -567,7 +566,7 @@ void MipsDebugger::Debug() { |
} |
} else if (strcmp(cmd, "gdb") == 0) { |
PrintF("relinquishing control to gdb\n"); |
- v8::internal::OS::DebugBreak(); |
+ v8::base::OS::DebugBreak(); |
PrintF("regaining control from gdb\n"); |
} else if (strcmp(cmd, "break") == 0) { |
if (argc == 2) { |
@@ -1244,7 +1243,7 @@ double Simulator::ReadD(int32_t addr, Instruction* instr) { |
PrintF("Unaligned (double) read at 0x%08x, pc=0x%08" V8PRIxPTR "\n", |
addr, |
reinterpret_cast<intptr_t>(instr)); |
- OS::Abort(); |
+ base::OS::Abort(); |
return 0; |
} |
@@ -1258,7 +1257,7 @@ void Simulator::WriteD(int32_t addr, double value, Instruction* instr) { |
PrintF("Unaligned (double) write at 0x%08x, pc=0x%08" V8PRIxPTR "\n", |
addr, |
reinterpret_cast<intptr_t>(instr)); |
- OS::Abort(); |
+ base::OS::Abort(); |
} |
@@ -1270,7 +1269,7 @@ uint16_t Simulator::ReadHU(int32_t addr, Instruction* instr) { |
PrintF("Unaligned unsigned halfword read at 0x%08x, pc=0x%08" V8PRIxPTR "\n", |
addr, |
reinterpret_cast<intptr_t>(instr)); |
- OS::Abort(); |
+ base::OS::Abort(); |
return 0; |
} |
@@ -1283,7 +1282,7 @@ int16_t Simulator::ReadH(int32_t addr, Instruction* instr) { |
PrintF("Unaligned signed halfword read at 0x%08x, pc=0x%08" V8PRIxPTR "\n", |
addr, |
reinterpret_cast<intptr_t>(instr)); |
- OS::Abort(); |
+ base::OS::Abort(); |
return 0; |
} |
@@ -1297,7 +1296,7 @@ void Simulator::WriteH(int32_t addr, uint16_t value, Instruction* instr) { |
PrintF("Unaligned unsigned halfword write at 0x%08x, pc=0x%08" V8PRIxPTR "\n", |
addr, |
reinterpret_cast<intptr_t>(instr)); |
- OS::Abort(); |
+ base::OS::Abort(); |
} |
@@ -1310,7 +1309,7 @@ void Simulator::WriteH(int32_t addr, int16_t value, Instruction* instr) { |
PrintF("Unaligned halfword write at 0x%08x, pc=0x%08" V8PRIxPTR "\n", |
addr, |
reinterpret_cast<intptr_t>(instr)); |
- OS::Abort(); |
+ base::OS::Abort(); |
} |
@@ -2857,8 +2856,8 @@ int32_t Simulator::Call(byte* entry, int argument_count, ...) { |
// Compute position of stack on entry to generated code. |
int entry_stack = (original_stack - (argument_count - 4) * sizeof(int32_t) |
- kCArgsSlotsSize); |
- if (OS::ActivationFrameAlignment() != 0) { |
- entry_stack &= -OS::ActivationFrameAlignment(); |
+ if (base::OS::ActivationFrameAlignment() != 0) { |
+ entry_stack &= -base::OS::ActivationFrameAlignment(); |
} |
// Store remaining arguments on stack, from low to high memory. |
intptr_t* stack_argument = reinterpret_cast<intptr_t*>(entry_stack); |