From 9bd3bb7bc804a16b2f0de03fa6d3d9d0928f38a2 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 22 Jun 2018 14:19:44 -0700 Subject: systemc: Implement most of sc_object. To avoid making it hard to change sc_object's implementation in the future, this change keeps most of the data members out of sc_object and keeps them in a seperate Object which is managed independently but still matches to the sc_objects one to one. This change also moves away from the SystemC/sc_gem5 namespace pair in favor of sc_gem5. Having two namespaces with classes, etc, living in both was complicating things. Having to use a namespace that doesn't fit in one scheme or the other isn't great, but it's the lesser of two evils. Change-Id: Ib59c3c515ca98c7fe519c59e9fe9270304b71cc0 Reviewed-on: https://gem5-review.googlesource.com/11611 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/core/sc_module_name.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/systemc/core/sc_module_name.cc') diff --git a/src/systemc/core/sc_module_name.cc b/src/systemc/core/sc_module_name.cc index b55e50001..ca568e2ad 100644 --- a/src/systemc/core/sc_module_name.cc +++ b/src/systemc/core/sc_module_name.cc @@ -36,10 +36,8 @@ namespace sc_core { sc_module_name::sc_module_name(const char *name) : - _name(name), _gem5_module(new SystemC::Module(name)), _on_the_stack(true) -{ - _gem5_module->push(); -} + _name(name), _gem5_module(new sc_gem5::Module(name)), _on_the_stack(true) +{} sc_module_name::sc_module_name(const sc_module_name &other) : _name(other._name), _gem5_module(other._gem5_module), _on_the_stack(false) -- cgit v1.2.3