Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/12593
Change subject: systemc: Change the default naming scheme to use
sc_gen_unique_name.
......................................................................
systemc: Change the default naming scheme to use sc_gen_unique_name.
The spec says the default name should just be "object", but the
Accellera implementation calls sc_gen_unique_name, and the tests
expects that.
Change-Id: Ic6922a6d9fb53f3126a9d527868fc11da5320446
---
M src/systemc/core/object.cc
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/systemc/core/object.cc b/src/systemc/core/object.cc
index 0fc046e..4e4a996 100644
--- a/src/systemc/core/object.cc
+++ b/src/systemc/core/object.cc
@@ -35,6 +35,7 @@
#include "systemc/core/event.hh"
#include "systemc/core/module.hh"
#include "systemc/core/scheduler.hh"
+#include "systemc/ext/core/sc_module.hh"
namespace sc_gem5
{
@@ -82,13 +83,13 @@
} // anonymous namespace
-Object::Object(sc_core::sc_object *_sc_obj) : Object(_sc_obj, "object") {}
+Object::Object(sc_core::sc_object *_sc_obj) : Object(_sc_obj, nullptr) {}
Object::Object(sc_core::sc_object *_sc_obj, const char *obj_name) :
_sc_obj(_sc_obj), _basename(obj_name ? obj_name : ""), parent(nullptr)
{
if (_basename == "")
- _basename = "object";
+ _basename = ::sc_core::sc_gen_unique_name("object");
Module *p = currentModule();
if (!p)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12593
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ic6922a6d9fb53f3126a9d527868fc11da5320446
Gerrit-Change-Number: 12593
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
