Skip to content

L
linux
Commit 4d0b4af9 authored by Mikhail Kouzmich's avatar Mikhail Kouzmich Committed by Len Brown
Browse files
Options

ACPICA: Restructured module into multiple functions. 

Restructured the AML ParseLoop function, breaking it into several
subfunctions in order to reduce CPU stack use and improve maintainability
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 2b705a8a
Show whitespace changes
Inline Side-by-side
Showing with 805 additions and 641 deletions
drivers/acpi/parser/psloop.c
View file @ 4d0b4af9
...@@ -42,12 +42,11 @@ ...@@ -42,12 +42,11 @@
*/ */
/* /*
* Parse the AML and build an operation tree as most interpreters, * Parse the AML and build an operation tree as most interpreters, (such as
* like Perl, do. Parsing is done by hand rather than with a YACC * Perl) do. Parsing is done by hand rather than with a YACC generated parser
* generated parser to tightly constrain stack and dynamic memory * to tightly constrain stack and dynamic memory usage. Parsing is kept
* usage. At the same time, parsing is kept flexible and the code * flexible and the code fairly compact by parsing based on a list of AML
* fairly compact by parsing based on a list of AML opcode * opcode templates in aml_op_info[].
* templates in aml_op_info[]
*/ */
#include <acpi/acpi.h> #include <acpi/acpi.h>
...@@ -60,111 +59,53 @@ ACPI_MODULE_NAME("psloop") ...@@ -60,111 +59,53 @@ ACPI_MODULE_NAME("psloop")
static u32 acpi_gbl_depth = 0; static u32 acpi_gbl_depth = 0;
/* Local prototypes */
static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state);
static acpi_status
acpi_ps_build_named_op(struct acpi_walk_state *walk_state,
u8 * aml_op_start,
union acpi_parse_object *unnamed_op,
union acpi_parse_object **op);
static acpi_status
acpi_ps_create_op(struct acpi_walk_state *walk_state,
u8 * aml_op_start, union acpi_parse_object **new_op);
static acpi_status
acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
u8 * aml_op_start, union acpi_parse_object *op);
static acpi_status
acpi_ps_complete_op(struct acpi_walk_state *walk_state,
union acpi_parse_object **op, acpi_status status);
static acpi_status
acpi_ps_complete_final_op(struct acpi_walk_state *walk_state,
union acpi_parse_object *op, acpi_status status);
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: acpi_ps_parse_loop * FUNCTION: acpi_ps_get_aml_opcode
* *
* PARAMETERS: walk_state - Current state * PARAMETERS: walk_state - Current state
* *
* RETURN: Status * RETURN: Status
* *
* DESCRIPTION: Parse AML (pointed to by the current parser state) and return * DESCRIPTION: Extract the next AML opcode from the input stream.
* a tree of ops.
* *
******************************************************************************/ ******************************************************************************/
acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
{ {
acpi_status status = AE_OK;
acpi_status status2;
union acpi_parse_object *op = NULL; /* current op */
union acpi_parse_object *arg = NULL;
union acpi_parse_object *pre_op = NULL;
struct acpi_parse_state *parser_state;
u8 *aml_op_start = NULL;
ACPI_FUNCTION_TRACE_PTR(ps_parse_loop, walk_state);
if (walk_state->descending_callback == NULL) {
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
parser_state = &walk_state->parser_state;
walk_state->arg_types = 0;
#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY))
if (walk_state->walk_type & ACPI_WALK_METHOD_RESTART) {
/* We are restarting a preempted control method */
if (acpi_ps_has_completed_scope(parser_state)) {
/*
* We must check if a predicate to an IF or WHILE statement
* was just completed
*/
if ((parser_state->scope->parse_scope.op) &&
((parser_state->scope->parse_scope.op->common.
aml_opcode == AML_IF_OP)
|| (parser_state->scope->parse_scope.op->common.
aml_opcode == AML_WHILE_OP))
&& (walk_state->control_state)
&& (walk_state->control_state->common.state ==
ACPI_CONTROL_PREDICATE_EXECUTING)) {
/*
* A predicate was just completed, get the value of the
* predicate and branch based on that value
*/
walk_state->op = NULL;
status =
acpi_ds_get_predicate_value(walk_state,
ACPI_TO_POINTER
(TRUE));
if (ACPI_FAILURE(status)
&& ((status & AE_CODE_MASK) !=
AE_CODE_CONTROL)) {
if (status == AE_AML_NO_RETURN_VALUE) {
ACPI_EXCEPTION((AE_INFO, status,
"Invoked method did not return a value"));
}
ACPI_EXCEPTION((AE_INFO, status,
"GetPredicate Failed"));
return_ACPI_STATUS(status);
}
status =
acpi_ps_next_parse_state(walk_state, op,
status);
}
acpi_ps_pop_scope(parser_state, &op,
&walk_state->arg_types,
&walk_state->arg_count);
ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
"Popped scope, Op=%p\n", op));
} else if (walk_state->prev_op) {
/* We were in the middle of an op */
op = walk_state->prev_op;
walk_state->arg_types = walk_state->prev_arg_types;
}
}
#endif
/* Iterative parsing loop, while there is more AML to process: */
while ((parser_state->aml < parser_state->aml_end) || (op)) {
aml_op_start = parser_state->aml;
if (!op) {
/* Get the next opcode from the AML stream */ ACPI_FUNCTION_TRACE_PTR(ps_get_aml_opcode, walk_state);
walk_state->aml_offset = walk_state->aml_offset =
(u32) ACPI_PTR_DIFF(parser_state->aml, (u32) ACPI_PTR_DIFF(walk_state->parser_state.aml,
parser_state->aml_start); walk_state->parser_state.aml_start);
walk_state->opcode = acpi_ps_peek_opcode(parser_state); walk_state->opcode = acpi_ps_peek_opcode(&(walk_state->parser_state));
/* /*
* First cut to determine what we have found: * First cut to determine what we have found:
...@@ -172,8 +113,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -172,8 +113,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
* 2) A name string * 2) A name string
* 3) An unknown/invalid opcode * 3) An unknown/invalid opcode
*/ */
walk_state->op_info = walk_state->op_info = acpi_ps_get_opcode_info(walk_state->opcode);
acpi_ps_get_opcode_info(walk_state->opcode);
switch (walk_state->op_info->class) { switch (walk_state->op_info->class) {
case AML_CLASS_ASCII: case AML_CLASS_ASCII:
case AML_CLASS_PREFIX: case AML_CLASS_PREFIX:
...@@ -191,80 +132,82 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -191,80 +132,82 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
ACPI_ERROR((AE_INFO, ACPI_ERROR((AE_INFO,
"Found unknown opcode %X at AML address %p offset %X, ignoring", "Found unknown opcode %X at AML address %p offset %X, ignoring",
walk_state->opcode, walk_state->opcode, walk_state->parser_state.aml,
parser_state->aml,
walk_state->aml_offset)); walk_state->aml_offset));
ACPI_DUMP_BUFFER(parser_state->aml, 128); ACPI_DUMP_BUFFER(walk_state->parser_state.aml, 128);
/* Assume one-byte bad opcode */ /* Assume one-byte bad opcode */
parser_state->aml++; walk_state->parser_state.aml++;
continue; return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
default: default:
/* Found opcode info, this is a normal opcode */ /* Found opcode info, this is a normal opcode */
parser_state->aml += walk_state->parser_state.aml +=
acpi_ps_get_opcode_size(walk_state->opcode); acpi_ps_get_opcode_size(walk_state->opcode);
walk_state->arg_types = walk_state->arg_types = walk_state->op_info->parse_args;
walk_state->op_info->parse_args;
break; break;
} }
/* Create Op structure and append to parent's argument list */ return_ACPI_STATUS(AE_OK);
}
if (walk_state->op_info->flags & AML_NAMED) { /*******************************************************************************
*
* FUNCTION: acpi_ps_build_named_op
*
* PARAMETERS: walk_state - Current state
* aml_op_start - Begin of named Op in AML
* unnamed_op - Early Op (not a named Op)
* Op - Returned Op
*
* RETURN: Status
*
* DESCRIPTION: Parse a named Op
*
******************************************************************************/
/* Allocate a new pre_op if necessary */ static acpi_status
acpi_ps_build_named_op(struct acpi_walk_state *walk_state,
u8 * aml_op_start,
union acpi_parse_object *unnamed_op,
union acpi_parse_object **op)
{
acpi_status status = AE_OK;
union acpi_parse_object *arg = NULL;
if (!pre_op) { ACPI_FUNCTION_TRACE_PTR(ps_build_named_op, walk_state);
pre_op =
acpi_ps_alloc_op(walk_state->
opcode);
if (!pre_op) {
status = AE_NO_MEMORY;
goto close_this_op;
}
}
pre_op->common.value.arg = NULL; unnamed_op->common.value.arg = NULL;
pre_op->common.aml_opcode = walk_state->opcode; unnamed_op->common.aml_opcode = walk_state->opcode;
/* /*
* Get and append arguments until we find the node that contains * Get and append arguments until we find the node that contains
* the name (the type ARGP_NAME). * the name (the type ARGP_NAME).
*/ */
while (GET_CURRENT_ARG_TYPE while (GET_CURRENT_ARG_TYPE(walk_state->arg_types) &&
(walk_state->arg_types) (GET_CURRENT_ARG_TYPE(walk_state->arg_types) != ARGP_NAME)) {
&&
(GET_CURRENT_ARG_TYPE
(walk_state->arg_types) != ARGP_NAME)) {
status = status =
acpi_ps_get_next_arg(walk_state, acpi_ps_get_next_arg(walk_state,
parser_state, &(walk_state->parser_state),
GET_CURRENT_ARG_TYPE GET_CURRENT_ARG_TYPE(walk_state->
(walk_state-> arg_types), &arg);
arg_types),
&arg);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
goto close_this_op; return_ACPI_STATUS(status);
} }
acpi_ps_append_arg(pre_op, arg); acpi_ps_append_arg(unnamed_op, arg);
INCREMENT_ARG_LIST(walk_state-> INCREMENT_ARG_LIST(walk_state->arg_types);
arg_types);
} }
/* /*
* Make sure that we found a NAME and didn't run out of * Make sure that we found a NAME and didn't run out of arguments
* arguments
*/ */
if (!GET_CURRENT_ARG_TYPE if (!GET_CURRENT_ARG_TYPE(walk_state->arg_types)) {
(walk_state->arg_types)) { return_ACPI_STATUS(AE_AML_NO_OPERAND);
status = AE_AML_NO_OPERAND;
goto close_this_op;
} }
/* We know that this arg is a name, move to next arg */ /* We know that this arg is a name, move to next arg */
...@@ -277,62 +220,97 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -277,62 +220,97 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
*/ */
walk_state->op = NULL; walk_state->op = NULL;
status = status = walk_state->descending_callback(walk_state, op);
walk_state->descending_callback(walk_state,
&op);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, status, ACPI_EXCEPTION((AE_INFO, status, "During name lookup/catalog"));
"During name lookup/catalog")); return_ACPI_STATUS(status);
goto close_this_op;
} }
if (!op) { if (!op) {
continue; return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
} }
status = status = acpi_ps_next_parse_state(walk_state, *op, status);
acpi_ps_next_parse_state(walk_state, op, if (ACPI_FAILURE(status)) {
status);
if (status == AE_CTRL_PENDING) { if (status == AE_CTRL_PENDING) {
status = AE_OK; return_ACPI_STATUS(AE_CTRL_PARSE_PENDING);
goto close_this_op;
} }
return_ACPI_STATUS(status);
if (ACPI_FAILURE(status)) {
goto close_this_op;
} }
acpi_ps_append_arg(op, acpi_ps_append_arg(*op, unnamed_op->common.value.arg);
pre_op->common.value.arg);
acpi_gbl_depth++; acpi_gbl_depth++;
if (op->common.aml_opcode == AML_REGION_OP) { if ((*op)->common.aml_opcode == AML_REGION_OP) {
/* /*
* Defer final parsing of an operation_region body, * Defer final parsing of an operation_region body, because we don't
* because we don't have enough info in the first pass * have enough info in the first pass to parse it correctly (i.e.,
* to parse it correctly (i.e., there may be method * there may be method calls within the term_arg elements of the body.)
* calls within the term_arg elements of the body.)
* *
* However, we must continue parsing because * However, we must continue parsing because the opregion is not a
* the opregion is not a standalone package -- * standalone package -- we don't know where the end is at this point.
* we don't know where the end is at this point.
* *
* (Length is unknown until parse of the body complete) * (Length is unknown until parse of the body complete)
*/ */
op->named.data = aml_op_start; (*op)->named.data = aml_op_start;
op->named.length = 0; (*op)->named.length = 0;
} }
} else {
/* Not a named opcode, just allocate Op and append to parent */
walk_state->op_info = return_ACPI_STATUS(AE_OK);
acpi_ps_get_opcode_info(walk_state->opcode); }
/*******************************************************************************
*
* FUNCTION: acpi_ps_create_op
*
* PARAMETERS: walk_state - Current state
* aml_op_start - Op start in AML
* new_op - Returned Op
*
* RETURN: Status
*
* DESCRIPTION: Get Op from AML
*
******************************************************************************/
static acpi_status
acpi_ps_create_op(struct acpi_walk_state *walk_state,
u8 * aml_op_start, union acpi_parse_object **new_op)
{
acpi_status status = AE_OK;
union acpi_parse_object *op;
union acpi_parse_object *named_op = NULL;
ACPI_FUNCTION_TRACE_PTR(ps_create_op, walk_state);
status = acpi_ps_get_aml_opcode(walk_state);
if (status == AE_CTRL_PARSE_CONTINUE) {
return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
}
/* Create Op structure and append to parent's argument list */
walk_state->op_info = acpi_ps_get_opcode_info(walk_state->opcode);
op = acpi_ps_alloc_op(walk_state->opcode); op = acpi_ps_alloc_op(walk_state->opcode);
if (!op) { if (!op) {
status = AE_NO_MEMORY; return_ACPI_STATUS(AE_NO_MEMORY);
goto close_this_op; }
if (walk_state->op_info->flags & AML_NAMED) {
status =
acpi_ps_build_named_op(walk_state, aml_op_start, op,
&named_op);
acpi_ps_free_op(op);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
} }
*new_op = named_op;
return_ACPI_STATUS(AE_OK);
}
/* Not a named opcode, just allocate Op and append to parent */
if (walk_state->op_info->flags & AML_CREATE) { if (walk_state->op_info->flags & AML_CREATE) {
/* /*
* Backup to beginning of create_xXXfield declaration * Backup to beginning of create_xXXfield declaration
...@@ -343,57 +321,47 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -343,57 +321,47 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
} }
acpi_ps_append_arg(acpi_ps_get_parent_scope acpi_ps_append_arg(acpi_ps_get_parent_scope
(parser_state), op); (&(walk_state->parser_state)), op);
if ((walk_state->descending_callback != NULL)) { if (walk_state->descending_callback != NULL) {
/* /*
* Find the object. This will either insert the object into * Find the object. This will either insert the object into
* the namespace or simply look it up * the namespace or simply look it up
*/ */
walk_state->op = op; walk_state->op = *new_op = op;
status = status = walk_state->descending_callback(walk_state, &op);
walk_state-> status = acpi_ps_next_parse_state(walk_state, op, status);
descending_callback(walk_state,
&op);
status =
acpi_ps_next_parse_state(walk_state,
op,
status);
if (status == AE_CTRL_PENDING) { if (status == AE_CTRL_PENDING) {
status = AE_OK; status = AE_CTRL_PARSE_PENDING;
goto close_this_op;
}
if (ACPI_FAILURE(status)) {
goto close_this_op;
}
}
}
op->common.aml_offset = walk_state->aml_offset;
if (walk_state->op_info) {
ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
"Opcode %4.4X [%s] Op %p Aml %p AmlOffset %5.5X\n",
(u32) op->common.aml_opcode,
walk_state->op_info->name, op,
parser_state->aml,
op->common.aml_offset));
} }
} }
/* return_ACPI_STATUS(status);
* Start arg_count at zero because we don't know if there are }
* any args yet
*/
walk_state->arg_count = 0;
/* Are there any arguments that must be processed? */ /*******************************************************************************
*
* FUNCTION: acpi_ps_get_arguments
*
* PARAMETERS: walk_state - Current state
* aml_op_start - Op start in AML
* Op - Current Op
*
* RETURN: Status
*
* DESCRIPTION: Get arguments for passed Op.
*
******************************************************************************/
if (walk_state->arg_types) { static acpi_status
acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
u8 * aml_op_start, union acpi_parse_object *op)
{
acpi_status status = AE_OK;
union acpi_parse_object *arg = NULL;
/* Get arguments */ ACPI_FUNCTION_TRACE_PTR(ps_get_arguments, walk_state);
switch (op->common.aml_opcode) { switch (op->common.aml_opcode) {
case AML_BYTE_OP: /* AML_BYTEDATA_ARG */ case AML_BYTE_OP: /* AML_BYTEDATA_ARG */
...@@ -404,20 +372,20 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -404,20 +372,20 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
/* Fill in constant or string argument directly */ /* Fill in constant or string argument directly */
acpi_ps_get_next_simple_arg(parser_state, acpi_ps_get_next_simple_arg(&(walk_state->parser_state),
GET_CURRENT_ARG_TYPE GET_CURRENT_ARG_TYPE(walk_state->
(walk_state-> arg_types),
arg_types), op); op);
break; break;
case AML_INT_NAMEPATH_OP: /* AML_NAMESTRING_ARG */ case AML_INT_NAMEPATH_OP: /* AML_NAMESTRING_ARG */
status = status =
acpi_ps_get_next_namepath(walk_state, acpi_ps_get_next_namepath(walk_state,
parser_state, op, &(walk_state->parser_state), op,
1); 1);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
goto close_this_op; return_ACPI_STATUS(status);
} }
walk_state->arg_types = 0; walk_state->arg_types = 0;
...@@ -425,35 +393,30 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -425,35 +393,30 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
default: default:
/* /*
* Op is not a constant or string, append each argument * Op is not a constant or string, append each argument to the Op
* to the Op
*/ */
while (GET_CURRENT_ARG_TYPE while (GET_CURRENT_ARG_TYPE(walk_state->arg_types)
(walk_state->arg_types)
&& !walk_state->arg_count) { && !walk_state->arg_count) {
walk_state->aml_offset = (u32) walk_state->aml_offset =
ACPI_PTR_DIFF(parser_state->aml, (u32) ACPI_PTR_DIFF(walk_state->parser_state.aml,
parser_state-> walk_state->parser_state.
aml_start); aml_start);
status = status =
acpi_ps_get_next_arg(walk_state, acpi_ps_get_next_arg(walk_state,
parser_state, &(walk_state->parser_state),
GET_CURRENT_ARG_TYPE GET_CURRENT_ARG_TYPE
(walk_state-> (walk_state->arg_types), &arg);
arg_types),
&arg);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
goto close_this_op; return_ACPI_STATUS(status);
} }
if (arg) { if (arg) {
arg->common.aml_offset = arg->common.aml_offset = walk_state->aml_offset;
walk_state->aml_offset;
acpi_ps_append_arg(op, arg); acpi_ps_append_arg(op, arg);
} }
INCREMENT_ARG_LIST(walk_state->
arg_types); INCREMENT_ARG_LIST(walk_state->arg_types);
} }
/* Special processing for certain opcodes */ /* Special processing for certain opcodes */
...@@ -462,19 +425,14 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -462,19 +425,14 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
#ifdef ACPI_ENABLE_MODULE_LEVEL_CODE #ifdef ACPI_ENABLE_MODULE_LEVEL_CODE
if ((walk_state->pass_number <= if ((walk_state->pass_number <= ACPI_IMODE_LOAD_PASS1) &&
ACPI_IMODE_LOAD_PASS1) ((walk_state->parse_flags & ACPI_PARSE_DISASSEMBLE) == 0)) {
&&
((walk_state->
parse_flags & ACPI_PARSE_DISASSEMBLE) ==
0)) {
/* /*
* We want to skip If/Else/While constructs during Pass1 * We want to skip If/Else/While constructs during Pass1 because we
* because we want to actually conditionally execute the * want to actually conditionally execute the code during Pass2.
* code during Pass2.
* *
* Except for disassembly, where we always want to * Except for disassembly, where we always want to walk the
* walk the If/Else/While packages * If/Else/While packages
*/ */
switch (op->common.aml_opcode) { switch (op->common.aml_opcode) {
case AML_IF_OP: case AML_IF_OP:
...@@ -486,8 +444,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -486,8 +444,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
/* Skip body of if/else/while in pass 1 */ /* Skip body of if/else/while in pass 1 */
parser_state->aml = walk_state->parser_state.aml =
parser_state->pkg_end; walk_state->parser_state.pkg_end;
walk_state->arg_count = 0; walk_state->arg_count = 0;
break; break;
...@@ -496,25 +454,24 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -496,25 +454,24 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
} }
} }
#endif #endif
switch (op->common.aml_opcode) { switch (op->common.aml_opcode) {
case AML_METHOD_OP: case AML_METHOD_OP:
/* /*
* Skip parsing of control method * Skip parsing of control method because we don't have enough
* because we don't have enough info in the first pass * info in the first pass to parse it correctly.
* to parse it correctly.
* *
* Save the length and address of the body * Save the length and address of the body
*/ */
op->named.data = parser_state->aml; op->named.data = walk_state->parser_state.aml;
op->named.length = op->named.length = (u32)
(u32) (parser_state->pkg_end - (walk_state->parser_state.pkg_end -
parser_state->aml); walk_state->parser_state.aml);
/* Skip body of method */ /* Skip body of method */
parser_state->aml = walk_state->parser_state.aml =
parser_state->pkg_end; walk_state->parser_state.pkg_end;
walk_state->arg_count = 0; walk_state->arg_count = 0;
break; break;
...@@ -523,25 +480,23 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -523,25 +480,23 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
case AML_VAR_PACKAGE_OP: case AML_VAR_PACKAGE_OP:
if ((op->common.parent) && if ((op->common.parent) &&
(op->common.parent->common. (op->common.parent->common.aml_opcode ==
aml_opcode == AML_NAME_OP) AML_NAME_OP)
&& (walk_state->pass_number <= && (walk_state->pass_number <=
ACPI_IMODE_LOAD_PASS2)) { ACPI_IMODE_LOAD_PASS2)) {
/* /*
* Skip parsing of Buffers and Packages * Skip parsing of Buffers and Packages because we don't have
* because we don't have enough info in the first pass * enough info in the first pass to parse them correctly.
* to parse them correctly.
*/ */
op->named.data = aml_op_start; op->named.data = aml_op_start;
op->named.length = op->named.length = (u32)
(u32) (parser_state-> (walk_state->parser_state.pkg_end -
pkg_end -
aml_op_start); aml_op_start);
/* Skip body */ /* Skip body */
parser_state->aml = walk_state->parser_state.aml =
parser_state->pkg_end; walk_state->parser_state.pkg_end;
walk_state->arg_count = 0; walk_state->arg_count = 0;
} }
break; break;
...@@ -549,9 +504,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -549,9 +504,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
case AML_WHILE_OP: case AML_WHILE_OP:
if (walk_state->control_state) { if (walk_state->control_state) {
walk_state->control_state-> walk_state->control_state->control.package_end =
control.package_end = walk_state->parser_state.pkg_end;
parser_state->pkg_end;
} }
break; break;
...@@ -560,98 +514,48 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -560,98 +514,48 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
/* No action for all other opcodes */ /* No action for all other opcodes */
break; break;
} }
break; break;
} }
}
/* Check for arguments that need to be processed */ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
*
* FUNCTION: acpi_ps_complete_op
*
* PARAMETERS: walk_state - Current state
* Op - Returned Op
* Status - Parse status before complete Op
*
* RETURN: Status
*
* DESCRIPTION: Complete Op
*
******************************************************************************/
static acpi_status
acpi_ps_complete_op(struct acpi_walk_state *walk_state,
union acpi_parse_object **op, acpi_status status)
{
acpi_status status2;
ACPI_FUNCTION_TRACE_PTR(ps_complete_op, walk_state);
if (walk_state->arg_count) {
/* /*
* There are arguments (complex ones), push Op and * Finished one argument of the containing scope
* prepare for argument
*/ */
status = acpi_ps_push_scope(parser_state, op, walk_state->parser_state.scope->parse_scope.arg_count--;
walk_state->arg_types,
walk_state->arg_count);
if (ACPI_FAILURE(status)) {
goto close_this_op;
}
op = NULL;
continue;
}
/*
* All arguments have been processed -- Op is complete,
* prepare for next
*/
walk_state->op_info =
acpi_ps_get_opcode_info(op->common.aml_opcode);
if (walk_state->op_info->flags & AML_NAMED) {
if (acpi_gbl_depth) {
acpi_gbl_depth--;
}
if (op->common.aml_opcode == AML_REGION_OP) {
/*
* Skip parsing of control method or opregion body,
* because we don't have enough info in the first pass
* to parse them correctly.
*
* Completed parsing an op_region declaration, we now
* know the length.
*/
op->named.length =
(u32) (parser_state->aml - op->named.data);
}
}
if (walk_state->op_info->flags & AML_CREATE) {
/*
* Backup to beginning of create_xXXfield declaration (1 for
* Opcode)
*
* body_length is unknown until we parse the body
*/
op->named.length =
(u32) (parser_state->aml - op->named.data);
}
/* This op complete, notify the dispatcher */
if (walk_state->ascending_callback != NULL) {
walk_state->op = op;
walk_state->opcode = op->common.aml_opcode;
status = walk_state->ascending_callback(walk_state);
status =
acpi_ps_next_parse_state(walk_state, op, status);
if (status == AE_CTRL_PENDING) {
status = AE_OK;
goto close_this_op;
}
}
close_this_op:
/*
* Finished one argument of the containing scope
*/
parser_state->scope->parse_scope.arg_count--;
/* Finished with pre_op */
if (pre_op) {
acpi_ps_free_op(pre_op);
pre_op = NULL;
}
/* Close this Op (will result in parse subtree deletion) */ /* Close this Op (will result in parse subtree deletion) */
status2 = acpi_ps_complete_this_op(walk_state, op); status2 = acpi_ps_complete_this_op(walk_state, *op);
if (ACPI_FAILURE(status2)) { if (ACPI_FAILURE(status2)) {
return_ACPI_STATUS(status2); return_ACPI_STATUS(status2);
} }
op = NULL;
*op = NULL;
switch (status) { switch (status) {
case AE_OK: case AE_OK:
...@@ -659,38 +563,34 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -659,38 +563,34 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
case AE_CTRL_TRANSFER: case AE_CTRL_TRANSFER:
/* We are about to transfer to a called method. */ /* We are about to transfer to a called method */
walk_state->prev_op = op; walk_state->prev_op = NULL;
walk_state->prev_arg_types = walk_state->arg_types; walk_state->prev_arg_types = walk_state->arg_types;
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
case AE_CTRL_END: case AE_CTRL_END:
acpi_ps_pop_scope(parser_state, &op, acpi_ps_pop_scope(&(walk_state->parser_state), op,
&walk_state->arg_types, &walk_state->arg_types,
&walk_state->arg_count); &walk_state->arg_count);
if (op) { if (*op) {
walk_state->op = op; walk_state->op = *op;
walk_state->op_info = walk_state->op_info =
acpi_ps_get_opcode_info(op->common. acpi_ps_get_opcode_info((*op)->common.aml_opcode);
aml_opcode); walk_state->opcode = (*op)->common.aml_opcode;
walk_state->opcode = op->common.aml_opcode;
status = walk_state->ascending_callback(walk_state);
status = status =
walk_state->ascending_callback(walk_state); acpi_ps_next_parse_state(walk_state, *op, status);
status =
acpi_ps_next_parse_state(walk_state, op,
status);
status2 = status2 = acpi_ps_complete_this_op(walk_state, *op);
acpi_ps_complete_this_op(walk_state, op);
if (ACPI_FAILURE(status2)) { if (ACPI_FAILURE(status2)) {
return_ACPI_STATUS(status2); return_ACPI_STATUS(status2);
} }
op = NULL;
} }
status = AE_OK; status = AE_OK;
break; break;
...@@ -699,15 +599,13 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -699,15 +599,13 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
/* Pop off scopes until we find the While */ /* Pop off scopes until we find the While */
while (!op || (op->common.aml_opcode != AML_WHILE_OP)) { while (!(*op) || ((*op)->common.aml_opcode != AML_WHILE_OP)) {
acpi_ps_pop_scope(parser_state, &op, acpi_ps_pop_scope(&(walk_state->parser_state), op,
&walk_state->arg_types, &walk_state->arg_types,
&walk_state->arg_count); &walk_state->arg_count);
if (op->common.aml_opcode != AML_WHILE_OP) { if ((*op)->common.aml_opcode != AML_WHILE_OP) {
status2 = status2 = acpi_ds_result_stack_pop(walk_state);
acpi_ds_result_stack_pop
(walk_state);
if (ACPI_FAILURE(status2)) { if (ACPI_FAILURE(status2)) {
return_ACPI_STATUS(status2); return_ACPI_STATUS(status2);
} }
...@@ -716,41 +614,33 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -716,41 +614,33 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
/* Close this iteration of the While loop */ /* Close this iteration of the While loop */
walk_state->op = op; walk_state->op = *op;
walk_state->op_info = walk_state->op_info =
acpi_ps_get_opcode_info(op->common.aml_opcode); acpi_ps_get_opcode_info((*op)->common.aml_opcode);
walk_state->opcode = op->common.aml_opcode; walk_state->opcode = (*op)->common.aml_opcode;
status = walk_state->ascending_callback(walk_state); status = walk_state->ascending_callback(walk_state);
status = status = acpi_ps_next_parse_state(walk_state, *op, status);
acpi_ps_next_parse_state(walk_state, op, status);
status2 = acpi_ps_complete_this_op(walk_state, op); status2 = acpi_ps_complete_this_op(walk_state, *op);
if (ACPI_FAILURE(status2)) { if (ACPI_FAILURE(status2)) {
return_ACPI_STATUS(status2); return_ACPI_STATUS(status2);
} }
op = NULL;
status = AE_OK; status = AE_OK;
break; break;
case AE_CTRL_TERMINATE: case AE_CTRL_TERMINATE:
status = AE_OK;
/* Clean up */ /* Clean up */
do { do {
if (op) { if (*op) {
status2 = status2 =
acpi_ps_complete_this_op(walk_state, acpi_ps_complete_this_op(walk_state, *op);
op);
if (ACPI_FAILURE(status2)) { if (ACPI_FAILURE(status2)) {
return_ACPI_STATUS(status2); return_ACPI_STATUS(status2);
} }
status2 = acpi_ds_result_stack_pop(walk_state);
status2 =
acpi_ds_result_stack_pop
(walk_state);
if (ACPI_FAILURE(status2)) { if (ACPI_FAILURE(status2)) {
return_ACPI_STATUS(status2); return_ACPI_STATUS(status2);
} }
...@@ -760,60 +650,82 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -760,60 +650,82 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
(&walk_state->control_state)); (&walk_state->control_state));
} }
acpi_ps_pop_scope(parser_state, &op, acpi_ps_pop_scope(&(walk_state->parser_state), op,
&walk_state->arg_types, &walk_state->arg_types,
&walk_state->arg_count); &walk_state->arg_count);
} while (op); } while (*op);
return_ACPI_STATUS(status); return_ACPI_STATUS(AE_OK);
default: /* All other non-AE_OK status */ default: /* All other non-AE_OK status */
do { do {
if (op) { if (*op) {
status2 = status2 =
acpi_ps_complete_this_op(walk_state, acpi_ps_complete_this_op(walk_state, *op);
op);
if (ACPI_FAILURE(status2)) { if (ACPI_FAILURE(status2)) {
return_ACPI_STATUS(status2); return_ACPI_STATUS(status2);
} }
} }
acpi_ps_pop_scope(parser_state, &op, acpi_ps_pop_scope(&(walk_state->parser_state), op,
&walk_state->arg_types, &walk_state->arg_types,
&walk_state->arg_count); &walk_state->arg_count);
} while (op); } while (*op);
#if 0
/* /*
* TBD: Cleanup parse ops on error * TBD: Cleanup parse ops on error
*/ */
#if 0 if (*op == NULL) {
if (op == NULL) { acpi_ps_pop_scope(parser_state, op,
acpi_ps_pop_scope(parser_state, &op,
&walk_state->arg_types, &walk_state->arg_types,
&walk_state->arg_count); &walk_state->arg_count);
} }
#endif #endif
walk_state->prev_op = op; walk_state->prev_op = NULL;
walk_state->prev_arg_types = walk_state->arg_types; walk_state->prev_arg_types = walk_state->arg_types;
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }
/* This scope complete? */ /* This scope complete? */
if (acpi_ps_has_completed_scope(parser_state)) { if (acpi_ps_has_completed_scope(&(walk_state->parser_state))) {
acpi_ps_pop_scope(parser_state, &op, acpi_ps_pop_scope(&(walk_state->parser_state), op,
&walk_state->arg_types, &walk_state->arg_types,
&walk_state->arg_count); &walk_state->arg_count);
ACPI_DEBUG_PRINT((ACPI_DB_PARSE, ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Popped scope, Op=%p\n", *op));
"Popped scope, Op=%p\n", op));
} else { } else {
op = NULL; *op = NULL;
} }
} /* while parser_state->Aml */ return_ACPI_STATUS(AE_OK);
}
/*******************************************************************************
*
* FUNCTION: acpi_ps_complete_final_op
*
* PARAMETERS: walk_state - Current state
* Op - Current Op
* Status - Current parse status before complete last
* Op
*
* RETURN: Status
*
* DESCRIPTION: Complete last Op.
*
******************************************************************************/
static acpi_status
acpi_ps_complete_final_op(struct acpi_walk_state *walk_state,
union acpi_parse_object *op, acpi_status status)
{
acpi_status status2;
ACPI_FUNCTION_TRACE_PTR(ps_complete_final_op, walk_state);
/* /*
* Complete the last Op (if not completed), and clear the scope stack. * Complete the last Op (if not completed), and clear the scope stack.
...@@ -838,8 +750,12 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -838,8 +750,12 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
acpi_ps_next_parse_state(walk_state, op, acpi_ps_next_parse_state(walk_state, op,
status); status);
if (status == AE_CTRL_PENDING) { if (status == AE_CTRL_PENDING) {
status = AE_OK; status =
goto close_this_op; acpi_ps_complete_op(walk_state, &op,
AE_OK);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
} }
if (status == AE_CTRL_TERMINATE) { if (status == AE_CTRL_TERMINATE) {
...@@ -858,7 +774,9 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -858,7 +774,9 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
} }
} }
acpi_ps_pop_scope(parser_state, acpi_ps_pop_scope(&
(walk_state->
parser_state),
&op, &op,
&walk_state-> &walk_state->
arg_types, arg_types,
...@@ -887,10 +805,252 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) ...@@ -887,10 +805,252 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
} }
} }
acpi_ps_pop_scope(parser_state, &op, &walk_state->arg_types, acpi_ps_pop_scope(&(walk_state->parser_state), &op,
&walk_state->arg_types,
&walk_state->arg_count); &walk_state->arg_count);
} while (op); } while (op);
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }
/*******************************************************************************
*
* FUNCTION: acpi_ps_parse_loop
*
* PARAMETERS: walk_state - Current state
*
* RETURN: Status
*
* DESCRIPTION: Parse AML (pointed to by the current parser state) and return
* a tree of ops.
*
******************************************************************************/
acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
{
acpi_status status = AE_OK;
union acpi_parse_object *op = NULL; /* current op */
struct acpi_parse_state *parser_state;
u8 *aml_op_start = NULL;
ACPI_FUNCTION_TRACE_PTR(ps_parse_loop, walk_state);
if (walk_state->descending_callback == NULL) {
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
parser_state = &walk_state->parser_state;
walk_state->arg_types = 0;
#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY))
if (walk_state->walk_type & ACPI_WALK_METHOD_RESTART) {
/* We are restarting a preempted control method */
if (acpi_ps_has_completed_scope(parser_state)) {
/*
* We must check if a predicate to an IF or WHILE statement
* was just completed
*/
if ((parser_state->scope->parse_scope.op) &&
((parser_state->scope->parse_scope.op->common.
aml_opcode == AML_IF_OP)
|| (parser_state->scope->parse_scope.op->common.
aml_opcode == AML_WHILE_OP))
&& (walk_state->control_state)
&& (walk_state->control_state->common.state ==
ACPI_CONTROL_PREDICATE_EXECUTING)) {
/*
* A predicate was just completed, get the value of the
* predicate and branch based on that value
*/
walk_state->op = NULL;
status =
acpi_ds_get_predicate_value(walk_state,
ACPI_TO_POINTER
(TRUE));
if (ACPI_FAILURE(status)
&& ((status & AE_CODE_MASK) !=
AE_CODE_CONTROL)) {
if (status == AE_AML_NO_RETURN_VALUE) {
ACPI_EXCEPTION((AE_INFO, status,
"Invoked method did not return a value"));
}
ACPI_EXCEPTION((AE_INFO, status,
"GetPredicate Failed"));
return_ACPI_STATUS(status);
}
status =
acpi_ps_next_parse_state(walk_state, op,
status);
}
acpi_ps_pop_scope(parser_state, &op,
&walk_state->arg_types,
&walk_state->arg_count);
ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
"Popped scope, Op=%p\n", op));
} else if (walk_state->prev_op) {
/* We were in the middle of an op */
op = walk_state->prev_op;
walk_state->arg_types = walk_state->prev_arg_types;
}
}
#endif
/* Iterative parsing loop, while there is more AML to process: */
while ((parser_state->aml < parser_state->aml_end) || (op)) {
aml_op_start = parser_state->aml;
if (!op) {
status =
acpi_ps_create_op(walk_state, aml_op_start, &op);
if (ACPI_FAILURE(status)) {
if (status == AE_CTRL_PARSE_CONTINUE) {
continue;
}
if (status == AE_CTRL_PARSE_PENDING) {
status = AE_OK;
}
status =
acpi_ps_complete_op(walk_state, &op,
status);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
continue;
}
op->common.aml_offset = walk_state->aml_offset;
if (walk_state->op_info) {
ACPI_DEBUG_PRINT((ACPI_DB_PARSE,
"Opcode %4.4X [%s] Op %p Aml %p AmlOffset %5.5X\n",
(u32) op->common.aml_opcode,
walk_state->op_info->name, op,
parser_state->aml,
op->common.aml_offset));
}
}
/*
* Start arg_count at zero because we don't know if there are
* any args yet
*/
walk_state->arg_count = 0;
/* Are there any arguments that must be processed? */
if (walk_state->arg_types) {
/* Get arguments */
status =
acpi_ps_get_arguments(walk_state, aml_op_start, op);
if (ACPI_FAILURE(status)) {
status =
acpi_ps_complete_op(walk_state, &op,
status);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
continue;
}
}
/* Check for arguments that need to be processed */
if (walk_state->arg_count) {
/*
* There are arguments (complex ones), push Op and
* prepare for argument
*/
status = acpi_ps_push_scope(parser_state, op,
walk_state->arg_types,
walk_state->arg_count);
if (ACPI_FAILURE(status)) {
status =
acpi_ps_complete_op(walk_state, &op,
status);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
continue;
}
op = NULL;
continue;
}
/*
* All arguments have been processed -- Op is complete,
* prepare for next
*/
walk_state->op_info =
acpi_ps_get_opcode_info(op->common.aml_opcode);
if (walk_state->op_info->flags & AML_NAMED) {
if (acpi_gbl_depth) {
acpi_gbl_depth--;
}
if (op->common.aml_opcode == AML_REGION_OP) {
/*
* Skip parsing of control method or opregion body,
* because we don't have enough info in the first pass
* to parse them correctly.
*
* Completed parsing an op_region declaration, we now
* know the length.
*/
op->named.length =
(u32) (parser_state->aml - op->named.data);
}
}
if (walk_state->op_info->flags & AML_CREATE) {
/*
* Backup to beginning of create_xXXfield declaration (1 for
* Opcode)
*
* body_length is unknown until we parse the body
*/
op->named.length =
(u32) (parser_state->aml - op->named.data);
}
/* This op complete, notify the dispatcher */
if (walk_state->ascending_callback != NULL) {
walk_state->op = op;
walk_state->opcode = op->common.aml_opcode;
status = walk_state->ascending_callback(walk_state);
status =
acpi_ps_next_parse_state(walk_state, op, status);
if (status == AE_CTRL_PENDING) {
status = AE_OK;
}
}
status = acpi_ps_complete_op(walk_state, &op, status);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
} /* while parser_state->Aml */
status = acpi_ps_complete_final_op(walk_state, op, status);
return_ACPI_STATUS(status);
}
include/acpi/acexcep.h
View file @ 4d0b4af9
...@@ -178,8 +178,10 @@ ...@@ -178,8 +178,10 @@
#define AE_CTRL_BREAK (acpi_status) (0x0009 | AE_CODE_CONTROL) #define AE_CTRL_BREAK (acpi_status) (0x0009 | AE_CODE_CONTROL)
#define AE_CTRL_CONTINUE (acpi_status) (0x000A | AE_CODE_CONTROL) #define AE_CTRL_CONTINUE (acpi_status) (0x000A | AE_CODE_CONTROL)
#define AE_CTRL_SKIP (acpi_status) (0x000B | AE_CODE_CONTROL) #define AE_CTRL_SKIP (acpi_status) (0x000B | AE_CODE_CONTROL)
#define AE_CTRL_PARSE_CONTINUE (acpi_status) (0x000C | AE_CODE_CONTROL)
#define AE_CTRL_PARSE_PENDING (acpi_status) (0x000D | AE_CODE_CONTROL)
#define AE_CODE_CTRL_MAX 0x000B #define AE_CODE_CTRL_MAX 0x000D
#ifdef DEFINE_ACPI_GLOBALS #ifdef DEFINE_ACPI_GLOBALS
...@@ -291,7 +293,9 @@ char const *acpi_gbl_exception_names_ctrl[] = { ...@@ -291,7 +293,9 @@ char const *acpi_gbl_exception_names_ctrl[] = {
"AE_CTRL_TRANSFER", "AE_CTRL_TRANSFER",
"AE_CTRL_BREAK", "AE_CTRL_BREAK",
"AE_CTRL_CONTINUE", "AE_CTRL_CONTINUE",
"AE_CTRL_SKIP" "AE_CTRL_SKIP",
"AE_CTRL_PARSE_CONTINUE",
"AE_CTRL_PARSE_PENDING"
}; };
#endif /* ACPI GLOBALS */ #endif /* ACPI GLOBALS */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7