From: whitequark <cz@m-labs.hk>
Date: Sun, 13 Oct 2019 03:19:17 +0000 (+0000)
Subject: hdl.ir: cast instance port connections to Values.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fde6cff119253f6792c3195c9ae42eebfcfd371f;p=nmigen.git

hdl.ir: cast instance port connections to Values.

Fixes #249.
---

diff --git a/nmigen/hdl/ir.py b/nmigen/hdl/ir.py
index 3173399..0f718ff 100644
--- a/nmigen/hdl/ir.py
+++ b/nmigen/hdl/ir.py
@@ -563,7 +563,7 @@ class Instance(Fragment):
             elif kind == "p":
                 self.parameters[name] = value
             elif kind in ("i", "o", "io"):
-                self.named_ports[name] = (value, kind)
+                self.named_ports[name] = (Value.cast(value), kind)
             else:
                 raise NameError("Instance argument {!r} should be a tuple (kind, name, value) "
                                 "where kind is one of \"p\", \"i\", \"o\", or \"io\""
@@ -575,11 +575,11 @@ class Instance(Fragment):
             elif kw.startswith("p_"):
                 self.parameters[kw[2:]] = arg
             elif kw.startswith("i_"):
-                self.named_ports[kw[2:]] = (arg, "i")
+                self.named_ports[kw[2:]] = (Value.cast(arg), "i")
             elif kw.startswith("o_"):
-                self.named_ports[kw[2:]] = (arg, "o")
+                self.named_ports[kw[2:]] = (Value.cast(arg), "o")
             elif kw.startswith("io_"):
-                self.named_ports[kw[3:]] = (arg, "io")
+                self.named_ports[kw[3:]] = (Value.cast(arg), "io")
             else:
                 raise NameError("Instance keyword argument {}={!r} does not start with one of "
                                 "\"p_\", \"i_\", \"o_\", or \"io_\""
diff --git a/nmigen/test/test_hdl_ir.py b/nmigen/test/test_hdl_ir.py
index bcd56b5..82b9ed1 100644
--- a/nmigen/test/test_hdl_ir.py
+++ b/nmigen/test/test_hdl_ir.py
@@ -667,6 +667,22 @@ class InstanceTestCase(FHDLTestCase):
             ("s6", (s6, "io")),
         ]))
 
+    def test_cast_ports(self):
+        inst = Instance("foo",
+            ("i", "s1", 1),
+            ("o", "s2", 2),
+            ("io", "s3", 3),
+            i_s4=4,
+            o_s5=5,
+            io_s6=6,
+        )
+        self.assertRepr(inst.named_ports["s1"][0], "(const 1'd1)")
+        self.assertRepr(inst.named_ports["s2"][0], "(const 2'd2)")
+        self.assertRepr(inst.named_ports["s3"][0], "(const 2'd3)")
+        self.assertRepr(inst.named_ports["s4"][0], "(const 3'd4)")
+        self.assertRepr(inst.named_ports["s5"][0], "(const 3'd5)")
+        self.assertRepr(inst.named_ports["s6"][0], "(const 3'd6)")
+
     def test_wrong_construct_arg(self):
         s = Signal()
         with self.assertRaises(NameError,