power_insn: drop redundant dataclass incantations
[openpower-isa.git] / src / openpower / decoder / power_insn.py
index 748eadef12cac8f089c63293eb78845fdb5197cd..bf6da71fec7fc9fdde859ec343c841523b18da8c 100644 (file)
@@ -3,6 +3,7 @@ import csv as _csv
 import dataclasses as _dataclasses
 import enum as _enum
 import functools as _functools
+import itertools as _itertools
 import os as _os
 import operator as _operator
 import pathlib as _pathlib
@@ -155,23 +156,6 @@ class PatternOpcode(Opcode):
         return super().__init__(value=value, mask=mask)
 
 
-class FieldsOpcode(Opcode):
-    def __init__(self, fields):
-        def field(opcode, field):
-            (value, mask) = opcode
-            (field, bits) = field
-            shifts = map(lambda bit: (31 - bit), reversed(tuple(bits)))
-            for (index, shift) in enumerate(shifts):
-                bit = ((field & (1 << index)) != 0)
-                value |= (bit << shift)
-                mask |= (1 << shift)
-            return (value, mask)
-
-        (value, mask) = _functools.reduce(field, fields, (0, 0))
-
-        return super().__init__(value=value, mask=mask)
-
-
 @_dataclasses.dataclass(eq=True, frozen=True)
 class PPCRecord:
     class FlagsMeta(type):
@@ -437,6 +421,9 @@ class BitSel:
     def __iter__(self):
         yield from range(self.start, (self.end + 1))
 
+    def __reversed__(self):
+        return tuple(reversed(tuple(self)))
+
     @property
     def start(self):
         return self.__start
@@ -517,16 +504,18 @@ class Fields:
 class Operand:
     name: str
 
+    def span(self, record):
+        return record.fields[self.name]
+
     def disassemble(self, insn, record,
             verbosity=Verbosity.NORMAL, indent=""):
         raise NotImplementedError
 
 
-@_dataclasses.dataclass(eq=True, frozen=True)
 class DynamicOperand(Operand):
     def disassemble(self, insn, record,
             verbosity=Verbosity.NORMAL, indent=""):
-        span = record.fields[self.name]
+        span = self.span(record=record)
         if isinstance(insn, SVP64Instruction):
             span = tuple(map(lambda bit: (bit + 32), span))
         value = insn[span]
@@ -540,18 +529,13 @@ class DynamicOperand(Operand):
             yield str(int(value))
 
 
-@_dataclasses.dataclass(eq=True, frozen=True)
-class ImmediateOperand(DynamicOperand):
-    pass
-
-
 @_dataclasses.dataclass(eq=True, frozen=True)
 class StaticOperand(Operand):
     value: int
 
     def disassemble(self, insn, record,
             verbosity=Verbosity.NORMAL, indent=""):
-        span = record.fields[self.name]
+        span = self.span(record=record)
         if isinstance(insn, SVP64Instruction):
             span = tuple(map(lambda bit: (bit + 32), span))
         value = insn[span]
@@ -565,17 +549,23 @@ class StaticOperand(Operand):
             yield str(int(value))
 
 
-@_dataclasses.dataclass(eq=True, frozen=True)
+class ImmediateOperand(DynamicOperand):
+    pass
+
+
 class DynamicOperandReg(DynamicOperand):
-    def spec(self, insn, record):
+    def spec(self, insn, record, merge):
         vector = False
-        span = record.fields[self.name]
+        span = self.span(record=record)
         if isinstance(insn, SVP64Instruction):
             span = tuple(map(lambda bit: (bit + 32), span))
         value = insn[span]
+        span = tuple(map(str, span))
 
         if isinstance(insn, SVP64Instruction):
             extra_idx = self.extra_idx(record=record)
+            if extra_idx is _SVExtra.NONE:
+                return (vector, value, span)
 
             if record.etype is _SVEtype.EXTRA3:
                 spec = insn.prefix.rm.extra3[extra_idx]
@@ -586,7 +576,6 @@ class DynamicOperandReg(DynamicOperand):
 
             if spec != 0:
                 vector = bool(spec[0])
-                span = tuple(map(str, span))
                 spec_span = spec.__class__
                 if record.etype is _SVEtype.EXTRA3:
                     spec_span = tuple(map(str, spec_span[1, 2]))
@@ -602,19 +591,7 @@ class DynamicOperandReg(DynamicOperand):
                 else:
                     raise ValueError(record.etype)
 
-                bits = (len(span) + len(spec_span))
-                value = _SelectableInt(value=value.value, bits=bits)
-                spec = _SelectableInt(value=spec.value, bits=bits)
-                if vector:
-                    value = ((value << 2) | spec)
-                    span = (span + spec_span)
-                else:
-                    value = ((spec << 5) | value)
-                    span = (spec_span + span)
-
-                value = _SelectableInt(value=value, bits=bits)
-
-        span = tuple(map(str, span))
+                (value, span) = merge(vector, value, span, spec, spec_span)
 
         return (vector, value, span)
 
