hdl.mem,lib,examples: use Signal.range().

diff --git a/examples/basic/fsm.py b/examples/basic/fsm.py
index 73e6f7d7a09f542bb6b87ee8799c827b38abbdf0..86b00dbe5a906dd6682647fedc86fb4151faf929 100644 (file)
--- a/examples/basic/fsm.py
+++ b/examples/basic/fsm.py
@@ -15,7 +15,7 @@ class UARTReceiver(Elaboratable):
     def elaborate(self, platform):
         m = Module()
 
-        ctr = Signal(max=self.divisor)
+        ctr = Signal.range(self.divisor)
         stb = Signal()
         with m.If(ctr == 0):
             m.d.sync += ctr.eq(self.divisor - 1)

diff --git a/examples/basic/por.py b/examples/basic/por.py
index 63eca23c9cab909c96137872d9b7c1b67037da2d..b503e4d9cb214907304de7e3f0eb00f1b227e2d3 100644 (file)
--- a/examples/basic/por.py
+++ b/examples/basic/por.py
@@ -7,7 +7,7 @@ cd_por  = ClockDomain(reset_less=True)
 cd_sync = ClockDomain()
 m.domains += cd_por, cd_sync
 
-delay = Signal(max=255, reset=255)
+delay = Signal.range(256, reset=255)
 with m.If(delay != 0):
     m.d.por += delay.eq(delay - 1)
 m.d.comb += [

diff --git a/examples/basic/uart.py b/examples/basic/uart.py
index 060d2f9cd466439f32138be3f3b48dc618589669..d7a9a9ceac531c465a118fe8c6d6075068ab658b 100644 (file)
--- a/examples/basic/uart.py
+++ b/examples/basic/uart.py
@@ -31,9 +31,9 @@ class UART(Elaboratable):
     def elaborate(self, platform):
         m = Module()
 
-        tx_phase = Signal(max=self.divisor)
+        tx_phase = Signal.range(self.divisor)
         tx_shreg = Signal(1 + self.data_bits + 1, reset=-1)
-        tx_count = Signal(max=len(tx_shreg) + 1)
+        tx_count = Signal.range(len(tx_shreg) + 1)
 
         m.d.comb += self.tx_o.eq(tx_shreg[0])
         with m.If(tx_count == 0):
@@ -54,9 +54,9 @@ class UART(Elaboratable):
                     tx_phase.eq(self.divisor - 1),
                 ]
 
-        rx_phase = Signal(max=self.divisor)
+        rx_phase = Signal.range(self.divisor)
         rx_shreg = Signal(1 + self.data_bits + 1, reset=-1)
-        rx_count = Signal(max=len(rx_shreg) + 1)
+        rx_count = Signal.range(len(rx_shreg) + 1)
 
         m.d.comb += self.rx_data.eq(rx_shreg[1:-1])
         with m.If(rx_count == 0):

diff --git a/nmigen/hdl/mem.py b/nmigen/hdl/mem.py
index 1ad7f420e994c82ee588e0002dd01e8c57ae1f1a..c0d7c3d0897dbd7e0d295a7a8dd7d4a26080eab2 100644 (file)
--- a/nmigen/hdl/mem.py
+++ b/nmigen/hdl/mem.py
@@ -83,7 +83,7 @@ class ReadPort(Elaboratable):
         self.domain      = domain
         self.transparent = transparent
 
