Debug output updates

This commit is contained in:
rmoore1 2005-12-12 22:26:03 +00:00
parent 7802350d46
commit 6988588492
2 changed files with 32 additions and 21 deletions

View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbutils - AML debugger utilities
* $Revision: 1.77 $
* $Revision: 1.78 $
*
******************************************************************************/
@ -260,7 +260,7 @@ AcpiDbDumpExternalObject (
case ACPI_TYPE_STRING:
AcpiOsPrintf ("[String] Value: ");
AcpiOsPrintf ("[String] Length %.2X = ", ObjDesc->String.Length);
for (i = 0; i < ObjDesc->String.Length; i++)
{
AcpiOsPrintf ("%c", ObjDesc->String.Pointer[i]);
@ -286,7 +286,7 @@ AcpiDbDumpExternalObject (
case ACPI_TYPE_PACKAGE:
AcpiOsPrintf ("[Package] Contains %d Elements:\n",
AcpiOsPrintf ("[Package] Contains %d Elements:\n",
ObjDesc->Package.Count);
for (i = 0; i < ObjDesc->Package.Count; i++)

View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmobject - ACPI object decode and display
* $Revision: 1.14 $
* $Revision: 1.18 $
*
******************************************************************************/
@ -127,8 +127,14 @@
#define _COMPONENT ACPI_CA_DEBUGGER
ACPI_MODULE_NAME ("dmnames")
/* Local prototypes */
/*****************************************************************************
static void
AcpiDmDecodeNode (
ACPI_NAMESPACE_NODE *Node);
/*******************************************************************************
*
* FUNCTION: AcpiDmDumpMethodInfo
*
@ -142,7 +148,7 @@
* Dumps the method execution stack, and the method locals/args,
* and disassembles the AML opcode that failed.
*
****************************************************************************/
******************************************************************************/
void
AcpiDmDumpMethodInfo (
@ -171,7 +177,7 @@ AcpiDmDumpMethodInfo (
return;
}
/*
/*
* If there is no Thread, we are not actually executing a method.
* This can happen when the iASL compiler calls the interpreter
* to perform constant folding.
@ -189,7 +195,7 @@ AcpiDmDumpMethodInfo (
AcpiNsPrintNodePathname (WalkState->MethodNode, NULL);
/* Display stack of executing methods */
AcpiOsPrintf ("\n\nMethod Execution Stack:\n");
NextWalkState = Thread->WalkStateList;
@ -246,7 +252,7 @@ AcpiDmDumpMethodInfo (
*
* RETURN: None
*
* DESCRIPTION: Short display of an internal object. Numbers and Strings.
* DESCRIPTION: Short display of an internal object. Numbers/Strings/Buffers.
*
******************************************************************************/
@ -326,12 +332,11 @@ AcpiDmDecodeInternalObject (
*
******************************************************************************/
void
static void
AcpiDmDecodeNode (
ACPI_NAMESPACE_NODE *Node)
{
AcpiOsPrintf ("<Node> Name %4.4s",
AcpiUtGetNodeName (Node));
@ -373,7 +378,7 @@ AcpiDmDisplayInternalObject (
if (!ObjDesc)
{
AcpiOsPrintf ("<NullObj>\n");
AcpiOsPrintf ("<Null Object>\n");
return;
}
@ -415,7 +420,8 @@ AcpiDmDisplayInternalObject (
AcpiOsPrintf ("[Local%d] ", ObjDesc->Reference.Offset);
if (WalkState)
{
ObjDesc = WalkState->LocalVariables[ObjDesc->Reference.Offset].Object;
ObjDesc = WalkState->LocalVariables[
ObjDesc->Reference.Offset].Object;
AcpiOsPrintf ("%p", ObjDesc);
AcpiDmDecodeInternalObject (ObjDesc);
}
@ -427,7 +433,8 @@ AcpiDmDisplayInternalObject (
AcpiOsPrintf ("[Arg%d] ", ObjDesc->Reference.Offset);
if (WalkState)
{
ObjDesc = WalkState->Arguments[ObjDesc->Reference.Offset].Object;
ObjDesc = WalkState->Arguments[
ObjDesc->Reference.Offset].Object;
AcpiOsPrintf ("%p", ObjDesc);
AcpiDmDecodeInternalObject (ObjDesc);
}
@ -459,7 +466,8 @@ AcpiDmDisplayInternalObject (
}
else
{
AcpiDmDecodeInternalObject (*(ObjDesc->Reference.Where));
AcpiDmDecodeInternalObject (
*(ObjDesc->Reference.Where));
}
break;
@ -541,7 +549,7 @@ AcpiDmDisplayInternalObject (
*
* FUNCTION: AcpiDmDisplayLocals
*
* PARAMETERS: None
* PARAMETERS: WalkState - State for current method
*
* RETURN: None
*
@ -562,7 +570,8 @@ AcpiDmDisplayLocals (
Node = WalkState->MethodNode;
if (!Node)
{
AcpiOsPrintf ("No method node (Executing subtree for buffer or opregion)\n");
AcpiOsPrintf (
"No method node (Executing subtree for buffer or opregion)\n");
return;
}
@ -588,7 +597,7 @@ AcpiDmDisplayLocals (
*
* FUNCTION: AcpiDmDisplayArguments
*
* PARAMETERS: None
* PARAMETERS: WalkState - State for current method
*
* RETURN: None
*
@ -611,7 +620,8 @@ AcpiDmDisplayArguments (
Node = WalkState->MethodNode;
if (!Node)
{
AcpiOsPrintf ("No method node (Executing subtree for buffer or opregion)\n");
AcpiOsPrintf (
"No method node (Executing subtree for buffer or opregion)\n");
return;
}
@ -624,8 +634,9 @@ AcpiDmDisplayArguments (
NumArgs = ObjDesc->Method.ParamCount;
Concurrency = ObjDesc->Method.Concurrency;
AcpiOsPrintf ("Arguments for Method [%4.4s]: (%X arguments defined, max concurrency = %X)\n",
AcpiUtGetNodeName (Node), NumArgs, Concurrency);
AcpiOsPrintf (
"Arguments for Method [%4.4s]: (%X arguments defined, max concurrency = %X)\n",
AcpiUtGetNodeName (Node), NumArgs, Concurrency);
for (i = 0; i < ACPI_METHOD_NUM_ARGS; i++)
{