summaryrefslogtreecommitdiff
path: root/src/systemc/core
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2018-10-04 17:45:34 -0700
committerGabe Black <gabeblack@google.com>2018-10-16 00:54:06 +0000
commita61426dcc4a7f775f0902ba272501e926aeec13f (patch)
tree72097c296d16592301e5318dd7d4882d1e44a963 /src/systemc/core
parentf39a68fcca3643a0bda2ca965c432ad70402fbd9 (diff)
downloadgem5-a61426dcc4a7f775f0902ba272501e926aeec13f.tar.xz
systemc: Keep track of progress when positionally binding.
Positionally binding more than once (like with the deprecated comma or << operators) should pick up where it left off the last time instead of starting again from the beginning. Change-Id: Ifc33520d6ce40544bd0ad80a5657b1a38a7914e4 Reviewed-on: https://gem5-review.googlesource.com/c/13297 Reviewed-by: Gabe Black <gabeblack@google.com> Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/systemc/core')
-rw-r--r--src/systemc/core/module.cc4
-rw-r--r--src/systemc/core/module.hh2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/systemc/core/module.cc b/src/systemc/core/module.cc
index f342b7f05..8cbde8f70 100644
--- a/src/systemc/core/module.cc
+++ b/src/systemc/core/module.cc
@@ -49,7 +49,7 @@ Module *_new_module;
Module::Module(const char *name) :
_name(name), _sc_mod(nullptr), _obj(nullptr), _ended(false),
- _deprecatedConstructor(false)
+ _deprecatedConstructor(false), bindingIndex(0)
{
panic_if(_new_module, "Previous module not finished.\n");
_new_module = this;
@@ -109,6 +109,7 @@ Module::bindPorts(std::vector<const ::sc_core::sc_bind_proxy *> &proxies)
auto proxyIt = proxies.begin();
auto portIt = ports.begin();
+ portIt += bindingIndex;
for (; proxyIt != proxies.end(); proxyIt++, portIt++) {
auto proxy = *proxyIt;
auto port = *portIt;
@@ -117,6 +118,7 @@ Module::bindPorts(std::vector<const ::sc_core::sc_bind_proxy *> &proxies)
else
port->vbind(*proxy->port());
}
+ bindingIndex += proxies.size();
}
void
diff --git a/src/systemc/core/module.hh b/src/systemc/core/module.hh
index 695f30565..8d6df81e6 100644
--- a/src/systemc/core/module.hh
+++ b/src/systemc/core/module.hh
@@ -125,6 +125,8 @@ class Module
std::vector<::sc_core::sc_port_base *> ports;
std::vector<::sc_core::sc_export_base *> exports;
+ int bindingIndex;
+
void beforeEndOfElaboration();
void endOfElaboration();
void startOfSimulation();