Changeset 108088 in vbox

Timestamp:

Feb 6, 2025 8:48:47 AM (2 weeks ago)

Author:

vboxsync

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

167382

Message:

Runtime/RTAcpi*: Updates to the ASL -> AML compiler, it is now possible to produce a valid AML table from the pre processed vbox-cpuhotplug.dsl SSDT, bugref:10733

Location:

trunk

Files:

• include/iprt/acpi.h (modified) (2 diffs)
• src/VBox/Runtime/common/acpi/acpi-ast.cpp (modified) (3 diffs)
• src/VBox/Runtime/common/acpi/acpi-compiler.cpp (modified) (9 diffs)
• src/VBox/Runtime/common/acpi/acpi.cpp (modified) (11 diffs)
• src/VBox/Runtime/include/internal/acpi.h (modified) (1 diff)

trunk/include/iprt/acpi.h

@@ -478 +478 @@
     kAcpiStmt_Index,
     /** DerefOf(ObjReference) statement. */
-    kAcpiStmt_DerefOf
+    kAcpiStmt_DerefOf,
+    /** Store(SuperName, TermArg => Integer) statement. */
+    kAcpiStmt_Notify
 } RTACPISTMT;
 
@@ -769 +771 @@
     kAcpiObjType_ThermalZone,
     /** Buffer field object - BuffFieldObj */
-    kAcpiObjType_BuffField
+    kAcpiObjType_BuffField,
+    /** Processor object - ProcessorObj */
+    kAcpiObjType_Processor,
 } RTACPIOBJTYPE;
 

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

@@ -390 +390 @@
             rc = RTAcpiTblStmtSimpleAppend(hAcpiTbl, kAcpiStmt_Return);
             if (RT_SUCCESS(rc))
-                rc = rtAcpiAstDumpToTbl(pAstNd->aArgs[0].u.pAstNd, hAcpiTbl);
+            {
+                if (pAstNd->aArgs[0].u.pAstNd)
+                    rc = rtAcpiAstDumpToTbl(pAstNd->aArgs[0].u.pAstNd, hAcpiTbl);
+                else
+                    rc = RTAcpiTblNullNameAppend(hAcpiTbl);
+            }
             break;
         }
@@ -596 +601 @@
         }
         case kAcpiAstNodeOp_Store:
+        case kAcpiAstNodeOp_Notify:
         {
             AssertBreakStmt(   pAstNd->cArgs == 2
@@ -601 +607 @@
                             && pAstNd->aArgs[1].enmType == kAcpiAstArgType_AstNode,
                             rc = VERR_INTERNAL_ERROR);
-            rc = RTAcpiTblStmtSimpleAppend(hAcpiTbl, kAcpiStmt_Store);
+            rc = RTAcpiTblStmtSimpleAppend(hAcpiTbl,
+                                             pAstNd->enmOp == kAcpiAstNodeOp_Store
+                                           ? kAcpiStmt_Store
+                                           : kAcpiStmt_Notify);
             if (RT_SUCCESS(rc))
                 rc = rtAcpiAstDumpToTbl(pAstNd->aArgs[0].u.pAstNd, hAcpiTbl);

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

@@ -90 +90 @@
     RTACPIASLTERMINAL_KEYWORD_THERMAL_ZONE_OBJ,
     RTACPIASLTERMINAL_KEYWORD_BUFF_FIELD_OBJ,
+    RTACPIASLTERMINAL_KEYWORD_PROCESSOR_OBJ,
     RTACPIASLTERMINAL_KEYWORD_SERIALIZED,
     RTACPIASLTERMINAL_KEYWORD_NOT_SERIALIZED,
@@ -288 +289 @@
     { RT_STR_TUPLE("XOR"),                      RTSCRIPTLEXTOKTYPE_KEYWORD,    true,  kAcpiAstNodeOp_Xor                               },
     { RT_STR_TUPLE("NOT"),                      RTSCRIPTLEXTOKTYPE_KEYWORD,    true,  kAcpiAstNodeOp_Not                               },
+    { RT_STR_TUPLE("NOTIFY"),                   RTSCRIPTLEXTOKTYPE_KEYWORD,    true,  kAcpiAstNodeOp_Notify                            },
 
     /* Keywords not in the operation parser table. */
@@ -305 +307 @@
     { RT_STR_TUPLE("THERMALZONEOBJ"),           RTSCRIPTLEXTOKTYPE_KEYWORD,    true,  RTACPIASLTERMINAL_KEYWORD_THERMAL_ZONE_OBJ       },
     { RT_STR_TUPLE("BUFFFIELDOBJ"),             RTSCRIPTLEXTOKTYPE_KEYWORD,    true,  RTACPIASLTERMINAL_KEYWORD_BUFF_FIELD_OBJ         },
+    { RT_STR_TUPLE("PROCESSOROBJ"),             RTSCRIPTLEXTOKTYPE_KEYWORD,    true,  RTACPIASLTERMINAL_KEYWORD_PROCESSOR_OBJ          },
 
     { RT_STR_TUPLE("SERIALIZED"),               RTSCRIPTLEXTOKTYPE_KEYWORD,    true,  RTACPIASLTERMINAL_KEYWORD_SERIALIZED             },
@@ -489 +492 @@
         if (ch != '.')
             break;
+        aszIde[idx++] = '.';
+        RTScriptLexConsumeCh(hScriptLex);
     }
 
