X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcpu%2Finorder%2Finorder_trace.cc;h=8edb5b1cc1a63bafe0940db6cefe74fd675e2933;hb=e8e9f9731281e8c2ecb50a9aa318a65402cbee5c;hp=90c94a4f567c29be7b1dec20f5526254efcc5742;hpb=279f179babc9e5663156777c533c06edc91bce9a;p=gem5.git diff --git a/src/cpu/inorder/inorder_trace.cc b/src/cpu/inorder/inorder_trace.cc index 90c94a4f5..8edb5b1cc 100644 --- a/src/cpu/inorder/inorder_trace.cc +++ b/src/cpu/inorder/inorder_trace.cc @@ -32,11 +32,12 @@ #include #include "config/the_isa.hh" -#include "cpu/exetrace.hh" #include "cpu/inorder/inorder_trace.hh" -#include "cpu/static_inst.hh" #include "cpu/inorder/pipeline_traits.hh" +#include "cpu/exetrace.hh" +#include "cpu/static_inst.hh" #include "cpu/thread_context.hh" +#include "debug/ExecEnable.hh" #include "params/InOrderTrace.hh" using namespace std; @@ -64,24 +65,24 @@ InOrderTraceRecord * InOrderTrace::getInstRecord(unsigned num_stages, bool stage_tracing, ThreadContext *tc) { - if (!IsOn(ExecEnable)) + if (!Debug::ExecEnable) return NULL; if (!Trace::enabled) return NULL; - return new InOrderTraceRecord(num_stages, stage_tracing, tc); + return new InOrderTraceRecord(num_stages, stage_tracing, tc, 0); } InOrderTraceRecord * InOrderTrace::getInstRecord(Tick when, ThreadContext *tc, - const StaticInstPtr staticInst, Addr pc, - const StaticInstPtr macroStaticInst, MicroPC upc) + const StaticInstPtr staticInst, TheISA::PCState _pc, + const StaticInstPtr macroStaticInst) { - return new InOrderTraceRecord(ThePipeline::NumStages, true, tc); + return new InOrderTraceRecord(ThePipeline::NumStages, true, tc, _pc); } -/* namespace Trace */ } +} // namespace Trace //////////////////////////////////////////////////////////////////////// //