From 02881a7bf3e5a5920d258d13ed0aed282f252f07 Mon Sep 17 00:00:00 2001 From: Curtis Dunham Date: Wed, 30 Sep 2015 15:21:55 -0500 Subject: base: remove Trace::enabled flag The DTRACE() macro tests both Trace::enabled and the specific flag. This change uses the same administrative interface for enabling/disabling tracing, but masks the SimpleFlags settings directly. This eliminates a load for every DTRACE() test, e.g. DPRINTF. --- src/cpu/exetrace.hh | 3 --- src/cpu/inst_pb_trace.cc | 4 ++-- src/cpu/inteltrace.hh | 3 --- 3 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/exetrace.hh b/src/cpu/exetrace.hh index 51a8c05c9..b7e808a2a 100644 --- a/src/cpu/exetrace.hh +++ b/src/cpu/exetrace.hh @@ -75,9 +75,6 @@ class ExeTracer : public InstTracer if (!Debug::ExecEnable) return NULL; - if (!Trace::enabled) - return NULL; - return new ExeTracerRecord(when, tc, staticInst, pc, macroStaticInst); } diff --git a/src/cpu/inst_pb_trace.cc b/src/cpu/inst_pb_trace.cc index e6ed425ec..400360078 100644 --- a/src/cpu/inst_pb_trace.cc +++ b/src/cpu/inst_pb_trace.cc @@ -123,8 +123,8 @@ InstPBTraceRecord* InstPBTrace::getInstRecord(Tick when, ThreadContext *tc, const StaticInstPtr si, TheISA::PCState pc, const StaticInstPtr mi) { - // Only record the trace if Exec debugging in enabled - if (!Trace::enabled || !Debug::ExecEnable) + // Only record the trace if Exec debugging is enabled + if (!Debug::ExecEnable) return NULL; return new InstPBTraceRecord(*this, when, tc, si, pc, mi); diff --git a/src/cpu/inteltrace.hh b/src/cpu/inteltrace.hh index 4ddf5eac9..fa1b51602 100644 --- a/src/cpu/inteltrace.hh +++ b/src/cpu/inteltrace.hh @@ -71,9 +71,6 @@ class IntelTrace : public InstTracer if (!Debug::ExecEnable) return NULL; - if (!Trace::enabled) - return NULL; - return new IntelTraceRecord(when, tc, staticInst, pc, macroStaticInst); } }; -- cgit v1.2.3