cpu: Revert "Don't change to suspend if the thread status is halted" (#1225)

Reverts gem5/gem5#1039
2024-06-12 00:20:06 -07:00
parent f9abf6bb08
commit 74afea471d
2 changed files with 2 additions and 5 deletions
--- a/src/cpu/o3/thread_context.cc
+++ b/src/cpu/o3/thread_context.cc
@@ -86,9 +86,7 @@ ThreadContext::suspend()
    DPRINTF(O3CPU, "Calling suspend on Thread Context %d\n",
            threadId());

-    if (thread->status() == gem5::ThreadContext::Suspended ||
-        thread->status() == gem5::ThreadContext::Halting ||
-        thread->status() == gem5::ThreadContext::Halted)
+    if (thread->status() == gem5::ThreadContext::Suspended)
        return;

    if (cpu->isDraining()) {
--- a/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@ -143,8 +143,7 @@ SimpleThread::activate()
 void
 SimpleThread::suspend()
 {
-    if (status() == ThreadContext::Suspended ||
-        status() == ThreadContext::Halted)
+    if (status() == ThreadContext::Suspended)
        return;

    lastActivate = curTick();