-        self.addr = Signal(max=memory.depth,
+        self.addr = Signal.range(memory.depth,
                            name="{}_r_addr".format(memory.name), src_loc_at=2)
         self.data = Signal(memory.width,
                            name="{}_r_data".format(memory.name), src_loc_at=2)
@@ -148,7 +148,7 @@ class WritePort(Elaboratable):
         self.priority     = priority
         self.granularity  = granularity
 
-        self.addr = Signal(max=memory.depth,
+        self.addr = Signal.range(memory.depth,
                            name="{}_w_addr".format(memory.name), src_loc_at=2)
         self.data = Signal(memory.width,
                            name="{}_w_data".format(memory.name), src_loc_at=2)

diff --git a/nmigen/lib/coding.py b/nmigen/lib/coding.py
index eed02c96bc7a7eb6185fcb70e349a1cbeacddf10..300a718ac26d224947457705ff29e3ca55463bbe 100644 (file)
--- a/nmigen/lib/coding.py
+++ b/nmigen/lib/coding.py
@@ -25,7 +25,7 @@ class Encoder(Elaboratable):
     ----------
     i : Signal(width), in
         One-hot input.
-    o : Signal(max=width), out
+    o : Signal.range(width), out
         Encoded binary.
     n : Signal, out
         Invalid: either none or multiple input bits are asserted.
@@ -34,7 +34,7 @@ class Encoder(Elaboratable):
         self.width = width
 
         self.i = Signal(width)
-        self.o = Signal(max=max(2, width))
+        self.o = Signal.range(width)
         self.n = Signal()
 
     def elaborate(self, platform):
@@ -64,7 +64,7 @@ class PriorityEncoder(Elaboratable):
     ----------
     i : Signal(width), in
         Input requests.
-    o : Signal(max=width), out
+    o : Signal.range(width), out
         Encoded binary.
     n : Signal, out
         Invalid: no input bits are asserted.
@@ -73,7 +73,7 @@ class PriorityEncoder(Elaboratable):
         self.width = width
 
         self.i = Signal(width)
-        self.o = Signal(max=max(2, width))
+        self.o = Signal.range(width)
         self.n = Signal()
 
     def elaborate(self, platform):
@@ -98,7 +98,7 @@ class Decoder(Elaboratable):
 
     Attributes
     ----------
-    i : Signal(max=width), in
+    i : Signal.range(width), in
         Input binary.
     o : Signal(width), out
         Decoded one-hot.
@@ -108,7 +108,7 @@ class Decoder(Elaboratable):
     def __init__(self, width):
         self.width = width
 
-        self.i = Signal(max=max(2, width))
+        self.i = Signal.range(width)
         self.n = Signal()
         self.o = Signal(width)
 

diff --git a/nmigen/lib/fifo.py b/nmigen/lib/fifo.py
index ded86cfe5ed6b06b4dc01132d86e736ca0d02544..af2f07285e48814db5a9ab0627d815e06462de86 100644 (file)
--- a/nmigen/lib/fifo.py
+++ b/nmigen/lib/fifo.py
@@ -136,7 +136,7 @@ class SyncFIFO(Elaboratable, FIFOInterface):
     def __init__(self, width, depth, fwft=True):
         super().__init__(width, depth, fwft)
 
-        self.level   = Signal(max=depth + 1)
+        self.level   = Signal.range(depth + 1)
         self.replace = Signal()
 
     def elaborate(self, platform):
@@ -153,8 +153,8 @@ class SyncFIFO(Elaboratable, FIFOInterface):
         wrport  = m.submodules.wrport = storage.write_port()
         rdport  = m.submodules.rdport = storage.read_port(
             domain="comb" if self.fwft else "sync", transparent=self.fwft)
-        produce = Signal(max=self.depth)
-        consume = Signal(max=self.depth)
+        produce = Signal.range(self.depth)
+        consume = Signal.range(self.depth)
 
         m.d.comb += [
             wrport.addr.eq(produce),
@@ -234,7 +234,7 @@ class SyncFIFOBuffered(Elaboratable, FIFOInterface):
     def __init__(self, width, depth):
         super().__init__(width, depth, fwft=True)
 
-        self.level = Signal(max=depth + 1)
+        self.level = Signal.range(depth + 1)
 
     def elaborate(self, platform):
         m = Module()

diff --git a/nmigen/test/test_lib_fifo.py b/nmigen/test/test_lib_fifo.py
index 9d136c8951b382a0b37c050f432de9a20c8c9cf9..068de5fe2391d6661d5ba3bad803d36ea5d9db8e 100644 (file)
--- a/nmigen/test/test_lib_fifo.py
+++ b/nmigen/test/test_lib_fifo.py
@@ -52,7 +52,7 @@ class FIFOModel(Elaboratable, FIFOInterface):
         self.wdomain = wdomain
 
         self.replace = Signal()
-        self.level   = Signal(max=self.depth + 1)
+        self.level   = Signal.range(self.depth + 1)
 
     def elaborate(self, platform):
         m = Module()
@@ -61,8 +61,8 @@ class FIFOModel(Elaboratable, FIFOInterface):
         wrport  = m.submodules.wrport = storage.write_port(domain=self.wdomain)
         rdport  = m.submodules.rdport = storage.read_port (domain="comb")
 
-        produce = Signal(max=self.depth)
-        consume = Signal(max=self.depth)
+        produce = Signal.range(self.depth)
+        consume = Signal.range(self.depth)
 
         m.d.comb += self.readable.eq(self.level > 0)
         m.d.comb += rdport.addr.eq((consume + 1) % self.depth)