Merged WALK_STATE and PARSE_STATE; new common function for

initialization of WALK_STATE


date	2001.09.11.20.10.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:27:38 +00:00
parent b5ff89ee10
commit 4d3a594ee8

View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbutils - AML debugger utilities
* $Revision: 1.40 $
* $Revision: 1.44 $
*
******************************************************************************/
@ -154,7 +154,7 @@ AcpiDbSetOutputDestination (
if (OutputFlags & DB_REDIRECTABLE_OUTPUT)
{
if (OutputToFile)
if (AcpiGbl_DbOutputToFile)
{
AcpiDbgLevel = AcpiGbl_DbDebugLevel;
}
@ -185,7 +185,7 @@ AcpiDbDumpBuffer (
AcpiOsPrintf ("\nLocation %X:\n", Address);
AcpiDbgLevel |= TRACE_TABLES;
AcpiDbgLevel |= ACPI_LV_TABLES;
AcpiUtDumpBuffer ((UINT8 *) Address, 64, DB_BYTE_DISPLAY, ACPI_UINT32_MAX);
}
@ -232,7 +232,7 @@ AcpiDbDumpObject (
case ACPI_TYPE_INTEGER:
AcpiOsPrintf ("[Integer] = %X%8.8X\n", HIDWORD (ObjDesc->Integer.Value),
AcpiOsPrintf ("[Integer] = %X%8.8X\n", HIDWORD (ObjDesc->Integer.Value),
LODWORD (ObjDesc->Integer.Value));
break;
@ -369,17 +369,40 @@ AcpiDbSecondPassParse (
ACPI_PARSE_OBJECT *StartOp;
ACPI_STATUS Status = AE_OK;
UINT32 BaseAmlOffset;
ACPI_WALK_STATE *WalkState;
FUNCTION_ENTRY ();
AcpiOsPrintf ("Pass two parse ....\n");
while (Op)
{
if (Op->Opcode == AML_METHOD_OP)
{
Method = (ACPI_PARSE2_OBJECT *) Op;
Status = AcpiPsParseAml (Op, Method->Data, Method->Length, 0,
NULL, NULL, NULL, AcpiDsLoad1BeginOp, AcpiDsLoad1EndOp);
WalkState = AcpiDsCreateWalkState (TABLE_ID_DSDT,
NULL, NULL, NULL);
if (!WalkState)
{
return (AE_NO_MEMORY);
}
WalkState->ParserState.Aml =
WalkState->ParserState.AmlStart = Method->Data;
WalkState->ParserState.AmlEnd =
WalkState->ParserState.PkgEnd = Method->Data + Method->Length;
WalkState->ParserState.StartScope = Op;
WalkState->DescendingCallback = AcpiDsLoad1BeginOp;
WalkState->AscendingCallback = AcpiDsLoad1EndOp;
Status = AcpiPsParseAml (WalkState);
BaseAmlOffset = (Method->Value.Arg)->AmlOffset + 1;
@ -406,7 +429,7 @@ AcpiDbSecondPassParse (
if (ACPI_FAILURE (Status))
{
return (Status);
break;
}
Op = AcpiPsGetDepthNext (Root, Op);