summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-10-10 17:24:03 -0400
committerGabe Black <gblack@eecs.umich.edu>2006-10-10 17:24:03 -0400
commit549412b33361629b03d9d85dac3bb3efa2f07baf (patch)
tree03995c9f63fafe5483716f96c8fc78a71e3360d0 /src/mem
parent5f9aca531d348bdc90585c41dcf9bf33201cc6cf (diff)
downloadgem5-549412b33361629b03d9d85dac3bb3efa2f07baf.tar.xz
Changed the bus to use a bool to keep track of retries rather than a pointer
src/mem/tport.cc: minor formatting tweak --HG-- extra : convert_revision : 7391d142815c5876fcc0f991bd053e6a1781c101
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/bus.cc32
-rw-r--r--src/mem/bus.hh18
-rw-r--r--src/mem/tport.cc3
3 files changed, 26 insertions, 27 deletions
diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 66cd581e7..3efaa93ac 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -68,13 +68,11 @@ Bus::init()
}
Bus::BusFreeEvent::BusFreeEvent(Bus *_bus) : Event(&mainEventQueue), bus(_bus)
-{
- assert(!scheduled());
-}
+{}
void Bus::BusFreeEvent::process()
{
- bus->recvRetry(0);
+ bus->recvRetry(-1);
}
const char * Bus::BusFreeEvent::description()
@@ -96,7 +94,7 @@ Bus::recvTiming(Packet *pkt)
// If the bus is busy, or other devices are in line ahead of the current
// one, put this device on the retry list.
if (tickNextIdle > curTick ||
- (retryList.size() && pktPort != retryingPort)) {
+ (retryList.size() && (!inRetry || pktPort != retryList.front()))) {
addToRetryList(pktPort);
return false;
}
@@ -109,9 +107,9 @@ Bus::recvTiming(Packet *pkt)
assert(success);
if (pkt->flags & SATISFIED) {
//Cache-Cache transfer occuring
- if (retryingPort) {
+ if (inRetry) {
retryList.pop_front();
- retryingPort = NULL;
+ inRetry = false;
}
return true;
}
@@ -182,9 +180,9 @@ Bus::recvTiming(Packet *pkt)
if (port->sendTiming(pkt)) {
// Packet was successfully sent. Return true.
// Also take care of retries
- if (retryingPort) {
+ if (inRetry) {
retryList.pop_front();
- retryingPort = NULL;
+ inRetry = false;
}
return true;
}
@@ -199,14 +197,14 @@ Bus::recvRetry(int id)
{
// If there's anything waiting...
if (retryList.size()) {
- retryingPort = retryList.front();
- retryingPort->sendRetry();
- // If the retryingPort pointer isn't null, sendTiming wasn't called
- if (retryingPort) {
- warn("sendRetry didn't call sendTiming\n");
- retryList.pop_front();
- retryingPort = NULL;
- }
+ //retryingPort = retryList.front();
+ inRetry = true;
+ retryList.front()->sendRetry();
+ // If inRetry is still true, sendTiming wasn't called
+ if (inRetry)
+ panic("Port %s didn't call sendTiming in it's recvRetry\n",\
+ retryList.front()->getPeer()->name());
+ //assert(!inRetry);
}
}
diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index ce3f4bed7..4affcd6ae 100644
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -195,7 +195,7 @@ class Bus : public MemObject
BusFreeEvent busIdle;
- Port * retryingPort;
+ bool inRetry;
/** An array of pointers to the peer port interfaces
connected to this bus.*/
@@ -207,18 +207,18 @@ class Bus : public MemObject
void addToRetryList(Port * port)
{
- if (!retryingPort) {
+ if (!inRetry) {
// The device wasn't retrying a packet, or wasn't at an appropriate
// time.
retryList.push_back(port);
} else {
// The device was retrying a packet. It didn't work, so we'll leave
// it at the head of the retry list.
- retryingPort = NULL;
+ inRetry = false;
- // We shouldn't be receiving a packet from one port when a different
+/* // We shouldn't be receiving a packet from one port when a different
// one is retrying.
- assert(port == retryingPort);
+ assert(port == retryingPort);*/
}
}
@@ -234,11 +234,13 @@ class Bus : public MemObject
Bus(const std::string &n, int bus_id, int _clock, int _width)
: MemObject(n), busId(bus_id), clock(_clock), width(_width),
- tickNextIdle(0), busIdle(this), retryingPort(NULL), defaultPort(NULL)
+ tickNextIdle(0), busIdle(this), inRetry(false), defaultPort(NULL)
{
//Both the width and clock period must be positive
- assert(width);
- assert(clock);
+ if (width <= 0)
+ fatal("Bus width must be positive\n");
+ if (clock <= 0)
+ fatal("Bus clock period must be positive\n");
}
};
diff --git a/src/mem/tport.cc b/src/mem/tport.cc
index 66811b820..528067170 100644
--- a/src/mem/tport.cc
+++ b/src/mem/tport.cc
@@ -79,8 +79,7 @@ SimpleTimingPort::SendEvent::process()
assert(port->outTiming >= 0);
if (port->transmitList.size()) {
port->transmitList.push_back(packet);
- }
- else if (port->sendTiming(packet)) {
+ } else if (port->sendTiming(packet)) {
// send successful
if (port->transmitList.size() == 0 && port->drainEvent) {
port->drainEvent->process();