Changeset 101742 in vbox for trunk/src/VBox

Timestamp:

Nov 3, 2023 3:16:50 PM (13 months ago)

Author:

vboxsync

Message:

VMM/IEM: Consider #if/#ifdef/#ifndef/#elif/#else/#endif when picking MC blocks for the threaded and native recompilation. This should fix the cmpxchg16b compile problems on arm64. [fix] bugref:10371

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllInstPython.py (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllInstPython.py

@@ -3331 +3331 @@
 
         @staticmethod
-        def isInBlockForArch(aoCppCondStack, sArch):
+        def isInBlockForArch(aoCppCondStack, sArch, iLine):
             """ Checks if sArch is included in the current conditional block. """
+            _ = iLine;
+            #print('debug: isInBlockForArch(%s,%s); line %s' % (len(aoCppCondStack), sArch, iLine), file = sys.stderr);
             for oCond in aoCppCondStack:
                 if oCond.isArchIncludedInPrimaryBlock(sArch):
                     if oCond.aoElif or oCond.fInElse:
+                        #print('debug: isInBlockForArch -> False #1', file = sys.stderr);
                         return False;
+                    #print('debug: isInBlockForArch(%s,%s): in IF-block' % (len(aoCppCondStack), sArch), file = sys.stderr);
                 else:
+                    fFine = False;
                     for oElifCond in oCond.aoElif:
                         if oElifCond.isArchIncludedInPrimaryBlock(sArch):
                             if oElifCond is not oCond.aoElif[-1] or oCond.fInElse:
+                                #print('debug: isInBlockForArch -> False #3', file = sys.stderr);
                                 return False;
-
+                            fFine = True;
+                    if not fFine and not oCond.fInElse:
+                        #print('debug: isInBlockForArch -> False #4', file = sys.stderr);
+                        return False;
+            #print('debug: isInBlockForArch -> True', file = sys.stderr);
             return True;
 
@@ -5029 +5039 @@
             if (   not self.aoCppCondStack
                 or not self.sHostArch
-                or self.PreprocessorConditional.isInBlockForArch(self.aoCppCondStack, self.sHostArch)):
+                or self.PreprocessorConditional.isInBlockForArch(self.aoCppCondStack, self.sHostArch, self.iLine)):
                 g_aoMcBlocks.append(self.oCurMcBlock);
                 self.cTotalMcBlocks += 1;