cpu: Update DRAM traffic gen

[gem5.git] / src / cpu / inorder / resources / agen_unit.cc

diff --git a/src/cpu/inorder/resources/agen_unit.cc b/src/cpu/inorder/resources/agen_unit.cc
index 15ff3c4ba7071d0db7fc46ba06ab0f94e3ff0f3e..f978b2fa78816c67654a5f35c5a0ba41a6c5e8b7 100644 (file)
--- a/src/cpu/inorder/resources/agen_unit.cc
+++ b/src/cpu/inorder/resources/agen_unit.cc
@@ -30,9 +30,11 @@
  */
 
 #include "cpu/inorder/resources/agen_unit.hh"
+#include "debug/InOrderAGEN.hh"
 
 AGENUnit::AGENUnit(std::string res_name, int res_id, int res_width,
-                   int res_latency, InOrderCPU *_cpu, ThePipeline::Params *params)
+                   Cycles res_latency, InOrderCPU *_cpu,
+                   ThePipeline::Params *params)
     : Resource(res_name, res_id, res_width, res_latency, _cpu)
 { }
 
@@ -49,15 +51,21 @@ AGENUnit::regStats()
 void
 AGENUnit::execute(int slot_num)
 {
-    ResourceRequest* agen_req = reqMap[slot_num];
-    DynInstPtr inst = reqMap[slot_num]->inst;
-    Fault fault = reqMap[slot_num]->fault;
+    ResourceRequest* agen_req = reqs[slot_num];
+    DynInstPtr inst = reqs[slot_num]->inst;
 #if TRACING_ON
     ThreadID tid = inst->readTid();
 #endif
-    int seq_num = inst->seqNum;
+    InstSeqNum seq_num = inst->seqNum;
 
-    agen_req->fault = NoFault;
+    if (inst->fault != NoFault) {
+        DPRINTF(InOrderAGEN,
+                "[tid:%i]: [sn:%i]: Detected %s fault @ %x. Forwarding to "
+                "next stage.\n", tid, inst->seqNum, inst->fault->name(),
+                inst->pcState());
+        agen_req->done();
+        return;
+    }
 
     switch (agen_req->cmd)
     {
@@ -69,18 +77,18 @@ AGENUnit::execute(int slot_num)
                         "[tid:%i] Generating Address for [sn:%i] (%s).\n",
                         tid, seq_num, inst->staticInst->getName());
 
-                fault = inst->calcEA();
+                inst->fault = inst->calcEA();
                 inst->setMemAddr(inst->getEA());
 
                 DPRINTF(InOrderAGEN,
                     "[tid:%i] [sn:%i] Effective address calculated as: %#x\n",
                     tid, seq_num, inst->getEA());
 
-                if (fault == NoFault) {
+                if (inst->fault == NoFault) {
                     agen_req->done();
                 } else {
-                    fatal("%s encountered while calculating address [sn:%i]",
-                          fault->name(), seq_num);
+                    fatal("%s encountered while calculating address [sn:%i] %s",
+                          inst->fault->name(), seq_num, inst->instName());
                 }
 
                 agens++;