From d4c6169bbb1e40fb9e29b0f477db0b026afb410c Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sun, 5 Apr 2020 20:55:21 +0100 Subject: [PATCH] unpack tuple with new op_fields --- src/soc/decoder/isa/caller.py | 2 +- src/soc/decoder/pseudo/pywriter.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/soc/decoder/isa/caller.py b/src/soc/decoder/isa/caller.py index 43e02714..5b5e3c11 100644 --- 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 aaadee50..4eb59439 100644 --- 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() -- 2.30.2