@@ -760 +765 @@
     RTACPIASLTERMINAL_KEYWORD_THERMAL_ZONE_OBJ,
     RTACPIASLTERMINAL_KEYWORD_BUFF_FIELD_OBJ,
+    RTACPIASLTERMINAL_KEYWORD_PROCESSOR_OBJ,
     RTACPIASLTERMINAL_INVALID
 };
@@ -873 +879 @@
                 case RTACPIASLTERMINAL_KEYWORD_THERMAL_ZONE_OBJ: pAstNd->aArgs[1].u.enmObjType = kAcpiObjType_ThermalZone; break;
                 case RTACPIASLTERMINAL_KEYWORD_BUFF_FIELD_OBJ:   pAstNd->aArgs[1].u.enmObjType = kAcpiObjType_BuffField; break;
+                case RTACPIASLTERMINAL_KEYWORD_PROCESSOR_OBJ:    pAstNd->aArgs[1].u.enmObjType = kAcpiObjType_Processor; break;
                 default:
                     AssertFailedReturn(VERR_INTERNAL_ERROR);
@@ -1236 +1243 @@
 
     RTACPIASL_PARSE_PUNCTUATOR(RTACPIASLTERMINAL_PUNCTUATOR_CLOSE_CURLY_BRACKET, '}');
+    return VINF_SUCCESS;
+}
+
+
+static DECLCALLBACK(int) rtAcpiTblAslParseReturn(PRTACPIASLCU pThis, PCRTACPIASLKEYWORD pKeyword, PRTACPIASTNODE pAstNd)
+{
+    RT_NOREF(pKeyword);
+
+    pAstNd->aArgs[0].enmType = kAcpiAstArgType_AstNode;
+    pAstNd->aArgs[0].u.pAstNd = NULL;
+
+    /*
+     * Return has three valid forms:
+     *    Return
+     *    Return ()
+     *    Return (TermArg)
+     */
+    if (rtAcpiAslLexerIsPunctuator(pThis, RTACPIASLTERMINAL_PUNCTUATOR_OPEN_BRACKET))
+    {
+        RTACPIASL_SKIP_CURRENT_TOKEN(); /* Skip the "(" */
+
+        if (!rtAcpiAslLexerIsPunctuator(pThis, RTACPIASLTERMINAL_PUNCTUATOR_CLOSE_BRACKET))
+        {
+            PRTACPIASTNODE pAstNdSize = NULL;
+            int rc = rtAcpiTblAslParseTermArg(pThis, &pAstNdSize);
+            if (RT_FAILURE(rc))
+                return rc;
+            pAstNd->aArgs[0].u.pAstNd = pAstNdSize;
+        }
+        RTACPIASL_PARSE_PUNCTUATOR(RTACPIASLTERMINAL_PUNCTUATOR_CLOSE_BRACKET, ')');
+    }
+
     return VINF_SUCCESS;
 }
