diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2012-02-24 11:42:00 -0500 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-02-24 11:42:00 -0500 |
commit | 9f07d2ce7ecf435b9a1946f15fb3491bb4636637 (patch) | |
tree | 33f66ff6c258214a6b266b3cc582a52774935ae2 /src/cpu/simple/atomic.hh | |
parent | ef4af8cec8b1826abff5b92b9fec32f7c2818372 (diff) | |
download | gem5-9f07d2ce7ecf435b9a1946f15fb3491bb4636637.tar.xz |
CPU: Round-two unifying instr/data CPU ports across models
This patch continues the unification of how the different CPU models
create and share their instruction and data ports. Most importantly,
it forces every CPU to have an instruction and a data port, and gives
these ports explicit getters in the BaseCPU (getDataPort and
getInstPort). The patch helps in simplifying the code, make
assumptions more explicit, andfurther ease future patches related to
the CPU ports.
The biggest changes are in the in-order model (that was not modified
in the previous unification patch), which now moves the ports from the
CacheUnit to the CPU. It also distinguishes the instruction fetch and
load-store unit from the rest of the resources, and avoids the use of
indices and casting in favour of keeping track of these two units
explicitly (since they are always there anyways). The atomic, timing
and O3 model simply return references to their already existing ports.
Diffstat (limited to 'src/cpu/simple/atomic.hh')
-rw-r--r-- | src/cpu/simple/atomic.hh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh index f677ed49b..8a1c9000f 100644 --- a/src/cpu/simple/atomic.hh +++ b/src/cpu/simple/atomic.hh @@ -101,8 +101,20 @@ class AtomicSimpleCPU : public BaseSimpleCPU Range<Addr> physMemAddr; + protected: + + /** Return a reference to the data port. */ + virtual CpuPort &getDataPort() { return dcachePort; } + + /** Return a reference to the instruction port. */ + virtual CpuPort &getInstPort() { return icachePort; } + public: + /** + * Override the getPort of the BaseCPU so that we can provide a pointer + * to the physmemPort, unique to the Atomic CPU. + */ virtual Port *getPort(const std::string &if_name, int idx = -1); virtual void serialize(std::ostream &os); |