From d7e51f1ab924934895ecacb608655cb412498af3 Mon Sep 17 00:00:00 2001 From: Michael Nolan Date: Sun, 5 Apr 2020 15:26:20 -0400 Subject: [PATCH] Handle new changes in pseudocode parser --- src/soc/decoder/isa/all.py | 12 ++++++------ src/soc/decoder/isa/caller.py | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/soc/decoder/isa/all.py b/src/soc/decoder/isa/all.py index e6c5fb9b..b9be75f4 100644 --- a/src/soc/decoder/isa/all.py +++ b/src/soc/decoder/isa/all.py @@ -8,12 +8,12 @@ from soc.decoder.isa.caller import ISACaller class ISA(ISACaller): def __init__(self, dec, regs): super().__init__(dec, regs) - self.fixedarith = fixedarith(dec, regs) - self.fixedload = fixedload(dec, regs) - self.fixedstore = fixedstore(dec, regs) + self.fixedarith = fixedarith() + self.fixedload = fixedload() + self.fixedstore = fixedstore() self.instrs = { - **self.fixedarith.instrs, - **self.fixedload.instrs, - **self.fixedstore.instrs, + **self.fixedarith.fixedarith_instrs, + **self.fixedload.fixedload_instrs, + **self.fixedstore.fixedstore_instrs, } diff --git a/src/soc/decoder/isa/caller.py b/src/soc/decoder/isa/caller.py index c60bdfc8..43e02714 100644 --- a/src/soc/decoder/isa/caller.py +++ b/src/soc/decoder/isa/caller.py @@ -132,7 +132,8 @@ class ISACaller: def call(self, name): yield from self.prep_namespace() - function, read_regs, uninit_regs, write_regs = self.instrs[name] + function, read_regs, uninit_regs, write_regs, form \ + = self.instrs[name] input_names = create_args(read_regs | uninit_regs) print(input_names) -- 2.30.2