Replace Signal(bits_for(... with Signal(max=...

Sebastien Bourdeauducq · Sebastien Bourdeauducq · commit 293a62dabefa · 2012-11-29T23:41:51.000+01:00
diff --git a/milkymist/asmicon/bankmachine.py b/milkymist/asmicon/bankmachine.py
@@ -42,7 +42,7 @@ def __init__(self, slicer, bankn, slots):
 		self.nslots = len(self.slots)
 		self.stb = Signal()
 		self.ack = Signal()
-		self.tag = Signal(bits_for(self.nslots-1))
+		self.tag = Signal(max=self.nslots)
 		self.adr = Signal(self.slots[0].adr.nbits)
 		self.we = Signal()
 		
@@ -238,7 +238,7 @@ def get_fragment(self):
 		# Respect write-to-precharge specification
 		precharge_ok = Signal()
 		t_unsafe_precharge = 2 + self.timing_settings.tWR - 1
-		unsafe_precharge_count = Signal(bits_for(t_unsafe_precharge))
+		unsafe_precharge_count = Signal(max=t_unsafe_precharge+1)
 		comb.append(precharge_ok.eq(unsafe_precharge_count == 0))
 		sync += [
 			If(self.cmd.stb & self.cmd.ack & self.cmd.is_write,
diff --git a/milkymist/asmicon/multiplexer.py b/milkymist/asmicon/multiplexer.py
@@ -64,7 +64,7 @@ def __init__(self, commands, dfi):
 		
 		ncmd = len(self.commands)
 		nph = len(self.dfi.phases)
-		self.sel = [Signal(bits_for(ncmd-1)) for i in range(nph)]
+		self.sel = [Signal(max=ncmd) for i in range(nph)]
 	
 	def get_fragment(self):
 		comb = []
@@ -194,7 +194,7 @@ def anti_starvation(timeout):
 			max_time = Signal()
 			if timeout:
 				t = timeout - 1
-				time = Signal(bits_for(t))
+				time = Signal(max=t+1)
 				comb.append(max_time.eq(time == 0))
 				sync.append(
 					If(~en,
diff --git a/milkymist/asmicon/refresher.py b/milkymist/asmicon/refresher.py
@@ -45,7 +45,7 @@ def get_fragment(self):
 		])
 		
 		# Periodic refresh counter
-		counter = Signal(bits_for(self.tREFI - 1))
+		counter = Signal(max=self.tREFI)
 		start = Signal()
 		sync += [
 			start.eq(0),
