aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/dbdisply.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/dev/acpica/dbdisply.c')
-rw-r--r--sys/contrib/dev/acpica/dbdisply.c78
1 files changed, 33 insertions, 45 deletions
diff --git a/sys/contrib/dev/acpica/dbdisply.c b/sys/contrib/dev/acpica/dbdisply.c
index 536c808cd050..39783c648a2d 100644
--- a/sys/contrib/dev/acpica/dbdisply.c
+++ b/sys/contrib/dev/acpica/dbdisply.c
@@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbdisply - debug display commands
- * $Revision: 67 $
+ * $Revision: 75 $
*
******************************************************************************/
@@ -116,12 +116,10 @@
#include "acpi.h"
-#include "acparser.h"
#include "amlcode.h"
#include "acdispat.h"
#include "acnamesp.h"
#include "acparser.h"
-#include "acevents.h"
#include "acinterp.h"
#include "acdebug.h"
@@ -152,7 +150,7 @@ AcpiDbGetPointer (
void *ObjPtr;
-#ifdef _IA16
+#if ACPI_MACHINE_WIDTH == 16
#include <stdio.h>
/* Have to handle 16-bit pointers of the form segment:offset */
@@ -193,16 +191,16 @@ AcpiDbDumpParserDescriptor (
const ACPI_OPCODE_INFO *Info;
- Info = AcpiPsGetOpcodeInfo (Op->Opcode);
+ Info = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode);
AcpiOsPrintf ("Parser Op Descriptor:\n");
- AcpiOsPrintf ("%20.20s : %4.4X\n", "Opcode", Op->Opcode);
+ AcpiOsPrintf ("%20.20s : %4.4X\n", "Opcode", Op->Common.AmlOpcode);
ACPI_DEBUG_ONLY_MEMBERS (AcpiOsPrintf ("%20.20s : %s\n", "Opcode Name", Info->Name));
- AcpiOsPrintf ("%20.20s : %p\n", "Value/ArgList", Op->Value);
- AcpiOsPrintf ("%20.20s : %p\n", "Parent", Op->Parent);
- AcpiOsPrintf ("%20.20s : %p\n", "NextOp", Op->Next);
+ AcpiOsPrintf ("%20.20s : %p\n", "Value/ArgList", Op->Common.Value.Arg);
+ AcpiOsPrintf ("%20.20s : %p\n", "Parent", Op->Common.Parent);
+ AcpiOsPrintf ("%20.20s : %p\n", "NextOp", Op->Common.Next);
}
@@ -291,7 +289,7 @@ AcpiDbDecodeAndDisplayObject (
goto DumpNte;
- case ACPI_DESC_TYPE_INTERNAL:
+ case ACPI_DESC_TYPE_OPERAND:
/* This is a ACPI OPERAND OBJECT */
@@ -413,14 +411,14 @@ AcpiDbDecodeInternalObject (
return;
}
- AcpiOsPrintf (" %s", AcpiUtGetTypeName (ObjDesc->Common.Type));
+ AcpiOsPrintf (" %s", AcpiUtGetObjectTypeName (ObjDesc));
- switch (ObjDesc->Common.Type)
+ switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
{
case ACPI_TYPE_INTEGER:
- AcpiOsPrintf (" %.8X%.8X", ACPI_HIDWORD (ObjDesc->Integer.Value),
- ACPI_LODWORD (ObjDesc->Integer.Value));
+ AcpiOsPrintf (" %8.8X%8.8X", ACPI_HIDWORD (ObjDesc->Integer.Value),
+ ACPI_LODWORD (ObjDesc->Integer.Value));
break;
@@ -448,6 +446,11 @@ AcpiDbDecodeInternalObject (
AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]);
}
break;
+
+
+ default:
+ /* No additional display for other types */
+ break;
}
}
@@ -494,7 +497,7 @@ AcpiDbDisplayInternalObject (
case ACPI_DESC_TYPE_NAMED:
AcpiOsPrintf ("<Node> Name %4.4s Type-%s",
- &((ACPI_NAMESPACE_NODE *)ObjDesc)->Name,
+ ((ACPI_NAMESPACE_NODE *)ObjDesc)->Name.Ascii,
AcpiUtGetTypeName (((ACPI_NAMESPACE_NODE *) ObjDesc)->Type));
if (((ACPI_NAMESPACE_NODE *) ObjDesc)->Flags & ANOBJ_METHOD_ARG)
@@ -508,38 +511,22 @@ AcpiDbDisplayInternalObject (
break;
- case ACPI_DESC_TYPE_INTERNAL:
+ case ACPI_DESC_TYPE_OPERAND:
- Type = ObjDesc->Common.Type;
+ Type = ACPI_GET_OBJECT_TYPE (ObjDesc);
if (Type > INTERNAL_TYPE_MAX)
{
- AcpiOsPrintf (" Type %x [Invalid Type]", Type);
+ AcpiOsPrintf (" Type %hX [Invalid Type]", Type);
return;
}
/* Decode the ACPI object type */
- switch (ObjDesc->Common.Type)
+ switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
{
case INTERNAL_TYPE_REFERENCE:
switch (ObjDesc->Reference.Opcode)
{
- case AML_ZERO_OP:
- AcpiOsPrintf ("[Const] Zero (0) [Null Target]", 0);
- break;
-
- case AML_ONES_OP:
- AcpiOsPrintf ("[Const] Ones (0xFFFFFFFFFFFFFFFF) [No Limit]");
- break;
-
- case AML_ONE_OP:
- AcpiOsPrintf ("[Const] One (1)");
- break;
-
- case AML_REVISION_OP:
- AcpiOsPrintf ("[Const] Revision (%X)", ACPI_CA_SUPPORT_LEVEL);
- break;
-
case AML_LOCAL_OP:
AcpiOsPrintf ("[Local%d] ", ObjDesc->Reference.Offset);
if (WalkState)
@@ -570,6 +557,8 @@ AcpiDbDisplayInternalObject (
break;
default:
+ AcpiOsPrintf ("Unknown Reference opcode %X\n",
+ ObjDesc->Reference.Opcode);
break;
}
@@ -640,14 +629,14 @@ AcpiDbDisplayMethodInfo (
NumArgs = ObjDesc->Method.ParamCount;
Concurrency = ObjDesc->Method.Concurrency;
- AcpiOsPrintf ("Currently executing control method is [%4.4s]\n", &Node->Name);
+ AcpiOsPrintf ("Currently executing control method is [%4.4s]\n", Node->Name.Ascii);
AcpiOsPrintf ("%X arguments, max concurrency = %X\n", NumArgs, Concurrency);
RootOp = StartOp;
- while (RootOp->Parent)
+ while (RootOp->Common.Parent)
{
- RootOp = RootOp->Parent;
+ RootOp = RootOp->Common.Parent;
}
Op = RootOp;
@@ -667,7 +656,7 @@ AcpiDbDisplayMethodInfo (
/* Decode the opcode */
- OpInfo = AcpiPsGetOpcodeInfo (Op->Opcode);
+ OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode);
switch (OpInfo->Class)
{
case AML_CLASS_ARGUMENT:
@@ -735,7 +724,7 @@ AcpiDbDisplayLocals (void)
ObjDesc = WalkState->MethodDesc;
Node = WalkState->MethodNode;
- AcpiOsPrintf ("Local Variables for method [%4.4s]:\n", &Node->Name);
+ AcpiOsPrintf ("Local Variables for method [%4.4s]:\n", Node->Name.Ascii);
for (i = 0; i < MTH_NUM_LOCALS; i++)
{
@@ -783,7 +772,7 @@ AcpiDbDisplayArguments (void)
Concurrency = ObjDesc->Method.Concurrency;
AcpiOsPrintf ("Method [%4.4s] has %X arguments, max concurrency = %X\n",
- &Node->Name, NumArgs, Concurrency);
+ Node->Name.Ascii, NumArgs, Concurrency);
for (i = 0; i < NumArgs; i++)
{
@@ -832,7 +821,7 @@ AcpiDbDisplayResults (void)
}
AcpiOsPrintf ("Method [%4.4s] has %X stacked result objects\n",
- &Node->Name, NumResults);
+ Node->Name.Ascii, NumResults);
for (i = 0; i < NumResults; i++)
{
@@ -858,7 +847,6 @@ AcpiDbDisplayResults (void)
void
AcpiDbDisplayCallingTree (void)
{
- UINT32 i;
ACPI_WALK_STATE *WalkState;
ACPI_NAMESPACE_NODE *Node;
@@ -873,11 +861,11 @@ AcpiDbDisplayCallingTree (void)
Node = WalkState->MethodNode;
AcpiOsPrintf ("Current Control Method Call Tree\n");
- for (i = 0; WalkState; i++)
+ while (WalkState)
{
Node = WalkState->MethodNode;
- AcpiOsPrintf (" [%4.4s]\n", &Node->Name);
+ AcpiOsPrintf (" [%4.4s]\n", Node->Name.Ascii);
WalkState = WalkState->Next;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 21:36:58 +0000