diff options
Diffstat (limited to 'source/compiler/prmacros.c')
| -rw-r--r-- | source/compiler/prmacros.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/source/compiler/prmacros.c b/source/compiler/prmacros.c index c384288f89a6..5e75901e23c2 100644 --- a/source/compiler/prmacros.c +++ b/source/compiler/prmacros.c @@ -176,7 +176,7 @@ PrDumpPredefinedNames ( PR_DEFINE_INFO *DefineInfo; - DefineInfo = Gbl_DefineList; + DefineInfo = AslGbl_DefineList; while (DefineInfo) { DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID @@ -225,7 +225,7 @@ PrAddDefine ( { DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID, "#define: name already exists: %s\n", - Gbl_CurrentLineNumber, Identifier); + AslGbl_CurrentLineNumber, Identifier); /* * Name already exists. This is only an error if the target name @@ -257,13 +257,13 @@ PrAddDefine ( DefineInfo->Identifier = IdentifierString; DefineInfo->Persist = Persist; - if (Gbl_DefineList) + if (AslGbl_DefineList) { - Gbl_DefineList->Previous = DefineInfo; + AslGbl_DefineList->Previous = DefineInfo; } - DefineInfo->Next = Gbl_DefineList; - Gbl_DefineList = DefineInfo; + DefineInfo->Next = AslGbl_DefineList; + AslGbl_DefineList = DefineInfo; return (DefineInfo); } @@ -291,7 +291,7 @@ PrRemoveDefine ( /* Match name and delete the node */ - DefineInfo = Gbl_DefineList; + DefineInfo = AslGbl_DefineList; while (DefineInfo) { if (!strcmp (DefineName, DefineInfo->Identifier)) @@ -304,7 +304,7 @@ PrRemoveDefine ( } else { - Gbl_DefineList = DefineInfo->Next; + AslGbl_DefineList = DefineInfo->Next; } if (DefineInfo->Next) @@ -325,7 +325,7 @@ PrRemoveDefine ( */ DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID "#undef: could not find %s\n", - Gbl_CurrentLineNumber, DefineName); + AslGbl_CurrentLineNumber, DefineName); } @@ -348,7 +348,7 @@ PrMatchDefine ( PR_DEFINE_INFO *DefineInfo; - DefineInfo = Gbl_DefineList; + DefineInfo = AslGbl_DefineList; while (DefineInfo) { if (!strcmp (MatchString, DefineInfo->Identifier)) @@ -399,10 +399,10 @@ PrAddMacro ( /* Find the end of the arguments list */ - TokenOffset = Name - Gbl_MainTokenBuffer + strlen (Name) + 1; + TokenOffset = Name - AslGbl_MainTokenBuffer + strlen (Name) + 1; while (1) { - BufferChar = Gbl_CurrentLineBuffer[TokenOffset]; + BufferChar = AslGbl_CurrentLineBuffer[TokenOffset]; if (BufferChar == '(') { Depth++; @@ -447,7 +447,7 @@ PrAddMacro ( /* Don't go beyond the argument list */ - TokenOffset = Token - Gbl_MainTokenBuffer + strlen (Token); + TokenOffset = Token - AslGbl_MainTokenBuffer + strlen (Token); if (TokenOffset > EndOfArgList) { break; @@ -455,7 +455,7 @@ PrAddMacro ( DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID "Macro arg: %s \n", - Gbl_CurrentLineNumber, Token); + AslGbl_CurrentLineNumber, Token); Args[i].Name = UtLocalCalloc (strlen (Token) + 1); strcpy (Args[i].Name, Token); @@ -472,7 +472,7 @@ PrAddMacro ( /* Get the macro body. Token now points to start of body */ - MacroBodyOffset = Token - Gbl_MainTokenBuffer; + MacroBodyOffset = Token - AslGbl_MainTokenBuffer; /* Match each method arg in the macro body for later use */ @@ -494,11 +494,11 @@ PrAddMacro ( UseCount = Args[i].UseCount; Args[i].Offset[UseCount] = - (Token - Gbl_MainTokenBuffer) - MacroBodyOffset; + (Token - AslGbl_MainTokenBuffer) - MacroBodyOffset; DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID "Macro Arg #%u: %s UseCount %u Offset %u \n", - Gbl_CurrentLineNumber, i, Token, + AslGbl_CurrentLineNumber, i, Token, UseCount+1, Args[i].Offset[UseCount]); Args[i].UseCount++; @@ -516,7 +516,7 @@ PrAddMacro ( Token = PrGetNextToken (NULL, PR_MACRO_SEPARATORS, Next); } - BodyInSource = &Gbl_CurrentLineBuffer[MacroBodyOffset]; + BodyInSource = &AslGbl_CurrentLineBuffer[MacroBodyOffset]; AddMacroToList: @@ -528,7 +528,7 @@ AddMacroToList: { DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID "#define: macro name already exists: %s\n", - Gbl_CurrentLineNumber, Name); + AslGbl_CurrentLineNumber, Name); /* Error only if not exactly the same macro */ @@ -544,7 +544,7 @@ AddMacroToList: DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID "Macro body: %s \n", - Gbl_CurrentLineNumber, BodyInSource); + AslGbl_CurrentLineNumber, BodyInSource); /* Add macro to the #define list */ @@ -600,7 +600,7 @@ PrDoMacroInvocation ( /* Take a copy of the macro body for expansion */ - strcpy (Gbl_MacroTokenBuffer, DefineInfo->Body); + strcpy (AslGbl_MacroTokenBuffer, DefineInfo->Body); /* Replace each argument within the prototype body */ @@ -619,8 +619,8 @@ PrDoMacroInvocation ( Length = Token - MacroStart + strlen (Token) + 1; PrReplaceData ( - &Gbl_CurrentLineBuffer[TokenOffset], Length, - Gbl_MacroTokenBuffer, strlen (Gbl_MacroTokenBuffer)); + &AslGbl_CurrentLineBuffer[TokenOffset], Length, + AslGbl_MacroTokenBuffer, strlen (AslGbl_MacroTokenBuffer)); return; } @@ -647,12 +647,12 @@ PrDoMacroInvocation ( } PrReplaceData ( - &Gbl_MacroTokenBuffer[Args->Offset[i]], strlen (Args->Name), + &AslGbl_MacroTokenBuffer[Args->Offset[i]], strlen (Args->Name), Token, strlen (Token)); DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID "ExpandArg: %s \n", - Gbl_CurrentLineNumber, Gbl_MacroTokenBuffer); + AslGbl_CurrentLineNumber, AslGbl_MacroTokenBuffer); } Args++; @@ -671,8 +671,8 @@ PrDoMacroInvocation ( Length = Token - MacroStart + strlen (Token) + 1; PrReplaceData ( - &Gbl_CurrentLineBuffer[TokenOffset], Length, - Gbl_MacroTokenBuffer, strlen (Gbl_MacroTokenBuffer)); + &AslGbl_CurrentLineBuffer[TokenOffset], Length, + AslGbl_MacroTokenBuffer, strlen (AslGbl_MacroTokenBuffer)); return; @@ -683,6 +683,6 @@ BadInvocation: DbgPrint (ASL_DEBUG_OUTPUT, PR_PREFIX_ID "Bad macro invocation: %s \n", - Gbl_CurrentLineNumber, Gbl_MacroTokenBuffer); + AslGbl_CurrentLineNumber, AslGbl_MacroTokenBuffer); return; } |