X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fbase%2Fcp_annotate.hh;h=3e4597ba8da861f7b9cbef1914b35e35eb2a17dc;hb=b312a41f21b6f76607fe7480a915a4c5093386a3;hp=8ce9995a8574539b028c0509b33e3f7d30a95c0f;hpb=30ce620d1d7b04387072e2dcf87530c33eb7c608;p=gem5.git diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh index 8ce9995a8..3e4597ba8 100644 --- a/src/base/cp_annotate.hh +++ b/src/base/cp_annotate.hh @@ -31,13 +31,13 @@ #ifndef __BASE__CP_ANNOTATE_HH__ #define __BASE__CP_ANNOTATE_HH__ -#include #include -#include #include +#include +#include -#include "base/hashmap.hh" #include "base/loader/symtab.hh" +#include "base/hashmap.hh" #include "base/trace.hh" #include "base/types.hh" #include "config/cp_annotate.hh" @@ -408,7 +408,7 @@ class CPA : SimObject int smi = getSm(sysi, sm, frame); add(OP_BEGIN, FL_HW | f, 0, smi, getSt(sm, st)); if (f & FL_BAD) - warn("BAD state encountered: at cycle %d: %s\n", curTick, st); + warn("BAD state encountered: at cycle %d: %s\n", curTick(), st); } inline void hwQ(flags f, System *sys, uint64_t frame, std::string sm,