--- nand.py- +++ nand.py @@ -225,7 +225,6 @@ # inp_x, out def __init__(self, parent, n, name='nand_n', latency=10): Obj.__init__(self, parent, name) - self.n = n new_pin_n( n, self, 'inp' ) AND_N(self, n, 'and_n', latency) conn2_n( n, (self, 'inp', 0), (self.and_n, 'inp', 0) ) @@ -238,7 +237,6 @@ # inp_x, out def __init__(self, parent, n, name='nor_n', latency=10): Obj.__init__(self, parent, name) - self.n = n new_pin_n( n, self, 'inp' ) OR_N(self, n, 'or_n', latency) conn2_n( n, (self, 'inp', 0), (self.or_n, 'inp', 0) ) @@ -353,7 +351,6 @@ # inp_x, CLK, out_x def __init__(self, parent, n, name='latch', latency=10): Obj.__init__(self, parent, name) - self.n = n Pin(self, 'CLK').conn = Joint(self, 'jt_clk').new_pin() for i in range(n): dff_i = DFF( self, name_i('dff', i), latency ) @@ -387,7 +384,6 @@ # CLK, out_x def __init__(self, parent, bit_n, name='counter', latency=10): Obj.__init__(self, parent, name) - self.n = bit_n clk = Pin(self, 'CLK') for i in range(bit_n): tff = TFF( self, name_i('tff', i), latency ) @@ -424,7 +420,6 @@ # p_x def __init__(self, parent, n, dlst=(), name='pin_set'): Obj.__init__(self, parent, name) - self.n = n new_pin_n(n, self, 'p', 0, dlst) class NOTSet(Obj): @@ -440,7 +435,6 @@ # inp_x, sel_x, out_x def __init__(self, parent, n, name='and_set', latency=10): Obj.__init__(self, parent, name) - self.n = n for i in range(n): and_i = AND( self, name_i('and', i), latency ) Pin( self, name_i('inp', i) ).conn = and_i.inp_a @@ -478,7 +472,6 @@ # inp_x, en, out_x def __init__(self, parent, n, name='gate', latency=10): Obj.__init__(self, parent, name) - self.n = n ANDSet(self, n, 'and_set', latency) @@ -494,7 +487,6 @@ # en, A_x, D_x, out def __init__(self, parent, bit_n, name='selector', latency=10): Obj.__init__(self, parent, name) - self.n = bit_n new_pin_n(bit_n, self, 'A') DECODER(self, bit_n, 'deco', latency) conn2_n( bit_n, (self, 'A', 0), (self.deco, 'inp', 0) ) @@ -535,7 +527,6 @@ def __init__(self, parent, abit_n, dlst=(), name='rom_d1', latency=10): Obj.__init__(self, parent, name) self.dbgout(dlst) - self.n = abit_n dn = 1 << abit_n SELECTOR(self, abit_n, 'select', latency) @@ -831,7 +822,6 @@ # Cin, A_x, B_x, Y_x, C def __init__(self, parent, n, name='add_n', latency=10): Obj.__init__(self, parent, name) - self.n = n c = Pin(self, 'Cin', 'L') for i in range(n): add_c = ADD_C( self, name_i('add_c', i), latency )