From 1f4855d84c5f6980653356fac8146d1e3a6c1cb7 Mon Sep 17 00:00:00 2001 From: Michael Nolan Date: Sun, 5 Apr 2020 15:10:43 -0400 Subject: [PATCH] Fix not being able to use all instructions in ISA class --- src/soc/decoder/isa/all.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/soc/decoder/isa/all.py b/src/soc/decoder/isa/all.py index 2cd59a0f..b6623fe8 100644 --- a/src/soc/decoder/isa/all.py +++ b/src/soc/decoder/isa/all.py @@ -1,8 +1,19 @@ +from caller import ISACaller from fixedarith import fixedarith from fixedload import fixedload from fixedstore import fixedstore -class ISA(fixedarith, fixedload, fixedstore): - pass +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.instrs = { + **self.fixedarith.instrs, + **self.fixedload.instrs, + **self.fixedstore.instrs, + } -- 2.30.2