Convert instruction info from tuple to namedtuple

[soc.git] / src / soc / decoder / pseudo / pywriter.py

diff --git a/src/soc/decoder/pseudo/pywriter.py b/src/soc/decoder/pseudo/pywriter.py
index e43cc41ff8300bc406271f00d24f0dc682691eaa..4b6b03abbf800e957bb8cbc367174bff443e8280 100644 (file)
--- a/src/soc/decoder/pseudo/pywriter.py
+++ b/src/soc/decoder/pseudo/pywriter.py
@@ -16,7 +16,7 @@ def get_isasrc_dir():
 header = """\
 # auto-generated by pywriter.py, do not edit or commit
 
-from soc.decoder.isa.caller import inject
+from soc.decoder.isa.caller import inject, instruction_info
 from soc.decoder.helpers import (EXTS, EXTS64, EXTZ64, ROTL64, ROTL32, MASK,)
 from soc.decoder.selectable_int import SelectableInt
 from soc.decoder.selectable_int import selectconcat as concat
@@ -26,10 +26,11 @@ class %s:
 
 """
 
-iinfo_template = """(%s, %s,
-                %s, %s,
-                %s, '%s',
-                %s)"""
+iinfo_template = """instruction_info(func=%s,
+                read_regs=%s,
+                uninit_regs=%s, write_regs=%s,
+                op_fields=%s, form='%s',
+                asmregs=%s)"""
 
 class PyISAWriter(ISA):
     def __init__(self):