Changeset 108215 in vbox for trunk/src/VBox/Runtime/common/acpi/acpi-ns.cpp

Timestamp:

Feb 13, 2025 6:24:31 PM (3 months ago)

Author:

vboxsync

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

167535

Message:

Runtime/RTAcpi*: Treat External delcarations differently so that they can be properly dumped to the AML code. With this RTIasl is capable of producing AML code for vbox-tpm.dsl matching that generated by iasl, bugref:10733

File:

• trunk/src/VBox/Runtime/common/acpi/acpi-ns.cpp (modified) (3 diffs)

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

@@ -231 +231 @@
     int rc = rtAcpiNsAddEntryWorker(pNsRoot, pszNameString, fSwitchTo, &pNsEntry);
     if (RT_SUCCESS(rc))
+    {
+        pNsEntry->fAstNd = true;
         pNsEntry->pAstNd = pAstNd;
+    }
 
     return rc;
@@ -243 +246 @@
     if (RT_SUCCESS(rc))
     {
+        pNsEntry->fAstNd  = false;
         pNsEntry->pAstNd  = NULL;
         pNsEntry->offBits = offBits;
@@ -252 +256 @@
 
 
+DECLHIDDEN(int) rtAcpiNsAddEntryExternal(PRTACPINSROOT pNsRoot, const char *pszNameString, PCRTACPIASLEXTERNAL pExternal)
+{
+    PRTACPINSENTRY pNsEntry = NULL;
+    int rc = rtAcpiNsAddEntryWorker(pNsRoot, pszNameString, false /*fSwitchTo*/, &pNsEntry);
+    if (RT_SUCCESS(rc))
+    {
+        pNsEntry->fAstNd    = false;
+        pNsEntry->pExternal = pExternal;
+    }
+
+    return rc;
+}
+
+
+DECLHIDDEN(int) rtAcpiNsQueryNamePathForNameString(PRTACPINSROOT pNsRoot, const char *pszNameString, char *pachNamePath, size_t *pcchNamePath)
+{
+    AssertReturn(!pachNamePath || *pcchNamePath >= 6, VERR_INVALID_PARAMETER); /* Needs to support at least \XXXX and the zero terminator. */
+
+    const char *pszNameSegLast = NULL;
+    PCRTACPINSENTRY pNsEntry = rtAcpiNsLookupWorker(pNsRoot, pszNameString, true /*fExcludeLast*/, &pszNameSegLast);
+    if (pNsEntry)
+    {
+        int rc = VERR_BUFFER_OVERFLOW;
+        size_t cchNamePath = 1; /* For the root prefix. */
+
+        if (!pachNamePath)
+        {
+            /* Calculate the name path size based on the number of segments. */
+            uint32_t cEntries = 0;
+            do
+            {
+                cEntries++;
+                pNsEntry = pNsEntry->pParent;
+            } while (pNsEntry);
+
+            cchNamePath += cEntries * (4 + 1) - 1; /* XXXX., except for the last one. */
+        }
+        else
+        {
+            uint32_t idxEntry = 0;
+            PCRTACPINSENTRY aNsEntries[255]; /* Maximum amount of name segments possible. */
+            do
+            {
+                aNsEntries[idxEntry++] = pNsEntry;
+                pNsEntry = pNsEntry->pParent;
+            } while (pNsEntry);
+
+            char *pch = pachNamePath;
+            *pch++ = '\\';
+            *pch   = '\0';
+
+            /* The last entry must be the root entry. */
+            idxEntry--;
+            Assert(!aNsEntries[idxEntry]->pParent);
+
+            while (idxEntry)
+            {
+                pNsEntry = aNsEntries[--idxEntry];
+                if (cchNamePath + 5 < *pcchNamePath)
+                {
+                    pch[0] = pNsEntry->achNameSeg[0];
+                    pch[1] = pNsEntry->achNameSeg[1];
+                    pch[2] = pNsEntry->achNameSeg[2];
+                    pch[3] = pNsEntry->achNameSeg[3];
+                    pch[4] = '.';
+                    pch += 5;
+                }
+                cchNamePath += 5;
+            }
+
+            /* Append the last name segment. */
+            if (cchNamePath + 5 < *pcchNamePath)
+            {
+                pch[0] = pszNameSegLast[0];
+                pch[1] = pszNameSegLast[1];
+                pch[2] = pszNameSegLast[2];
+                pch[3] = pszNameSegLast[3];
+                pch[4] = '\0';
+                cchNamePath += 4;
+            }
+
+            if (cchNamePath <= *pcchNamePath)
+                rc = VINF_SUCCESS;
+        }
+
+        *pcchNamePath = cchNamePath;
+        return rc;
+    }
+
+    *pcchNamePath = 0;
+    return VERR_NOT_FOUND;
+}
+
+
 DECLHIDDEN(int) rtAcpiNsPop(PRTACPINSROOT pNsRoot)
 {