Changeset 108234 in vbox

Timestamp:

Feb 16, 2025 2:20:28 PM (2 months ago)

Author:

vboxsync

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

167555

Message:

Runtime/RTAcpi*: Implement constant folding for ShiftLeft (used by vbox.dsl), bugref:10733

Location:

trunk/src/VBox/Runtime

Files:

• common/acpi/acpi-ast.cpp (modified) (7 diffs)
• common/acpi/acpi-compiler.cpp (modified) (2 diffs)
• common/acpi/acpi-ns.cpp (modified) (6 diffs)
• include/internal/acpi.h (modified) (4 diffs)

trunk/src/VBox/Runtime/common/acpi/acpi-ast.cpp

@@ -92 +92 @@
 
 
-DECLHIDDEN(int) rtAcpiAstNodeTransform(PRTACPIASTNODE pAstNd, PRTERRINFO pErrInfo)
-{
-#if 0
-    /* Walk all arguments containing AST nodes first. */
-    for (uint8_t i = 0; i < pAstNd->cArgs; i++)
-    {
-        if (   pAstNd->aArgs[i].enmType == kAcpiAstArgType_AstNode
-            && pAstNd->aArgs[i].u.pAstNd)
-        {
-            int rc = rtAcpiAstNodeTransform(pAstNd->aArgs[i].u.pAstNd, pErrInfo);
-            if (RT_FAILURE(rc))
-                return rc;
-        }
-    }
-
-    if (pAstNd->fFlags & RTACPI_AST_NODE_F_NEW_SCOPE)
-    {
-        PRTACPIASTNODE pIt/*, pItPrev*/;
-        /* Do transformations on the nodes first. */
-        RTListForEach(&pAstNd->LstScopeNodes, pIt, RTACPIASTNODE, NdAst)
-        {
-            int rc = rtAcpiAstNodeTransform(pIt, pErrInfo);
-            if (RT_FAILURE(rc))
-                return rc;
-        }
-
-        /* Now do transformations on our level. */
-        RTListForEachReverseSafe(&pAstNd->LstScopeNodes, pIt, pItPrev, RTACPIASTNODE, NdAst)
-        {
-            /*
-             * If there is an If AST node followed by Else we move the Else branch as the last
-             * statement in the If because when emitting to AML the Else is enclosed in the If
-             * package.
-             */
-            if (   pIt->enmOp == kAcpiAstNodeOp_Else
-                && pItPrev
-                && pItPrev->enmOp == kAcpiAstNodeOp_If)
-            {
-                RTListNodeRemove(&pIt->NdAst);
-                RTListAppend(&pItPrev->LstScopeNodes, &pIt->NdAst);
-            }
-        }
-    }
-#else
-    RT_NOREF(pAstNd, pErrInfo);
-#endif
-
-    return VINF_SUCCESS;
-}
-
-
 /**
  * Evaluates the given AST node to an integer if possible.
  *
  * @returns IPRT status code.
- * @param   pAstNd          The AST node to evaluate.
- * @param   pNsRoot         The namespace root this AST belongs to.
- * @param   pu64            Where to store the integer on success.
+ * @param   pAstNd                  The AST node to evaluate.
+ * @param   pNsRoot                 The namespace root this AST belongs to.
+ * @param   fResolveIdentifiers     Flag whether to try resolving identifiers to constant integers.
+ * @param   pu64                    Where to store the integer on success.
  */
-static int rtAcpiAstNodeEvaluateToInteger(PCRTACPIASTNODE pAstNd, PRTACPINSROOT pNsRoot, uint64_t *pu64)
+static int rtAcpiAstNodeEvaluateToInteger(PCRTACPIASTNODE pAstNd, PRTACPINSROOT pNsRoot, bool fResolveIdentifiers, uint64_t *pu64)
 {
     /* Easy way out?. */
@@ -172 +122 @@
     }
 
