unpack tuple with new op_fields

diff --git a/src/soc/decoder/isa/caller.py b/src/soc/decoder/isa/caller.py
index 43e0271417e7f3df2410601b2cb8aad17760c601..5b5e3c1162592961a051144c39a0fac10f260b27 100644 (file)
--- a/src/soc/decoder/isa/caller.py
+++ b/src/soc/decoder/isa/caller.py
@@ -132,7 +132,7 @@ class ISACaller:
     def call(self, name):
         yield from self.prep_namespace()
 
-        function, read_regs, uninit_regs, write_regs, form \
+        function, read_regs, uninit_regs, write_regs, op_fields, form \
             = self.instrs[name]
         input_names = create_args(read_regs | uninit_regs)
         print(input_names)

diff --git a/src/soc/decoder/pseudo/pywriter.py b/src/soc/decoder/pseudo/pywriter.py
index aaadee5041d0e1cb76d13bc7d4b515eaf758795e..4eb59439987f9585475171decfe6ca08bb28d6d6 100644 (file)
--- a/src/soc/decoder/pseudo/pywriter.py
+++ b/src/soc/decoder/pseudo/pywriter.py
@@ -100,8 +100,10 @@ class PyISAWriter(ISA):
 
 if __name__ == '__main__':
     isa = PyISAWriter()
+    isa.write_pysource('fixedarith')
     isa.write_pysource('sprset')
     #isa.write_pysource('system')
+    isa.write_isa_class()
     exit(0)
     isa.write_pysource('stringldst')
     isa.write_pysource('fixedshift')
@@ -112,5 +114,3 @@ if __name__ == '__main__':
     isa.write_pysource('fixedstore')
     isa.write_pysource('fixedload')
     isa.write_pysource('comparefixed')
-    isa.write_pysource('fixedarith')
-    isa.write_isa_class()