@@ -1415 +1454 @@
     /* kAcpiAstNodeOp_One               */  RTACPI_ASL_KEYWORD_DEFINE_0REQ_0OPT("One",              RTACPI_AST_NODE_F_DEFAULT),
     /* kAcpiAstNodeOp_Ones              */  RTACPI_ASL_KEYWORD_DEFINE_0REQ_0OPT("Ones",             RTACPI_AST_NODE_F_DEFAULT),
-    /* kAcpiAstNodeOp_Return            */  RTACPI_ASL_KEYWORD_DEFINE_1REQ_0OPT("Return",           RTACPI_AST_NODE_F_DEFAULT,   kAcpiAstArgType_AstNode),
+    /* kAcpiAstNodeOp_Return            */  RTACPI_ASL_KEYWORD_DEFINE_HANDLER(  "Return",           rtAcpiTblAslParseReturn,  0, 1, RTACPI_AST_NODE_F_DEFAULT),
     /* kAcpiAstNodeOp_Unicode           */  RTACPI_ASL_KEYWORD_DEFINE_1REQ_0OPT("Unicode",          RTACPI_AST_NODE_F_DEFAULT,   kAcpiAstArgType_AstNode), /* Actually only String allowed here */
     /* kAcpiAstNodeOp_OperationRegion   */  RTACPI_ASL_KEYWORD_DEFINE_4REQ_0OPT("OperationRegion",  RTACPI_AST_NODE_F_DEFAULT,   kAcpiAstArgType_NameString, kAcpiAstArgType_RegionSpace, kAcpiAstArgType_AstNode, kAcpiAstArgType_AstNode),
@@ -1452 +1491 @@
     /* kAcpiAstNodeOp_Xor               */  RTACPI_ASL_KEYWORD_DEFINE_2REQ_1OPT("Xor",              RTACPI_AST_NODE_F_DEFAULT,    kAcpiAstArgType_AstNode, kAcpiAstArgType_AstNode, kAcpiAstArgType_AstNode),
     /* kAcpiAstNodeOp_Not               */  RTACPI_ASL_KEYWORD_DEFINE_1REQ_1OPT("Not",              RTACPI_AST_NODE_F_DEFAULT,    kAcpiAstArgType_AstNode, kAcpiAstArgType_AstNode),
+    /* kAcpiAstNodeOp_Notify            */  RTACPI_ASL_KEYWORD_DEFINE_2REQ_0OPT("Notify",           RTACPI_AST_NODE_F_DEFAULT,    kAcpiAstArgType_AstNode, kAcpiAstArgType_AstNode),
 
 };

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

@@ -69 +69 @@
 typedef struct RTACPITBLSTACKELEM
 {
-    /** Pointer to the table buffer memory where the PkgLength object starts. */
-    uint8_t                     *pbPkgLength;
+    /** Offset into the table buffer memory where the PkgLength object starts. */
+    uint32_t                    offPkgLength;
     /** Current size of the package in bytes, without the PkgLength object. */
     uint32_t                    cbPkg;
@@ -200 +200 @@
     pThis->pbTblBuf = pbNew;
     pThis->cbTblBuf = cbNew;
+    pThis->pHdr     = (PACPITBLHDR)pbNew;
 
     uint8_t *pb = &pThis->pbTblBuf[pThis->offTblBuf];
@@ -214 +215 @@
  * @param pThis                 The ACPI table instance.
  * @param bOp                   The opcode byte the package starts with (for verification purposes when finalizing the package).
- * @param pbPkgBuf              The Start of the package buffer.
- */
-static int rtAcpiTblPkgAppendEx(PRTACPITBLINT pThis, uint8_t bOp, uint8_t *pbPkgBuf)
+ * @param offPkgBuf             Offset of the start of the package buffer.
+ */
+static int rtAcpiTblPkgAppendEx(PRTACPITBLINT pThis, uint8_t bOp, uint32_t offPkgBuf)
 {
     /* Get a new stack element. */
@@ -234 +235 @@
 
     PRTACPITBLSTACKELEM pStackElem = &pThis->paPkgStack[++pThis->idxPkgStackElem];
-    pStackElem->pbPkgLength = pbPkgBuf;
-    pStackElem->cbPkg       = 0;
-    pStackElem->bOp         = bOp;
+    pStackElem->offPkgLength = offPkgBuf;
+    pStackElem->cbPkg        = 0;
+    pStackElem->bOp          = bOp;
     return VINF_SUCCESS;
 }
@@ -268 +269 @@
      */
     rtAcpiTblUpdatePkgLength(pThis, sizeof(bOp));
-    return rtAcpiTblPkgAppendEx(pThis, bOp, pbPkg + 1);
+    return rtAcpiTblPkgAppendEx(pThis, bOp, (pbPkg + 1) - pThis->pbTblBuf);
 }
 
