diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2012-03-30 09:38:35 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-03-30 09:38:35 -0400 |
commit | a14013af3a9e04d68985aea7bcff6c1e70bdbb82 (patch) | |
tree | 67e1fcae84daca1bd507d439a24919d178f4d16e /src/cpu/thread_state.hh | |
parent | 390cfc7be9e5e477451a31a1dc8df82b42ee4011 (diff) | |
download | gem5-a14013af3a9e04d68985aea7bcff6c1e70bdbb82.tar.xz |
CPU: Unify initMemProxies across CPUs and simulation modes
This patch unifies where initMemProxies is called, in the init()
method of each BaseCPU subclass, before TheISA::initCPU is
called. Moreover, it also ensures that initMemProxies is called in
both full-system and syscall-emulation mode, thus unifying also across
the modes. An additional check is added in the ThreadState to ensure
that initMemProxies is only called once.
Diffstat (limited to 'src/cpu/thread_state.hh')
-rw-r--r-- | src/cpu/thread_state.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/thread_state.hh b/src/cpu/thread_state.hh index 3f58e4f14..995a870f5 100644 --- a/src/cpu/thread_state.hh +++ b/src/cpu/thread_state.hh @@ -85,7 +85,7 @@ struct ThreadState { * Initialise the physical and virtual port proxies and tie them to * the data port of the CPU. * - * tc ThreadContext for the virtual-to-physical translation + * @param tc ThreadContext for the virtual-to-physical translation */ void initMemProxies(ThreadContext *tc); @@ -105,7 +105,7 @@ struct ThreadState { Process *getProcessPtr() { return process; } - SETranslatingPortProxy &getMemProxy(); + SETranslatingPortProxy &getMemProxy() { return *proxy; } /** Reads the number of instructions functionally executed and * committed. |