Changeset 107064 in vbox

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

Location:

trunk

Files:

• include/iprt/acpi.h (modified) (3 diffs)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/common/misc/acpi.cpp (modified) (4 diffs)

trunk/include/iprt/acpi.h

@@ -261 +261 @@
  */
 RTDECL(int) RTAcpiTblNameAppend(RTACPITBL hAcpiTbl, const char *pszName);
+
+
+/**
+ * Appends a new NullName object.
+ *
+ * @returns IPRT status code.
+ * @param   hAcpiTbl            The ACPI table handle.
+ */
+RTDECL(int) RTAcpiTblNullNameAppend(RTACPITBL hAcpiTbl);
+
+
+/**
+ * Appends a new NameString object.
+ *
+ * @returns IPRT status code.
+ * @param   hAcpiTbl            The ACPI table handle.
+ * @param   pszName             The name to append.
+ */
+RTDECL(int) RTAcpiTblNameStringAppend(RTACPITBL hAcpiTbl, const char *pszName);
 
 
@@ -321 +340 @@
     kAcpiStmt_Break,
     /** Continue statement. */
-    kAcpiStmt_Continue
+    kAcpiStmt_Continue,
+    /** Add(Operand, Operand, Target) statement. */
+    kAcpiStmt_Add,
+    /** Subtract(Operand, Operand, Target) statement. */
+    kAcpiStmt_Subtract,
+    /** And(Operand, Operand, Target) statement. */
+    kAcpiStmt_And,
+    /** Nand(Operand, Operand, Target) statement. */
+    kAcpiStmt_Nand,
+    /** Or(Operand, Operand, Target) statement. */
+    kAcpiStmt_Or,
+    /** Xor(Operand, Operand, Target) statement. */
+    kAcpiStmt_Xor,
+    /** Not(Operand, Target) statement. */
+    kAcpiStmt_Not,
+    /** Store(TermArg, Supername) statement. */
+    kAcpiStmt_Store,
+    /** Index(BuffPkgStrObj, IndexValue, Target) statement. */
+    kAcpiStmt_Index,
+    /** DerefOf(ObjReference) statement. */
+    kAcpiStmt_DerefOf
 } RTACPISTMT;
 
@@ -480 +519 @@
 
 /**
+ * Appends a new OperationRegion() to the given ACPI table - extended version.
+ *
+ * @returns IPRT status code.
+ * @param   hAcpiTbl            The ACPI table handle.
+ * @param   pszName             The name of the operation region.
+ * @param   enmSpace            The operation region space type.
+ *
+ * @note This doesn't encode the region offset and size arguments but leaves it up to the caller
+ *       to be able to encode complex stuff.
+ */
+RTDECL(int) RTAcpiTblOpRegionAppendEx(RTACPITBL hAcpiTbl, const char *pszName, RTACPIOPREGIONSPACE enmSpace);
+
+
+/**
  * Appends a new OperationRegion() to the given ACPI table.
  *

trunk/include/iprt/mangling.h

@@ -412 +412 @@
 # define RTAcpiTblMethodFinalize                        RT_MANGLER(RTAcpiTblMethodFinalize)
 # define RTAcpiTblNameAppend                            RT_MANGLER(RTAcpiTblNameAppend)
+# define RTAcpiTblNameStringAppend                      RT_MANGLER(RTAcpiTblNameStringAppend)
+# define RTAcpiTblNullNameAppend                        RT_MANGLER(RTAcpiTblNullNameAppend)
 # define RTAcpiTblOpRegionAppend                        RT_MANGLER(RTAcpiTblOpRegionAppend)
+# define RTAcpiTblOpRegionAppendEx                      RT_MANGLER(RTAcpiTblOpRegionAppendEx)
 # define RTAcpiTblPackageStart                          RT_MANGLER(RTAcpiTblPackageStart)
 # define RTAcpiTblPackageFinalize                       RT_MANGLER(RTAcpiTblPackageFinalize)

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);