@@ -302 +303 @@
      */
     rtAcpiTblUpdatePkgLength(pThis, sizeof(uint8_t) + sizeof(bOp));
-    return rtAcpiTblPkgAppendEx(pThis, bOp, pbPkg + 2);
+    return rtAcpiTblPkgAppendEx(pThis, bOp, (pbPkg + 2) - pThis->pbTblBuf);
 }
 
@@ -329 +330 @@
      * Note! PkgLength will also include its own length.
      */
-    uint8_t  *pbPkgLength = pPkgElem->pbPkgLength;
+    uint8_t  *pbPkgLength = &pThis->pbTblBuf[pPkgElem->offPkgLength];
     uint32_t cbThisPkg    = pPkgElem->cbPkg;
     if (cbThisPkg + 1 <= 63)
@@ -436 +437 @@
 
 /**
+ * Appends the given name segment to the destination padding the segment with '_' if the
+ * name segment is shorter than 4 characters.
+ *
+ * @returns Pointer to the character after the given name segment.
+ * @param   pbDst               Where to store the name segment.
+ * @param   pachNameSeg         The name segment to append.
+ */
+DECLINLINE(const char *) rtAcpiTblAppendNameSeg(uint8_t *pbDst, const char *pachNameSeg)
+{
+    Assert(pachNameSeg[0] != '.' && pachNameSeg[0] != '\0');
+
+    uint8_t cch = 1;
+    pbDst[0] = pachNameSeg[0];
+
+    for (uint8_t i = 1; i < 4; i++)
+    {
+        if (   pachNameSeg[cch] != '.'
+            && pachNameSeg[cch] != '\0')
+        {
+            pbDst[i] = pachNameSeg[cch];
+            cch++;
+        }
+        else
+            pbDst[i] = '_';
+    }
+
+    return &pachNameSeg[cch];
+}
+
+
+/**
  * Appends the given namestring to the ACPI table, updating the package length of the current package
  * and padding the name with _ if too short.
  *
  * @param pThis                 The ACPI table instance.
- * @param pszName               The name to append, maximum is 4 bytes (or 5 if \\ is the first character).
- *
- * @todo This is completely wrong with how name strings are working.
- */
-DECLINLINE(void) rtAcpiTblAppendNameString(PRTACPITBLINT pThis, const char *pszName)
-{
-    uint32_t cbName = *pszName == '\\' ? 5 : 4;
-    uint8_t *pb = rtAcpiTblBufEnsureSpace(pThis, cbName);
+ * @param pszName               The name string to append.
+ */
+static void rtAcpiTblAppendNameString(PRTACPITBLINT pThis, const char *pszName)
+{
+    if (*pszName == '\\')
+    {
+        /* Root prefix. */
+        rtAcpiTblAppendByte(pThis, '\\');
+        pszName++;
+    }
+    else if (*pszName == '^')
+    {
+        /* PrefixPath */
+        do
+        {
+            rtAcpiTblAppendByte(pThis, '^');
+            pszName++;
+        }
+        while (*pszName == '^');
+    }
+
+    /*
+     * We need to count the number of segments to decide whether a
+     * NameSeg, DualNamePath or MultiNamePath is needed.
+     */
+    uint8_t cSegments = 1;
+    const char *pszTmp = pszName;
+    while (*pszTmp != '\0')
+    {
+        if (*pszTmp++ == '.')
+            cSegments++;
+    }
+
+    size_t cbReq = cSegments * 4 * sizeof(uint8_t);
+    if (cSegments == 2)
+        cbReq++; /* DualName Prefix */
+    else if (cSegments != 1)
+        cbReq += 2; /* MultiName prefix + segment count */
+    uint8_t *pb = rtAcpiTblBufEnsureSpace(pThis, cbReq);
     if (pb)
     {
-        rtAcpiTblCopyStringPadWith(pb, cbName, pszName, '_');
-        rtAcpiTblUpdatePkgLength(pThis, cbName);
+        if (cSegments == 1)
+        {
+            rtAcpiTblAppendNameSeg(pb, pszName);
+            rtAcpiTblUpdatePkgLength(pThis, 4);
+        }
+        else if (cSegments == 2)
+        {
+            *pb++ = ACPI_AML_BYTE_CODE_PREFIX_DUAL_NAME;
+            pszName = rtAcpiTblAppendNameSeg(pb, pszName);
+            pb += 4;
+            Assert(*pszName == '.');
+            pszName++;
+            pszName = rtAcpiTblAppendNameSeg(pb, pszName);
+            Assert(*pszName == '\0'); RT_NOREF(pszName);
+            rtAcpiTblUpdatePkgLength(pThis, 1 + 8);
+        }
+        else
+        {
+            *pb++ = ACPI_AML_BYTE_CODE_PREFIX_MULTI_NAME;
+            *pb++ = cSegments;
+            for (uint8_t i = 0; i < cSegments; i++)
+            {
+                pszName = rtAcpiTblAppendNameSeg(pb, pszName);
+                Assert(*pszName == '.' || *pszName == '\0');
+                pb += 4;
+                pszName++;
+            }
+            rtAcpiTblUpdatePkgLength(pThis, 2 + cSegments * 4);
+        }
     }
 }
@@ -587 +677 @@
 
                 PRTACPITBLSTACKELEM pStackElem = &pThis->paPkgStack[pThis->idxPkgStackElem];
-                pStackElem->pbPkgLength        = pThis->pbTblBuf; /* Starts with the header. */
+                pStackElem->offPkgLength       = 0; /* Starts with the header. */
                 pStackElem->cbPkg              = sizeof(*pThis->pHdr);
                 pStackElem->bOp                = UINT8_MAX;
@@ -1004 +1094 @@
         case kAcpiStmt_Index:      bOp = ACPI_AML_BYTE_CODE_OP_INDEX;       break;
         case kAcpiStmt_DerefOf:    bOp = ACPI_AML_BYTE_CODE_OP_DEREF_OF;    break;
+        case kAcpiStmt_Notify:     bOp = ACPI_AML_BYTE_CODE_OP_NOTIFY;      break;
         default:
             AssertFailedReturn(VERR_INVALID_PARAMETER);
@@ -1247 +1338 @@
         case kAcpiObjType_ThermalZone: bObjType = ACPI_AML_OBJECT_TYPE_THERMAL_ZONE; break;
         case kAcpiObjType_BuffField:   bObjType = ACPI_AML_OBJECT_TYPE_BUFFER_FIELD; break;
+        case kAcpiObjType_Processor:   bObjType = ACPI_AML_OBJECT_TYPE_PROCESSOR; break;
         default:
             pThis->rcErr = VERR_INVALID_PARAMETER;

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

@@ -165 +165 @@
     kAcpiAstNodeOp_Xor,
     kAcpiAstNodeOp_Not,
+    kAcpiAstNodeOp_Notify,
     kAcpiAstNodeOp_32Bit_Hack = 0x7fffffff
 } RTACPIASTNODEOP;