diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-25 10:41:23 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-25 10:41:23 -0400 |
| commit | 4c92708b48d51bfb6592ff48925f5a7a0157da5b (patch) | |
| tree | 2535fb1529ef60f64a3f26f943af5d8d681b22d8 /src/cpu/testers/directedtest | |
| parent | 79750fc575db0966ff9d0530975377c35f630eca (diff) | |
| download | gem5-4c92708b48d51bfb6592ff48925f5a7a0157da5b.tar.xz | |
MEM: Add the PortId type and a corresponding id field to Port
This patch introduces the PortId type, moves the definition of
INVALID_PORT_ID to the Port class, and also gives every port an id to
reflect the fact that each element in a vector port has an
identifier/index.
Previously the bus and Ruby testers (and potentially other users of
the vector ports) added the id field in their port subclasses, and now
this functionality is always present as it is moved to the base class.
Diffstat (limited to 'src/cpu/testers/directedtest')
| -rw-r--r-- | src/cpu/testers/directedtest/RubyDirectedTester.cc | 2 | ||||
| -rw-r--r-- | src/cpu/testers/directedtest/RubyDirectedTester.hh | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.cc b/src/cpu/testers/directedtest/RubyDirectedTester.cc index a6dc257d5..b5fe662af 100644 --- a/src/cpu/testers/directedtest/RubyDirectedTester.cc +++ b/src/cpu/testers/directedtest/RubyDirectedTester.cc @@ -93,7 +93,7 @@ RubyDirectedTester::getMasterPort(const std::string &if_name, int idx) bool RubyDirectedTester::CpuPort::recvTiming(PacketPtr pkt) { - tester->hitCallback(idx, pkt->getAddr()); + tester->hitCallback(id, pkt->getAddr()); // // Now that the tester has completed, delete the packet, then return diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.hh b/src/cpu/testers/directedtest/RubyDirectedTester.hh index bd0b52a90..08b034d3f 100644 --- a/src/cpu/testers/directedtest/RubyDirectedTester.hh +++ b/src/cpu/testers/directedtest/RubyDirectedTester.hh @@ -54,12 +54,10 @@ class RubyDirectedTester : public MemObject public: CpuPort(const std::string &_name, RubyDirectedTester *_tester, - uint32_t _idx) - : MasterPort(_name, _tester), tester(_tester), idx(_idx) + Port::PortId _id) + : MasterPort(_name, _tester, _id), tester(_tester) {} - uint32_t idx; - protected: virtual bool recvTiming(PacketPtr pkt); virtual void recvRetry() |