UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / BaseTools / Source / C / VfrCompile / Pccts / antlr / gen.c

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c b/BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c
index 368a96b9ac8609f76c6c75cecf0c0b7403d42bbd..8e41239f4751504a6aab36e2b2b9657347827cd8 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c
@@ -1590,7 +1590,7 @@ int *lastAltEmpty; /* MR23 */
                   with input "C"\r
 \r
    Before MR21 the error message would be "expecting B - found C".  After MR21\r
-   the error message would be "expcect A, B - found C".  This was good, but it\r
+   the error message would be "expect A, B - found C".  This was good, but it\r
    caused problems for those using parser exceptions because the reference to\r
    B was generated inside the {...} where B really wasn't part of the block.\r
 \r
@@ -1781,7 +1781,7 @@ Junction *q;
                followed by a loopBlock whereas the start of a (...)+ block is\r
                represented as a single node: a plusBlock.  So if first_item_is_guess_block\r
                is called when the current node is a loopBegin it starts with the\r
-               loop block rather than the the sub block which follows the loop block.\r
+               loop block rather than the sub block which follows the loop block.\r
                However, we can't just skip past the loop block because some routines\r
                depend on the old implementation.  So, we provide a new implementation\r
                which does skip the loopBlock.  However, which should be called when ?\r
@@ -1968,7 +1968,7 @@ ActionNode *p;
                     (p->pred_fail == NULL ?                          /* MR23/MR27 */\r
                                "0 /* report */" : "1 /* user action */"),   /* MR23/MR27 */\r
                     (p->pred_fail == NULL ?                          /* MR23 */\r
-                        "0; /* no user action */" : p->pred_fail));  /* MR23 */\r
+                        "; /* no user action */" : p->pred_fail));   /* MR23 */\r
                        tabs--;\r
                }\r
                else    /* not a predicate */\r
@@ -2618,7 +2618,7 @@ TokNode *p;
                     (a->pred_fail == NULL ?                          /* MR23/MR27 */\r
                                "0 /* report */" : "1 /* user action */"),   /* MR23/MR27 */\r
                     (a->pred_fail == NULL ?                          /* MR23 */\r
-                        "0; /* no user action */" : a->pred_fail));  /* MR23 */\r
+                        "; /* no user action */" : a->pred_fail));   /* MR23 */\r
                        tabs--;\r
 /* Disabled in MR30 ************************************************************\r
    And moved into genAction\r
@@ -3496,7 +3496,7 @@ do {    /* MR10     Change recursion into iteration         */
                        /* MR23\r
                           If there were only one return value operand and\r
                           it had an initializer then it would have been\r
-                          initiailized in the declaration.\r
+                          initialized in the declaration.\r
                        */\r
 \r
                        returnValueInitializer = getInitializer(q->ret);         /* MR23 */\r
@@ -3740,7 +3740,7 @@ RuleEntry *r;
         /* NOTICE: this is done only here, for the method definition, but  */\r
         /*         not for the method declaration inside the class         */\r
         /*         definition. This is exactly the behaviour defined in    */\r
-        /*         C++ standard for default paramters.                     */\r
+        /*         C++ standard for default parameters.                    */\r
 \r
        DumpANSIFunctionArgDef(output,q, 0 /* emit initializers ? */);\r
        _gen("\n");\r
@@ -3866,7 +3866,7 @@ int file;
 /* MR10 */    _gen(" *  ");\r
 /* MR10 */    for (i=0 ; i < Save_argc ; i++) {\r
 /* MR10 */      _gen(" ");\r
-/* MR10 */      _gen(Save_argv[i]);\r
+/* MR10 */      _gen1("%s", Save_argv[i]);\r
 /* MR10 */    };\r
        _gen("\n");\r
        _gen(" *\n");\r
@@ -3911,7 +3911,7 @@ int file;
        }\r
 #endif\r
        /* ###WARNING: This will have to change when SetWordSize changes */\r
-       if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));\r
+       if ( !GenCC ) _gen1("#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));\r
     if (TraceGen) {\r
       _gen("#ifndef zzTRACE_RULES\n");  /* MR20 */\r
       _gen("#define zzTRACE_RULES\n");  /* MR20 */\r
@@ -4125,7 +4125,7 @@ char * gate;                                    /* MR10 */
        if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));\r
 #endif\r
        /* ###WARNING: This will have to change when SetWordSize changes */\r
-       fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));\r
+       fprintf(f, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));\r
     if (TraceGen) {\r
       fprintf(f,"#ifndef zzTRACE_RULES\n");  /* MR20 */\r
       fprintf(f,"#define zzTRACE_RULES\n");  /* MR20 */\r
@@ -4726,7 +4726,7 @@ int bInitializer;
                blocks to look like (...|...| epsilon) since there were\r
                intervening generics.  This fixes the problem for this\r
                particular case.  Things like actions or empty blocks of\r
-               various kinds will still cause problems, but I wasnt't\r
+               various kinds will still cause problems, but I wasn't\r
                prepared to handle pathological cases like (A|()*). It\r
                does handle (A | ()), which is a recommended idiom for\r
                epsilon.\r