Changeset 106341 in vbox for trunk/src/VBox/Runtime

Timestamp:

Oct 16, 2024 8:24:59 AM (6 months ago)

Author:

vboxsync

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

165154

Message:

Runtime: Add ACPI table builder API to dynamically generate a DSDT/SSDT, bugref:10733 [build fix]

File:

• trunk/src/VBox/Runtime/common/misc/acpi.cpp (modified) (10 diffs)

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

@@ -87 +87 @@
     uint8_t                     *pbTblBuf;
     /** Size of the table buffer. */
-    size_t                      cbTblBuf;
+    uint32_t                    cbTblBuf;
     /** Current offset into the table buffer. */
     uint32_t                    offTblBuf;
@@ -162 +162 @@
  * @param cbAdd                 How many bytes to add to the package length.
  */
-DECL_FORCE_INLINE(void) rtAcpiTblUpdatePkgLength(PRTACPITBLINT pThis, size_t cbAdd)
+DECL_FORCE_INLINE(void) rtAcpiTblUpdatePkgLength(PRTACPITBLINT pThis, uint32_t cbAdd)
 {
     PRTACPITBLSTACKELEM pPkgElem = &pThis->paPkgStack[pThis->idxPkgStackElem];
@@ -176 +176 @@
  * @param cbReq                 Amount of bytes requested.
  */
-static uint8_t *rtAcpiTblBufEnsureSpace(PRTACPITBLINT pThis, size_t cbReq)
+static uint8_t *rtAcpiTblBufEnsureSpace(PRTACPITBLINT pThis, uint32_t cbReq)
 {
     if (RT_LIKELY(pThis->cbTblBuf - pThis->offTblBuf >= cbReq))
@@ -185 +185 @@
     }
 
-    size_t const cbNew = RT_ALIGN_Z(pThis->cbTblBuf + cbReq, _4K);
+    uint32_t const cbNew = RT_ALIGN_32(pThis->cbTblBuf + cbReq, _4K);
     uint8_t *pbNew = (uint8_t *)RTMemRealloc(pThis->pbTblBuf, cbNew);
     if (RT_UNLIKELY(!pbNew))
@@ -324 +324 @@
      * Note! PkgLength will also include its own length.
      */
-    uint8_t *pbPkgLength = pPkgElem->pbPkgLength;
-    size_t  cbThisPkg    = pPkgElem->cbPkg;
+    uint8_t  *pbPkgLength = pPkgElem->pbPkgLength;
+    uint32_t cbThisPkg    = pPkgElem->cbPkg;
     if (cbThisPkg + 1 <= 63)
     {
@@ -419 +419 @@
 DECLINLINE(void) rtAcpiTblAppendNameString(PRTACPITBLINT pThis, const char *pszName)
 {
-    size_t cbName = *pszName == '\\' ? 5 : 4;
+    uint32_t cbName = *pszName == '\\' ? 5 : 4;
     uint8_t *pb = rtAcpiTblBufEnsureSpace(pThis, cbName);
     if (pb)
@@ -548 +548 @@
 {
     PRTACPITBLINT pThis = hAcpiTbl;
-    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertPtrReturn(pThis, 0);
     AssertRCReturn(pThis->rcErr, 0);
     AssertReturn(pThis->fFinalized, 0);
@@ -707 +707 @@
 
     rtAcpiTblAppendByte(pThis, ACPI_AML_BYTE_CODE_PREFIX_STRING);
-    rtAcpiTblAppendData(pThis, psz, strlen(psz) + 1);
+    rtAcpiTblAppendData(pThis, psz, (uint32_t)strlen(psz) + 1);
     return pThis->rcErr;
 }
@@ -761 +761 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(!cbBuf || RT_VALID_PTR(pvBuf), VERR_INVALID_PARAMETER);
+    AssertReturn(cbBuf <= UINT32_MAX, VERR_BUFFER_OVERFLOW);
 
     rtAcpiTblPkgStart(pThis, ACPI_AML_BYTE_CODE_OP_BUFFER);
     RTAcpiTblIntegerAppend(hAcpiTbl, cbBuf);
     if (pvBuf)
-        rtAcpiTblAppendData(pThis, pvBuf, cbBuf);
+        rtAcpiTblAppendData(pThis, pvBuf, (uint32_t)cbBuf);
     return rtAcpiTblPkgFinish(pThis, ACPI_AML_BYTE_CODE_OP_BUFFER);
 }
@@ -814 +815 @@
  * @param   cbReq               Number of free bytes required.
  */
-static uint8_t *rtAcpiResBufEnsureSpace(PRTACPIRESINT pThis, size_t cbReq)
+static uint8_t *rtAcpiResBufEnsureSpace(PRTACPIRESINT pThis, uint32_t cbReq)
 {
     if (RT_LIKELY(pThis->cbResBuf - pThis->offResBuf >= cbReq))