date	2005.06.28.21.25.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:29:58 +00:00
parent e8e2be7201
commit f76c8a3776
2 changed files with 40 additions and 9 deletions

View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmbuffer - AML disassembler, buffer and string support
* $Revision: 1.16 $
* $Revision: 1.18 $
*
******************************************************************************/
@ -126,6 +126,12 @@
#define _COMPONENT ACPI_CA_DEBUGGER
ACPI_MODULE_NAME ("dmbuffer")
/* Local prototypes */
static void
AcpiDmUnicode (
ACPI_PARSE_OBJECT *Op);
/*******************************************************************************
*
@ -423,7 +429,7 @@ AcpiDmUnicode (
/*******************************************************************************
*
* FUNCTION: AcpiIsEisaId
* FUNCTION: AcpiDmIsEisaId
*
* PARAMETERS: Op - Op to be examined
*
@ -434,7 +440,7 @@ AcpiDmUnicode (
******************************************************************************/
void
AcpiIsEisaId (
AcpiDmIsEisaId (
ACPI_PARSE_OBJECT *Op)
{
UINT32 Name;

View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dmwalk - AML disassembly tree walk
* $Revision: 1.17 $
* $Revision: 1.20 $
*
******************************************************************************/
@ -128,7 +128,32 @@
ACPI_MODULE_NAME ("dmwalk")
#define DB_FULL_OP_INFO "%5.5X #%4.4hX "
#define DB_FULL_OP_INFO "[%4.4s] @%5.5X #%4.4hX: "
/* Local prototypes */
static ACPI_STATUS
AcpiDmDescendingOp (
ACPI_PARSE_OBJECT *Op,
UINT32 Level,
void *Context);
static ACPI_STATUS
AcpiDmAscendingOp (
ACPI_PARSE_OBJECT *Op,
UINT32 Level,
void *Context);
static void
AcpiDmWalkParseTree (
ACPI_PARSE_OBJECT *Op,
ASL_WALK_CALLBACK DescendingCallback,
ASL_WALK_CALLBACK AscendingCallback,
void *Context);
static UINT32
AcpiDmBlockType (
ACPI_PARSE_OBJECT *Op);
/*******************************************************************************
@ -162,8 +187,8 @@ AcpiDmDisassemble (
}
Info.Level = 0;
Info.WalkState = WalkState;
AcpiDmWalkParseTree (Op, AcpiDmDescendingOp, AcpiDmAscendingOp, &Info);
return;
}
@ -452,8 +477,8 @@ AcpiDmDescendingOp (
{
/* In verbose mode, print the AML offset, opcode and depth count */
VERBOSE_PRINT ((DB_FULL_OP_INFO, (UINT32) Op->Common.AmlOffset,
Op->Common.AmlOpcode));
VERBOSE_PRINT ((DB_FULL_OP_INFO, &Info->WalkState->MethodNode->Name,
(UINT32) Op->Common.AmlOffset, Op->Common.AmlOpcode));
if (Op->Common.AmlOpcode == AML_SCOPE_OP)
{
@ -573,7 +598,7 @@ AcpiDmDescendingOp (
/* Check for _HID and related EISAID() */
AcpiIsEisaId (Op);
AcpiDmIsEisaId (Op);
AcpiOsPrintf (", ");
break;