From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 9 Mar 2015 14:39:08 +0000 (-0500)
Subject: cpu: o3: Remove unused code in iew, add assert instead.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5003ed5f7ae08ca8a0233a9862d17372a450d1cb;p=gem5.git

cpu: o3: Remove unused code in iew, add assert instead.
---

diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh
index bf44fb9f2..4741df634 100644
--- a/src/cpu/o3/iew_impl.hh
+++ b/src/cpu/o3/iew_impl.hh
@@ -1094,21 +1094,12 @@ DefaultIEW<Impl>::dispatchInsts(ThreadID tid)
 
             iewExecutedNop[tid]++;
 
-            add_to_iq = false;
-        } else if (inst->isExecuted()) {
-            assert(0 && "Instruction shouldn't be executed.\n");
-            DPRINTF(IEW, "Issue: Executed branch encountered, "
-                    "skipping.\n");
-
-            inst->setIssued();
-            inst->setCanCommit();
-
-            instQueue.recordProducer(inst);
-
             add_to_iq = false;
         } else {
+            assert(!inst->isExecuted());
             add_to_iq = true;
         }
+
         if (inst->isNonSpeculative()) {
             DPRINTF(IEW, "[tid:%i]: Issue: Nonspeculative instruction "
                     "encountered, skipping.\n", tid);