-    if (pAstNd->enmOp == kAcpiAstNodeOp_Identifier)
+    if (   pAstNd->enmOp == kAcpiAstNodeOp_Identifier
+        && fResolveIdentifiers)
     {
         /* Look it up in the namespace and use the result. */
@@ -178 +129 @@
         if (!pNsEntry)
             return VERR_NOT_FOUND;
-
-        *pu64 = pNsEntry->offBits;
+        if (pNsEntry->enmType != kAcpiNsEntryType_ResourceField)
+            return VERR_NOT_SUPPORTED;
+
+        *pu64 = pNsEntry->RsrcFld.offBits;
         return VINF_SUCCESS;
     }
@@ -185 +138 @@
     /** @todo */
     return VERR_NOT_IMPLEMENTED;
+}
+
+
+DECLHIDDEN(int) rtAcpiAstNodeTransform(PRTACPIASTNODE pAstNd, PRTACPINSROOT pNsRoot, PRTERRINFO pErrInfo)
+{
+    /* Walk all arguments containing AST nodes first. */
+    for (uint8_t i = 0; i < pAstNd->cArgs; i++)
+    {
+        if (   pAstNd->aArgs[i].enmType == kAcpiAstArgType_AstNode
+            && pAstNd->aArgs[i].u.pAstNd)
+        {
+            int rc = rtAcpiAstNodeTransform(pAstNd->aArgs[i].u.pAstNd, pNsRoot, pErrInfo);
+            if (RT_FAILURE(rc))
+                return rc;
+        }
+    }
+
+    if (pAstNd->fFlags & RTACPI_AST_NODE_F_NEW_SCOPE)
+    {
+        PRTACPIASTNODE pIt/*, pItPrev*/;
+        /* Do transformations on the nodes first. */
+        RTListForEach(&pAstNd->LstScopeNodes, pIt, RTACPIASTNODE, NdAst)
+        {
+            int rc = rtAcpiAstNodeTransform(pIt, pNsRoot, pErrInfo);
+            if (RT_FAILURE(rc))
+                return rc;
+        }
+    }
+
+    /* Now do optimizations we can do here. */
+    switch (pAstNd->enmOp)
+    {
+        case kAcpiAstNodeOp_ShiftLeft:
+        {
+            /*
+             * If both arguments evaluate to constant integers we can convert this
+             * to the final result.
+             */
+            /** @todo Skips the 3 operand variant (no target), check what iasl is doing here. */
+            if (!pAstNd->aArgs[2].u.pAstNd)
+            {
+                uint64_t u64ValToShift = 0;
+                uint64_t u64ValShift = 0;
+                int rc = rtAcpiAstNodeEvaluateToInteger(pAstNd->aArgs[0].u.pAstNd, pNsRoot, false /*fResolveIdentifiers*/, &u64ValToShift);
+                if (RT_SUCCESS(rc))
+                    rc = rtAcpiAstNodeEvaluateToInteger(pAstNd->aArgs[1].u.pAstNd, pNsRoot, false /*fResolveIdentifiers*/, &u64ValShift);
+                if (   RT_SUCCESS(rc)
+                    && u64ValShift <= 63)
+                {
+                    /** @todo Check overflow handling. */
+                    rtAcpiAstNodeFree(pAstNd->aArgs[0].u.pAstNd);
+                    rtAcpiAstNodeFree(pAstNd->aArgs[1].u.pAstNd);
+
+                    pAstNd->aArgs[0].u.pAstNd = NULL;
+                    pAstNd->aArgs[1].u.pAstNd = NULL;
+                    pAstNd->cArgs             = 0;
+                    pAstNd->enmOp             = kAcpiAstNodeOp_Number;
+                    pAstNd->u64               = u64ValToShift << u64ValShift;
+                }
+            }
+            break;
+        }
+        default:
+            break;
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -548 +568 @@
             {
                 /* Try resolving to a constant expression. */
-                rc = rtAcpiAstNodeEvaluateToInteger(pAstNd->aArgs[0].u.pAstNd, pNsRoot, &cElems);
+                rc = rtAcpiAstNodeEvaluateToInteger(pAstNd->aArgs[0].u.pAstNd, pNsRoot, true /*fResolveIdentifiers*/, &cElems);
                 if (RT_FAILURE(rc))
                     break;
@@ -615 +635 @@
                         /* Try resolving to a constant expression. */
                         uint64_t u64 = 0;
-                        rc = rtAcpiAstNodeEvaluateToInteger(pIt, pNsRoot, &u64);
+                        rc = rtAcpiAstNodeEvaluateToInteger(pIt, pNsRoot, true /*fResolveIdentifiers*/, &u64);
                         if (RT_FAILURE(rc))
                             break;
@@ -832 +852 @@
                 else
                 {
-                    rc = rtAcpiAstNodeEvaluateToInteger(pAstNd->aArgs[1].u.pAstNd, pNsRoot, &off);
+                    rc = rtAcpiAstNodeEvaluateToInteger(pAstNd->aArgs[1].u.pAstNd, pNsRoot, true /*fResolveIdentifiers*/, &off);
                     off = pAstNd->enmOp == kAcpiAstNodeOp_CreateBitField ? off : off / 8;
                 }

trunk/src/VBox/Runtime/common/acpi/acpi-compiler.cpp

@@ -2989 +2989 @@
                 {
                     /* 2. - Optimize AST (constant folding, etc). */
+                    PRTACPIASTNODE pIt;
+                    RTListForEach(&pThis->LstStmts, pIt, RTACPIASTNODE, NdAst)
+                    {
+                        rc = rtAcpiAstNodeTransform(pIt, pThis->pNs, pErrInfo);
+                        if (RT_FAILURE(rc))
+                            break;
+                    }
 
                     /* 3. - Traverse AST and output table. */
@@ -3012 +3019 @@
                     if (RT_SUCCESS(rc))
                     {
-                        PRTACPIASTNODE pIt;
+                        pIt;
                         RTListForEach(&pThis->LstStmts, pIt, RTACPIASTNODE, NdAst)
                         {
-                            rc = rtAcpiAstNodeTransform(pIt, pErrInfo);
-                            if (RT_FAILURE(rc))
-                                break;
-
                             rc = rtAcpiAstDumpToTbl(pIt, pThis->pNs, pThis->hAcpiTbl);
                             if (RT_FAILURE(rc))

trunk/src/VBox/Runtime/common/acpi/acpi-ns.cpp

@@ -231 +231 @@
  * @returns IPRT status code.
  * @param   pNsRoot             The namespace to add the new entry to.
+ * @param   enmType             The type of the namespace entry.
  * @param   pszNameString       The namestring to add.
  * @param   fSwitchTo           Flag whether to switch to the new entry.
@@ -236 +237 @@
  * @param   ppNsEntry           Where to store the pointer to the created entry on success.
  */
-static int rtAcpiNsAddEntryWorker(PRTACPINSROOT pNsRoot, const char *pszNameString, bool fSwitchTo, bool fIgnoreExisting, PRTACPINSENTRY *ppNsEntry)
+static int rtAcpiNsAddEntryWorker(PRTACPINSROOT pNsRoot, RTACPINSENTRYTYPE enmType, const char *pszNameString, bool fSwitchTo, bool fIgnoreExisting, PRTACPINSENTRY *ppNsEntry)
 {
     AssertReturn(   !fSwitchTo
@@ -263 +264 @@
         if (pNsEntry)
         {
+            pNsEntry->enmType = enmType;
             pNsEntry->pParent = pNsEntryParent;
             RTListInit(&pNsEntry->LstNsEntries);
@@ -340 +342 @@
 {
     PRTACPINSENTRY pNsEntry = NULL;
-    int rc = rtAcpiNsAddEntryWorker(pNsRoot, pszNameString, fSwitchTo, false /*fIgnoreExisting*/, &pNsEntry);
+    int rc = rtAcpiNsAddEntryWorker(pNsRoot, kAcpiNsEntryType_AstNode, pszNameString, fSwitchTo, false /*fIgnoreExisting*/, &pNsEntry);
     if (rc == VERR_ALREADY_EXISTS)
         rc = VINF_SUCCESS;
     if (RT_SUCCESS(rc))
-    {
-        pNsEntry->fAstNd = true;
         pNsEntry->pAstNd = pAstNd;
-    }
 
     return rc;
@@ -356 +355 @@
 {
     PRTACPINSENTRY pNsEntry = NULL;
-    int rc = rtAcpiNsAddEntryWorker(pNsRoot, pszNameString, false /*fSwitchTo*/, true /*fIgnoreExisting*/, &pNsEntry);
+    int rc = rtAcpiNsAddEntryWorker(pNsRoot, kAcpiNsEntryType_ResourceField, pszNameString, false /*fSwitchTo*/, true /*fIgnoreExisting*/, &pNsEntry);
     if (RT_SUCCESS(rc))
     {
-        pNsEntry->fAstNd  = false;
-        pNsEntry->pAstNd  = NULL;
-        pNsEntry->offBits = offBits;
-        pNsEntry->cBits   = cBits;
+        pNsEntry->RsrcFld.offBits = offBits;
+        pNsEntry->RsrcFld.cBits   = cBits;
     }
 
@@ -372 +369 @@
 {
     PRTACPINSENTRY pNsEntry = NULL;
-    int rc = rtAcpiNsAddEntryWorker(pNsRoot, pszNameString, false /*fSwitchTo*/, false /*fIgnoreExisting*/, &pNsEntry);
+    int rc = rtAcpiNsAddEntryWorker(pNsRoot, kAcpiNsEntryType_External, pszNameString, false /*fSwitchTo*/, false /*fIgnoreExisting*/, &pNsEntry);
     if (RT_SUCCESS(rc))
-    {
-        pNsEntry->fAstNd    = false;
         pNsEntry->pExternal = pExternal;
-    }
 
     return rc;

trunk/src/VBox/Runtime/include/internal/acpi.h

@@ -79 +79 @@
 
 /**
+ * ACPI namespace entry type.
+ */
+typedef enum RTACPINSENTRYTYPE
+{
+    /** Invalid type. */
+    kAcpiNsEntryType_Invalid = 0,
+    /** Namespace entry points to an AST node. */
+    kAcpiNsEntryType_AstNode,
+    /** Namesapce entry points to an external declaration. */
+    kAcpiNsEntryType_External,
+    /** Namespace entry is a resource field containing an offset and number of bits. */
+    kAcpiNsEntryType_ResourceField,
+    /** 32bit hack. */
+    kAcpiNsEntryType_32Bit_Hack = 0x7fffffff
+} RTACPINSENTRYTYPE;
+
+
+/**
  * An ACPI namespace entry.
  */
@@ -89 +107 @@
     /** The name segment identifying the entry. */
     char                    achNameSeg[4];
-    /** Flag whether this points to an AST node or an external. */
-    bool                    fAstNd;
+    /** Namespace entry type.. */
+    RTACPINSENTRYTYPE       enmType;
     /** Type dependent data. */
     union
@@ -98 +116 @@
         /** Pointer to the external declaration. */
         PCRTACPIASLEXTERNAL pExternal;
+        /** Resource field data. */
+        struct
+        {
+                /** Bit offset for resource fields. */
+                uint32_t    offBits;
+                /** Bit count for resource fields. */
+                uint32_t    cBits;
+        } RsrcFld;
     };
-    /** Bit offset for resource fields. */
-    uint32_t                offBits;
-    /** Bit count for resource fields. */
-    uint32_t                cBits;
     /** List of namespace entries below this entry. */
     RTLISTANCHOR            LstNsEntries;
@@ -347 +369 @@
  * @returns IPRT status.
  * @param   pAstNd              The AST node to transform.
+ * @param   pNsRoot             The namespace root.
  * @param   pErrInfo            Some additional error information on failure.
- *
- * @note This currently only implements merging if ... else ... nodes but can be extended to
- *       also do some optimizations and proper checking.
- */
-DECLHIDDEN(int) rtAcpiAstNodeTransform(PRTACPIASTNODE pAstNd, PRTERRINFO pErrInfo);
+ */
+DECLHIDDEN(int) rtAcpiAstNodeTransform(PRTACPIASTNODE pAstNd, PRTACPINSROOT pNsRoot, PRTERRINFO pErrInfo);