From bc16bbc158613b7eaebe7d2021a6a0503c4a0635 Mon Sep 17 00:00:00 2001
From: Korey Sewell <ksewell@umich.edu>
Date: Fri, 18 Feb 2011 14:31:31 -0500
Subject: inorder: add names and slot #s to res. dprints

---
 src/cpu/inorder/resource.cc | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/cpu/inorder/resource.cc')

diff --git a/src/cpu/inorder/resource.cc b/src/cpu/inorder/resource.cc
index 701785658..24211532e 100644
--- a/src/cpu/inorder/resource.cc
+++ b/src/cpu/inorder/resource.cc
@@ -31,6 +31,8 @@
 
 #include <vector>
 #include <list>
+
+#include "base/str.hh"
 #include "cpu/inorder/resource.hh"
 #include "cpu/inorder/cpu.hh"
 using namespace std;
@@ -376,7 +378,7 @@ int ResourceRequest::maxReqCount = 0;
 
 ResourceRequest::ResourceRequest(Resource *_res)
     : res(_res), inst(NULL), stagePasses(0), valid(false), doneInResource(false),
-      complSlotNum(-1), completed(false), squashed(false), processing(false),
+      completed(false), squashed(false), processing(false),
       memStall(false)
 {
 }
@@ -391,6 +393,12 @@ ResourceRequest::~ResourceRequest()
         inst = NULL;
 }
 
+std::string
+ResourceRequest::name()
+{
+    return res->name() + "."  + to_string(slotNum);
+}
+
 void
 ResourceRequest::setRequest(DynInstPtr _inst, int stage_num,
                             int res_idx, int slot_num, unsigned _cmd)
@@ -433,11 +441,6 @@ ResourceRequest::done(bool completed)
 
     setCompleted(completed);
 
-    // Used for debugging purposes
-    if (completed) {
-        complSlotNum = slotNum;
-    }
-
     doneInResource = true;
 }
 
@@ -466,7 +469,8 @@ ResourceEvent::process()
 const char *
 ResourceEvent::description()
 {
-    string desc = resource->name() + " event";
+    string desc = resource->name() + "-event:slot[" + to_string(slotIdx)
+        + "]";
 
     return desc.c_str();
 }
-- 
cgit v1.2.3