diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-02-28 20:06:31 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-02-28 20:06:31 +0000 |
commit | 691d1929c1c1f25857086b168ef9973b2472de41 (patch) | |
tree | 04e90e804d87765833c7230981b2cca94e2ebf94 /source/components/parser/psloop.c | |
parent | a0b3a9cf1fc8fe1d9f95e69cdf8914bb6ebcee03 (diff) | |
download | src-691d1929c1c1f25857086b168ef9973b2472de41.tar.gz src-691d1929c1c1f25857086b168ef9973b2472de41.zip |
Import ACPICA 20170224.vendor/acpica/20170224
Notes
Notes:
svn path=/vendor-sys/acpica/dist/; revision=314405
svn path=/vendor-sys/acpica/20170224/; revision=314406; tag=vendor/acpica/20170224
Diffstat (limited to 'source/components/parser/psloop.c')
-rw-r--r-- | source/components/parser/psloop.c | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/source/components/parser/psloop.c b/source/components/parser/psloop.c index be5b2607c7e7..9ff8bcfb77e6 100644 --- a/source/components/parser/psloop.c +++ b/source/components/parser/psloop.c @@ -55,6 +55,7 @@ #include "acparser.h" #include "acdispat.h" #include "amlcode.h" +#include "acconvert.h" #define _COMPONENT ACPI_PARSER ACPI_MODULE_NAME ("psloop") @@ -142,6 +143,22 @@ AcpiPsGetArguments ( { WalkState->Aml = WalkState->ParserState.Aml; + switch (Op->Common.AmlOpcode) + { + case AML_METHOD_OP: + case AML_BUFFER_OP: + case AML_PACKAGE_OP: + case AML_VARIABLE_PACKAGE_OP: + case AML_WHILE_OP: + + break; + + default: + + ASL_CV_CAPTURE_COMMENTS (WalkState); + break; + } + Status = AcpiPsGetNextArg (WalkState, &(WalkState->ParserState), GET_CURRENT_ARG_TYPE (WalkState->ArgTypes), &Arg); if (ACPI_FAILURE (Status)) @@ -249,7 +266,7 @@ AcpiPsGetArguments ( case AML_BUFFER_OP: case AML_PACKAGE_OP: - case AML_VAR_PACKAGE_OP: + case AML_VARIABLE_PACKAGE_OP: if ((Op->Common.Parent) && (Op->Common.Parent->Common.AmlOpcode == AML_NAME_OP) && @@ -487,6 +504,8 @@ AcpiPsParseLoop ( while ((ParserState->Aml < ParserState->AmlEnd) || (Op)) { + ASL_CV_CAPTURE_COMMENTS (WalkState); + AmlOpStart = ParserState->Aml; if (!Op) { @@ -520,12 +539,26 @@ AcpiPsParseLoop ( AcpiExStartTraceOpcode (Op, WalkState); } - /* * Start ArgCount at zero because we don't know if there are * any args yet */ - WalkState->ArgCount = 0; + WalkState->ArgCount = 0; + + switch (Op->Common.AmlOpcode) + { + case AML_BYTE_OP: + case AML_WORD_OP: + case AML_DWORD_OP: + case AML_QWORD_OP: + + break; + + default: + + ASL_CV_CAPTURE_COMMENTS (WalkState); + break; + } /* Are there any arguments that must be processed? */ |