diff options
author | Brandon Potter <brandon.potter@amd.com> | 2015-07-10 16:05:24 -0500 |
---|---|---|
committer | Brandon Potter <brandon.potter@amd.com> | 2015-07-10 16:05:24 -0500 |
commit | bfe7ee96ad5abec40639d47dc2b0512d6baa0f81 (patch) | |
tree | bf731166c1e2d1e1fb6a98fe3916700a4104671d /src/mem/ruby/system/System.hh | |
parent | f9a370f1728fe5d752fa6962ba23774eec8c883e (diff) | |
download | gem5-bfe7ee96ad5abec40639d47dc2b0512d6baa0f81.tar.xz |
ruby: replace global g_abs_controls with per-RubySystem var
This is another step in the process of removing global variables
from Ruby to enable multiple RubySystem instances in a single simulation.
The list of abstract controllers is per-RubySystem and should be
represented that way, rather than as a global.
Since this is the last remaining Ruby global variable, the
src/mem/ruby/Common/Global.* files are also removed.
Diffstat (limited to 'src/mem/ruby/system/System.hh')
-rw-r--r-- | src/mem/ruby/system/System.hh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh index 57a1b7cfb..fdb5fc881 100644 --- a/src/mem/ruby/system/System.hh +++ b/src/mem/ruby/system/System.hh @@ -45,6 +45,7 @@ #include "sim/clocked_object.hh" class Network; +class AbstractController; class RubySystem : public ClockedObject { @@ -142,6 +143,7 @@ class RubySystem : public ClockedObject public: Profiler* m_profiler; CacheRecorder* m_cache_recorder; + std::vector<std::map<uint32_t, AbstractController *> > m_abstract_controls; }; class RubyStatsCallback : public Callback |