diff options
Diffstat (limited to 'source/compiler/aslerror.c')
-rw-r--r-- | source/compiler/aslerror.c | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/source/compiler/aslerror.c b/source/compiler/aslerror.c index 39297a4c5225..6d45cd400351 100644 --- a/source/compiler/aslerror.c +++ b/source/compiler/aslerror.c @@ -221,7 +221,7 @@ AslAbort ( { AePrintErrorLog (ASL_FILE_STDERR); - if (Gbl_DebugFlag) + if (AslGbl_DebugFlag) { /* Print error summary to stdout also */ @@ -248,7 +248,7 @@ void AeClearErrorLog ( void) { - ASL_ERROR_MSG *Enode = Gbl_ErrorLog; + ASL_ERROR_MSG *Enode = AslGbl_ErrorLog; ASL_ERROR_MSG *Next; @@ -261,7 +261,7 @@ AeClearErrorLog ( Enode = Next; } - Gbl_ErrorLog = NULL; + AslGbl_ErrorLog = NULL; } @@ -289,9 +289,9 @@ AeAddToErrorLog ( /* If Gbl_ErrorLog is null, this is the first error node */ - if (!Gbl_ErrorLog) + if (!AslGbl_ErrorLog) { - Gbl_ErrorLog = Enode; + AslGbl_ErrorLog = Enode; return; } @@ -300,7 +300,7 @@ AeAddToErrorLog ( * List is sorted according to line number. */ Prev = NULL; - Next = Gbl_ErrorLog; + Next = AslGbl_ErrorLog; while ((Next) && (Next->LogicalLineNumber <= Enode->LogicalLineNumber)) { @@ -318,7 +318,7 @@ AeAddToErrorLog ( } else { - Gbl_ErrorLog = Enode; + AslGbl_ErrorLog = Enode; } } @@ -382,7 +382,7 @@ AeDecodeErrorMessageId ( ExtraMessage = NULL; } - if (Gbl_VerboseErrors && !PrematureEOF) + if (AslGbl_VerboseErrors && !PrematureEOF) { if (Total >= 256) { @@ -426,7 +426,7 @@ AeDecodeErrorMessageId ( } fprintf (OutputFile, "\n"); - if (Gbl_VerboseErrors && !Enode->SubError) + if (AslGbl_VerboseErrors && !Enode->SubError) { fprintf (OutputFile, "\n"); } @@ -469,10 +469,10 @@ AePrintErrorSourceLine ( * Use the merged header/source file if present, otherwise * use input file */ - SourceFile = Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Handle; + SourceFile = AslGbl_Files[ASL_FILE_SOURCE_OUTPUT].Handle; if (!SourceFile) { - SourceFile = Gbl_Files[ASL_FILE_INPUT].Handle; + SourceFile = AslGbl_Files[ASL_FILE_INPUT].Handle; } if (SourceFile) @@ -497,7 +497,7 @@ AePrintErrorSourceLine ( /* Print filename and line number if present and valid */ - if (Gbl_VerboseErrors) + if (AslGbl_VerboseErrors) { fprintf (OutputFile, "%-8s", Enode->Filename); @@ -530,7 +530,7 @@ AePrintErrorSourceLine ( { fprintf (OutputFile, "[*** iASL: Seek error on source code temp file %s ***]", - Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename); + AslGbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename); fprintf (OutputFile, "\n"); return AE_OK; @@ -540,7 +540,7 @@ AePrintErrorSourceLine ( { fprintf (OutputFile, "[*** iASL: Read error on source code temp file %s ***]", - Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename); + AslGbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename); return AE_IO_ERROR; } /* Read/write the source line, up to the maximum line length */ @@ -569,7 +569,7 @@ AePrintErrorSourceLine ( { fprintf (OutputFile, "[*** iASL: Read error on source code temp file %s ***]", - Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename); + AslGbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename); return AE_IO_ERROR; } @@ -629,7 +629,7 @@ AePrintException ( ASL_ERROR_MSG *Child = Enode->SubError; - if (Gbl_NoErrors) + if (AslGbl_NoErrors) { return; } @@ -648,7 +648,7 @@ AePrintException ( case ASL_WARNING2: case ASL_WARNING3: - if (!Gbl_DisplayWarnings) + if (!AslGbl_DisplayWarnings) { return; } @@ -656,7 +656,7 @@ AePrintException ( case ASL_REMARK: - if (!Gbl_DisplayRemarks) + if (!AslGbl_DisplayRemarks) { return; } @@ -664,7 +664,7 @@ AePrintException ( case ASL_OPTIMIZATION: - if (!Gbl_DisplayOptimizations) + if (!AslGbl_DisplayOptimizations) { return; } @@ -678,7 +678,7 @@ AePrintException ( /* Get the various required file handles */ - OutputFile = Gbl_Files[FileId].Handle; + OutputFile = AslGbl_Files[FileId].Handle; if (Header) { @@ -764,7 +764,7 @@ void AePrintErrorLog ( UINT32 FileId) { - ASL_ERROR_MSG *Enode = Gbl_ErrorLog; + ASL_ERROR_MSG *Enode = AslGbl_ErrorLog; /* Walk the error node list */ @@ -978,20 +978,20 @@ AslLogNewError ( AeAddToErrorLog (Enode); - if (Gbl_DebugFlag) + if (AslGbl_DebugFlag) { /* stderr is a file, send error to it immediately */ AePrintException (ASL_FILE_STDERR, Enode, NULL); } - Gbl_ExceptionCount[Level]++; - if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) + AslGbl_ExceptionCount[Level]++; + if (AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) { printf ("\nMaximum error count (%u) exceeded\n", ASL_MAX_ERROR_COUNT); - Gbl_SourceLine = 0; - Gbl_NextError = Gbl_ErrorLog; + AslGbl_SourceLine = 0; + AslGbl_NextError = AslGbl_ErrorLog; CmCleanupAndExit (); exit(1); } @@ -1026,7 +1026,7 @@ AslIsExceptionIgnored ( ExceptionIgnored = AslIsExceptionDisabled (Level, MessageId); ExceptionIgnored |= AslIsExceptionExpected (Level, MessageId); - return (Gbl_AllExceptionsDisabled || ExceptionIgnored); + return (AslGbl_AllExceptionsDisabled || ExceptionIgnored); } @@ -1050,12 +1050,12 @@ AslCheckExpectedExceptions ( UINT8 i; - for (i = 0; i < Gbl_ExpectedMessagesIndex; ++i) + for (i = 0; i < AslGbl_ExpectedMessagesIndex; ++i) { - if (!Gbl_ExpectedMessages[i].MessageReceived) + if (!AslGbl_ExpectedMessages[i].MessageReceived) { AslError (ASL_ERROR, ASL_MSG_EXCEPTION_NOT_RECEIVED, NULL, - Gbl_ExpectedMessages[i].MessageIdStr); + AslGbl_ExpectedMessages[i].MessageIdStr); } } } @@ -1095,17 +1095,17 @@ AslExpectException ( /* Insert value into the global expected message array */ - if (Gbl_ExpectedMessagesIndex >= ASL_MAX_EXPECTED_MESSAGES) + if (AslGbl_ExpectedMessagesIndex >= ASL_MAX_EXPECTED_MESSAGES) { printf ("Too many messages have been registered as expected (max %u)\n", ASL_MAX_DISABLED_MESSAGES); return (AE_LIMIT); } - Gbl_ExpectedMessages[Gbl_ExpectedMessagesIndex].MessageId = MessageId; - Gbl_ExpectedMessages[Gbl_ExpectedMessagesIndex].MessageIdStr = MessageIdString; - Gbl_ExpectedMessages[Gbl_ExpectedMessagesIndex].MessageReceived = FALSE; - Gbl_ExpectedMessagesIndex++; + AslGbl_ExpectedMessages[AslGbl_ExpectedMessagesIndex].MessageId = MessageId; + AslGbl_ExpectedMessages[AslGbl_ExpectedMessagesIndex].MessageIdStr = MessageIdString; + AslGbl_ExpectedMessages[AslGbl_ExpectedMessagesIndex].MessageReceived = FALSE; + AslGbl_ExpectedMessagesIndex++; return (AE_OK); } @@ -1142,15 +1142,15 @@ AslDisableException ( /* Insert value into the global disabled message array */ - if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES) + if (AslGbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES) { printf ("Too many messages have been disabled (max %u)\n", ASL_MAX_DISABLED_MESSAGES); return (AE_LIMIT); } - Gbl_DisabledMessages[Gbl_DisabledMessagesIndex] = MessageId; - Gbl_DisabledMessagesIndex++; + AslGbl_DisabledMessages[AslGbl_DisabledMessagesIndex] = MessageId; + AslGbl_DisabledMessagesIndex++; return (AE_OK); } @@ -1181,13 +1181,13 @@ AslIsExceptionExpected ( /* Mark this exception as received */ EncodedMessageId = AeBuildFullExceptionCode (Level, MessageId); - for (i = 0; i < Gbl_ExpectedMessagesIndex; i++) + for (i = 0; i < AslGbl_ExpectedMessagesIndex; i++) { /* Simple implementation via fixed array */ - if (EncodedMessageId == Gbl_ExpectedMessages[i].MessageId) + if (EncodedMessageId == AslGbl_ExpectedMessages[i].MessageId) { - return (Gbl_ExpectedMessages[i].MessageReceived = TRUE); + return (AslGbl_ExpectedMessages[i].MessageReceived = TRUE); } } @@ -1225,7 +1225,7 @@ AslIsExceptionDisabled ( /* Check for global disable via -w1/-w2/-w3 options */ - if (Level > Gbl_WarningLevel) + if (Level > AslGbl_WarningLevel) { return (TRUE); } @@ -1239,11 +1239,11 @@ AslIsExceptionDisabled ( * the user (-vw option) */ EncodedMessageId = AeBuildFullExceptionCode (Level, MessageId); - for (i = 0; i < Gbl_DisabledMessagesIndex; i++) + for (i = 0; i < AslGbl_DisabledMessagesIndex; i++) { /* Simple implementation via fixed array */ - if (EncodedMessageId == Gbl_DisabledMessages[i]) + if (EncodedMessageId == AslGbl_DisabledMessages[i]) { return (TRUE); } @@ -1376,7 +1376,7 @@ AslCoreSubsystemError ( BOOLEAN Abort) { - sprintf (MsgBuffer, "%s %s", AcpiFormatException (Status), ExtraMessage); + sprintf (AslGbl_MsgBuffer, "%s %s", AcpiFormatException (Status), ExtraMessage); if (Op) { @@ -1385,12 +1385,12 @@ AslCoreSubsystemError ( Op->Asl.LogicalLineNumber, Op->Asl.LogicalByteOffset, Op->Asl.Column, - Op->Asl.Filename, MsgBuffer); + Op->Asl.Filename, AslGbl_MsgBuffer); } else { AslCommonError (ASL_ERROR, ASL_MSG_CORE_EXCEPTION, - 0, 0, 0, 0, NULL, MsgBuffer); + 0, 0, 0, 0, NULL, AslGbl_MsgBuffer); } if (Abort) @@ -1419,11 +1419,11 @@ AslCompilererror ( const char *CompilerMessage) { - Gbl_SyntaxError++; + AslGbl_SyntaxError++; - AslCommonError (ASL_ERROR, ASL_MSG_SYNTAX, Gbl_CurrentLineNumber, - Gbl_LogicalLineNumber, Gbl_CurrentLineOffset, - Gbl_CurrentColumn, Gbl_Files[ASL_FILE_INPUT].Filename, + AslCommonError (ASL_ERROR, ASL_MSG_SYNTAX, AslGbl_CurrentLineNumber, + AslGbl_LogicalLineNumber, AslGbl_CurrentLineOffset, + AslGbl_CurrentColumn, AslGbl_Files[ASL_FILE_INPUT].Filename, ACPI_CAST_PTR (char, CompilerMessage)); return (0); |