derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemc: Change the default naming scheme to use sc_gen_unique_name.

Browse Source 
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
Reviewed-on: https://gem5-review.googlesource.com/c/12593
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
Gabe Black
2018-09-05 00:40:04 -07:00
parent e38594f758
commit df9f2984c7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/systemc/core/object.cc
View File

@@ -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 @@ nameIsUnique(Objects *objects, Events *events, const std::string &name)
} // 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)