mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-03-06 06:11:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix for return object during method restart

Browse Source 
date	2000.02.22.21.27.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 17:01:03 +00:00
parent afe6742fa5
commit 32c1dfa384
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/components/dispatcher/dsmethod.c
View File

@ -156,7 +156,9 @@ PsxParseMethod (
/* INIT_WALK_INFO Info; */
DEBUG_PRINT (TRACE_PARSE, ("PsParseMethod: [%4.4s] Nte=%p\n",
FUNCTION_TRACE ("PsxParseMethod");
DEBUG_PRINT (TRACE_PARSE, ("PsxParseMethod: [%4.4s] Nte=%p\n",
&((NAME_TABLE_ENTRY *)ObjHandle)->Name, ObjHandle));
@ -170,7 +172,7 @@ PsxParseMethod (
Op = PsAllocOp (AML_MethodOp);
if (!Op)
{
return AE_NO_MEMORY;
return_ACPI_STATUS (AE_NO_MEMORY);
}
/* Init new op with the method name and pointer back to the NTE */
@ -183,7 +185,7 @@ PsxParseMethod (
Status = NsScopeStackPush (Entry->Scope, ACPI_TYPE_Method);
if (ACPI_FAILURE (Status))
{
return Status;
return_ACPI_STATUS (Status);
}
/* Parse the method, creating a parse tree */
@ -191,7 +193,7 @@ PsxParseMethod (
Status = PsParseAml (Op, ObjDesc->Method.Pcode, ObjDesc->Method.PcodeLength);
if (ACPI_FAILURE (Status))
{
return Status;
return_ACPI_STATUS (Status);
}
/*
@ -199,7 +201,7 @@ PsxParseMethod (
* method into the namespace. Don't include the method op in the walk, start with
* first arg.
*/
PsWalkParsedAml (PsGetArg (Op, 0), Op, NULL, NULL, PsxLoadBeginMethodOp, PsxLoadEndOp);
/* PsWalkParsedAml (PsGetArg (Op, 0), Op, NULL, NULL, PsxLoadBeginMethodOp, PsxLoadEndOp); */
/*
@ -229,7 +231,7 @@ BREAKPOINT3;
ObjDesc->Method.ParserOp = Op;
return Status;
return_ACPI_STATUS (Status);
}
@ -346,14 +348,20 @@ PsxRestartControlMethod (
FUNCTION_TRACE_PTR ("PsxRestartControlMethod", WalkState);
if (ReturnDesc)
{
/* Get the return value (if any) from the previous method. NULL if no return value */
PsxResultStackPush (ReturnDesc, WalkState);
/* Delete the return value if it will not be used by the calling method */
PsxDeleteResultIfNotUsed (WalkState->NextOp, ReturnDesc, WalkState);
}
DEBUG_PRINT (TRACE_PARSE, ("PsxRestart: Method=%p Return=%p State=%p\n",
MethodCallOp, ReturnDesc, WalkState));
/*
* Currently, the only way a method can be preempted is by the nested execution
* of another method. Therefore, we can safely pop the scope stack here