summaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/dsutils.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/dev/acpica/dsutils.c')
-rw-r--r--sys/contrib/dev/acpica/dsutils.c58
1 files changed, 28 insertions, 30 deletions
diff --git a/sys/contrib/dev/acpica/dsutils.c b/sys/contrib/dev/acpica/dsutils.c
index 96a1656266fe..1e1bc831c4fb 100644
--- a/sys/contrib/dev/acpica/dsutils.c
+++ b/sys/contrib/dev/acpica/dsutils.c
@@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dsutils - Dispatcher utilities
- * $Revision: 62 $
+ * $Revision: 68 $
*
******************************************************************************/
@@ -157,7 +157,7 @@ AcpiDsIsResultUsed (
if (!Op)
{
- DEBUG_PRINTP (ACPI_ERROR, ("Null Op\n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null Op\n"));
return_VALUE (TRUE);
}
@@ -181,7 +181,7 @@ AcpiDsIsResultUsed (
ParentInfo = AcpiPsGetOpcodeInfo (Op->Parent->Opcode);
if (ACPI_GET_OP_TYPE (ParentInfo) != ACPI_OP_TYPE_OPCODE)
{
- DEBUG_PRINTP (ACPI_ERROR, ("Unknown parent opcode. Op=%X\n", Op));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown parent opcode. Op=%X\n", Op));
return_VALUE (FALSE);
}
@@ -206,8 +206,8 @@ AcpiDsIsResultUsed (
/* Never delete the return value associated with a return opcode */
- DEBUG_PRINTP (TRACE_DISPATCH,
- ("Result used, [RETURN] opcode=%X Op=%X\n", Op->Opcode, Op));
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+ "Result used, [RETURN] opcode=%X Op=%X\n", Op->Opcode, Op));
return_VALUE (TRUE);
break;
@@ -222,8 +222,8 @@ AcpiDsIsResultUsed (
if ((WalkState->ControlState->Common.State == CONTROL_PREDICATE_EXECUTING) &&
(WalkState->ControlState->Control.PredicateOp == Op))
{
- DEBUG_PRINTP (TRACE_DISPATCH,
- ("Result used as a predicate, [IF/WHILE] opcode=%X Op=%X\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+ "Result used as a predicate, [IF/WHILE] opcode=%X Op=%X\n",
Op->Opcode, Op));
return_VALUE (TRUE);
}
@@ -249,14 +249,14 @@ AcpiDsIsResultUsed (
(Op->Parent->Opcode == AML_CREATE_DWORD_FIELD_OP) ||
(Op->Parent->Opcode == AML_CREATE_QWORD_FIELD_OP))
{
- DEBUG_PRINTP (TRACE_DISPATCH,
- ("Result used, [Region or CreateField] opcode=%X Op=%X\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+ "Result used, [Region or CreateField] opcode=%X Op=%X\n",
Op->Opcode, Op));
return_VALUE (TRUE);
}
- DEBUG_PRINTP (TRACE_DISPATCH,
- ("Result not used, Parent opcode=%X Op=%X\n", Op->Opcode, Op));
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+ "Result not used, Parent opcode=%X Op=%X\n", Op->Opcode, Op));
return_VALUE (FALSE);
break;
@@ -305,7 +305,7 @@ AcpiDsDeleteResultIfNotUsed (
if (!Op)
{
- DEBUG_PRINTP (ACPI_ERROR, ("Null Op\n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Null Op\n"));
return_VOID;
}
@@ -318,10 +318,8 @@ AcpiDsDeleteResultIfNotUsed (
if (!AcpiDsIsResultUsed (Op, WalkState))
{
/*
- * Must pop the result stack (ObjDesc should be equal
- * to ResultObj)
+ * Must pop the result stack (ObjDesc should be equal to ResultObj)
*/
-
Status = AcpiDsResultPop (&ObjDesc, WalkState);
if (ACPI_SUCCESS (Status))
{
@@ -374,7 +372,7 @@ AcpiDsCreateOperand (
if ((Arg->Opcode == AML_INT_NAMEPATH_OP) &&
(Arg->Value.String))
{
- DEBUG_PRINTP (TRACE_DISPATCH, ("Getting a name: Arg=%p\n", Arg));
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Getting a name: Arg=%p\n", Arg));
/* Get the entire name string from the AML stream */
@@ -397,7 +395,6 @@ AcpiDsCreateOperand (
* IMODE_EXECUTE) in order to support the creation of
* namespace objects during the execution of control methods.
*/
-
ParentOp = Arg->Parent;
if ((AcpiPsIsNodeOp (ParentOp->Opcode)) &&
(ParentOp->Opcode != AML_INT_METHODCALL_OP) &&
@@ -487,7 +484,7 @@ AcpiDsCreateOperand (
*/
Opcode = AML_ZERO_OP; /* Has no arguments! */
- DEBUG_PRINTP (TRACE_DISPATCH, ("Null namepath: Arg=%p\n", Arg));
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Null namepath: Arg=%p\n", Arg));
/*
* TBD: [Investigate] anything else needed for the
@@ -511,8 +508,8 @@ AcpiDsCreateOperand (
if (Flags & OP_HAS_RETURN_VALUE)
{
- DEBUG_PRINTP (TRACE_DISPATCH,
- ("Argument previously created, already stacked \n"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+ "Argument previously created, already stacked \n"));
DEBUGGER_EXEC (AcpiDbDisplayArgumentObject (WalkState->Operands [WalkState->NumOperands - 1], WalkState));
@@ -527,7 +524,7 @@ AcpiDsCreateOperand (
* Only error is underflow, and this indicates
* a missing or null operand!
*/
- DEBUG_PRINTP (ACPI_ERROR, ("Missing or null operand, %s\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Missing or null operand, %s\n",
AcpiFormatException (Status)));
return_ACPI_STATUS (Status);
}
@@ -607,7 +604,7 @@ AcpiDsCreateOperands (
goto Cleanup;
}
- DEBUG_PRINTP (TRACE_DISPATCH, ("Arg #%d (%p) done, Arg1=%p\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Arg #%d (%p) done, Arg1=%p\n",
ArgCount, Arg, FirstArg));
/* Move on to next argument, if any */
@@ -628,7 +625,7 @@ Cleanup:
AcpiDsObjStackPopAndDelete (ArgCount, WalkState);
- DEBUG_PRINTP (ACPI_ERROR, ("While creating Arg %d - %s\n",
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "While creating Arg %d - %s\n",
(ArgCount + 1), AcpiFormatException (Status)));
return_ACPI_STATUS (Status);
}
@@ -715,7 +712,7 @@ AcpiDsMapOpcodeToDataType (
{
/* Unknown opcode */
- DEBUG_PRINTP (ACPI_ERROR, ("Unknown AML opcode: %x\n", Opcode));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unknown AML opcode: %x\n", Opcode));
return (DataType);
}
@@ -729,6 +726,7 @@ AcpiDsMapOpcodeToDataType (
case AML_BYTE_OP:
case AML_WORD_OP:
case AML_DWORD_OP:
+ case AML_QWORD_OP:
DataType = ACPI_TYPE_INTEGER;
break;
@@ -744,8 +742,8 @@ AcpiDsMapOpcodeToDataType (
break;
default:
- DEBUG_PRINTP (ACPI_ERROR,
- ("Unknown (type LITERAL) AML opcode: %x\n", Opcode));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Unknown (type LITERAL) AML opcode: %x\n", Opcode));
break;
}
break;
@@ -767,8 +765,8 @@ AcpiDsMapOpcodeToDataType (
break;
default:
- DEBUG_PRINTP (ACPI_ERROR,
- ("Unknown (type DATA_TERM) AML opcode: %x\n", Opcode));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Unknown (type DATA_TERM) AML opcode: %x\n", Opcode));
break;
}
break;
@@ -820,8 +818,8 @@ AcpiDsMapOpcodeToDataType (
default:
- DEBUG_PRINTP (ACPI_ERROR,
- ("Unimplemented data type opcode: %x\n", Opcode));
+ ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ "Unimplemented data type opcode: %x\n", Opcode));
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-05 13:13:36 +0000