Some methods have been hidden.

Author: shtaxxx

veriloggen/core/function.py

@@ -44,13 +44,22 @@ def Body(self, *statement):
     def call(self, *args):
         return FunctionCall(self, *args)
 
-    def next(self, r):
-        return self.__call__(r)
+    def next(self, value):
+        return vtypes.Subst(self, value)
 
-    def add_subst(self, s):
+    def bit_length(self):
+        return self.width
+
+    def write(self, value):
+        return self.next(value)
+    
+    def _add_subst(self, s):
         self.subst.append(s)
 
-    def set_raw_width(self, msb, lsb):
+    def _get_subst(self):
+        return self.subst
+    
+    def _set_raw_width(self, msb, lsb):
         self.width_msb = msb
         self.width_lsb = lsb
 
@@ -61,8 +70,8 @@ def __setattr__(self, attr, value):
             object.__setattr__(self, 'width_lsb', None)
         object.__setattr__(self, attr, value)
 
-    def __call__(self, r):
-        return vtypes.Subst(self, r)
+    def __call__(self, value):
+        return self.next(value)
 
 class FunctionCall(vtypes._Numeric):
     def __init__(self, func, *args):

veriloggen/core/vtypes.py

@@ -270,29 +270,29 @@ def __init__(self, width=1, length=None, signed=False, value=None, initval=None,
         self.initval = initval
         self.subst = []
 
-    def next(self, r, ldelay=None, rdelay=None):
-        return Subst(self, r, ldelay=ldelay, rdelay=rdelay)
-    
-    def connect(self, prefix='', postfix=''):
-        return ( prefix + self.name + postfix, self )
-
-    def add_subst(self, s):
-        self.subst.append(s)
+    def next(self, value, blk=False, ldelay=None, rdelay=None):
+        return Subst(self, value, blk=blk, ldelay=ldelay, rdelay=rdelay)
 
-    def get_subst(self):
-        return self.subst
+    def write(self, value, blk=False, ldelay=None, rdelay=None):
+        return self.next(value, blk=blk, ldelay=ldelay, rdelay=rdelay)
 
     def reset(self):
         return None
 
     def bit_length(self):
         return self.width
 
-    def set_raw_width(self, msb, lsb):
+    def _add_subst(self, s):
+        self.subst.append(s)
+
+    def _get_subst(self):
+        return self.subst
+    
+    def _set_raw_width(self, msb, lsb):
         self.width_msb = msb
         self.width_lsb = lsb
 
-    def set_raw_length(self, msb, lsb):
+    def _set_raw_length(self, msb, lsb):
         self.length_msb = msb
         self.length_lsb = lsb
 
@@ -309,8 +309,8 @@ def __setattr__(self, attr, value):
     def __str__(self):
         return self.name
 
-    def __call__(self, r, ldelay=None, rdelay=None):
-        return self.next(r, ldelay, rdelay)
+    def __call__(self, value, blk=False, ldelay=None, rdelay=None):
+        return self.next(value, blk=blk, ldelay=ldelay, rdelay=rdelay)
 
 #-------------------------------------------------------------------------------
 class Input(_Variable): pass
@@ -333,7 +333,7 @@ def dec(self):
         return self.sub(1)
 
 class Wire(_Variable):
-    def add_subst(self, s):
+    def _add_subst(self, s):
         if len(self.subst) > 0:
             raise ValueError('Wire %s is already assigned.' % self.name)
         self.subst.append(s)
@@ -642,7 +642,7 @@ def __init__(self, var, pos):
     def next(self, r):
         return Subst(self, r)
 
-    def add_subst(self, s):
+    def _add_subst(self, s):
         self.subst.append(s)
 
     def bit_length(self):
@@ -666,7 +666,7 @@ def __init__(self, var, msb, lsb):
     def next(self, r):
         return Subst(self, r)
 
-    def add_subst(self, s):
+    def _add_subst(self, s):
         self.subst.append(s)
 
     def bit_length(self):
@@ -686,7 +686,7 @@ def __init__(self, *vars):
     def next(self, r):
         return Subst(self, r)
 
-    def add_subst(self, s):
+    def _add_subst(self, s):
         self.subst.append(s)
 
     def bit_length(self):
@@ -760,7 +760,7 @@ def __init__(self, left, right, blk=False, ldelay=None, rdelay=None):
         self.blk = blk
         self.ldelay = ldelay
         self.rdelay = rdelay
-        self.left.add_subst(self)
+        self.left._add_subst(self)
 
     def _type_check_left(self, left):
         if not isinstance(left, VeriloggenNode):

veriloggen/dataflow/dtypes.py

@@ -70,7 +70,7 @@ def _and_vars(*vars):
 def _connect_ready(m, var, ready):
     if var is None:
         return
-    prev_subst = var.get_subst()
+    prev_subst = var._get_subst()
     if not prev_subst:
         m.Assign( var(ready) )
     elif isinstance(prev_subst[0].right, vtypes.Int) and (prev_subst[0].right.value==1):

veriloggen/pipeline/pipeline.py

@@ -373,7 +373,7 @@ def make_output(self):
             ready = vtypes.Int(1)
 
         if ovar.ready is not None:
-            prev_subst = ovar.ready.get_subst()
+            prev_subst = ovar.ready._get_subst()
             if len(prev_subst) == 0:
                 ovar.df.m.Assign( ovar.ready(ready) )
             elif isinstance(prev_subst[0].right, vtypes.Int) and (prev_subst[0].right.value==1):

veriloggen/verilog/from_verilog.py

@@ -184,7 +184,7 @@ def visit_Input(self, node):
         signed = node.signed
         obj = vtypes.Input(width, signed=signed, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(obj)
         return obj
 
@@ -194,7 +194,7 @@ def visit_Output(self, node):
         signed = node.signed
         obj = vtypes.Output(width, signed=signed, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(obj)
         return obj
 
@@ -204,7 +204,7 @@ def visit_Inout(self, node):
         signed = node.signed
         obj = vtypes.Inout(width, signed=signed, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(obj)
         return obj
 
@@ -214,7 +214,7 @@ def visit_Tri(self, node):
         signed = node.signed
         obj = vtypes.Tri(width, signed=signed, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(obj)
         return obj
 
@@ -224,7 +224,7 @@ def visit_Wire(self, node):
         signed = node.signed
         obj = vtypes.Wire(width, signed=signed, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(obj)
         return obj
 
@@ -234,7 +234,7 @@ def visit_Reg(self, node):
         signed = node.signed
         obj = vtypes.Reg(width, signed=signed, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(obj)
         return obj
 
@@ -245,8 +245,8 @@ def visit_WireArray(self, node):
         signed = node.signed
         obj = vtypes.Wire(width, length=length, signed=signed, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
-        obj.set_raw_length(self.visit(node.length.msb), self.visit(node.length.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+        obj._set_raw_length(self.visit(node.length.msb), self.visit(node.length.lsb))
         self.add_object(obj)
         return obj
 
@@ -257,8 +257,8 @@ def visit_RegArray(self, node):
         signed = node.signed
         obj = vtypes.Reg(width, length=length, signed=signed, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
-        obj.set_raw_length(self.visit(node.length.msb), self.visit(node.length.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+        obj._set_raw_length(self.visit(node.length.msb), self.visit(node.length.lsb))
         self.add_object(obj)
         return obj
 
@@ -268,7 +268,7 @@ def visit_Integer(self, node):
         signed = node.signed
         obj = vtypes.Integer(width, signed=signed, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(obj)
         return obj
 
@@ -277,7 +277,7 @@ def visit_Real(self, node):
         width = self.visit(node.width) if node.width is not None else None
         obj = vtypes.Real(width, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(obj)
         return obj
 
@@ -286,7 +286,7 @@ def visit_Genvar(self, node):
         width = self.visit(node.width) if node.width is not None else None
         obj = vtypes.Genvar(width, name=name)
         if node.width is not None:
-            obj.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            obj._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(obj)
         return obj
 
@@ -302,7 +302,7 @@ def visit_Parameter(self, node):
         signed = node.signed
         param = vtypes.Parameter(value, width, signed, name=name)
         if node.width is not None:
-            param.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            param._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(param)
         return param
 
@@ -313,7 +313,7 @@ def visit_Localparam(self, node):
         signed = node.signed
         param = vtypes.Localparam(value, width, signed, name=name)
         if node.width is not None:
-            param.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            param._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(param)
         return param
 
@@ -324,7 +324,7 @@ def visit_Supply(self, node):
         signed = node.signed
         param = vtypes.Supply(value, width, signed, name=name)
         if node.width is not None:
-            param.set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
+            param._set_raw_width(self.visit(node.width.msb), self.visit(node.width.lsb))
         self.add_object(param)
         return param
 
@@ -688,7 +688,7 @@ def visit_Function(self, node):
         width = self.visit(node.retwidth) if node.retwidth is not None else None
         func = function.Function(name, width)
         if node.retwidth is not None:
-            func.set_raw_width(self.visit(node.retwidth.msb), self.visit(node.retwidth.lsb))
+            func._set_raw_width(self.visit(node.retwidth.msb), self.visit(node.retwidth.lsb))
         statement = [ self.visit(s) for s in node.statement ]
         body = []
 
@@ -698,15 +698,15 @@ def visit_Function(self, node):
                     if isinstance(d, vtypes.Input):
                         t = func.Input(d.name, d.width, d.length, d.signed, d.value)
                         if d.width_msb is not None and d.width_lsb is not None:
-                            t.set_raw_width(d.width_msb, d.width_lsb)
+                            t._set_raw_width(d.width_msb, d.width_lsb)
                     elif isinstance(d, vtypes.Reg):
                         t = func.Reg(d.name, d.width, d.length, d.signed, d.value)
                         if d.width_msb is not None and d.width_lsb is not None:
-                            t.set_raw_width(d.width_msb, d.width_lsb)
+                            t._set_raw_width(d.width_msb, d.width_lsb)
                     elif isinstance(d, vtypes.Integer):
                         t = func.Integer(d.name, d.width, d.length, d.signed, d.value)
                         if d.width_msb is not None and d.width_lsb is not None:
-                            t.set_raw_width(d.width_msb, d.width_lsb)
+                            t._set_raw_width(d.width_msb, d.width_lsb)
                     else:
                         body.append(s)
             else:
@@ -741,15 +741,15 @@ def visit_Task(self, node):
                     if isinstance(d, vtypes.Input):
                         t = _task.Input(d.name, d.width, d.length, d.signed, d.value)
                         if d.width_msb is not None and d.width_lsb is not None:
-                            t.set_raw_width(d.width_msb, d.width_lsb)
+                            t._set_raw_width(d.width_msb, d.width_lsb)
                     elif isinstance(d, vtypes.Reg):
                         t = _task.Reg(d.name, d.width, d.length, d.signed, d.value)
                         if d.width_msb is not None and d.width_lsb is not None:
-                            t.set_raw_width(d.width_msb, d.width_lsb)
+                            t._set_raw_width(d.width_msb, d.width_lsb)
                     elif isinstance(d, vtypes.Integer):
                         t = _task.Integer(d.name, d.width, d.length, d.signed, d.value)
                         if d.width_msb is not None and d.width_lsb is not None:
-                            t.set_raw_width(d.width_msb, d.width_lsb)
+                            t._set_raw_width(d.width_msb, d.width_lsb)
                     else:
                         body.append(s)
             else: