Index: src/mips/simulator-mips.cc |
diff --git a/src/mips/simulator-mips.cc b/src/mips/simulator-mips.cc |
index e37b6e12f9309a296556327074a303339d62a649..ea41b6642e225d4f3aad262072d97e014d1a69d4 100644 |
--- a/src/mips/simulator-mips.cc |
+++ b/src/mips/simulator-mips.cc |
@@ -586,7 +586,7 @@ void MipsDebugger::Debug() { |
} |
while (cur < end) { |
- PrintF(" 0x%08x: 0x%08x %10d", |
+ PrintF(" 0x%08" PRIxPTR ": 0x%08x %10d", |
reinterpret_cast<intptr_t>(cur), *cur, *cur); |
HeapObject* obj = reinterpret_cast<HeapObject*>(*cur); |
int value = *cur; |
@@ -649,8 +649,8 @@ void MipsDebugger::Debug() { |
while (cur < end) { |
dasm.InstructionDecode(buffer, cur); |
- PrintF(" 0x%08x %s\n", |
- reinterpret_cast<intptr_t>(cur), buffer.start()); |
+ PrintF(" 0x%08" PRIxPTR " %s\n", reinterpret_cast<intptr_t>(cur), |
+ buffer.start()); |
cur += Instruction::kInstrSize; |
} |
} else if (strcmp(cmd, "gdb") == 0) { |
@@ -771,8 +771,8 @@ void MipsDebugger::Debug() { |
while (cur < end) { |
dasm.InstructionDecode(buffer, cur); |
- PrintF(" 0x%08x %s\n", |
- reinterpret_cast<intptr_t>(cur), buffer.start()); |
+ PrintF(" 0x%08" PRIxPTR " %s\n", reinterpret_cast<intptr_t>(cur), |
+ buffer.start()); |
cur += Instruction::kInstrSize; |
} |
} else if ((strcmp(cmd, "h") == 0) || (strcmp(cmd, "help") == 0)) { |
@@ -1786,8 +1786,8 @@ void Simulator::TraceMemWr(int32_t addr, int32_t value, TraceType t) { |
int Simulator::ReadW(int32_t addr, Instruction* instr) { |
if (addr >=0 && addr < 0x400) { |
// This has to be a NULL-dereference, drop into debugger. |
- PrintF("Memory read from bad address: 0x%08x, pc=0x%08x\n", |
- addr, reinterpret_cast<intptr_t>(instr)); |
+ PrintF("Memory read from bad address: 0x%08x, pc=0x%08" PRIxPTR "\n", addr, |
+ reinterpret_cast<intptr_t>(instr)); |
MipsDebugger dbg(this); |
dbg.Debug(); |
} |
@@ -1808,8 +1808,8 @@ int Simulator::ReadW(int32_t addr, Instruction* instr) { |
void Simulator::WriteW(int32_t addr, int value, Instruction* instr) { |
if (addr >= 0 && addr < 0x400) { |
// This has to be a NULL-dereference, drop into debugger. |
- PrintF("Memory write to bad address: 0x%08x, pc=0x%08x\n", |
- addr, reinterpret_cast<intptr_t>(instr)); |
+ PrintF("Memory write to bad address: 0x%08x, pc=0x%08" PRIxPTR "\n", addr, |
+ reinterpret_cast<intptr_t>(instr)); |
MipsDebugger dbg(this); |
dbg.Debug(); |
} |
@@ -1953,7 +1953,7 @@ uintptr_t Simulator::StackLimit(uintptr_t c_limit) const { |
// Unsupported instructions use Format to print an error and stop execution. |
void Simulator::Format(Instruction* instr, const char* format) { |
- PrintF("Simulator found unsupported instruction:\n 0x%08x: %s\n", |
+ PrintF("Simulator found unsupported instruction:\n 0x%08" PRIxPTR ": %s\n", |
reinterpret_cast<intptr_t>(instr), format); |
UNIMPLEMENTED_MIPS(); |
} |
@@ -4413,8 +4413,9 @@ void Simulator::InstructionDecode(Instruction* instr) { |
UNSUPPORTED(); |
} |
if (::v8::internal::FLAG_trace_sim) { |
- PrintF(" 0x%08x %-44s %s\n", reinterpret_cast<intptr_t>(instr), |
- buffer.start(), trace_buf_.start()); |
+ PrintF(" 0x%08" PRIxPTR " %-44s %s\n", |
+ reinterpret_cast<intptr_t>(instr), buffer.start(), |
+ trace_buf_.start()); |
} |
if (!pc_modified_) { |
set_register(pc, reinterpret_cast<int32_t>(instr) + |