memory: fix address range overlap with zero-sized resources.

amaranth-lang · Jun 24, 2020 · 13a2370 · 13a2370
1 parent 4a6a948
commit 13a2370
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/nmigen_soc/memory.py b/nmigen_soc/memory.py
@@ -171,7 +171,7 @@ def _compute_addr_range(self, addr, size, step=1, *, alignment, extend):
         if not isinstance(size, int) or size < 0:
             raise ValueError("Size must be a non-negative integer, not {!r}"
                              .format(size))
-        size = self._align_up(size, alignment)
+        size = self._align_up(max(size, 1), alignment)
 
         if addr > (1 << self.addr_width) or addr + size > (1 << self.addr_width):
             if extend:

diff --git a/nmigen_soc/test/test_memory.py b/nmigen_soc/test/test_memory.py
@@ -104,6 +104,11 @@ def test_add_resource_extend(self):
                          (0x10000, 0x10001))
         self.assertEqual(memory_map.addr_width, 17)
 
+    def test_add_resource_size_zero(self):
+        memory_map = MemoryMap(addr_width=1, data_width=8)
+        self.assertEqual(memory_map.add_resource("a", size=0), (0, 1))
+        self.assertEqual(memory_map.add_resource("b", size=0), (1, 2))
+
     def test_add_resource_wrong_address(self):
         memory_map = MemoryMap(addr_width=16, data_width=8)
         with self.assertRaisesRegex(ValueError,