From 9c7ad6b05bb1343c7448d9207032e2a9e6f6d19a Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sebastien@milkymist.org>
Date: Fri, 26 Jul 2013 15:42:14 +0200
Subject: [PATCH] fhdl: RenameClockDomains decorator

---
 migen/fhdl/decorators.py | 13 ++++++++++++-
 migen/fhdl/module.py     | 18 +++---------------
 migen/fhdl/std.py        |  2 +-
 migen/genlib/fifo.py     |  7 +++----
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/migen/fhdl/decorators.py b/migen/fhdl/decorators.py
index 0a9d1cf1c..7c7efe164 100644
--- a/migen/fhdl/decorators.py
+++ b/migen/fhdl/decorators.py
@@ -1,5 +1,5 @@
 from migen.fhdl.structure import *
-from migen.fhdl.tools import insert_reset
+from migen.fhdl.tools import insert_reset, rename_clock_domain
 
 class ModuleDecorator:
 	def __init__(self, decorated):
@@ -78,3 +78,14 @@ def __init__(self, *args, **kwargs):
 	def transform_fragment_insert(self, f, to_insert):
 		for reset, cdn in to_insert:
 			f.sync[cdn] = insert_reset(reset, f.sync[cdn])
+
+class RenameClockDomains(ModuleDecorator):
+	def __init__(self, decorated, cd_remapping):
+		ModuleDecorator.__init__(self, decorated)
+		if isinstance(cd_remapping, str):
+			cd_remapping = {"sys": cd_remapping}
+		object.__setattr__(self, "_rc_cd_remapping", cd_remapping)
+
+	def transform_fragment(self, f):
+		for old, new in self._rc_cd_remapping.items():
+			rename_clock_domain(f, old, new)
diff --git a/migen/fhdl/module.py b/migen/fhdl/module.py
index bacaf91b9..4764abbc8 100644
--- a/migen/fhdl/module.py
+++ b/migen/fhdl/module.py
@@ -68,11 +68,11 @@ def __iadd__(self, other):
 
 class _ModuleSubmodules(_ModuleProxy):
 	def __setattr__(self, name, value):
-		self._fm._submodules += [(name, e, dict()) for e in _flat_list(value)]
+		self._fm._submodules += [(name, e) for e in _flat_list(value)]
 		setattr(self._fm, name, value)
 	
 	def __iadd__(self, other):
-		self._fm._submodules += [(None, e, dict()) for e in _flat_list(other)]
+		self._fm._submodules += [(None, e) for e in _flat_list(other)]
 		return self
 
 class _ModuleClockDomains(_ModuleProxy, _ModuleForwardAttr):
@@ -131,20 +131,8 @@ def __setattr__(self, name, value):
 		else:
 			object.__setattr__(self, name, value)
 
-	def add_submodule(self, submodule, cd_remapping=dict(), name=None):
-		if isinstance(cd_remapping, str):
-			cd_remapping = {"sys": cd_remapping}
-		if name is not None:
-			setattr(self, name, submodule)
-		self._submodules.append((name, submodule, cd_remapping))
-
 	def _collect_submodules(self):
-		r = []
-		for name, submodule, cd_remapping in self._submodules:
-			f = submodule.get_fragment()
-			for old, new in cd_remapping.items():
-				rename_clock_domain(f, old, new)
-			r.append((name, f))
+		r = [(name, submodule.get_fragment()) for name, submodule in self._submodules]
 		self._submodules = []
 		return r
 
diff --git a/migen/fhdl/std.py b/migen/fhdl/std.py
index 8a6f6845c..3a4a3de51 100644
--- a/migen/fhdl/std.py
+++ b/migen/fhdl/std.py
@@ -2,4 +2,4 @@
 from migen.fhdl.module import Module
 from migen.fhdl.specials import TSTriple, Instance, Memory
 from migen.fhdl.size import log2_int, bits_for, flen
-from migen.fhdl.decorators import DecorateModule, InsertCE, InsertReset
+from migen.fhdl.decorators import DecorateModule, InsertCE, InsertReset, RenameClockDomains
diff --git a/migen/genlib/fifo.py b/migen/genlib/fifo.py
index 12b8033df..afb397f83 100644
--- a/migen/genlib/fifo.py
+++ b/migen/genlib/fifo.py
@@ -88,10 +88,9 @@ def __init__(self, width_or_layout, depth):
 
 		depth_bits = log2_int(depth, True)
 
-		produce = GrayCounter(depth_bits+1)
-		self.add_submodule(produce, "write")
-		consume = GrayCounter(depth_bits+1)
-		self.add_submodule(consume, "read")
+		produce = RenameClockDomains(GrayCounter(depth_bits+1), "write")
+		consume = RenameClockDomains(GrayCounter(depth_bits+1), "read")
+		self.submodules += produce, consume
 		self.comb += [
 			produce.ce.eq(self.writable & self.we),
 			consume.ce.eq(self.readable & self.re)