diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2012-05-30 05:29:42 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-05-30 05:29:42 -0400 |
commit | cad802761a876c6dcd00d58e09c8984886c987f6 (patch) | |
tree | fcb327a8923631de61133c6ad14aeaffcc44761c /src/cpu/testers/rubytest | |
parent | 6a54f7fc5ff1c33bc9f222014dc08c33248b0299 (diff) | |
download | gem5-cad802761a876c6dcd00d58e09c8984886c987f6.tar.xz |
Packet: Unify the use of PortID in packet and port
This patch removes the Packet::NodeID typedef and unifies it with the
Port::PortId. The src and dest fields in the packet are used to hold a
port id (e.g. in the bus), and thus the two should actually be the
same.
The typedef PortID is now global (in base/types.hh) and aligned with
the ThreadID in terms of capitalisation and naming of the
InvalidPortID constant.
Before this patch, two flags were used for valid destination and
source, rather than relying on a named value (InvalidPortID), and
this is now redundant, as the src and dest field themselves are
sufficient to tell whether the current value is a valid port
identifier or not. Consequently, the VALID_SRC and VALID_DST are
removed.
As part of the cleaning up, a number of int parameters and local
variables are updated to use PortID.
Note that Ruby still has its own NodeID typedef. Furthermore, the
MemObject getMaster/SlavePort still has an int idx parameter with a
default value of -1 which should eventually change to PortID idx =
InvalidPortID.
Diffstat (limited to 'src/cpu/testers/rubytest')
-rw-r--r-- | src/cpu/testers/rubytest/RubyTester.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/testers/rubytest/RubyTester.hh b/src/cpu/testers/rubytest/RubyTester.hh index 8fbd886b3..ad4b506ac 100644 --- a/src/cpu/testers/rubytest/RubyTester.hh +++ b/src/cpu/testers/rubytest/RubyTester.hh @@ -57,7 +57,7 @@ class RubyTester : public MemObject // RubyPorts that support both types of requests, separate InstOnly // and DataOnly CpuPorts will map to that RubyPort - CpuPort(const std::string &_name, RubyTester *_tester, PortId _id) + CpuPort(const std::string &_name, RubyTester *_tester, PortID _id) : MasterPort(_name, _tester, _id), tester(_tester) {} |