summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cpu/memtest/memtest.hh4
-rw-r--r--src/cpu/o3/fetch.hh4
-rw-r--r--src/cpu/o3/lsq.hh4
-rw-r--r--src/cpu/ozone/front_end.hh4
-rw-r--r--src/cpu/ozone/lw_lsq.hh4
-rw-r--r--src/cpu/simple/atomic.hh4
-rw-r--r--src/cpu/simple/timing.hh4
-rw-r--r--src/dev/io_device.cc4
-rw-r--r--src/dev/io_device.hh6
-rw-r--r--src/dev/pcidev.cc4
-rw-r--r--src/dev/pcidev.hh2
-rw-r--r--src/kern/tru64/tru64_events.cc2
-rw-r--r--src/mem/bridge.cc2
-rw-r--r--src/mem/bridge.hh2
-rw-r--r--src/mem/bus.cc182
-rw-r--r--src/mem/bus.hh167
-rw-r--r--src/mem/cache/base_cache.cc3
-rw-r--r--src/mem/cache/base_cache.hh2
-rw-r--r--src/mem/physical.cc9
-rw-r--r--src/mem/physical.hh4
-rw-r--r--src/mem/port.hh4
21 files changed, 185 insertions, 236 deletions
diff --git a/src/cpu/memtest/memtest.hh b/src/cpu/memtest/memtest.hh
index 84e16b98a..a6b08d61c 100644
--- a/src/cpu/memtest/memtest.hh
+++ b/src/cpu/memtest/memtest.hh
@@ -115,8 +115,8 @@ class MemTest : public MemObject
virtual void recvRetry();
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
- { resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
+ bool &snoop)
+ { resp.clear(); snoop = true; }
};
CpuPort cachePort;
diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index 241935416..d9b0a47bd 100644
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -100,8 +100,8 @@ class DefaultFetch
/** Returns the address ranges of this device. */
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
- { resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
+ bool &snoop)
+ { resp.clear(); snoop = true; }
/** Timing version of receive. Handles setting fetch to the
* proper status to start fetching. */
diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index fd8f878a7..06de608e0 100644
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -316,8 +316,8 @@ class LSQ {
/** Returns the address ranges of this device. */
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
- { resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
+ bool &snoop)
+ { resp.clear(); snoop = true; }
/** Timing version of receive. Handles writing back and
* completing the load or store that has returned from
diff --git a/src/cpu/ozone/front_end.hh b/src/cpu/ozone/front_end.hh
index 0acf99ead..667392c06 100644
--- a/src/cpu/ozone/front_end.hh
+++ b/src/cpu/ozone/front_end.hh
@@ -91,8 +91,8 @@ class FrontEnd
/** Returns the address ranges of this device. */
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
- { resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
+ bool &snoop)
+ { resp.clear(); snoop = true; }
/** Timing version of receive. Handles setting fetch to the
* proper status to start fetching. */
diff --git a/src/cpu/ozone/lw_lsq.hh b/src/cpu/ozone/lw_lsq.hh
index c981b8e63..2048ad6bb 100644
--- a/src/cpu/ozone/lw_lsq.hh
+++ b/src/cpu/ozone/lw_lsq.hh
@@ -257,8 +257,8 @@ class OzoneLWLSQ {
virtual void recvStatusChange(Status status);
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
- { resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
+ bool &snoop)
+ { resp.clear(); snoop = true; }
virtual bool recvTiming(PacketPtr pkt);
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh
index ad4aa4708..b127e3791 100644
--- a/src/cpu/simple/atomic.hh
+++ b/src/cpu/simple/atomic.hh
@@ -104,8 +104,8 @@ class AtomicSimpleCPU : public BaseSimpleCPU
virtual void recvRetry();
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
- { resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
+ bool &snoop)
+ { resp.clear(); snoop = true; }
};
CpuPort icachePort;
diff --git a/src/cpu/simple/timing.hh b/src/cpu/simple/timing.hh
index e65cbe46b..39958bfb6 100644
--- a/src/cpu/simple/timing.hh
+++ b/src/cpu/simple/timing.hh
@@ -91,8 +91,8 @@ class TimingSimpleCPU : public BaseSimpleCPU
virtual void recvStatusChange(Status status);
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
- { resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
+ bool &snoop)
+ { resp.clear(); snoop = false; }
struct TickEvent : public Event
{
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index 6528bd81c..ecbb391ef 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -48,9 +48,9 @@ PioPort::recvAtomic(PacketPtr pkt)
}
void
-PioPort::getDeviceAddressRanges(AddrRangeList &resp, AddrRangeList &snoop)
+PioPort::getDeviceAddressRanges(AddrRangeList &resp, bool &snoop)
{
- snoop.clear();
+ snoop = false;
device->addressRanges(resp);
}
diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh
index bd150bfe4..25bd2de8d 100644
--- a/src/dev/io_device.hh
+++ b/src/dev/io_device.hh
@@ -59,7 +59,7 @@ class PioPort : public SimpleTimingPort
virtual Tick recvAtomic(PacketPtr pkt);
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop);
+ bool &snoop);
public:
@@ -127,8 +127,8 @@ class DmaPort : public Port
virtual void recvRetry() ;
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
- { resp.clear(); snoop.clear(); }
+ bool &snoop)
+ { resp.clear(); snoop = false; }
void queueDma(PacketPtr pkt, bool front = false);
void sendDma();
diff --git a/src/dev/pcidev.cc b/src/dev/pcidev.cc
index f906e69cf..c2a2bc02d 100644
--- a/src/dev/pcidev.cc
+++ b/src/dev/pcidev.cc
@@ -76,9 +76,9 @@ PciDev::PciConfigPort::recvAtomic(PacketPtr pkt)
void
PciDev::PciConfigPort::getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
+ bool &snoop)
{
- snoop.clear();
+ snoop = false;;
resp.push_back(RangeSize(configAddr, PCI_CONFIG_SIZE+1));
}
diff --git a/src/dev/pcidev.hh b/src/dev/pcidev.hh
index 5044e2932..5ddbe84a0 100644
--- a/src/dev/pcidev.hh
+++ b/src/dev/pcidev.hh
@@ -89,7 +89,7 @@ class PciDev : public DmaDevice
virtual Tick recvAtomic(PacketPtr pkt);
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop);
+ bool &snoop);
Platform *platform;
diff --git a/src/kern/tru64/tru64_events.cc b/src/kern/tru64/tru64_events.cc
index 0ad89f8bd..4db5df067 100644
--- a/src/kern/tru64/tru64_events.cc
+++ b/src/kern/tru64/tru64_events.cc
@@ -54,7 +54,7 @@ BadAddrEvent::process(ThreadContext *tc)
uint64_t a0 = tc->readIntReg(ArgumentReg0);
AddrRangeList resp;
- AddrRangeList snoop;
+ bool snoop;
AddrRangeIter iter;
bool found = false;
diff --git a/src/mem/bridge.cc b/src/mem/bridge.cc
index d68d4ded0..eebf91a85 100644
--- a/src/mem/bridge.cc
+++ b/src/mem/bridge.cc
@@ -361,7 +361,7 @@ Bridge::BridgePort::recvStatusChange(Port::Status status)
void
Bridge::BridgePort::getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
+ bool &snoop)
{
otherPort->getPeerAddressRanges(resp, snoop);
}
diff --git a/src/mem/bridge.hh b/src/mem/bridge.hh
index a47fe3c1e..89d626611 100644
--- a/src/mem/bridge.hh
+++ b/src/mem/bridge.hh
@@ -182,7 +182,7 @@ class Bridge : public MemObject
/** When receiving a address range request the peer port,
pass it to the bridge. */
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop);
+ bool &snoop);
};
BridgePort portA, portB;
diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 895123f8b..ec33bd4c5 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -285,16 +285,15 @@ Bus::findPort(Addr addr, int id)
{
/* An interval tree would be a better way to do this. --ali. */
int dest_id = -1;
- AddrRangeIter iter;
- range_map<Addr,int>::iterator i;
- i = portMap.find(RangeSize(addr,1));
+ PortIter i = portMap.find(RangeSize(addr,1));
if (i != portMap.end())
dest_id = i->second;
// Check if this matches the default range
if (dest_id == -1) {
- for (iter = defaultRange.begin(); iter != defaultRange.end(); iter++) {
+ for (AddrRangeIter iter = defaultRange.begin();
+ iter != defaultRange.end(); iter++) {
if (*iter == addr) {
DPRINTF(Bus, " found addr %#llx on default\n", addr);
return defaultPort;
@@ -322,88 +321,63 @@ Bus::findPort(Addr addr, int id)
return interfaces[dest_id];
}
-std::vector<int>
-Bus::findSnoopPorts(Addr addr, int id)
-{
- int i = 0;
- AddrRangeIter iter;
- std::vector<int> ports;
-
- while (i < portSnoopList.size())
- {
- if (portSnoopList[i].range == addr && portSnoopList[i].portId != id) {
- //Careful to not overlap ranges
- //or snoop will be called more than once on the port
-
- //@todo Fix this hack because ranges are overlapping
- //need to make sure we dont't create overlapping ranges
- bool hack_overlap = false;
- int size = ports.size();
- for (int j=0; j < size; j++) {
- if (ports[j] == portSnoopList[i].portId)
- hack_overlap = true;
- }
-
- if (!hack_overlap)
- ports.push_back(portSnoopList[i].portId);
-// DPRINTF(Bus, " found snoop addr %#llx on device%d\n", addr,
-// portSnoopList[i].portId);
- }
- i++;
- }
- return ports;
-}
-
Tick
Bus::atomicSnoop(PacketPtr pkt, Port *responder)
{
- std::vector<int> ports = findSnoopPorts(pkt->getAddr(), pkt->getSrc());
Tick response_time = 0;
- while (!ports.empty())
- {
- if (interfaces[ports.back()] != responder) {
- Tick response = interfaces[ports.back()]->sendAtomic(pkt);
+ for (SnoopIter s_iter = snoopPorts.begin();
+ s_iter != snoopPorts.end();
+ s_iter++) {
+ BusPort *p = *s_iter;
+ if (p != responder && p->getId() != pkt->getSrc()) {
+ Tick response = p->sendAtomic(pkt);
if (response) {
assert(!response_time); //Multiple responders
response_time = response;
}
}
- ports.pop_back();
}
+
return response_time;
}
void
Bus::functionalSnoop(PacketPtr pkt, Port *responder)
{
- std::vector<int> ports = findSnoopPorts(pkt->getAddr(), pkt->getSrc());
-
- //The packet may be changed by another bus on snoops, restore the id after each
- int id = pkt->getSrc();
- while (!ports.empty() && pkt->result != Packet::Success)
- {
- if (interfaces[ports.back()] != responder)
- interfaces[ports.back()]->sendFunctional(pkt);
- ports.pop_back();
- pkt->setSrc(id);
+ // The packet may be changed by another bus on snoops, restore the
+ // id after each
+ int src_id = pkt->getSrc();
+
+ for (SnoopIter s_iter = snoopPorts.begin();
+ s_iter != snoopPorts.end();
+ s_iter++) {
+ BusPort *p = *s_iter;
+ if (p != responder && p->getId() != src_id) {
+ p->sendFunctional(pkt);
+ }
+ if (pkt->result == Packet::Success) {
+ break;
+ }
+ pkt->setSrc(src_id);
}
}
bool
Bus::timingSnoop(PacketPtr pkt, Port* responder)
{
- std::vector<int> ports = findSnoopPorts(pkt->getAddr(), pkt->getSrc());
- bool success = true;
-
- while (!ports.empty() && success)
- {
- if (interfaces[ports.back()] != responder) //Don't call if responder also, once will do
- success = interfaces[ports.back()]->sendTiming(pkt);
- ports.pop_back();
+ for (SnoopIter s_iter = snoopPorts.begin();
+ s_iter != snoopPorts.end();
+ s_iter++) {
+ BusPort *p = *s_iter;
+ if (p != responder && p->getId() != pkt->getSrc()) {
+ bool success = p->sendTiming(pkt);
+ if (!success)
+ return false;
+ }
}
- return success;
+ return true;
}
@@ -454,7 +428,7 @@ void
Bus::recvStatusChange(Port::Status status, int id)
{
AddrRangeList ranges;
- AddrRangeList snoops;
+ bool snoops;
AddrRangeIter iter;
assert(status == Port::RangeChange &&
@@ -467,7 +441,7 @@ Bus::recvStatusChange(Port::Status status, int id)
// Only try to update these ranges if the user set a default responder.
if (responderSet) {
defaultPort->getPeerAddressRanges(ranges, snoops);
- assert(snoops.size() == 0);
+ assert(snoops == false);
for(iter = ranges.begin(); iter != ranges.end(); iter++) {
defaultRange.push_back(*iter);
DPRINTF(BusAddrRanges, "Adding range %#llx - %#llx for default range\n",
@@ -477,39 +451,33 @@ Bus::recvStatusChange(Port::Status status, int id)
} else {
assert((id < maxId && id >= 0) || id == defaultId);
- Port *port = interfaces[id];
- range_map<Addr,int>::iterator portIter;
- std::vector<DevMap>::iterator snoopIter;
+ BusPort *port = interfaces[id];
// Clean out any previously existent ids
- for (portIter = portMap.begin(); portIter != portMap.end(); ) {
+ for (PortIter portIter = portMap.begin();
+ portIter != portMap.end(); ) {
if (portIter->second == id)
portMap.erase(portIter++);
else
portIter++;
}
- for (snoopIter = portSnoopList.begin(); snoopIter != portSnoopList.end(); ) {
- if (snoopIter->portId == id)
- snoopIter = portSnoopList.erase(snoopIter);
+ for (SnoopIter s_iter = snoopPorts.begin();
+ s_iter != snoopPorts.end(); ) {
+ if ((*s_iter)->getId() == id)
+ s_iter = snoopPorts.erase(s_iter);
else
- snoopIter++;
+ s_iter++;
}
port->getPeerAddressRanges(ranges, snoops);
- for(iter = snoops.begin(); iter != snoops.end(); iter++) {
- DevMap dm;
- dm.portId = id;
- dm.range = *iter;
-
- //@todo, make sure we don't overlap ranges
- DPRINTF(BusAddrRanges, "Adding snoop range %#llx - %#llx for id %d\n",
- dm.range.start, dm.range.end, id);
- portSnoopList.push_back(dm);
+ if (snoops) {
+ DPRINTF(BusAddrRanges, "Adding id %d to snoop list\n", id);
+ snoopPorts.push_back(port);
}
- for(iter = ranges.begin(); iter != ranges.end(); iter++) {
+ for (iter = ranges.begin(); iter != ranges.end(); iter++) {
DPRINTF(BusAddrRanges, "Adding range %#llx - %#llx for id %d\n",
iter->start, iter->end, id);
if (portMap.insert(*iter, id) == portMap.end())
@@ -532,28 +500,24 @@ Bus::recvStatusChange(Port::Status status, int id)
}
void
-Bus::addressRanges(AddrRangeList &resp, AddrRangeList &snoop, int id)
+Bus::addressRanges(AddrRangeList &resp, bool &snoop, int id)
{
- std::vector<DevMap>::iterator snoopIter;
- range_map<Addr,int>::iterator portIter;
- AddrRangeIter dflt_iter;
- bool subset;
-
resp.clear();
- snoop.clear();
+ snoop = false;
DPRINTF(BusAddrRanges, "received address range request, returning:\n");
- for (dflt_iter = defaultRange.begin(); dflt_iter != defaultRange.end();
- dflt_iter++) {
+ for (AddrRangeIter dflt_iter = defaultRange.begin();
+ dflt_iter != defaultRange.end(); dflt_iter++) {
resp.push_back(*dflt_iter);
DPRINTF(BusAddrRanges, " -- Dflt: %#llx : %#llx\n",dflt_iter->start,
dflt_iter->end);
}
- for (portIter = portMap.begin(); portIter != portMap.end(); portIter++) {
- subset = false;
- for (dflt_iter = defaultRange.begin(); dflt_iter != defaultRange.end();
- dflt_iter++) {
+ for (PortIter portIter = portMap.begin();
+ portIter != portMap.end(); portIter++) {
+ bool subset = false;
+ for (AddrRangeIter dflt_iter = defaultRange.begin();
+ dflt_iter != defaultRange.end(); dflt_iter++) {
if ((portIter->first.start < dflt_iter->start &&
portIter->first.end >= dflt_iter->start) ||
(portIter->first.start < dflt_iter->end &&
@@ -574,15 +538,11 @@ Bus::addressRanges(AddrRangeList &resp, AddrRangeList &snoop, int id)
}
}
- for (snoopIter = portSnoopList.begin();
- snoopIter != portSnoopList.end(); snoopIter++)
- {
- if (snoopIter->portId != id) {
- snoop.push_back(snoopIter->range);
- DPRINTF(BusAddrRanges, " -- Snoop: %#llx : %#llx\n",
- snoopIter->range.start, snoopIter->range.end);
- //@todo We need to properly insert snoop ranges
- //not overlapping the ranges (multiple)
+ for (SnoopIter s_iter = snoopPorts.begin(); s_iter != snoopPorts.end();
+ s_iter++) {
+ if ((*s_iter)->getId() != id) {
+ snoop = true;
+ break;
}
}
}
@@ -593,17 +553,17 @@ Bus::findBlockSize(int id)
if (cachedBlockSizeValid)
return cachedBlockSize;
- int max_bs = -1, tmp_bs;
- range_map<Addr,int>::iterator portIter;
- std::vector<DevMap>::iterator snoopIter;
- for (portIter = portMap.begin(); portIter != portMap.end(); portIter++) {
- tmp_bs = interfaces[portIter->second]->peerBlockSize();
+ int max_bs = -1;
+
+ for (PortIter portIter = portMap.begin();
+ portIter != portMap.end(); portIter++) {
+ int tmp_bs = interfaces[portIter->second]->peerBlockSize();
if (tmp_bs > max_bs)
max_bs = tmp_bs;
}
- for (snoopIter = portSnoopList.begin();
- snoopIter != portSnoopList.end(); snoopIter++) {
- tmp_bs = interfaces[snoopIter->portId]->peerBlockSize();
+ for (SnoopIter s_iter = snoopPorts.begin();
+ s_iter != snoopPorts.end(); s_iter++) {
+ int tmp_bs = (*s_iter)->peerBlockSize();
if (tmp_bs > max_bs)
max_bs = tmp_bs;
}
diff --git a/src/mem/bus.hh b/src/mem/bus.hh
index f0dc67b12..5dd98c07e 100644
--- a/src/mem/bus.hh
+++ b/src/mem/bus.hh
@@ -52,93 +52,6 @@
class Bus : public MemObject
{
- /** a globally unique id for this bus. */
- int busId;
- /** the clock speed for the bus */
- int clock;
- /** the width of the bus in bytes */
- int width;
- /** the next tick at which the bus will be idle */
- Tick tickNextIdle;
-
- Event * drainEvent;
-
-
- static const int defaultId = -3; //Make it unique from Broadcast
-
- struct DevMap {
- int portId;
- Range<Addr> range;
- };
- range_map<Addr, int> portMap;
- AddrRangeList defaultRange;
- std::vector<DevMap> portSnoopList;
-
- /** Function called by the port when the bus is recieving a Timing
- transaction.*/
- bool recvTiming(PacketPtr pkt);
-
- /** Function called by the port when the bus is recieving a Atomic
- transaction.*/
- Tick recvAtomic(PacketPtr pkt);
-
- /** Function called by the port when the bus is recieving a Functional
- transaction.*/
- void recvFunctional(PacketPtr pkt);
-
- /** Timing function called by port when it is once again able to process
- * requests. */
- void recvRetry(int id);
-
- /** Function called by the port when the bus is recieving a status change.*/
- void recvStatusChange(Port::Status status, int id);
-
- /** Find which port connected to this bus (if any) should be given a packet
- * with this address.
- * @param addr Address to find port for.
- * @param id Id of the port this packet was received from (to prevent
- * loops)
- * @return pointer to port that the packet should be sent out of.
- */
- Port *findPort(Addr addr, int id);
-
- /** Find all ports with a matching snoop range, except src port. Keep in mind
- * that the ranges shouldn't overlap or you will get a double snoop to the same
- * interface.and the cache will assert out.
- * @param addr Address to find snoop prts for.
- * @param id Id of the src port of the request to avoid calling snoop on src
- * @return vector of IDs to snoop on
- */
- std::vector<int> findSnoopPorts(Addr addr, int id);
-
- /** Snoop all relevant ports atomicly. */
- Tick atomicSnoop(PacketPtr pkt, Port* responder);
-
- /** Snoop all relevant ports functionally. */
- void functionalSnoop(PacketPtr pkt, Port *responder);
-
- /** Call snoop on caches, be sure to set SNOOP_COMMIT bit if you want
- * the snoop to happen
- * @return True if succeds.
- */
- bool timingSnoop(PacketPtr pkt, Port *responder);
-
- /** Process address range request.
- * @param resp addresses that we can respond to
- * @param snoop addresses that we would like to snoop
- * @param id ide of the busport that made the request.
- */
- void addressRanges(AddrRangeList &resp, AddrRangeList &snoop, int id);
-
- /** Occupy the bus with transmitting the packet pkt */
- void occupyBus(PacketPtr pkt);
-
- /** Ask everyone on the bus what their size is
- * @param id id of the busport that made the request
- * @return the max of all the sizes
- */
- int findBlockSize(int id);
-
/** Declaration of the buses port type, one will be instantiated for each
of the interfaces connecting to the bus. */
class BusPort : public Port
@@ -198,7 +111,7 @@ class Bus : public MemObject
// the 'owned' address ranges of all the other interfaces on
// this bus...
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
+ bool &snoop)
{ bus->addressRanges(resp, snoop, id); }
// Ask the bus to ask everyone on the bus what their block size is and
@@ -219,6 +132,84 @@ class Bus : public MemObject
const char *description();
};
+ /** a globally unique id for this bus. */
+ int busId;
+ /** the clock speed for the bus */
+ int clock;
+ /** the width of the bus in bytes */
+ int width;
+ /** the next tick at which the bus will be idle */
+ Tick tickNextIdle;
+
+ Event * drainEvent;
+
+
+ static const int defaultId = -3; //Make it unique from Broadcast
+
+ typedef range_map<Addr,int>::iterator PortIter;
+ range_map<Addr, int> portMap;
+
+ AddrRangeList defaultRange;
+
+ typedef std::vector<BusPort*>::iterator SnoopIter;
+ std::vector<BusPort*> snoopPorts;
+
+ /** Function called by the port when the bus is recieving a Timing
+ transaction.*/
+ bool recvTiming(PacketPtr pkt);
+
+ /** Function called by the port when the bus is recieving a Atomic
+ transaction.*/
+ Tick recvAtomic(PacketPtr pkt);
+
+ /** Function called by the port when the bus is recieving a Functional
+ transaction.*/
+ void recvFunctional(PacketPtr pkt);
+
+ /** Timing function called by port when it is once again able to process
+ * requests. */
+ void recvRetry(int id);
+
+ /** Function called by the port when the bus is recieving a status change.*/
+ void recvStatusChange(Port::Status status, int id);
+
+ /** Find which port connected to this bus (if any) should be given a packet
+ * with this address.
+ * @param addr Address to find port for.
+ * @param id Id of the port this packet was received from (to prevent
+ * loops)
+ * @return pointer to port that the packet should be sent out of.
+ */
+ Port *findPort(Addr addr, int id);
+
+ /** Snoop all relevant ports atomicly. */
+ Tick atomicSnoop(PacketPtr pkt, Port* responder);
+
+ /** Snoop all relevant ports functionally. */
+ void functionalSnoop(PacketPtr pkt, Port *responder);
+
+ /** Call snoop on caches, be sure to set SNOOP_COMMIT bit if you want
+ * the snoop to happen
+ * @return True if succeds.
+ */
+ bool timingSnoop(PacketPtr pkt, Port *responder);
+
+ /** Process address range request.
+ * @param resp addresses that we can respond to
+ * @param snoop addresses that we would like to snoop
+ * @param id ide of the busport that made the request.
+ */
+ void addressRanges(AddrRangeList &resp, bool &snoop, int id);
+
+ /** Occupy the bus with transmitting the packet pkt */
+ void occupyBus(PacketPtr pkt);
+
+ /** Ask everyone on the bus what their size is
+ * @param id id of the busport that made the request
+ * @return the max of all the sizes
+ */
+ int findBlockSize(int id);
+
BusFreeEvent busIdle;
bool inRetry;
diff --git a/src/mem/cache/base_cache.cc b/src/mem/cache/base_cache.cc
index b699271f7..d75d35ebb 100644
--- a/src/mem/cache/base_cache.cc
+++ b/src/mem/cache/base_cache.cc
@@ -67,8 +67,7 @@ BaseCache::CachePort::recvStatusChange(Port::Status status)
}
void
-BaseCache::CachePort::getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
+BaseCache::CachePort::getDeviceAddressRanges(AddrRangeList &resp, bool &snoop)
{
AddrRangeList dummy;
otherPort->getPeerAddressRanges(resp, dummy);
diff --git a/src/mem/cache/base_cache.hh b/src/mem/cache/base_cache.hh
index 2d63945d9..f7107a86a 100644
--- a/src/mem/cache/base_cache.hh
+++ b/src/mem/cache/base_cache.hh
@@ -92,7 +92,7 @@ class BaseCache : public MemObject
virtual void recvStatusChange(Status status);
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop);
+ bool &snoop);
virtual int deviceBlockSize();
diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index 97c42509f..6621c36cf 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -385,18 +385,17 @@ PhysicalMemory::MemoryPort::recvStatusChange(Port::Status status)
void
PhysicalMemory::MemoryPort::getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
+ bool &snoop)
{
memory->getAddressRanges(resp, snoop);
}
void
-PhysicalMemory::getAddressRanges(AddrRangeList &resp, AddrRangeList &snoop)
+PhysicalMemory::getAddressRanges(AddrRangeList &resp, bool &snoop)
{
- snoop.clear();
+ snoop = false;
resp.clear();
- resp.push_back(RangeSize(start(),
- params()->addrRange.size()));
+ resp.push_back(RangeSize(start(), params()->addrRange.size()));
}
int
diff --git a/src/mem/physical.hh b/src/mem/physical.hh
index e3355d6aa..b9af5d334 100644
--- a/src/mem/physical.hh
+++ b/src/mem/physical.hh
@@ -64,7 +64,7 @@ class PhysicalMemory : public MemObject
virtual void recvStatusChange(Status status);
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop);
+ bool &snoop);
virtual int deviceBlockSize();
};
@@ -169,7 +169,7 @@ class PhysicalMemory : public MemObject
public:
int deviceBlockSize();
- void getAddressRanges(AddrRangeList &resp, AddrRangeList &snoop);
+ void getAddressRanges(AddrRangeList &resp, bool &snoop);
virtual Port *getPort(const std::string &if_name, int idx = -1);
void virtual init();
unsigned int drain(Event *de);
diff --git a/src/mem/port.hh b/src/mem/port.hh
index 877e00293..b23de6050 100644
--- a/src/mem/port.hh
+++ b/src/mem/port.hh
@@ -172,7 +172,7 @@ class Port
@param snoop is a list of ranges snooped
*/
virtual void getDeviceAddressRanges(AddrRangeList &resp,
- AddrRangeList &snoop)
+ bool &snoop)
{ panic("??"); }
public:
@@ -222,7 +222,7 @@ class Port
/** Called by the associated device if it wishes to find out the address
ranges connected to the peer ports devices.
*/
- void getPeerAddressRanges(AddrRangeList &resp, AddrRangeList &snoop)
+ void getPeerAddressRanges(AddrRangeList &resp, bool &snoop)
{ peer->getDeviceAddressRanges(resp, snoop); }
/** This function is a wrapper around sendFunctional()
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 20:59:36 +0000