Method Arg/Local pseudo-nodes now marked with flags instead of an

actual type value because the type changes when an assignment is made to the
node.


date	2000.11.21.21.10.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:18:40 +00:00
parent 9708c37047
commit 6f218fadae

View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbdisply - debug display commands
* $Revision: 1.35 $
* $Revision: 1.37 $
*
******************************************************************************/
@ -352,10 +352,13 @@ DumpNte:
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("Could not convert name to pathname\n");
return;
}
AcpiOsPrintf ("Object Pathname: %s\n", RetBuf.Pointer);
else
{
AcpiOsPrintf ("Object Pathname: %s\n", RetBuf.Pointer);
}
if (!AcpiOsReadable (Node, sizeof (ACPI_NAMESPACE_NODE)))
{
AcpiOsPrintf ("Invalid Named object at address %p\n", Node);
@ -367,7 +370,7 @@ DumpNte:
if (Node->Object)
{
AcpiOsPrintf ("\nAttached Object (0x%p):\n", Node->Object);
AcpiOsPrintf ("\nAttached Object (%p):\n", Node->Object);
if (!AcpiOsReadable (Node->Object, sizeof (ACPI_OPERAND_OBJECT)))
{
AcpiOsPrintf ("Invalid internal ACPI Object at address %p\n", Node->Object);
@ -407,7 +410,7 @@ AcpiDbDecodeInternalObject (
switch (ObjDesc->Common.Type)
{
case ACPI_TYPE_NUMBER:
AcpiOsPrintf ("0x%.8X", ObjDesc->Number.Value);
AcpiOsPrintf ("%.8X", ObjDesc->Number.Value);
break;
case ACPI_TYPE_STRING:
@ -456,8 +459,17 @@ AcpiDbDisplayInternalObject (
else if (VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_NAMED))
{
AcpiOsPrintf ("<Node> Name %4.4s Type %s", &((ACPI_NAMESPACE_NODE *)ObjDesc)->Name,
AcpiCmGetTypeName (((ACPI_NAMESPACE_NODE *) ObjDesc)->Type));
AcpiOsPrintf ("<Node> Name %4.4s Type-%s",
&((ACPI_NAMESPACE_NODE *)ObjDesc)->Name,
AcpiCmGetTypeName (((ACPI_NAMESPACE_NODE *) ObjDesc)->Type));
if (((ACPI_NAMESPACE_NODE *) ObjDesc)->Flags & ANOBJ_METHOD_ARG)
{
AcpiOsPrintf (" [Method Arg]");
}
if (((ACPI_NAMESPACE_NODE *) ObjDesc)->Flags & ANOBJ_METHOD_LOCAL)
{
AcpiOsPrintf (" [Method Local]");
}
}
else if (VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_INTERNAL))
@ -478,15 +490,15 @@ AcpiDbDisplayInternalObject (
switch (ObjDesc->Reference.OpCode)
{
case AML_ZERO_OP:
AcpiOsPrintf ("[Const] Number 0x%.8X", 0);
AcpiOsPrintf ("[Const] Number %.8X", 0);
break;
case AML_ONES_OP:
AcpiOsPrintf ("[Const] Number 0x%.8X", ACPI_UINT32_MAX);
AcpiOsPrintf ("[Const] Number %.8X", ACPI_UINT32_MAX);
break;
case AML_ONE_OP:
AcpiOsPrintf ("[Const] Number 0x%.8X", 1);
AcpiOsPrintf ("[Const] Number %.8X", 1);
break;
case AML_LOCAL_OP:
@ -585,7 +597,7 @@ AcpiDbDisplayMethodInfo (
Concurrency = ObjDesc->Method.Concurrency;
AcpiOsPrintf ("Currently executing control method is [%4.4s]\n", &Node->Name);
AcpiOsPrintf ("%d arguments, max concurrency = %d\n", NumArgs, Concurrency);
AcpiOsPrintf ("%X arguments, max concurrency = %X\n", NumArgs, Concurrency);
RootOp = StartOp;
@ -649,10 +661,10 @@ AcpiDbDisplayMethodInfo (
Op = AcpiPsGetDepthNext (StartOp, Op);
}
AcpiOsPrintf ("Method contains: %d AML Opcodes - %d Operators, %d Operands\n",
AcpiOsPrintf ("Method contains: %X AML Opcodes - %X Operators, %X Operands\n",
NumOps, NumOperators, NumOperands);
AcpiOsPrintf ("Remaining to execute: %d AML Opcodes - %d Operators, %d Operands\n",
AcpiOsPrintf ("Remaining to execute: %X AML Opcodes - %X Operators, %X Operands\n",
NumRemainingOps, NumRemainingOperators, NumRemainingOperands);
}
@ -736,7 +748,7 @@ AcpiDbDisplayArguments (void)
NumArgs = ObjDesc->Method.ParamCount;
Concurrency = ObjDesc->Method.Concurrency;
AcpiOsPrintf ("Method [%4.4s] has %d arguments, max concurrency = %d\n", &Node->Name, NumArgs, Concurrency);
AcpiOsPrintf ("Method [%4.4s] has %X arguments, max concurrency = %X\n", &Node->Name, NumArgs, Concurrency);
for (i = 0; i < NumArgs; i++)
{
@ -780,7 +792,7 @@ AcpiDbDisplayResults (void)
Node = WalkState->MethodNode;
NumResults = WalkState->NumResults - WalkState->CurrentResult;
AcpiOsPrintf ("Method [%4.4s] has %d stacked result objects\n", &Node->Name, NumResults);
AcpiOsPrintf ("Method [%4.4s] has %X stacked result objects\n", &Node->Name, NumResults);
for (i = WalkState->CurrentResult; i < WalkState->NumResults; i++)
{