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/inorder/inorder_trace.hh | 4 ++-- src/cpu/inorder/thread_context.hh | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'src/cpu/inorder') diff --git a/src/cpu/inorder/inorder_trace.hh b/src/cpu/inorder/inorder_trace.hh index 5386f641d..bb90f305e 100644 --- a/src/cpu/inorder/inorder_trace.hh +++ b/src/cpu/inorder/inorder_trace.hh @@ -47,8 +47,8 @@ class InOrderTraceRecord : public ExeTracerRecord { public: InOrderTraceRecord(unsigned num_stages, bool _stage_tracing, - ThreadContext *_thread, TheISA::PCState _pc, bool spec = false) - : ExeTracerRecord(0, _thread, NULL, _pc, spec) + ThreadContext *_thread, TheISA::PCState _pc) + : ExeTracerRecord(0, _thread, NULL, _pc) { stageTrace = _stage_tracing; stageCycle.resize(num_stages); diff --git a/src/cpu/inorder/thread_context.hh b/src/cpu/inorder/thread_context.hh index 7b1dc833f..022beaaee 100644 --- a/src/cpu/inorder/thread_context.hh +++ b/src/cpu/inorder/thread_context.hh @@ -290,14 +290,6 @@ class InOrderThreadContext : public ThreadContext void setStCondFailures(unsigned sc_failures) { thread->storeCondFailures = sc_failures; } - // Only really makes sense for old CPU model. Lots of code - // outside the CPU still checks this function, so it will - // always return false to keep everything working. - /** Checks if the thread is misspeculating. Because it is - * very difficult to determine if the thread is - * misspeculating, this is set as false. */ - bool misspeculating() { return false; } - /** Executes a syscall in SE mode. */ void syscall(int64_t callnum) { return cpu->syscall(callnum, thread->threadId()); } -- cgit v1.2.3