From: Korey Sewell <ksewell@umich.edu>
Date: Wed, 27 Feb 2008 21:53:08 +0000 (-0500)
Subject: Fix Load/Store Queue squashing after a SMT thread is removed but ensuring
X-Git-Tag: m5_2.0_beta5~3^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b45cf21a8e2ead22996daa0960747db8ec95db71;p=gem5.git

Fix Load/Store Queue squashing after a SMT thread is removed but ensuring
you are squashing from the current instruction # causing the thread exit.

--HG--
extra : convert_revision : ccbeece7dd1d5fee43f30ab19370908972113473
---

diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index ff1ee7920..84aea0479 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -695,7 +695,7 @@ FullO3CPU<Impl>::removeThread(unsigned tid)
     decode.squash(tid);
     rename.squash(squash_seq_num, tid);
     iew.squash(tid);
-    //iew.ldstQueue.squash(squash_seq_num, tid);
+    iew.ldstQueue.squash(squash_seq_num, tid);
     commit.rob->squash(squash_seq_num, tid);