Changeset 108937 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 10, 2025 10:55:42 PM (4 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168447

Message:

VMM/IEM: Take the group+set conditions into account for each instruction as well. Reorged group/set/instructions. jiraref:VBP-1598

File:

• trunk/src/VBox/VMM/VMMAll/target-armv8/bsd-spec-analyze.py (modified) (31 diffs)

trunk/src/VBox/VMM/VMMAll/target-armv8/bsd-spec-analyze.py

@@ -92 +92 @@
     'FEAT_PCDPHINT':        False, ##@todo 'fPCDPHint',
     'FEAT_SME2p2':          False, ##@todo 'fSme2p2',
+    'FEAT_SSVE_FEXPA':      False, ##@todo 'fSsveFexpa',
     'FEAT_SSVE_FP8DOT2':    False, ##@todo 'fSsveFp8Dot2',
     'FEAT_SSVE_FP8DOT4':    False, ##@todo 'fSsveFp8Dot4',
+    'FEAT_SSVE_FP8FMA':     False, ##@todo 'fSsveFp8Fma',
     'FEAT_SVE2p2':          False, ##@todo 'fSve2p2',
     'FEAT_SVE_BFSCALE':     False, ##@todo 'fSveBfscale',
@@ -100 +102 @@
     'FEAT_SME_F8F16':       False, ##@todo 'fSmeF8F16',
     'FEAT_SME_F8F32':       False, ##@todo 'fSmeF8F32',
+    'FEAT_SME_LUTv2':       False, ##@todo 'fSmeLutv2',
+    'FEAT_SME_MOP4':        False, ##@todo 'fSmeMop4',
+    'FEAT_SME_TMOP':        False, ##@todo 'fSmeTmop',
+    'FEAT_SVE_AES2':        False, ##@todo 'fSveAes2',
 
     # Generated by sed + sort:
@@ -502 +508 @@
             self.oRight = oLeft;
 
+    def clone(self):
+        return ArmAstBinaryOp(self.oLeft.clone(), self.sOp, self.oRight.clone());
+
     @staticmethod
     def needParentheses(oNode, sOp = '&&'):
@@ -591 +600 @@
         self.oExpr = oExpr;
 
+    def clone(self):
+        return ArmAstUnaryOp(self.sOp, self.oExpr.clone());
+
     @staticmethod
     def needParentheses(oNode):
@@ -609 +621 @@
     def __init__(self, oVar, aoValues):
         ArmAstBase.__init__(self, ArmAstBase.ksTypeSquareOp);
+        assert isinstance(oVar, ArmAstBase);
         self.oVar     = oVar;
         self.aoValues = aoValues;
+
+    def clone(self):
+        return ArmAstSquareOp(self.oVar.clone(), [oValue.clone() for oValue in self.aoValues]);
 
     def toString(self):
@@ -624 +640 @@
         ArmAstBase.__init__(self, ArmAstBase.ksTypeConcat);
         self.aoValues = aoValues;
+
+    def clone(self):
+        return ArmAstConcat([oValue.clone() for oValue in self.aoValues]);
 
     def toString(self):
@@ -663 +682 @@
         self.aoArgs = aoArgs;
 
+    def clone(self):
+        return ArmAstFunction(self.sName, [oArg.clone() for oArg in self.aoArgs]);
+
     def toString(self):
         return '%s(%s)' % (self.sName, ','.join([oArg.toString() for oArg in self.aoArgs]),);
@@ -677 +699 @@
         assert self.s_oReValidName.match(sName), 'sName=%s' % (sName);
         self.sName = sName;
+
+    def clone(self):
+        return ArmAstIdentifier(self.sName);
 
     def toString(self):
@@ -692 +717 @@
         self.fValue = fValue;
 
+    def clone(self):
+        return ArmAstBool(self.fValue);
+
     def toString(self):
         return 'true' if self.fValue is True else 'false';
@@ -703 +731 @@
         ArmAstBase.__init__(self, ArmAstBase.ksTypeInteger);
         self.iValue = int(iValue);
+
+    def clone(self):
+        return ArmAstInteger(self.iValue);
 
     def toString(self):
@@ -720 +751 @@
         self.aoValues = aoValues;
 
+    def clone(self):
+        return ArmAstSet([oValue.clone() for oValue in self.aoValues]);
+
     def toString(self):
         return '(%s)' % (', '.join([oValue.toString() for oValue in self.aoValues]),);
@@ -731 +765 @@
         ArmAstBase.__init__(self, ArmAstBase.ksTypeValue);
         self.sValue = sValue;
+
+    def clone(self):
+        return ArmAstValue(self.sValue);
 
     def toString(self):
@@ -773 +810 @@
     def __repr__(self):
         return self.__str__();
+
+    def clone(self):
+        return ArmEncodesetField(self.oJson, self.iFirstBit, self.cBitsWidth, self.fFixed, self.fValue, self.sName);
 
     def getMask(self):
@@ -819 +859 @@
 
     @staticmethod
-    def fromJsonEncodeset(oJson, aoSet, fCovered):
+    def encodesetFromJson(oJson):
         assert oJson['_type'] == 'Instruction.Encodeset.Encodeset', oJson['_type'];
+        aoSet   = [];
+        fFields = 0;
         for oJsonValue in oJson['values']:
             oNewField = ArmEncodesetField.fromJson(oJsonValue);
             fNewMask  = oNewField.getShiftedMask();
-            if (fNewMask & fCovered) != fNewMask:
-                aoSet.append(oNewField)
-                fCovered |= fNewMask;
-        return (aoSet, fCovered);
-
-
-class ArmInstruction(object):
+            assert (fNewMask & fFields) == 0;
+            aoSet.append(oNewField);
+            fFields  |= fNewMask;
+        return (aoSet, fFields);
+
+    @staticmethod
+    def encodesetAddParentFields(aoFields, fFields, aoParentFields):
+        for oParentField in aoParentFields:
+            fNewMask  = oParentField.getShiftedMask();
+            if (fNewMask & fFields) != fNewMask:
+                aoFields.append(oParentField.clone()); # (paranoid: clone)
+                fFields |= fNewMask;
+        return (aoFields, fFields);
+
+
+class ArmInstructionBase(object):
+    """
+    Base class for ArmInstruction, ArmInstructionSet and ArmInstructionGroup
+
+    Instances of ArmInstruction will have ArmInstructionGroup (or maybe
+    ArmInstructionGroup) as parent.
+
+    Instances of ArmInstructionGroup have ArmInstructionSet as parent.
+
+    Instances of ArmInstructionSet doesn't have a parent, so it is None.
+    """
+
+    s_oReValidName = re.compile('^[_A-Za-z][_A-Za-z0-9]+$');
+
+    def __init__(self, oJson, sName, aoFields, fFields, oCondition, oParent):
+        self.oJson           = oJson;
+        self.sName           = sName;
+        self.oParent         = oParent;
+        self.aoFields        = aoFields;
+        self.fFields         = fFields;  ##< Not necessarily correct for Instructions!
+        self.oCondition      = oCondition;
+
+        assert ArmInstructionBase.s_oReValidName.match(sName), '%s' % (sName);
+        assert (oJson['_type'] == 'Instruction.InstructionSet') == (oParent is None);
+        assert not oParent or isinstance(oParent, (ArmInstructionGroup, ArmInstructionSet));
+
+
+    def getUpIterator(self):
+        """ Get an iterator the starts with 'self' and goes up the parent chain. """
+        class UpIterator(object):
+            def __init__(self, oNode):
+                self.oNext = oNode;
+
+            def __iter__(self):
+                return self;
+
+            def __next__(self):
+                oRet = self.oNext;
+                if oRet:
+                    self.oNext = oRet.oParent;
+                    return oRet;
+                raise StopIteration();
+        return UpIterator(self);
+
+    def getFieldByName(self, sName, fRaiseXpctIfNotFound = True):
+        """ Looks up a named field in the aoFields. """
+        for oField in self.aoFields:
+            if oField.sName and oField.sName == sName:
+                return oField;
+        if fRaiseXpctIfNotFound:
+            raise Exception('Could not find field %s in instruction %s' % (sName, self.sName,));
+        return None;
+
+
+class ArmInstructionOrganizerBase(ArmInstructionBase):
+    """ Common base class for ArmInstructionSet and ArmInstructionGroup. """
+
+    s_oReValidName = re.compile('^[_A-Za-z][_A-Za-z0-9]+$');
+
+    def __init__(self, oJson, sName, aoFields, fFields, oCondition, oParent = None):
+        ArmInstructionBase.__init__(self, oJson, sName, aoFields, fFields, oCondition, oParent);
+        self.aoInstructions     = [];   ##< The instruction directly under this object (no in sub-set or groups).
+        self.dInstructions      = {};   ##< The instructions in self.aoInstructions indexed by name.
+        self.aoAllInstructions  = [];   ##< All the instructions in this set.
+        self.dAllInstructions   = {};   ##< The instructions in self.aoAllInstructions indexed by name.
+        self.aoGroups           = [];   ##< Groups under this object.
+
+    def toString(self):
+        return '%s-name=%s Fields=#%u/%#010x cond=%s parent=%s' \
+             % ('set' if isinstance(self, ArmInstructionSet) else 'group', self.sName,
+                len(self.aoFields), self.fFields, self.oCondition.toString(), self.oParent.sName if self.oParent else '<none>',);
+
+    def addInstruction(self, oInstr):
+        """ Recursively adds the instruction to the ALL collections."""
+        self.aoAllInstructions.append(oInstr);
+        assert oInstr.sName not in self.dAllInstructions;
+        self.dAllInstructions[oInstr.sName] = oInstr;
+
+        if self.oParent:
+            self.oParent.addInstruction(oInstr);
+        else:
+            g_dAllArmInstructionsBySet[self.sName].append(oInstr);
+
+    def addImmediateInstruction(self, oInstr):
+        """ Adds an instruction immediately below this group/set. """
+        assert oInstr.sName not in self.dInstructions;
+        assert oInstr.oParent == self;
+
+        self.aoInstructions.append(oInstr);
+        self.dInstructions[oInstr.sName] = oInstr;
+
+        if self.oParent:
+            assert isinstance(self, ArmInstructionGroup);
+            g_dAllArmInstructionsByGroup[self.sName].append(oInstr);
+
+        self.addInstruction(oInstr);
+
+class ArmInstructionSet(ArmInstructionOrganizerBase):
+    """ Representation of a Instruction.InstructionSet object. """
+
+    def __init__(self, oJson, sName, aoFields, fFields, oCondition, cBitsWidth):
+        ArmInstructionOrganizerBase.__init__(self, oJson, sName, aoFields, fFields, oCondition);
+        self.cBitsWidth = cBitsWidth;
+        assert cBitsWidth == 32;
+
+    def __str__(self):
+        return self.toString();
+
+    def __repr__(self):
+        return self.toString();
+
+    def toString(self):
+        return ArmInstructionOrganizerBase.toString(self) + ' read_bits=%u' % (self.cBitsWidth,);
+
+    @staticmethod
+    def fromJson(oJson):
+        assert oJson['_type'] == 'Instruction.InstructionSet';
+        sName = oJson['name'];
+
+        (aoFields, fFields) = ArmEncodesetField.encodesetFromJson(oJson['encoding']);
+        oCondition          = ArmAstBase.fromJson(oJson['condition']);
+        print('debug: Instruction set %s' % (sName,));
+        return ArmInstructionSet(oJson, sName, aoFields, fFields, oCondition, int(oJson['read_width']));
+
+
+class ArmInstructionGroup(ArmInstructionOrganizerBase):
+    """ Representation of a Instruction.InstructionGroup object. """
+
+    def __init__(self, oJson, sName, aoFields, fFields, oCondition, oParent):
+        ArmInstructionOrganizerBase.__init__(self, oJson, sName, aoFields, fFields, oCondition, oParent);
+
+    def __str__(self):
+        return self.toString();
+
+    def __repr__(self):
+        return self.toString();
+
+    def toString(self):
+        return ArmInstructionOrganizerBase.toString(self);
+
+    @staticmethod
+    def fromJson(oJson, oParent):
+        assert oJson['_type'] == 'Instruction.InstructionGroup';
+        sName = oJson['name'];
+
+        (aoFields, fFields) = ArmEncodesetField.encodesetFromJson(oJson['encoding']);
+        oCondition          = ArmAstBase.fromJson(oJson['condition']);
+        print('debug: Instruction group %s' % (sName,));
+        return ArmInstructionGroup(oJson, sName, aoFields, fFields, oCondition, oParent);
+
+
+
+class ArmInstruction(ArmInstructionBase):
     """
     ARM instruction
@@ -836 +1039 @@
     s_oReValidName = re.compile('^[_A-Za-z][_A-Za-z0-9]+$');
 
-    def __init__(self, oJson, sName, sMemonic, sAsmDisplay, aoEncodesets, oCondition):
-        assert self.s_oReValidName.match(sName), 'sName=%s' % (sName);
-        self.oJson           = oJson;
-        self.sName           = sName;
+    def __init__(self, oJson, sName, sMemonic, sAsmDisplay, aoFields, fFields, oCondition, oParent):
+        ArmInstructionBase.__init__(self, oJson, sName, aoFields, fFields, oCondition, oParent);
         self.sMnemonic       = sMemonic;
         self.sAsmDisplay     = sAsmDisplay;
-        self.sSet            = None;
-        self.asGroups        = [];
-        self.aoEncodesets    = aoEncodesets;
-        self.oCondition      = oCondition;
         self.fFixedMask      = 0;
         self.fFixedValue     = 0;
-        for oField in aoEncodesets:
+        for oField in aoFields:
             self.fFixedMask  |= oField.fFixed << oField.iFirstBit;
             self.fFixedValue |= oField.fValue << oField.iFirstBit;
@@ -854 +1051 @@
         # State related to decoder.
         self.fDecoderLeafCheckNeeded = False;    ##< Whether we need to check fixed value/mask in leaf decoder functions.
+
+        # Check input.
+        assert self.s_oReValidName.match(sName), 'sName=%s' % (sName);
 
     def toString(self, cchName = 0, fEncoding = False):
@@ -861 +1061 @@
             sRet = 'sName=%-*s sMnemonic=%-*s' % (cchName, self.sName, cchName, self.sMnemonic);
         if not fEncoding:
-            return '%s fFixedValue/Mask=%#x/%#x #encoding=%s' % (sRet, self.fFixedValue, self.fFixedMask, len(self.aoEncodesets));
+            return '%s fFixedValue/Mask=%#x/%#x #encoding=%s' % (sRet, self.fFixedValue, self.fFixedMask, len(self.aoFields));
         return '%s fFixedValue/Mask=%#x/%#x encoding=\n    %s' \
-             % (sRet, self.fFixedValue, self.fFixedMask, ',\n    '.join([str(s) for s in self.aoEncodesets]),);
+             % (sRet, self.fFixedValue, self.fFixedMask, ',\n    '.join([str(s) for s in self.aoFields]),);
 
     def __str__(self):
@@ -877 +1077 @@
         return self.sName[:-1];
 
-    def getFieldByName(self, sName, fRaiseXpctIfNotFound = True):
-        """ Looks up a named field in the aoEncodesets. """
-        for oField in self.aoEncodesets:
-            if oField.sName and oField.sName == sName:
-                return oField;
-        if fRaiseXpctIfNotFound:
-            raise Exception('Could not find field %s in instruction %s' % (sName, self.sName,));
-        return None;
+    def getSetAndGroupNames(self):
+        asNames = [];
+        oParent = self.oParent;
+        while oParent:
+            asNames.append(oParent.sName)
+            oParent = oParent.oParent;
+        return asNames;
+
+    def getSetAndGroupNamesWithLabels(self):
+        asNames = self.getSetAndGroupNames();
+        if len(asNames) > 1:
+            return 'Instruction Set: %s  Group%s: %s' % (asNames[-1], 's' if len(asNames) > 2 else '', ', '.join(asNames[:-1]),);
+        return 'Instruction Set: %s' % (asNames[-1],);
+
 
 
@@ -895 +1101 @@
 
 ## All the instructions.
-g_aoAllArmInstructions = []             # type: List[ArmInstruction]
+g_aoAllArmInstructions = []                                     # type: List[ArmInstruction]
 
 ## All the instructions by name (not mnemonic).
-g_dAllArmInstructionsByName = {}        # type: Dict[ArmInstruction]
-
-## All the instruction by instruction set name.
-g_dAllArmInstructionsBySet = {}         # type: Dict[List[ArmInstruction]]
-
-## All the instruction by instruction group name.
-g_dAllArmInstructionsByGroup = {}       # type: Dict[List[ArmInstruction]]
+g_dAllArmInstructionsByName = {}                                # type: Dict[ArmInstruction]
+
+## All the instructions by instruction set name.
+g_dAllArmInstructionsBySet = collections.defaultdict(list)      # type: Dict[List[ArmInstruction]]
+
+## All the instructions by (immediate) instruction group name.
+g_dAllArmInstructionsByGroup = collections.defaultdict(list)    # type: Dict[List[ArmInstruction]]
+
+## The instruction sets.
+g_aoArmInstructionSets = []                                     # type: List[ArmInstructionSet]
+
+## The instruction sets by name.
+g_dArmInstructionSets = {}                                      # type: Dict[ArmInstructionSet]
+
+## The instruction groups.
+g_aoArmInstructionGroups = []                                   # type: List[ArmInstructionGroup]
+
+## The instruction groups.
+g_dArmInstructionGroups = {}                                    # type: Dict[ArmInstructionGroup]
 
 
@@ -985 +1203 @@
 
 
-def parseInstructions(aoStack, aoJson, ddAsmRules):
+def parseInstructions(oParent, aoJson, ddAsmRules):
     for oJson in aoJson:
-        if oJson['_type'] == "Instruction.InstructionSet":
-            assert oJson['name'];
-            parseInstructions([oJson,] + aoStack, oJson['children'], ddAsmRules);
-
-        elif oJson['_type'] == "Instruction.InstructionGroup":
-            assert oJson['name'];
-            parseInstructions([oJson,] + aoStack, oJson['children'], ddAsmRules);
-
-        elif oJson['_type'] == "Instruction.Instruction":
+        sType = oJson['_type'];
+        if sType == 'Instruction.InstructionSet':
+            if oParent: raise Exception("InstructionSet shouldn't have a parent!");
+            oInstrSet = ArmInstructionSet.fromJson(oJson);
+            assert oInstrSet.sName not in g_dArmInstructionSets;
+            g_dArmInstructionSets[oInstrSet.sName] = oInstrSet;
+            g_aoArmInstructionSets.append(oInstrSet);
+
+            parseInstructions(oInstrSet, oJson['children'], ddAsmRules);
+
+        elif sType == 'Instruction.InstructionGroup':
+            if not oParent: raise Exception("InstructionGroup should have a parent!");
+            oInstrGroup = ArmInstructionGroup.fromJson(oJson, oParent);
+            #if oInstrGroup.sName in g_dArmInstructionGroups: # happens with
+
+            if oInstrGroup.sName in g_dArmInstructionGroups:
+                if oInstrGroup.sName == oParent.sName: # sve_intx_clamp, sve_intx_dot2
+                    oInstrGroup.sName += '_lvl2'
+                else:
+                    assert oInstrGroup.sName not in g_dArmInstructionGroups, '%s' % (oInstrGroup.sName,);
+
+            g_dArmInstructionGroups[oInstrGroup.sName] = oInstrGroup;
+            g_aoArmInstructionGroups.append(oInstrGroup);
+            oParent.aoGroups.append(oInstrGroup);
+
+            parseInstructions(oInstrGroup, oJson['children'], ddAsmRules);
+
+        elif sType == "Instruction.Instruction":
+            if not oParent: raise Exception("Instruction should have a parent!");
+
             #
             # Start by getting the instruction attributes.
@@ -1001 +1240 @@
             sInstrNm = oJson['name'];
 
-            (aoEncodesets, fCovered) = ArmEncodesetField.fromJsonEncodeset(oJson['encoding'], [], 0);
-            for oParent in aoStack:
-                if 'encoding' in oParent:
-                    (aoEncodesets, fCovered) = ArmEncodesetField.fromJsonEncodeset(oParent['encoding'], aoEncodesets, fCovered);
-
-            oCondition = ArmAstBase.fromJson(oJson['condition']);
+            (aoFields, fFields) = ArmEncodesetField.encodesetFromJson(oJson['encoding']);
+            oCondition          = ArmAstBase.fromJson(oJson['condition']);
+
+            for oUp in oParent.getUpIterator():
+                if oUp.fFields & ~fFields:
+                    (aoFields, fFields) = ArmEncodesetField.encodesetAddParentFields(aoFields, fFields, oUp.aoFields);
+                if not oUp.oCondition.isBoolAndTrue():
+                    oCondition = ArmAstBinaryOp(oCondition, '&&', oUp.oCondition.clone());
+
             #sCondBefore = oCondition.toString();
             #print('debug transfer: %s: org:  %s' % (sInstrNm, sCondBefore));
-            (oCondition, fMod) = transferConditionsToEncoding(oCondition, aoEncodesets, collections.defaultdict(list), sInstrNm);
+            ## @todo fFields isn't updated here!
+            (oCondition, fMod) = transferConditionsToEncoding(oCondition, aoFields, collections.defaultdict(list), sInstrNm);
             #if fMod:
             #    print('debug transfer: %s: %s  ---->  %s' % (sInstrNm, sCondBefore, oCondition.toString()));
@@ -1029 +1272 @@
             # Instantiate it.
             #
-            oInstr = ArmInstruction(oJson, sInstrNm, sMnemonic, sAsmDisplay, aoEncodesets, oCondition);
+            oInstr = ArmInstruction(oJson, sInstrNm, sMnemonic, sAsmDisplay, aoFields, fFields, oCondition, oParent);
 
             #
             # Add the instruction to the various lists and dictionaries.
-            # This is where the sSet and asGroups properties are populated.
             #
             g_aoAllArmInstructions.append(oInstr);
@@ -1039 +1281 @@
             g_dAllArmInstructionsByName[oInstr.sName] = oInstr;
 
-            for oParent in reversed(aoStack): ## @todo reversed?
-                sName = oParent['name'];
-                sParentType = oParent['_type'];
-                if sParentType == "Instruction.InstructionSet":
-                    assert not oInstr.sSet;
-                    oInstr.sSet = sName;
-                    if sName in g_dAllArmInstructionsBySet:
-                        g_dAllArmInstructionsBySet[sName].append(oInstr);
-                    else:
-                        g_dAllArmInstructionsBySet[sName] = [oInstr,];
-                elif sParentType == "Instruction.InstructionGroup":
-                    if sName not in oInstr.asGroups: # sve_intx_clamp comes up twice for instance.
-                        oInstr.asGroups.append(sName);
-                        if sName in g_dAllArmInstructionsByGroup:
-                            g_dAllArmInstructionsByGroup[sName].append(oInstr);
-                        else:
-                            g_dAllArmInstructionsByGroup[sName] = [oInstr,];
-                else:
-                    raise Exception('Unexpected stack entry type: %s' % (sParentType,));
+            oParent.addImmediateInstruction(oInstr);
+
+        else:
+            raise Exception('Unexpected instruction object type: %s' % (sType,));
 
     return True;
 
-def transferConditionsToEncoding(oCondition, aoEncodesets, dPendingNotEq, sInstrNm, uDepth = 0, fMod = False):
+def transferConditionsToEncoding(oCondition, aoFields, dPendingNotEq, sInstrNm, uDepth = 0, fMod = False):
     """
     This is for dealing with stuff like asr_z_p_zi_ and lsr_z_p_zi_ which has
@@ -1079 +1306 @@
             # Recurse into each side of an AND expression.
             #print('debug transfer: %s: recursion...' % (sInstrNm,));
-            (oCondition.oLeft, fMod)  = transferConditionsToEncoding(oCondition.oLeft,  aoEncodesets, dPendingNotEq,
+            (oCondition.oLeft, fMod)  = transferConditionsToEncoding(oCondition.oLeft,  aoFields, dPendingNotEq,
                                                                      sInstrNm, uDepth + 1, fMod);
-            (oCondition.oRight, fMod) = transferConditionsToEncoding(oCondition.oRight, aoEncodesets, dPendingNotEq,
+            (oCondition.oRight, fMod) = transferConditionsToEncoding(oCondition.oRight, aoFields, dPendingNotEq,
                                                                      sInstrNm, uDepth + 1, fMod);
             if oCondition.oLeft.isBoolAndTrue():
@@ -1096 +1323 @@
                 oValue     = oCondition.oRight;
                 #print('debug transfer: %s: binaryop step 2...' % (sInstrNm,));
-                for oField in aoEncodesets: # ArmEncodesetField
+                for oField in aoFields: # ArmEncodesetField
                     if oField.sName and oField.sName == sFieldName:
                         # ArmAstInteger (unlikely):
@@ -1953 +2180 @@
         # Organize this by instruction set, groups and instructions.
         sPrevCategory = '';
-        for oInstr in sorted(g_aoAllArmInstructions, key = operator.attrgetter('sSet', 'asGroups')):
+        for oInstr in sorted(g_aoAllArmInstructions, key = ArmInstruction.getSetAndGroupNames):
             # New group/category?
-            sCategory = ' / '.join([oInstr.sSet if oInstr.sSet else 'no-instr-set'] + oInstr.asGroups);
+            sCategory = ' / '.join(oInstr.getSetAndGroupNames(),);
             if sCategory != sPrevCategory:
                 asLines += [
@@ -1970 +2197 @@
             # Emit the instruction stub.
             asArgs  = [ # Note! Must match generateDecoderFunctions exactly.
-                oField.sName for oField in sorted(oInstr.aoEncodesets, key = operator.attrgetter('iFirstBit')) if oField.sName
+                oField.sName for oField in sorted(oInstr.aoFields, key = operator.attrgetter('iFirstBit')) if oField.sName
             ];
             asLines += [
@@ -1991 +2218 @@
 
             def getFieldInfo(self, sName):
-                oField = oInstr.getFieldByName(sName)
-                return (sName, oField.cBitsWidth);
+                oInstr = self.oInstr;
+                oField = oInstr.getFieldByName(sName, False)
+                if oField:
+                    return (sName, oField.cBitsWidth);
+                # Look for the field in groups and sets and generate a name that extracts it from uOpcode:
+                ## @todo eliminate conditions checks from the parent on parent fields that are fixed in the given instr.
+                for oParent in oInstr.oParent.getUpIterator():
+                    oField = oParent.getFieldByName(sName, False);
+                    if oField:
+                        return ('((uOpcode >> %u) & %#x)' % (oField.iFirstBit, oField.getMask()), oField.cBitsWidth);
+                raise Exception('Field %s was not found for instruction %s' % (sName, oInstr.sName,));
 
             def convertFunctionCall(self, oCall):
@@ -2004 +2240 @@
                     sCpumFeature = g_dSpecFeatToCpumFeat.get(sFeatureNm, None);
                     if sCpumFeature is None:
-                        raise Exception('IsFeatureImplemented parameter not known: %s (see g_dSpecFeatToCpumFeat)'
-                                        % (sFeatureNm));
-                    if sCpumFeature is False:
+                        print('warning: IsFeatureImplemented parameter not known: %s (see g_dSpecFeatToCpumFeat)' % (sFeatureNm));
+                        #raise Exception('IsFeatureImplemented parameter not known: %s (see g_dSpecFeatToCpumFeat)'
+                        #                % (sFeatureNm));
+                    if not isinstance(sCpumFeature, str):
                         return 'false /** @todo IEM_GET_GUEST_CPU_FEATURES(pVCpu)->%s*/' % (sFeatureNm,);
                     return 'IEM_GET_GUEST_CPU_FEATURES(pVCpu)->%s /*%s*/' % (sCpumFeature, sFeatureNm,)
@@ -2017 +2254 @@
                 '',
                 '/* %08x/%08x: %s' % (oInstr.fFixedMask, oInstr.fFixedValue, oInstr.sAsmDisplay,),
-                '   Instruction Set: %s%s%s */'
-                % (oInstr.sSet, ' Group: ' if oInstr.asGroups else '', ','.join(oInstr.asGroups),),
+                '   %s */'% (oInstr.getSetAndGroupNamesWithLabels(),),
                 'FNIEMOP_DEF_1(iemDecodeA64_%s, uint32_t, uOpcode)' % (sCName,),
                 '{',
@@ -2042 +2278 @@
             asArgs  = [];
             sLogFmt = '';
-            for oField in sorted(oInstr.aoEncodesets, key = operator.attrgetter('iFirstBit')): # ArmEncodesetField
+            for oField in sorted(oInstr.aoFields, key = operator.attrgetter('iFirstBit')): # ArmEncodesetField
                 if oField.sName:
                     asArgs.append(oField.sName);