get_name method in Interface

Author: shtaxxx

sample/bram/bram.py

@@ -5,14 +5,15 @@
 from veriloggen import *
 
 class BramInterface(Interface):
-    def __init__(self, m, prefix, postfix, addrwidth, datawidth, io=False):
-        Interface.__init__(self, m, prefix, postfix, io)
-        
+    def __init__(self, m, prefix, postfix, addrwidth, datawidth, direction):
+        Interface.__init__(self, m, prefix, postfix)
+
+        self.direction = direction
         self.addrwidth = self.Parameter('ADDR_WIDTH', addrwidth)
         self.datawidth = self.Parameter('DATA_WIDTH', datawidth)
 
-        In = self.Input if self.io else self.Reg # self.Wire
-        Out = self.Output if self.io else self.Wire 
+        In = self.Input if self.direction == 'in' else self.Reg # self.Wire
+        Out = self.Output if self.direction == 'in' else self.Wire 
 
         self.addr = In('addr', addrwidth)
         self.datain = In('datain', datawidth)
@@ -26,7 +27,7 @@ def mkBram(name):
     datawidth = m.Parameter('DATA_WIDTH', 32)
 
     clk = m.Input('CLK')
-    bramif = BramInterface(m, '', '', addrwidth, datawidth, io=True)
+    bramif = BramInterface(m, '', '', addrwidth, datawidth, direction='in')
 
     d_addr = m.Reg('d_' + bramif.addr.name, datawidth)
     mem = m.Reg('mem', datawidth, Int(2)**addrwidth)
@@ -46,7 +47,7 @@ def mkTop():
     datawidth = m.Parameter('DATA_WIDTH', 32)
     clk = m.Input('CLK')
     rst = m.Input('RST')
-    bramif = BramInterface(m, 'bram_', '', addrwidth, datawidth)
+    bramif = BramInterface(m, 'bram_', '', addrwidth, datawidth, direction='out')
 
     params = collections.OrderedDict()
     params.update(bramif.connectAllParameters())

veriloggen/interface.py

@@ -8,42 +8,48 @@
 import vtypes
 
 class Interface(vtypes.VeriloggenNode):
-    def __init__(self, module, prefix='', postfix='', io=False):
+    def __init__(self, module, prefix='', postfix=''):
         self.module = module
         self.prefix = prefix
         self.postfix = postfix
-        self.io = io
 
+    def get_name(self, name):
+        return self.prefix + name + self.postfix
+
+    def get_basename(self, name):
+        return re.sub(r'' + self.postfix + '$', '', name.replace(self.prefix, '', 1))
+
+    
     def Input(self, name, width=1, length=None, signed=False, value=None):
-        new_name = self.prefix + name + self.postfix
+        new_name = self.get_name(name)
         return self.module.Input(name, width, length, signed, value)
 
     def Output(self, name, width=1, length=None, signed=False, value=None):
-        new_name = self.prefix + name + self.postfix
+        new_name = self.get_name(name)
         return self.module.Output(name, width, length, signed, value)
 
     def OutputReg(self, name, width=1, length=None, signed=False, value=None):
-        new_name = self.prefix + name + self.postfix
+        new_name = self.get_name(name)
         return self.module.OutputReg(name, width, length, signed, value)
 
     def Inout(self, name, width=1, length=None, signed=False, value=None):
-        new_name = self.prefix + name + self.postfix
+        new_name = self.get_name(name)
         return self.module.Inout(name, width, length, signed, value)
 
     def Reg(self, name, width=1, length=None, signed=False, value=None):
-        new_name = self.prefix + name + self.postfix
+        new_name = self.get_name(name)
         return self.module.Reg(name, width, length, signed, value)
 
     def Wire(self, name, width=1, length=None, signed=False, value=None):
-        new_name = self.prefix + name + self.postfix
+        new_name = self.get_name(name)
         return self.module.Wire(name, width, length, signed, value)
 
     def Parameter(self, name, value, width=None, signed=False):
-        new_name = self.prefix + name + self.postfix
+        new_name = self.get_name(name)
         return self.module.Parameter(name, value, width, signed)
 
     def Localparam(self, name, value, width=None, signed=False):
