From 64d31e75b960f08de57cf78f8bdc793d1135c5cd Mon Sep 17 00:00:00 2001
From: Korey Sewell <ksewell@umich.edu>
Date: Fri, 18 Feb 2011 14:30:38 -0500
Subject: inorder: ignore nops in execution unit

---
 src/cpu/inorder/resources/execution_unit.cc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/cpu/inorder/resources/execution_unit.cc b/src/cpu/inorder/resources/execution_unit.cc
index e4d0c20b9..b2540cff8 100644
--- a/src/cpu/inorder/resources/execution_unit.cc
+++ b/src/cpu/inorder/resources/execution_unit.cc
@@ -101,8 +101,17 @@ ExecutionUnit::execute(int slot_num)
     {
       case ExecuteInst:
         {
-            DPRINTF(InOrderExecute, "[tid:%i] Executing [sn:%i] [PC:%s] %s.\n",
-                    inst->readTid(), seq_num, inst->pcState(), inst->instName());
+            if (inst->isNop()) {
+                DPRINTF(InOrderExecute, "[tid:%i] [sn:%i] [PC:%s] Ignoring execution"
+                        "of %s.\n", inst->readTid(), seq_num, inst->pcState(),
+                        inst->instName());
+                inst->setExecuted();
+                exec_req->done();
+                return;
+            } else {
+                DPRINTF(InOrderExecute, "[tid:%i] Executing [sn:%i] [PC:%s] %s.\n",
+                        inst->readTid(), seq_num, inst->pcState(), inst->instName());
+            }
 
             if (cur_tick != lastExecuteTick) {
                 lastExecuteTick = cur_tick;
-- 
cgit v1.2.3