length (1-dimension) to dims (N-dimension)

Author: shtaxxx

tests/extension/resolver_/bram/resolver_bram.py

@@ -26,7 +26,7 @@ def mkBram(datawidth=32, addrwidth=10, numports=2):
         delay_addr = m.Reg('delay_ADDR%d' % i, addrwidth)
         ports.append( (addr, din, we, dout, delay_addr) )
 
-    mem = m.Reg('mem', datawidth, length=Int(2)**addrwidth)
+    mem = m.Reg('mem', datawidth, Int(2)**addrwidth)
 
     for i in range(numports):
         addr, din ,we, dout, delay_addr = ports[i]

veriloggen/core/function.py

@@ -9,29 +9,28 @@
 
 class Function(vtypes.VeriloggenNode):
 
-    def __init__(self, name, width=1):
+    def __init__(self, name, width=1, raw_width=None):
         vtypes.VeriloggenNode.__init__(self)
         self.name = name
         self.width = width
-        self.width_msb = None
-        self.width_lsb = None
+        self.raw_width = raw_width
         self.io_variable = collections.OrderedDict()
         self.variable = collections.OrderedDict()
         self.statement = None
         self.subst = []
 
-    def Input(self, name, width=None, length=None, signed=False, value=None):
-        t = vtypes.Input(width, length, signed, value, name=name)
+    def Input(self, name, width=None, dims=None, signed=False, value=None):
+        t = vtypes.Input(width, dims, signed, value, name=name)
         self.io_variable[name] = t
         return t
 
-    def Reg(self, name, width=None, length=None, signed=False, value=None):
-        t = vtypes.Reg(width, length, signed, value, name=name)
+    def Reg(self, name, width=None, dims=None, signed=False, value=None):
+        t = vtypes.Reg(width, dims, signed, value, name=name)
         self.variable[name] = t
         return t
 
-    def Integer(self, name, width=None, length=None, signed=False, value=None):
-        t = vtypes.Integer(width, length, signed, value, name=name)
+    def Integer(self, name, width=None, dims=None, signed=False, value=None):
+        t = vtypes.Integer(width, dims, signed, value, name=name)
         self.variable[name] = t
         return t
 
@@ -60,15 +59,9 @@ def _add_subst(self, s):
     def _get_subst(self):
         return self.subst
 
-    def _set_raw_width(self, msb, lsb):
-        self.width_msb = msb
-        self.width_lsb = lsb
-
     def __setattr__(self, attr, value):
-        # when width or length is overwritten, msb and lsb values are reset.
         if attr == 'width':
-            object.__setattr__(self, 'width_msb', None)
-            object.__setattr__(self, 'width_lsb', None)
+            object.__setattr__(self, 'raw_width', None)
         object.__setattr__(self, attr, value)
 
     def __call__(self, value):