@@ -655,7 +632,25 @@ class DynamicOperandReg(DynamicOperand):
             yield f"{vector}{prefix}{int(value)}"
 
 
-class DynamicOperandGPR(DynamicOperandReg):
+class DynamicOperandGPRFPR(DynamicOperandReg):
+    def spec(self, insn, record):
+        def merge(vector, value, span, spec, spec_span):
+            bits = (len(span) + len(spec_span))
+            value = _SelectableInt(value=value.value, bits=bits)
+            spec = _SelectableInt(value=spec.value, bits=bits)
+            if vector:
+                value = ((value << 2) | spec)
+                span = (span + spec_span)
+            else:
+                value = ((spec << 5) | value)
+                span = (spec_span + span)
+
+            return (value, span)
+
+        return super().spec(insn=insn, record=record, merge=merge)
+
+
+class DynamicOperandGPR(DynamicOperandGPRFPR):
     def disassemble(self, insn, record,
             verbosity=Verbosity.NORMAL, indent=""):
         prefix = "" if (verbosity <= Verbosity.SHORT) else "r"
@@ -664,8 +659,7 @@ class DynamicOperandGPR(DynamicOperandReg):
             verbosity=verbosity, indent=indent)
 
 
-@_dataclasses.dataclass(eq=True, frozen=True)
-class DynamicOperandFPR(DynamicOperandReg):
+class DynamicOperandFPR(DynamicOperandGPRFPR):
     def disassemble(self, insn, record,
             verbosity=Verbosity.NORMAL, indent=""):
         prefix = "" if (verbosity <= Verbosity.SHORT) else "f"
@@ -674,11 +668,10 @@ class DynamicOperandFPR(DynamicOperandReg):
             verbosity=verbosity, indent=indent)
 
 
-@_dataclasses.dataclass(eq=True, frozen=True)
 class DynamicOperandTargetAddr(DynamicOperandReg):
     def disassemble(self, insn, record, field,
             verbosity=Verbosity.NORMAL, indent=""):
-        span = record.fields[field]
+        span = self.span(record=record)
         if isinstance(insn, SVP64Instruction):
             span = tuple(map(lambda bit: (bit + 32), span))
         value = insn[span]
@@ -694,8 +687,10 @@ class DynamicOperandTargetAddr(DynamicOperandReg):
                 _SelectableInt(value=0b00, bits=2))))
 
 
-@_dataclasses.dataclass(eq=True, frozen=True)
 class DynamicOperandTargetAddrLI(DynamicOperandTargetAddr):
