X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fsoc%2Fdecoder%2Fpower_fieldsn.py;h=243bda894687eafea7d468f1ac00222e571da689;hb=HEAD;hp=819c40deac9c9b4f00dc2cdd859bc0e8ff3df4a3;hpb=73d801a7740c1b197196c795df64586e6b27fd6b;p=soc.git

diff --git a/src/soc/decoder/power_fieldsn.py b/src/soc/decoder/power_fieldsn.py
index 819c40de..243bda89 100644
--- a/src/soc/decoder/power_fieldsn.py
+++ b/src/soc/decoder/power_fieldsn.py
@@ -1,80 +1,5 @@
-from collections import OrderedDict
-from soc.decoder.power_fields import DecodeFields, BitRange
-from nmigen import Module, Elaboratable, Signal, Cat
-from nmigen.cli import rtlil
-
-
-class SignalBitRange(BitRange):
-    def __init__(self, signal):
-        BitRange.__init__(self)
-        self.signal = signal
-
-    def _rev(self, k):
-        width = self.signal.shape()[0]
-        return width-1-k
-
-    def __getitem__(self, subs):
-        # *sigh* field numberings are bit-inverted.  PowerISA 3.0B section 1.3.2
-        print ("SignalBitRange", subs, len(self), self.items())
-        if isinstance(subs, slice):
-            res = []
-            print (subs)
-            start, stop, step = subs.start, subs.stop, subs.step
-            if step is None:
-                step = 1
-            if start is None:
-                start = 0
-            if stop is None:
-                stop = -1
-            if start < 0:
-                start = len(self) + start + 1
-            if stop < 0:
-                stop = len(self) + stop + 1
-            print ("range", start, stop, step)
-            for t in range(start, stop, step):
-                t = len(self) - 1 - t # invert field back
-                k = OrderedDict.__getitem__(self, t)
-                print ("t", t, k)
-                res.append(self.signal[self._rev(k)]) # reverse-order here
-            return Cat(*res)
-        else:
-            if subs < 0:
-                subs = len(self) + subs
-            subs = len(self) - 1 - subs # invert field back
-            k = OrderedDict.__getitem__(self, subs)
-            return self.signal[self._rev(k)] # reverse-order here
-
-        print ("translated", subs, translated)
-
-
-class SigDecode(Elaboratable):
-
-    def __init__(self, width):
-        self.opcode_in = Signal(width, reset_less=False)
-        self.df = DecodeFields(SignalBitRange, [self.opcode_in])
-        self.df.create_specs()
-        self.x_s = Signal(len(self.df.FormX.S), reset_less=True)
-        self.x_sh = Signal(len(self.df.FormX.SH), reset_less=True)
-        self.dq_xs_s = Signal(len(self.df.FormDQ.SX_S), reset_less=True)
-
-    def elaborate(self, platform):
-        m = Module()
-        comb = m.d.comb
-        comb += self.x_s.eq(self.df.FormX.S[0])
-        comb += self.x_sh.eq(self.df.FormX.SH[0:-1])
-        comb += self.dq_xs_s.eq(self.df.FormDQ.SX_S[0:-1])
-        return m
-
-    def ports(self):
-        return [self.opcode_in, self.x_s, self.x_sh]
-
-def create_sigdecode():
-    s = SigDecode(32)
-    return s
-
-if __name__ == '__main__':
-    sigdecode = create_sigdecode()
-    vl = rtlil.convert(sigdecode, ports=sigdecode.ports())
-    with open("decoder.il", "w") as f:
-        f.write(vl)
+# moved to openpower-isa
+# https://git.libre-soc.org/?p=openpower-isa.git;a=summary
+# wildcard imports here ONLY to support migration
 
+from openpower.decoder.power_fieldsn import *