Deleted Added
full compact
dsmethod.c (316303) dsmethod.c (322877)
1/******************************************************************************
2 *
3 * Module Name: dsmethod - Parser/Interpreter interface - control method parsing
4 *
5 *****************************************************************************/
6
7/******************************************************************************
8 *

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

328 ******************************************************************************/
329
330ACPI_STATUS
331AcpiDsMethodError (
332 ACPI_STATUS Status,
333 ACPI_WALK_STATE *WalkState)
334{
335 UINT32 AmlOffset;
1/******************************************************************************
2 *
3 * Module Name: dsmethod - Parser/Interpreter interface - control method parsing
4 *
5 *****************************************************************************/
6
7/******************************************************************************
8 *

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

328 ******************************************************************************/
329
330ACPI_STATUS
331AcpiDsMethodError (
332 ACPI_STATUS Status,
333 ACPI_WALK_STATE *WalkState)
334{
335 UINT32 AmlOffset;
336 ACPI_NAME Name = 0;
336
337
338 ACPI_FUNCTION_ENTRY ();
339
340
341 /* Ignore AE_OK and control exception codes */
342
343 if (ACPI_SUCCESS (Status) ||

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

356
357 /*
358 * Handler can map the exception code to anything it wants, including
359 * AE_OK, in which case the executing method will not be aborted.
360 */
361 AmlOffset = (UINT32) ACPI_PTR_DIFF (WalkState->Aml,
362 WalkState->ParserState.AmlStart);
363
337
338
339 ACPI_FUNCTION_ENTRY ();
340
341
342 /* Ignore AE_OK and control exception codes */
343
344 if (ACPI_SUCCESS (Status) ||

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

357
358 /*
359 * Handler can map the exception code to anything it wants, including
360 * AE_OK, in which case the executing method will not be aborted.
361 */
362 AmlOffset = (UINT32) ACPI_PTR_DIFF (WalkState->Aml,
363 WalkState->ParserState.AmlStart);
364
364 Status = AcpiGbl_ExceptionHandler (Status,
365 WalkState->MethodNode ?
366 WalkState->MethodNode->Name.Integer : 0,
365 if (WalkState->MethodNode)
366 {
367 Name = WalkState->MethodNode->Name.Integer;
368 }
369 else if (WalkState->DeferredNode)
370 {
371 Name = WalkState->DeferredNode->Name.Integer;
372 }
373
374 Status = AcpiGbl_ExceptionHandler (Status, Name,
367 WalkState->Opcode, AmlOffset, NULL);
368 AcpiExEnterInterpreter ();
369 }
370
371 AcpiDsClearImplicitReturn (WalkState);
372
373 if (ACPI_FAILURE (Status))
374 {

--- 648 unchanged lines hidden ---
375 WalkState->Opcode, AmlOffset, NULL);
376 AcpiExEnterInterpreter ();
377 }
378
379 AcpiDsClearImplicitReturn (WalkState);
380
381 if (ACPI_FAILURE (Status))
382 {

--- 648 unchanged lines hidden ---