From f6742ea26e1a1cac21b486c7c5adad6fb6304e92 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Sun, 25 Jan 2015 07:22:26 -0500 Subject: cpu: Remove all notion that we know when the cpu is misspeculating. We have no way of knowing if a CPU model is on the wrong path with our execute-in-execute CPU models. Don't pretend that we do. --- src/cpu/inteltrace.hh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/cpu/inteltrace.hh') diff --git a/src/cpu/inteltrace.hh b/src/cpu/inteltrace.hh index e5f88bf1a..4ddf5eac9 100644 --- a/src/cpu/inteltrace.hh +++ b/src/cpu/inteltrace.hh @@ -37,7 +37,6 @@ #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" #include "debug/ExecEnable.hh" -#include "debug/ExecSpeculative.hh" #include "params/IntelTrace.hh" #include "sim/insttracer.hh" @@ -48,8 +47,8 @@ class IntelTraceRecord : public InstRecord public: IntelTraceRecord(Tick _when, ThreadContext *_thread, const StaticInstPtr _staticInst, TheISA::PCState _pc, - bool spec, const StaticInstPtr _macroStaticInst = NULL) - : InstRecord(_when, _thread, _staticInst, _pc, spec, + const StaticInstPtr _macroStaticInst = NULL) + : InstRecord(_when, _thread, _staticInst, _pc, _macroStaticInst) { } @@ -75,11 +74,7 @@ class IntelTrace : public InstTracer if (!Trace::enabled) return NULL; - if (!Debug::ExecSpeculative && tc->misspeculating()) - return NULL; - - return new IntelTraceRecord(when, tc, - staticInst, pc, tc->misspeculating(), macroStaticInst); + return new IntelTraceRecord(when, tc, staticInst, pc, macroStaticInst); } }; -- cgit v1.2.3