bank/description: AutoReg

diff --git a/migen/bank/description.py b/migen/bank/description.py
index 610c6a7602a959d2e4b210f52d97598dd8e256af..b68384cbb8367086e43c621d4d5385e7a1392290 100644 (file)
--- a/migen/bank/description.py
+++ b/migen/bank/description.py
@@ -1,17 +1,14 @@
-from migen.fhdl.structure import *
+from copy import copy
 
-def regprefix(prefix, registers):
-       for register in registers:
-               register.name = prefix + register.name
-       return registers
+from migen.fhdl.structure import *
+from migen.fhdl.specials import Memory
 
-def memprefix(prefix, memories):
-       for memory in memories:
-               memory.name_override = prefix + memory.name_override
-       return memories
+class Register(HUID):
+       pass
 
-class RegisterRaw:
+class RegisterRaw(Register):
        def __init__(self, name, size=1):
+               Register.__init__(self)
                self.name = name
                self.size = size
                self.re = Signal()
@@ -37,8 +34,9 @@ class Field:
                                self.w = Signal(self.size)
                                self.we = Signal()
 
-class RegisterFields:
+class RegisterFields(Register):
        def __init__(self, name, fields):
+               Register.__init__(self)
                self.name = name
                self.fields = fields
 
@@ -47,6 +45,41 @@ class RegisterField(RegisterFields):
                self.field = Field(name, size, access_bus, access_dev, reset, atomic_write)
                RegisterFields.__init__(self, name, [self.field])
 
+def regprefix(prefix, registers):
+       r = []
+       for register in registers:
+               c = copy(register)
+               c.name = prefix + c.name
+               r.append(c)
+       return r
+
+def memprefix(prefix, memories):
+       r = []
+       for memory in memories:
+               c = copy(memory)
+               c.name_override = prefix + c.name_override
+               r.append(c)
+       return memories
+
+class AutoReg:
+       def get_memories(self):
+               r = []
+               for k, v in self.__dict__.items():
+                       if isinstance(v, Memory):
+                               r.append(v)
+                       elif hasattr(v, "get_memories"):
+                               r += memprefix(k + "_", v.get_memories())
+               return sorted(r, key=lambda x: x.huid)
+
+       def get_registers(self):
+               r = []
+               for k, v in self.__dict__.items():
+                       if isinstance(v, Register):
+                               r.append(v)
+                       elif hasattr(v, "get_registers"):
+                               r += regprefix(k + "_", v.get_registers())
+               return sorted(r, key=lambda x: x.huid)
+
 (ALIAS_NON_ATOMIC, ALIAS_ATOMIC_HOLD, ALIAS_ATOMIC_COMMIT) = range(3)
 
 class FieldAlias: