power_insn: remove the whitespaces properly

[openpower-isa.git] / src / openpower / decoder / power_fields.py

diff --git a/src/openpower/decoder/power_fields.py b/src/openpower/decoder/power_fields.py
index f41b89e3db5feafdd9f6db1448f9ffa547b3d7e5..48cd23d45dd2f8f02fd265462a76ac1f31ff8278 100644 (file)
--- a/src/openpower/decoder/power_fields.py
+++ b/src/openpower/decoder/power_fields.py
@@ -49,10 +49,9 @@ class Reference:
         span = dict.fromkeys(self.__class__.span).keys()
         lhs = _selectconcat(*(self.storage[bit] for bit in span))
 
-        if isinstance(other, Field):
-            bits = len(other.__class__)
-            value = int(other)
-            rhs = _SelectableInt(value=value, bits=bits)
+        if isinstance(other, Reference):
+            span = dict.fromkeys(other.__class__.span).keys()
+            rhs = _selectconcat(*(other.storage[bit] for bit in span))
         elif isinstance(other, int):
             bits = len(self.__class__)
             if other.bit_length() > bits:
@@ -117,11 +116,6 @@ class FieldMeta(type):
 
         return super().__new__(metacls, clsname, bases, ns)
 
-    def __getitem__(cls, size):
-        clsname = f"{cls.__name__}[{size}]"
-        items = ((Field,) * size)
-        return ArrayMeta(clsname, (Array,), {}, items=items)
-
     def __repr__(cls):
         if not cls.__members__:
             return cls.__name__
@@ -133,6 +127,19 @@ class FieldMeta(type):
     def __len__(cls):
         return len(cls.__members__)
 
+    def __getitem__(cls, selector):
+        if isinstance(selector, int):
+            selector = (selector,)
+
+        items = []
+        for idx in selector:
+            if not isinstance(idx, int):
+                raise ValueError(selector)
+            item = cls.__members__[idx]
+            items.append(item)
+
+        return cls.__class__(cls.__name__, (Field,), {}, items=items)
+
     def remap(cls, scheme):
         if isinstance(scheme, type) and issubclass(scheme, Mapping):
             scheme = range(len(scheme))
@@ -197,6 +204,11 @@ class ArrayMeta(type):
             length += len(field)
         return length
 
+    def __getitem__(cls, size):
+        clsname = f"{cls.__name__}[{size}]"
+        items = ((Field,) * size)
+        return ArrayMeta(clsname, (Array,), {}, items=items)
+
     def remap(cls, scheme):
         scheme_md = []
         scheme_sd = []
@@ -318,6 +330,19 @@ class MappingMeta(type):
             length = max(length, len(field))
         return length
 
+    def __getitem__(cls, selector):
+        best_min = 0
+        best_max = 0
+        for field in cls.__members__.values():
+            length = len(field)
+            best_min = min(best_min, length)
+            best_max = max(best_max, length)
+
+        items = tuple(range(best_min, best_max))
+        field = FieldMeta(cls.__name__, (Field,), {}, items=items)
+
+        return field[selector]
+
     def remap(cls, scheme):
         ns = {}
         annotations = {}