diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpu/exetrace.cc | 17 | ||||
| -rw-r--r-- | src/cpu/exetrace.hh | 1 |
2 files changed, 5 insertions, 13 deletions
diff --git a/src/cpu/exetrace.cc b/src/cpu/exetrace.cc index bbfd3d3cd..aeb17078c 100644 --- a/src/cpu/exetrace.cc +++ b/src/cpu/exetrace.cc @@ -46,6 +46,7 @@ #include "cpu/exetrace.hh" #include <iomanip> +#include <sstream> #include "arch/isa_traits.hh" #include "arch/utility.hh" @@ -64,15 +65,9 @@ using namespace TheISA; namespace Trace { void -ExeTracerRecord::dumpTicks(ostream &outs) -{ - ccprintf(outs, "%7d: ", when); -} - -void Trace::ExeTracerRecord::traceInst(const StaticInstPtr &inst, bool ran) { - ostream &outs = Trace::output(); + std::stringstream outs; if (!Debug::ExecUser || !Debug::ExecKernel) { bool in_user_mode = TheISA::inUserMode(thread); @@ -80,11 +75,6 @@ Trace::ExeTracerRecord::traceInst(const StaticInstPtr &inst, bool ran) if (!in_user_mode && !Debug::ExecKernel) return; } - if (!DTRACE(FmtTicksOff)) - dumpTicks(outs); - - outs << thread->getCpuPtr()->name() << " "; - if (Debug::ExecAsid) outs << "A" << dec << TheISA::getExecutingAsid(thread) << " "; @@ -185,6 +175,9 @@ Trace::ExeTracerRecord::traceInst(const StaticInstPtr &inst, bool ran) // End of line... // outs << endl; + + Trace::getDebugLogger()->dprintf_flag( + when, thread->getCpuPtr()->name(), "ExecEnable", outs.str().c_str()); } void diff --git a/src/cpu/exetrace.hh b/src/cpu/exetrace.hh index b7e808a2a..b9ffb41ae 100644 --- a/src/cpu/exetrace.hh +++ b/src/cpu/exetrace.hh @@ -57,7 +57,6 @@ class ExeTracerRecord : public InstRecord void traceInst(const StaticInstPtr &inst, bool ran); void dump(); - virtual void dumpTicks(std::ostream &outs); }; class ExeTracer : public InstTracer |