Deleted Added
sdiff udiff text old ( 99146 ) new ( 99679 )
full compact
dbutils.c (99146) dbutils.c (99679)
1/*******************************************************************************
2 *
3 * Module Name: dbutils - AML debugger utilities
1/*******************************************************************************
2 *
3 * Module Name: dbutils - AML debugger utilities
4 * $Revision: 52 $
4 * $Revision: 55 $
5 *
6 ******************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.

--- 101 unchanged lines hidden (view full) ---

114 *
115 *****************************************************************************/
116
117
118#include "acpi.h"
119#include "acparser.h"
120#include "amlcode.h"
121#include "acnamesp.h"
5 *
6 ******************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.

--- 101 unchanged lines hidden (view full) ---

114 *
115 *****************************************************************************/
116
117
118#include "acpi.h"
119#include "acparser.h"
120#include "amlcode.h"
121#include "acnamesp.h"
122#include "acparser.h"
123#include "acevents.h"
124#include "acinterp.h"
125#include "acdebug.h"
126#include "acdispat.h"
127
128
129#ifdef ENABLE_DEBUGGER
130
131#define _COMPONENT ACPI_DEBUGGER
132 ACPI_MODULE_NAME ("dbutils")

--- 224 unchanged lines hidden (view full) ---

357 *
358 ******************************************************************************/
359
360ACPI_STATUS
361AcpiDbSecondPassParse (
362 ACPI_PARSE_OBJECT *Root)
363{
364 ACPI_PARSE_OBJECT *Op = Root;
122#include "acdebug.h"
123#include "acdispat.h"
124
125
126#ifdef ENABLE_DEBUGGER
127
128#define _COMPONENT ACPI_DEBUGGER
129 ACPI_MODULE_NAME ("dbutils")

--- 224 unchanged lines hidden (view full) ---

354 *
355 ******************************************************************************/
356
357ACPI_STATUS
358AcpiDbSecondPassParse (
359 ACPI_PARSE_OBJECT *Root)
360{
361 ACPI_PARSE_OBJECT *Op = Root;
365 ACPI_PARSE2_OBJECT *Method;
362 ACPI_PARSE_OBJECT *Method;
366 ACPI_PARSE_OBJECT *SearchOp;
367 ACPI_PARSE_OBJECT *StartOp;
368 ACPI_STATUS Status = AE_OK;
369 UINT32 BaseAmlOffset;
370 ACPI_WALK_STATE *WalkState;
371
372
373 ACPI_FUNCTION_ENTRY ();
374
375
376 AcpiOsPrintf ("Pass two parse ....\n");
377
363 ACPI_PARSE_OBJECT *SearchOp;
364 ACPI_PARSE_OBJECT *StartOp;
365 ACPI_STATUS Status = AE_OK;
366 UINT32 BaseAmlOffset;
367 ACPI_WALK_STATE *WalkState;
368
369
370 ACPI_FUNCTION_ENTRY ();
371
372
373 AcpiOsPrintf ("Pass two parse ....\n");
374
378
379 while (Op)
380 {
375 while (Op)
376 {
381 if (Op->Opcode == AML_METHOD_OP)
377 if (Op->Common.AmlOpcode == AML_METHOD_OP)
382 {
378 {
383 Method = (ACPI_PARSE2_OBJECT *) Op;
379 Method = Op;
384
380
381 /* Create a new walk state for the parse */
382
385 WalkState = AcpiDsCreateWalkState (TABLE_ID_DSDT,
386 NULL, NULL, NULL);
387 if (!WalkState)
388 {
389 return (AE_NO_MEMORY);
390 }
391
383 WalkState = AcpiDsCreateWalkState (TABLE_ID_DSDT,
384 NULL, NULL, NULL);
385 if (!WalkState)
386 {
387 return (AE_NO_MEMORY);
388 }
389
390 /* Init the Walk State */
392
393 WalkState->ParserState.Aml =
391
392 WalkState->ParserState.Aml =
394 WalkState->ParserState.AmlStart = Method->Data;
393 WalkState->ParserState.AmlStart = Method->Named.Data;
395 WalkState->ParserState.AmlEnd =
394 WalkState->ParserState.AmlEnd =
396 WalkState->ParserState.PkgEnd = Method->Data + Method->Length;
395 WalkState->ParserState.PkgEnd = Method->Named.Data + Method->Named.Length;
397 WalkState->ParserState.StartScope = Op;
398
399 WalkState->DescendingCallback = AcpiDsLoad1BeginOp;
400 WalkState->AscendingCallback = AcpiDsLoad1EndOp;
401
396 WalkState->ParserState.StartScope = Op;
397
398 WalkState->DescendingCallback = AcpiDsLoad1BeginOp;
399 WalkState->AscendingCallback = AcpiDsLoad1EndOp;
400
401 /* Perform the AML parse */
402
403 Status = AcpiPsParseAml (WalkState);
404
402
403 Status = AcpiPsParseAml (WalkState);
404
405
406 BaseAmlOffset = (Method->Value.Arg)->AmlOffset + 1;
407 StartOp = (Method->Value.Arg)->Next;
405 BaseAmlOffset = (Method->Common.Value.Arg)->Common.AmlOffset + 1;
406 StartOp = (Method->Common.Value.Arg)->Common.Next;
408 SearchOp = StartOp;
409
410 while (SearchOp)
411 {
407 SearchOp = StartOp;
408
409 while (SearchOp)
410 {
412 SearchOp->AmlOffset += BaseAmlOffset;
411 SearchOp->Common.AmlOffset += BaseAmlOffset;
413 SearchOp = AcpiPsGetDepthNext (StartOp, SearchOp);
414 }
412 SearchOp = AcpiPsGetDepthNext (StartOp, SearchOp);
413 }
415
416 }
417
414 }
415
418 if (Op->Opcode == AML_REGION_OP)
416 if (Op->Common.AmlOpcode == AML_REGION_OP)
419 {
420 /* TBD: [Investigate] this isn't quite the right thing to do! */
421 /*
422 *
423 * Method = (ACPI_DEFERRED_OP *) Op;
424 * Status = AcpiPsParseAml (Op, Method->Body, Method->BodyLength);
425 */
426 }

--- 67 unchanged lines hidden --- 		417 {
418 /* TBD: [Investigate] this isn't quite the right thing to do! */
419 /*
420 *
421 * Method = (ACPI_DEFERRED_OP *) Op;
422 * Status = AcpiPsParseAml (Op, Method->Body, Method->BodyLength);
423 */
424 }

--- 67 unchanged lines hidden ---