+    def span(self, record):
+        return record.fields["LI"]
+
     def disassemble(self, insn, record,
             verbosity=Verbosity.NORMAL, indent=""):
         return super().disassemble(field="LI",
@@ -704,6 +699,9 @@ class DynamicOperandTargetAddrLI(DynamicOperandTargetAddr):
 
 
 class DynamicOperandTargetAddrBD(DynamicOperandTargetAddr):
+    def span(self, record):
+        return record.fields["BD"]
+
     def disassemble(self, insn, record,
             verbosity=Verbosity.NORMAL, indent=""):
         return super().disassemble(field="BD",
@@ -711,9 +709,43 @@ class DynamicOperandTargetAddrBD(DynamicOperandTargetAddr):
             verbosity=verbosity, indent=indent)
 
 
+class DynamicOperandDDX(DynamicOperand):
+    def span(self, record):
+        operands = map(DynamicOperand, ("d0", "d1", "d2"))
+        spans = map(lambda operand: operand.span(record=record), operands)
+        return sum(spans, tuple())
+
+    def disassemble(self, insn, record,
+            verbosity=Verbosity.NORMAL, indent=""):
+        span = self.span(record=record)
+        if isinstance(insn, SVP64Instruction):
+            span = tuple(map(lambda bit: (bit + 32), span))
+        value = insn[span]
+
+        if verbosity >= Verbosity.VERBOSE:
+            yield f"{indent}D"
+            mapping = {
+                "d0": "[0:9]",
+                "d1": "[10:15]",
+                "d2": "[16]",
+            }
+            for (subname, subspan) in mapping.items():
+                operand = DynamicOperand(name=subname)
+                span = operand.span(record=record)
+                if isinstance(insn, SVP64Instruction):
+                    span = tuple(map(lambda bit: (bit + 32), span))
+                value = insn[span]
+                span = map(str, span)
+                yield f"{indent}{indent}{operand.name} = D{subspan}"
+                yield f"{indent}{indent}{indent}{int(value):0{value.bits}b}"
+                yield f"{indent}{indent}{indent}{', '.join(span)}"
+        else:
+            yield str(int(value))
+
+
 class Operands(tuple):
     def __new__(cls, insn, iterable):
-        branches = {
+        custom = {
             "b": {"target_addr": DynamicOperandTargetAddrLI},
             "ba": {"target_addr": DynamicOperandTargetAddrLI},
             "bl": {"target_addr": DynamicOperandTargetAddrLI},
@@ -722,6 +754,9 @@ class Operands(tuple):
             "bca": {"target_addr": DynamicOperandTargetAddrBD},
             "bcl": {"target_addr": DynamicOperandTargetAddrBD},
             "bcla": {"target_addr": DynamicOperandTargetAddrBD},
+            "addpcis": {"D": DynamicOperandDDX},
+            "fishmv": {"D": DynamicOperandDDX},
+            "fmvis": {"D": DynamicOperandDDX},
         }
 
         operands = []
@@ -743,8 +778,8 @@ class Operands(tuple):
                 if immediate is not None:
                     operands.append(ImmediateOperand(name=immediate))
 
-                if insn in branches and operand in branches[insn]:
-                    dynamic_cls = branches[insn][operand]
+                if insn in custom and operand in custom[insn]:
+                    dynamic_cls = custom[insn][operand]
 
                 if operand in _RegType.__members__:
                     regtype = _RegType[operand]
@@ -798,17 +833,38 @@ class Record:
 
     @cached_property
     def opcode(self):
-        fields = []
+        value = ([0] * 32)
+        mask = ([0] * 32)
+
         if self.section.opcode:
-            fields += [(self.section.opcode.value, BitSel((0, 5)))]
-            fields += [(self.ppc.opcode.value, self.section.bitsel)]
-        else:
-            fields += [(self.ppc.opcode.value, self.section.bitsel)]
+            for (src, dst) in enumerate(reversed(BitSel((0, 5)))):
+                value[dst] = ((self.section.opcode.value & (1 << src)) != 0)
+                mask[dst] = ((self.section.opcode.mask & (1 << src)) != 0)
+
+        for (src, dst) in enumerate(reversed(self.section.bitsel)):
+            value[dst] = ((self.ppc.opcode.value & (1 << src)) != 0)
+            mask[dst] = ((self.ppc.opcode.mask & (1 << src)) != 0)
 
         for operand in self.operands.static:
-            fields += [(operand.value, self.fields[operand.name])]
+            for (src, dst) in enumerate(reversed(operand.span(record=self))):
+                value[dst] = ((operand.value & (1 << src)) != 0)
+                mask[dst] = True
+
+        for operand in self.operands.dynamic:
+            for dst in operand.span(record=self):
+                value[dst] = False
+                mask[dst] = False
+
+        def onebit(bit):
+            return _SelectableInt(value=int(bit), bits=1)
 
-        return FieldsOpcode(fields)
+        value = _selectconcat(*map(onebit, value))
+        mask = _selectconcat(*map(onebit, mask))
+
+        value = int(value)
+        mask = int(mask)
+
+        return Opcode(value=value, mask=mask)
 
     @property
     def function(self):
@@ -981,7 +1037,7 @@ class WordInstruction(Instruction):
             blob = " ".join(map(lambda byte: f"{byte:02x}", blob))
             blob += "    "
 
-        record = self.record(db=db)
+        record = db[self]
         if record is None:
             yield f"{blob}.long 0x{integer:08x}"
             return
@@ -1436,7 +1492,7 @@ class SVP64Instruction(PrefixedInstruction):
 
         blob_prefix = blob(int(self.prefix))
         blob_suffix = blob(int(self.suffix))
-        record = self.record(db=db)
+        record = db[self]
         if record is None or record.svp64 is None:
             yield f"{blob_prefix}.long 0x{int(self.prefix):08x}"
             yield f"{blob_suffix}.long 0x{int(self.suffix):08x}"
@@ -1448,7 +1504,8 @@ class SVP64Instruction(PrefixedInstruction):
             yield f"{blob_prefix}sv.{record.name} {','.join(operands)}"
         else:
             yield f"{blob_prefix}{record.name}"
-        yield f"{blob_suffix}"
+        if blob_suffix:
+            yield f"{blob_suffix}"
 
         (mode, mode_desc) = self.mode(db=db)
 
@@ -1684,11 +1741,14 @@ class Database:
     def __getitem__(self, key):
         if isinstance(key, (int, Instruction)):
             key = int(key)
+            matches = []
             for record in self:
                 opcode = record.opcode
                 if ((opcode.value & opcode.mask) ==
                         (key & opcode.mask)):
-                    return record
+                    matches.append(record)
+            if matches:
+                return matches[-1]
             return None
         elif isinstance(key, Opcode):
             for record in self: