diff options
| author | Andrey Ayupov | 2017-08-04 11:02:41 -0700 |
|---|---|---|
| committer | Adam Izraelevitz | 2017-08-04 11:02:41 -0700 |
| commit | a84956afa36dbe29e87dd6c2168848a426ec42d3 (patch) | |
| tree | f16697471871b7a2b9f65f8bbe8c7271bd26feb7 /src/main | |
| parent | 86f7abd4d63a33bbb0012fa254b01edf10ba2159 (diff) | |
bug fix for cases when we want to flatten a module in which a module is instantiated multiple times (#634)
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/scala/firrtl/transforms/Flatten.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/firrtl/transforms/Flatten.scala b/src/main/scala/firrtl/transforms/Flatten.scala index 748ea00c..cc40c569 100644 --- a/src/main/scala/firrtl/transforms/Flatten.scala +++ b/src/main/scala/firrtl/transforms/Flatten.scala @@ -65,7 +65,7 @@ class Flatten extends Transform { case WDefInstance(info, instName, moduleName, instTpe) => if (insts.contains(ComponentName(instName, ModuleName(parent.name, CircuitName(c.main)))) || mods.contains(ModuleName(parent.name, CircuitName(c.main)))) { - val newModName = nsp.newName(moduleName+"_TO_FLATTEN") + val newModName = if (seedMods.contains(moduleName)) seedMods(moduleName) else nsp.newName(moduleName+"_TO_FLATTEN") seedMods += moduleName -> newModName WDefInstance(info, instName, newModName, instTpe) } else x @@ -85,7 +85,7 @@ class Flatten extends Transform { def dupMod(x: Statement): Statement = x match { case _: Block => x map dupMod case WDefInstance(info, instName, moduleName, instTpe) => - val newModName = nsp.newName(moduleName+"_TO_FLATTEN") + val newModName = if (replMods.contains(moduleName)) replMods(moduleName) else nsp.newName(moduleName+"_TO_FLATTEN") replMods += moduleName -> newModName WDefInstance(info, instName, newModName, instTpe) case _ => x |