diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-03 03:50:14 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-04-03 03:50:14 -0400 |
commit | a8e6adb0b1284e89a63bcb14fe1fdace2b89e0c8 (patch) | |
tree | 18965c93c0c5fad292e4a4db8c181240e1a00054 /src/cpu/base.hh | |
parent | a7859f7e4541f2750df52ec725563d378ab7ddbb (diff) | |
download | gem5-a8e6adb0b1284e89a63bcb14fe1fdace2b89e0c8.tar.xz |
Atomic: Remove the physmem_port and access memory directly
This patch removes the physmem_port from the Atomic CPU and instead
uses the system pointer to access the physmem when using the fastmem
option. The system already keeps track of the physmem and the valid
memory address ranges, and with this patch we merely make use of that
existing functionality. As a result of this change, the overloaded
getMasterPort in the Atomic CPU can be removed, thus unifying the CPUs.
Diffstat (limited to 'src/cpu/base.hh')
-rw-r--r-- | src/cpu/base.hh | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/cpu/base.hh b/src/cpu/base.hh index 145b014aa..3fb0f648b 100644 --- a/src/cpu/base.hh +++ b/src/cpu/base.hh @@ -170,22 +170,16 @@ class BaseCPU : public MemObject MasterID instMasterId() { return _instMasterId; } /** - * Get a master port on this MemObject. This method is virtual to allow - * the subclasses of the BaseCPU to override it. All CPUs have a - * data and instruction port, but the Atomic CPU (in its current - * form) adds a port directly connected to the memory and has to - * override getMasterPort. - * - * This method uses getDataPort and getInstPort to resolve the two - * ports. + * Get a master port on this CPU. All CPUs have a data and + * instruction port, and this method uses getDataPort and + * getInstPort of the subclasses to resolve the two ports. * * @param if_name the port name * @param idx ignored index * * @return a reference to the port with the given name */ - virtual MasterPort &getMasterPort(const std::string &if_name, - int idx = -1); + MasterPort &getMasterPort(const std::string &if_name, int idx = -1); // Tick currentTick; inline Tick frequency() const { return SimClock::Frequency / clock; } |