Deleted Added
sdiff udiff text old ( 77424 ) new ( 82367 )
full compact
dsmethod.c (77424) dsmethod.c (82367)
1/******************************************************************************
2 *
3 * Module Name: dsmethod - Parser/Interpreter interface - control method parsing
1/******************************************************************************
2 *
3 * Module Name: dsmethod - Parser/Interpreter interface - control method parsing
4 * $Revision: 63 $
4 * $Revision: 64 $
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.

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

164
165 /* Parameter Validation */
166
167 if (!ObjHandle)
168 {
169 return_ACPI_STATUS (AE_NULL_ENTRY);
170 }
171
5 *
6 *****************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.

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

164
165 /* Parameter Validation */
166
167 if (!ObjHandle)
168 {
169 return_ACPI_STATUS (AE_NULL_ENTRY);
170 }
171
172 DEBUG_PRINTP (ACPI_INFO, ("**** Parsing [%4.4s] **** NamedObj=%p\n",
172 ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "**** Parsing [%4.4s] **** NamedObj=%p\n",
173 &((ACPI_NAMESPACE_NODE *)ObjHandle)->Name, ObjHandle));
174
175
176 /* Extract the method object from the method Node */
177
178 Node = (ACPI_NAMESPACE_NODE *) ObjHandle;
179 ObjDesc = Node->Object;
180 if (!ObjDesc)

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

233 return_ACPI_STATUS (Status);
234 }
235
236 /* Get a new OwnerId for objects created by this method */
237
238 OwnerId = AcpiUtAllocateOwnerId (OWNER_TYPE_METHOD);
239 ObjDesc->Method.OwningId = OwnerId;
240
173 &((ACPI_NAMESPACE_NODE *)ObjHandle)->Name, ObjHandle));
174
175
176 /* Extract the method object from the method Node */
177
178 Node = (ACPI_NAMESPACE_NODE *) ObjHandle;
179 ObjDesc = Node->Object;
180 if (!ObjDesc)

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

233 return_ACPI_STATUS (Status);
234 }
235
236 /* Get a new OwnerId for objects created by this method */
237
238 OwnerId = AcpiUtAllocateOwnerId (OWNER_TYPE_METHOD);
239 ObjDesc->Method.OwningId = OwnerId;
240
241 DEBUG_PRINTP (ACPI_INFO, ("**** [%4.4s] Parsed **** NamedObj=%p Op=%p\n",
241 ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "**** [%4.4s] Parsed **** NamedObj=%p Op=%p\n",
242 &((ACPI_NAMESPACE_NODE *)ObjHandle)->Name, ObjHandle, Op));
243
244 /* Install the parsed tree in the method object */
245 /* TBD: [Restructure] Obsolete field? */
246
247 AcpiPsDeleteParseTree (Op);
248
249 return_ACPI_STATUS (Status);

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

351 ACPI_OPERAND_OBJECT *ObjDesc;
352 ACPI_WALK_STATE *NextWalkState;
353 ACPI_PARSE_STATE *ParserState;
354 UINT32 i;
355
356
357 FUNCTION_TRACE_PTR ("DsCallControlMethod", ThisWalkState);
358
242 &((ACPI_NAMESPACE_NODE *)ObjHandle)->Name, ObjHandle, Op));
243
244 /* Install the parsed tree in the method object */
245 /* TBD: [Restructure] Obsolete field? */
246
247 AcpiPsDeleteParseTree (Op);
248
249 return_ACPI_STATUS (Status);

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

351 ACPI_OPERAND_OBJECT *ObjDesc;
352 ACPI_WALK_STATE *NextWalkState;
353 ACPI_PARSE_STATE *ParserState;
354 UINT32 i;
355
356
357 FUNCTION_TRACE_PTR ("DsCallControlMethod", ThisWalkState);
358
359 DEBUG_PRINTP (TRACE_DISPATCH, ("Execute method %p, currentstate=%p\n",
359 ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Execute method %p, currentstate=%p\n",
360 ThisWalkState->PrevOp, ThisWalkState));
361
362 /*
363 * Get the namespace entry for the control method we are about to call
364 */
365 MethodNode = ThisWalkState->MethodCallNode;
366 if (!MethodNode)
367 {

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

471 ThisWalkState->Operands [i] = NULL;
472 }
473
474 /* Clear the operand stack */
475
476 ThisWalkState->NumOperands = 0;
477
478
360 ThisWalkState->PrevOp, ThisWalkState));
361
362 /*
363 * Get the namespace entry for the control method we are about to call
364 */
365 MethodNode = ThisWalkState->MethodCallNode;
366 if (!MethodNode)
367 {

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

471 ThisWalkState->Operands [i] = NULL;
472 }
473
474 /* Clear the operand stack */
475
476 ThisWalkState->NumOperands = 0;
477
478
479 DEBUG_PRINTP (TRACE_DISPATCH, ("Starting nested execution, newstate=%p\n",
479 ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Starting nested execution, newstate=%p\n",
480 NextWalkState));
481
482 return_ACPI_STATUS (AE_OK);
483
484
485 /* On error, we must delete the new walk state */
486
487Cleanup:

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

538 * Delete the return value if it will not be used by the
539 * calling method
540 */
541 AcpiUtRemoveReference (ReturnDesc);
542 }
543
544 }
545
480 NextWalkState));
481
482 return_ACPI_STATUS (AE_OK);
483
484
485 /* On error, we must delete the new walk state */
486
487Cleanup:

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

538 * Delete the return value if it will not be used by the
539 * calling method
540 */
541 AcpiUtRemoveReference (ReturnDesc);
542 }
543
544 }
545
546 DEBUG_PRINTP (TRACE_DISPATCH,
547 ("Method=%p Return=%p ReturnUsed?=%X ResStack=%p State=%p\n",
546 ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
547 "Method=%p Return=%p ReturnUsed?=%X ResStack=%p State=%p\n",
548 WalkState->MethodCallOp, ReturnDesc, WalkState->ReturnUsed,
549 WalkState->Results, WalkState));
550
551
552 return_ACPI_STATUS (AE_OK);
553}
554
555

--- 89 unchanged lines hidden --- 		548 WalkState->MethodCallOp, ReturnDesc, WalkState->ReturnUsed,
549 WalkState->Results, WalkState));
550
551
552 return_ACPI_STATUS (AE_OK);
553}
554
555

--- 89 unchanged lines hidden ---