-        new_name = self.prefix + name + self.postfix
+        new_name = self.get_name(name)
         return self.module.Localparam(name, value, width, signed)
 
     def connectAllPorts(self, prefix='', postfix=''):
@@ -54,19 +60,19 @@ def connectAllPorts(self, prefix='', postfix=''):
         wires = [ s for s in self.__dir__() if isinstance(getattr(self, s), vtypes.Wire) ]
         ret = collections.OrderedDict()
         for p in inputs:
-            name = prefix + re.sub(r'' + self.postfix + '$', '', getattr(self, p).name.replace(self.prefix, '', 1)) + postfix
+            name = prefix + self.get_basename(getattr(self, p).name) + postfix
             ret[name] = getattr(self, p)
         for p in outputs:
-            name = prefix + re.sub(r'' + self.postfix + '$', '', getattr(self, p).name.replace(self.prefix, '', 1)) + postfix
+            name = prefix + self.get_basename(getattr(self, p).name) + postfix
             ret[name] = getattr(self, p)
         for p in inouts:
-            name = prefix + re.sub(r'' + self.postfix + '$', '', getattr(self, p).name.replace(self.prefix, '', 1)) + postfix
+            name = prefix + self.get_basename(getattr(self, p).name) + postfix
             ret[name] = getattr(self, p)
         for p in regs:
-            name = prefix + re.sub(r'' + self.postfix + '$', '', getattr(self, p).name.replace(self.prefix, '', 1)) + postfix
+            name = prefix + self.get_basename(getattr(self, p).name) + postfix
             ret[name] = getattr(self, p)
         for p in wires:
-            name = prefix + re.sub(r'' + self.postfix + '$', '', getattr(self, p).name.replace(self.prefix, '', 1)) + postfix
+            name = prefix + self.get_basename(getattr(self, p).name) + postfix
             ret[name] = getattr(self, p)
         return ret
 
@@ -75,10 +81,10 @@ def connectAllParameters(self, prefix='', postfix=''):
         localparams = [ s for s in self.__dir__() if isinstance(getattr(self, s), vtypes.Localparam) ]
         ret = collections.OrderedDict()
         for p in parameters:
-            name = prefix + re.sub(r'' + self.postfix + '$', '', getattr(self, p).name.replace(self.prefix, '', 1)) + postfix
+            name = prefix + self.get_basename(getattr(self, p).name) + postfix
             ret[name] = getattr(self, p)
         for p in localparams:
-            name = prefix + re.sub(r'' + self.postfix + '$', '', getattr(self, p).name.replace(self.prefix, '', 1)) + postfix
+            name = prefix + self.get_basename(getattr(self, p).name) + postfix
             ret[name] = getattr(self, p)
         return ret
 

veriloggen/toverilog.py

@@ -280,13 +280,13 @@ def visit_Ulnot(self, node):
     #---------------------------------------------------------------------------
     # First clas object wrapper
     def visit_Int(self, node):
-        return vast.IntConst(str(node))
+        return vast.IntConst(str(node.value))
 
     def visit_Float(self, node):
-        return vast.FloatConst(str(node))
+        return vast.FloatConst(str(node.value))
 
     def visit_Str(self, node):
-        return vast.StringConst(node)
+        return vast.StringConst(node.value)
 
     #---------------------------------------------------------------------------
     def visit_int(self, node):
@@ -494,13 +494,13 @@ def visit_Cond(self, node):
     #---------------------------------------------------------------------------
     # First clas object wrapper
     def visit_Int(self, node):
-        return vast.IntConst(str(node))
+        return vast.IntConst(str(node.value))
 
     def visit_Float(self, node):
-        return vast.FloatConst(str(node))
+        return vast.FloatConst(str(node.value))
 
     def visit_Str(self, node):
-        return vast.StringConst(node)
+        return vast.StringConst(node.value)
 
     #---------------------------------------------------------------------------
     def visit_int(self, node):

veriloggen/vtypes.py

@@ -16,10 +16,10 @@ def __ne__(self, r):
         return NotEq(self, r)
 
     def __ge__(self, r):
-        return GreaerEq(self, r)
+        return GreaterEq(self, r)
 
     def __gt__(self, r):
-        return GreaerThan(self, r)
+        return GreaterThan(self, r)
 
     def __add__(self, r):
         return Plus(self, r)