Chromium Code Reviews| Index: runtime/vm/simulator_arm64.cc |
| =================================================================== |
| --- runtime/vm/simulator_arm64.cc (revision 42479) |
| +++ runtime/vm/simulator_arm64.cc (working copy) |
| @@ -23,8 +23,9 @@ |
| namespace dart { |
| -DEFINE_FLAG(bool, trace_sim, false, "Trace simulator execution."); |
| -DEFINE_FLAG(int, stop_sim_at, 0, |
| +DEFINE_FLAG(int, trace_sim_after, -1, |
| + "Trace simulator execution after instruction count reached."); |
| +DEFINE_FLAG(int, stop_sim_at, -1, |
| "Instruction address or instruction count to stop simulator at."); |
| @@ -639,8 +640,13 @@ |
| OS::Print("Not at debugger stop.\n"); |
| } |
| } else if (strcmp(cmd, "trace") == 0) { |
| - FLAG_trace_sim = !FLAG_trace_sim; |
| - OS::Print("execution tracing %s\n", FLAG_trace_sim ? "on" : "off"); |
| + if (FLAG_trace_sim_after == -1) { |
| + FLAG_trace_sim_after = sim_->get_icount(); |
| + OS::Print("execution tracing on\n"); |
| + } else { |
| + FLAG_trace_sim_after = -1; |
| + OS::Print("execution tracing off\n"); |
| + } |
| } else if (strcmp(cmd, "bt") == 0) { |
| PrintBacktrace(); |
| } else { |
| @@ -1557,7 +1563,8 @@ |
| int64_t saved_lr = get_register(LR); |
| Redirection* redirection = Redirection::FromHltInstruction(instr); |
| uword external = redirection->external_function(); |
| - if (FLAG_trace_sim) { |
| + if (static_cast<uintptr_t>(icount_) > |
|
zra
2014/12/19 17:49:47
Same comment.
regis
2014/12/22 20:17:34
Done.
|
| + static_cast<uintptr_t>(FLAG_trace_sim_after)) { |
| OS::Print("Call to host function at 0x%" Pd "\n", external); |
| } |
| @@ -3272,7 +3279,9 @@ |
| // Executes the current instruction. |
| void Simulator::InstructionDecode(Instr* instr) { |
| pc_modified_ = false; |
| - if (FLAG_trace_sim) { |
| + if (static_cast<uintptr_t>(icount_) > |
| + static_cast<uintptr_t>(FLAG_trace_sim_after)) { |
| + OS::Print("%"Pu64" ", icount_); |
| const uword start = reinterpret_cast<uword>(instr); |
| const uword end = start + Instr::kInstrSize; |
| Disassembler::Disassemble(start, end); |