From: Michael Nolan <mtnolan2640@gmail.com>
Date: Sun, 5 Apr 2020 19:26:20 +0000 (-0400)
Subject: Handle new changes in pseudocode parser
X-Git-Tag: div_pipeline~1464
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d7e51f1ab924934895ecacb608655cb412498af3;p=soc.git

Handle new changes in pseudocode parser
---

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)