Deleted Added
sdiff udiff text old ( 102550 ) new ( 104470 )
full compact
dsobject.c (102550) dsobject.c (104470)
1/******************************************************************************
2 *
3 * Module Name: dsobject - Dispatcher object management routines
1/******************************************************************************
2 *
3 * Module Name: dsobject - Dispatcher object management routines
4 * $Revision: 106 $
4 * $Revision: 108 $
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.

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

334ACPI_STATUS
335AcpiDsBuildInternalObject (
336 ACPI_WALK_STATE *WalkState,
337 ACPI_PARSE_OBJECT *Op,
338 ACPI_OPERAND_OBJECT **ObjDescPtr)
339{
340 ACPI_OPERAND_OBJECT *ObjDesc;
341 ACPI_STATUS Status;
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.

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

334ACPI_STATUS
335AcpiDsBuildInternalObject (
336 ACPI_WALK_STATE *WalkState,
337 ACPI_PARSE_OBJECT *Op,
338 ACPI_OPERAND_OBJECT **ObjDescPtr)
339{
340 ACPI_OPERAND_OBJECT *ObjDesc;
341 ACPI_STATUS Status;
342 char *Name;
343
344
345 ACPI_FUNCTION_TRACE ("DsBuildInternalObject");
346
347
342
343
344 ACPI_FUNCTION_TRACE ("DsBuildInternalObject");
345
346
347 *ObjDescPtr = NULL;
348 if (Op->Common.AmlOpcode == AML_INT_NAMEPATH_OP)
349 {
350 /*
351 * This is an named object reference. If this name was
352 * previously looked up in the namespace, it was stored in this op.
353 * Otherwise, go ahead and look it up now
354 */
355 if (!Op->Common.Node)
356 {
357 Status = AcpiNsLookup (WalkState->ScopeInfo, Op->Common.Value.String,
358 ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
359 ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL,
360 (ACPI_NAMESPACE_NODE **) &(Op->Common.Node));
361
362 if (ACPI_FAILURE (Status))
363 {
348 if (Op->Common.AmlOpcode == AML_INT_NAMEPATH_OP)
349 {
350 /*
351 * This is an named object reference. If this name was
352 * previously looked up in the namespace, it was stored in this op.
353 * Otherwise, go ahead and look it up now
354 */
355 if (!Op->Common.Node)
356 {
357 Status = AcpiNsLookup (WalkState->ScopeInfo, Op->Common.Value.String,
358 ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
359 ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL,
360 (ACPI_NAMESPACE_NODE **) &(Op->Common.Node));
361
362 if (ACPI_FAILURE (Status))
363 {
364 if (Status == AE_NOT_FOUND)
365 {
366 Name = NULL;
367 Status = AcpiNsExternalizeName (ACPI_UINT32_MAX, Op->Common.Value.String, NULL, &Name);
368 if (ACPI_SUCCESS (Status))
369 {
370 ACPI_REPORT_WARNING (("Reference %s at AML %X not found\n",
371 Name, Op->Common.AmlOffset));
372 ACPI_MEM_FREE (Name);
373 }
374 else
375 {
376 ACPI_REPORT_WARNING (("Reference %s at AML %X not found\n",
377 Op->Common.Value.String, Op->Common.AmlOffset));
378 }
379
380 *ObjDescPtr = NULL;
381 }
382 else
383 {
384 return_ACPI_STATUS (Status);
385 }
364 ACPI_REPORT_NSERROR (Op->Common.Value.String, Status);
365 return_ACPI_STATUS (Status);
386 }
387 }
388 }
389
390 /* Create and init the internal ACPI object */
391
392 ObjDesc = AcpiUtCreateInternalObject ((AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode))->ObjectType);
393 if (!ObjDesc)

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

876 switch (OpInfo->Type)
877 {
878 case AML_TYPE_LOCAL_VARIABLE:
879
880 /* Split the opcode into a base opcode + offset */
881
882 ObjDesc->Reference.Opcode = AML_LOCAL_OP;
883 ObjDesc->Reference.Offset = Opcode - AML_LOCAL_OP;
366 }
367 }
368 }
369
370 /* Create and init the internal ACPI object */
371
372 ObjDesc = AcpiUtCreateInternalObject ((AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode))->ObjectType);
373 if (!ObjDesc)

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

856 switch (OpInfo->Type)
857 {
858 case AML_TYPE_LOCAL_VARIABLE:
859
860 /* Split the opcode into a base opcode + offset */
861
862 ObjDesc->Reference.Opcode = AML_LOCAL_OP;
863 ObjDesc->Reference.Offset = Opcode - AML_LOCAL_OP;
864
884#ifndef ACPI_NO_METHOD_EXECUTION
865#ifndef ACPI_NO_METHOD_EXECUTION
885 AcpiDsMethodDataGetNode (AML_LOCAL_OP, ObjDesc->Reference.Offset,
886 WalkState, (ACPI_NAMESPACE_NODE **) &ObjDesc->Reference.Object);
866 Status = AcpiDsMethodDataGetNode (AML_LOCAL_OP, ObjDesc->Reference.Offset,
867 WalkState, (ACPI_NAMESPACE_NODE **) &ObjDesc->Reference.Object);
887#endif
888 break;
889
890
891 case AML_TYPE_METHOD_ARGUMENT:
892
893 /* Split the opcode into a base opcode + offset */
894

--- 32 unchanged lines hidden --- 		868#endif
869 break;
870
871
872 case AML_TYPE_METHOD_ARGUMENT:
873
874 /* Split the opcode into a base opcode + offset */
875

--- 32 unchanged lines hidden ---