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

Timestamp:

Nov 20, 2024 8:21:23 PM (2 months ago)

Author:

vboxsync

Message:

Runtime/RTAcpi*: Support more statements, an extended variant of the Region() API, bugref:10733

File:

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

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

@@ -750 +750 @@
 
 
+RTDECL(int) RTAcpiTblNullNameAppend(RTACPITBL hAcpiTbl)
+{
+    PRTACPITBLINT pThis = hAcpiTbl;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+
+    rtAcpiTblAppendByte(pThis, 0x00);
+    return pThis->rcErr;
+}
+
+
+RTDECL(int) RTAcpiTblNameStringAppend(RTACPITBL hAcpiTbl, const char *pszName)
+{
+    PRTACPITBLINT pThis = hAcpiTbl;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+
+    rtAcpiTblAppendNameString(pThis, pszName);
+    return pThis->rcErr;
+}
+
+
 RTDECL(int) RTAcpiTblStringAppend(RTACPITBL hAcpiTbl, const char *psz)
 {
@@ -849 +869 @@
         case kAcpiStmt_Break:      bOp = ACPI_AML_BYTE_CODE_OP_BREAK;       break;
         case kAcpiStmt_Continue:   bOp = ACPI_AML_BYTE_CODE_OP_CONTINUE;    break;
+        case kAcpiStmt_Add:        bOp = ACPI_AML_BYTE_CODE_OP_ADD;         break;
+        case kAcpiStmt_Subtract:   bOp = ACPI_AML_BYTE_CODE_OP_SUBTRACT;    break;
+        case kAcpiStmt_And:        bOp = ACPI_AML_BYTE_CODE_OP_AND;         break;
+        case kAcpiStmt_Nand:       bOp = ACPI_AML_BYTE_CODE_OP_NAND;        break;
+        case kAcpiStmt_Or:         bOp = ACPI_AML_BYTE_CODE_OP_OR;          break;
+        case kAcpiStmt_Xor:        bOp = ACPI_AML_BYTE_CODE_OP_XOR;         break;
+        case kAcpiStmt_Not:        bOp = ACPI_AML_BYTE_CODE_OP_NOT;         break;
+        case kAcpiStmt_Store:      bOp = ACPI_AML_BYTE_CODE_OP_STORE;       break;
+        case kAcpiStmt_Index:      bOp = ACPI_AML_BYTE_CODE_OP_INDEX;       break;
+        case kAcpiStmt_DerefOf:    bOp = ACPI_AML_BYTE_CODE_OP_DEREF_OF;    break;
         default:
             AssertFailedReturn(VERR_INVALID_PARAMETER);
@@ -977 +1007 @@
 
 
-RTDECL(int) RTAcpiTblOpRegionAppend(RTACPITBL hAcpiTbl, const char *pszName, RTACPIOPREGIONSPACE enmSpace,
-                                    uint64_t offRegion, uint64_t cbRegion)
+RTDECL(int) RTAcpiTblOpRegionAppendEx(RTACPITBL hAcpiTbl, const char *pszName, RTACPIOPREGIONSPACE enmSpace)
 {
     PRTACPITBLINT pThis = hAcpiTbl;
@@ -1006 +1035 @@
     }
     rtAcpiTblAppendByte(pThis, bRegionSpace);
+    return pThis->rcErr;
+}
+
+
+RTDECL(int) RTAcpiTblOpRegionAppend(RTACPITBL hAcpiTbl, const char *pszName, RTACPIOPREGIONSPACE enmSpace,
+                                    uint64_t offRegion, uint64_t cbRegion)
+{
+    PRTACPITBLINT pThis = hAcpiTbl;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+
+    int rc = RTAcpiTblOpRegionAppendEx(pThis, pszName, enmSpace);
+    if (RT_FAILURE(rc))
+        return rc;
+
     RTAcpiTblIntegerAppend(pThis, offRegion);
     RTAcpiTblIntegerAppend(pThis, cbRegion);