diff options
| author | Robert Moore <Robert.Moore@intel.com> | 2014-01-17 09:50:48 -0800 |
|---|---|---|
| committer | Robert Moore <Robert.Moore@intel.com> | 2014-01-17 09:50:48 -0800 |
| commit | 9e0ce66a123f82613168be52eaa4cb73fe5f567d (patch) | |
| tree | 44a723574ba0d37027f5b8ef509f86c1f2926674 | |
| parent | 2171e9bafb7352bae7ea4540c19ce769f7be0398 (diff) | |
iASL: Eliminate duplicate warnings/errors.
This change eliminates possible duplicate warnings and errors for
predefined names.
| -rw-r--r-- | source/compiler/aslerror.c | 3 | ||||
| -rw-r--r-- | source/compiler/aslglobal.h | 1 | ||||
| -rw-r--r-- | source/compiler/aslpredef.c | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/source/compiler/aslerror.c b/source/compiler/aslerror.c index 8e506f096..e1f801519 100644 --- a/source/compiler/aslerror.c +++ b/source/compiler/aslerror.c @@ -889,7 +889,8 @@ AslError ( /* Check if user wants to ignore this exception */ - if (AslIsExceptionDisabled (Level, MessageId)) + if (Gbl_AllExceptionsDisabled || + AslIsExceptionDisabled (Level, MessageId)) { return; } diff --git a/source/compiler/aslglobal.h b/source/compiler/aslglobal.h index f6dc41d1d..7dd431887 100644 --- a/source/compiler/aslglobal.h +++ b/source/compiler/aslglobal.h @@ -242,6 +242,7 @@ ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_UseOriginalCompilerId, ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_VerboseTemplates, FALSE); ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_DoTemplates, FALSE); ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_CompileGeneric, FALSE); +ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (Gbl_AllExceptionsDisabled, FALSE); #define HEX_OUTPUT_NONE 0 diff --git a/source/compiler/aslpredef.c b/source/compiler/aslpredef.c index c94c3e24a..9305ac7a6 100644 --- a/source/compiler/aslpredef.c +++ b/source/compiler/aslpredef.c @@ -323,10 +323,16 @@ ApCheckPredefinedReturnValue ( const ACPI_PREDEFINED_INFO *ThisName; - /* Check parent method for a match against the predefined name list */ - + /* + * Check parent method for a match against the predefined name list. + * + * Note: Disable compiler errors/warnings because any errors will be + * caught when analyzing the parent method. Eliminates duplicate errors. + */ + Gbl_AllExceptionsDisabled = TRUE; Index = ApCheckForPredefinedName (MethodInfo->Op, MethodInfo->Op->Asl.NameSeg); + Gbl_AllExceptionsDisabled = FALSE; switch (Index) { |