examples: update LM32 instance

diff --git a/examples/basic/lm32_inst.py b/examples/basic/lm32_inst.py
index 678dca5575f55b0e0938e081187eb8678a4af650..2213f780289acfffd611fba08aefde4745301b22 100644 (file)
--- a/examples/basic/lm32_inst.py
+++ b/examples/basic/lm32_inst.py
@@ -4,36 +4,40 @@ from migen.fhdl import verilog
 class LM32:
        def __init__(self):
                self.inst = Instance("lm32_top",
-                       [("I_ADR_O", BV(32)),
-                       ("I_DAT_O", BV(32)),
-                       ("I_SEL_O", BV(4)),
-                       ("I_CYC_O", BV(1)),
-                       ("I_STB_O", BV(1)),
-                       ("I_WE_O", BV(1)),
-                       ("I_CTI_O", BV(3)),
-                       ("I_LOCK_O", BV(1)),
-                       ("I_BTE_O", BV(1)),
-                       ("D_ADR_O", BV(32)),
-                       ("D_DAT_O", BV(32)),
-                       ("D_SEL_O", BV(4)),
-                       ("D_CYC_O", BV(1)),
-                       ("D_STB_O", BV(1)),
-                       ("D_WE_O", BV(1)),
-                       ("D_CTI_O", BV(3)),
-                       ("D_LOCK_O", BV(1)),
-                       ("D_BTE_O", BV(1))],
-                       [("interrupt", BV(32)),
-                       ("ext_break", BV(1)),
-                       ("I_DAT_I", BV(32)),
-                       ("I_ACK_I", BV(1)),
-                       ("I_ERR_I", BV(1)),
-                       ("I_RTY_I", BV(1)),
-                       ("D_DAT_I", BV(32)),
-                       ("D_ACK_I", BV(1)),
-                       ("D_ERR_I", BV(1)),
-                       ("D_RTY_I", BV(1))],
-                       clkport="clk_i",
-                       rstport="rst_i",
+                       Instance.ClockPort("clk_i"),
+                       Instance.ResetPort("rst_i"),
+               
+                       Instance.Input("interrupt", BV(32)),
+                       Instance.Input("ext_break", BV(1)),
+               
+                       Instance.Output("I_ADR_O", BV(32)),
+                       Instance.Output("I_DAT_O", BV(32)),
+                       Instance.Output("I_SEL_O", BV(4)),
+                       Instance.Output("I_CYC_O", BV(1)),
+                       Instance.Output("I_STB_O", BV(1)),
+                       Instance.Output("I_WE_O", BV(1)),
+                       Instance.Output("I_CTI_O", BV(3)),
+                       Instance.Output("I_LOCK_O", BV(1)),
+                       Instance.Output("I_BTE_O", BV(1)),
+                       Instance.Input("I_DAT_I", BV(32)),
+                       Instance.Input("I_ACK_I", BV(1)),
+                       Instance.Input("I_ERR_I", BV(1)),
+                       Instance.Input("I_RTY_I", BV(1)),
+                       
+                       Instance.Output("D_ADR_O", BV(32)),
+                       Instance.Output("D_DAT_O", BV(32)),
+                       Instance.Output("D_SEL_O", BV(4)),
+                       Instance.Output("D_CYC_O", BV(1)),
+                       Instance.Output("D_STB_O", BV(1)),
+                       Instance.Output("D_WE_O", BV(1)),
+                       Instance.Output("D_CTI_O", BV(3)),
+                       Instance.Output("D_LOCK_O", BV(1)),
+                       Instance.Output("D_BTE_O", BV(1)),
+                       Instance.Input("D_DAT_I", BV(32)),
+                       Instance.Input("D_ACK_I", BV(1)),
+                       Instance.Input("D_ERR_I", BV(1)),
+                       Instance.Input("D_RTY_I", BV(1)),
+                       
                        name="lm32")
        
        def get_fragment(self):
@@ -43,4 +47,4 @@ cpus = [LM32() for i in range(4)]
 frag = Fragment()
 for cpu in cpus:
        frag += cpu.get_fragment()
-print(verilog.convert(frag, set([cpus[0].inst.ins["interrupt"], cpus[0].inst.outs["I_WE_O"]])))
+print(verilog.convert(frag, set([cpus[0].inst.get_io("interrupt"), cpus[0].inst.get_io("I_WE_O")])))