* Nathan Binkert
*/
-#ifndef __EXETRACE_HH__
-#define __EXETRACE_HH__
+#ifndef __CPU_EXETRACE_HH__
+#define __CPU_EXETRACE_HH__
#include "base/trace.hh"
+#include "base/types.hh"
#include "cpu/static_inst.hh"
-#include "sim/host.hh"
-#include "sim/insttracer.hh"
+#include "cpu/thread_context.hh"
+#include "debug/ExecEnable.hh"
#include "params/ExeTracer.hh"
+#include "sim/insttracer.hh"
class ThreadContext;
-
namespace Trace {
class ExeTracerRecord : public InstRecord
{
public:
ExeTracerRecord(Tick _when, ThreadContext *_thread,
- const StaticInstPtr _staticInst, Addr _pc, bool spec,
- const StaticInstPtr _macroStaticInst = NULL, MicroPC _upc = 0)
- : InstRecord(_when, _thread, _staticInst, _pc, spec,
- _macroStaticInst, _upc)
+ const StaticInstPtr _staticInst, TheISA::PCState _pc,
+ const StaticInstPtr _macroStaticInst = NULL)
+ : InstRecord(_when, _thread, _staticInst, _pc, _macroStaticInst)
{
}
- void traceInst(StaticInstPtr inst, bool ran);
+ void traceInst(const StaticInstPtr &inst, bool ran);
void dump();
+ virtual void dumpTicks(std::ostream &outs);
};
class ExeTracer : public InstTracer
InstRecord *
getInstRecord(Tick when, ThreadContext *tc,
- const StaticInstPtr staticInst, Addr pc,
- const StaticInstPtr macroStaticInst = NULL, MicroPC upc = 0)
+ const StaticInstPtr staticInst, TheISA::PCState pc,
+ const StaticInstPtr macroStaticInst = NULL)
{
- if (!IsOn(ExecEnable))
- return NULL;
-
- if (!Trace::enabled)
- return NULL;
-
- if (!IsOn(ExecSpeculative) && tc->misspeculating())
+ if (!Debug::ExecEnable)
return NULL;
return new ExeTracerRecord(when, tc,
- staticInst, pc, tc->misspeculating(), macroStaticInst, upc);
+ staticInst, pc, macroStaticInst);
}
};
-/* namespace Trace */ }
+} // namespace Trace
-#endif // __EXETRACE_HH__
+#endif // __CPU_EXETRACE_HH__