[coreboot] New patch to review for coreboot: 2e66ea9 sconfig: fix up shipped code

Patrick Georgi (patrick@georgi-clan.de) gerrit at coreboot.org
Fri Jul 13 12:04:42 CEST 2012


Patrick Georgi (patrick at georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1226

-gerrit

commit 2e66ea915ae2527bc15e4caa5c2b59bfffab26df
Author: Patrick Georgi <patrick.georgi at secunet.com>
Date:   Fri Jul 13 12:02:44 2012 +0200

    sconfig: fix up shipped code
    
    The lex compile wasn't current (or something) and so INTA wasn't lexed
    properly.
    
    Change-Id: I5a760430788792f54c4e1e0d419b8dd525079d15
    Signed-off-by: Patrick Georgi <patrick.georgi at secunet.com>
---
 util/sconfig/lex.yy.c_shipped |  210 +++++++++++++++++++++--------------------
 1 files changed, 108 insertions(+), 102 deletions(-)

diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped
index a955e2e..4eee138 100644
--- a/util/sconfig/lex.yy.c_shipped
+++ b/util/sconfig/lex.yy.c_shipped
@@ -368,8 +368,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 29
-#define YY_END_OF_BUFFER 30
+#define YY_NUM_RULES 30
+#define YY_END_OF_BUFFER 31
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -377,21 +377,21 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[112] =
+static yyconst flex_int16_t yy_accept[116] =
     {   0,
-        0,    0,   30,   28,    1,    3,   28,   28,   28,   25,
-       25,   23,   26,   26,   26,   26,   28,   28,   28,   28,
-       28,   28,   28,    1,    3,   28,    0,   28,    0,    2,
-       25,   26,   28,   28,   26,   28,   28,   28,   28,   18,
-       28,   28,   28,    7,   28,   28,   28,   28,   27,   27,
-       24,   28,   28,   17,   22,   12,   28,   28,   16,   28,
-        8,    9,   11,   28,   28,    4,   28,   28,   28,   28,
-       28,   28,   28,   28,   28,   28,   13,   28,   28,   28,
-        5,   28,   10,   28,   28,   28,   28,   20,   28,   28,
-       28,   28,   28,   28,   28,   28,    6,   28,   28,   28,
-
-       28,   28,   19,   28,   15,   28,   28,   21,   28,   14,
-        0
+        0,    0,   31,   29,    1,    3,   29,   29,   29,   25,
+       25,   23,   26,   29,   26,   26,   26,   29,   29,   29,
+       29,   29,   29,   29,    1,    3,   29,    0,   29,    0,
+        2,   25,   26,   29,   29,   29,   26,   29,   29,   29,
+       29,   18,   29,   29,   29,    7,   29,   29,   29,   29,
+       28,   28,   24,   29,   29,   29,   17,   22,   12,   29,
+       29,   16,   29,    8,    9,   11,   29,   29,   27,    4,
+       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
+       13,   29,   29,   29,    5,   29,   10,   29,   29,   29,
+       29,   20,   29,   29,   29,   29,   29,   29,   29,   29,
+
+        6,   29,   29,   29,   29,   29,   19,   29,   15,   29,
+       29,   21,   29,   14,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -402,14 +402,14 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    2,    1,    5,    6,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    7,    1,    8,    7,    9,
         7,    7,    7,    7,    7,    7,    7,    1,    1,    1,
-       10,    1,    1,    1,   11,   11,   11,   11,   11,   11,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,   12,    1,   13,   14,   15,   16,
-
-       17,   18,   19,   20,   21,    1,    1,   22,   23,   24,
-       25,   26,   27,   28,   29,   30,   31,   32,    1,   33,
-       34,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+       10,    1,    1,    1,   11,   11,   11,   11,   12,   12,
+        1,    1,   13,    1,    1,    1,    1,   14,    1,    1,
+        1,    1,    1,   15,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,   16,    1,   17,   18,   19,   20,
+
+       21,   22,   23,   24,   25,    1,    1,   26,   27,   28,
+       29,   30,   31,   32,   33,   34,   35,   36,    1,   37,
+       38,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -426,100 +426,102 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[35] =
+static yyconst flex_int32_t yy_meta[39] =
     {   0,
         1,    2,    2,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1
+        1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int16_t yy_base[117] =
+static yyconst flex_int16_t yy_base[121] =
     {   0,
-        0,    0,  172,    0,  169,  173,  167,   33,   37,   34,
-      136,    0,   46,   49,   53,   56,   50,  155,   48,   22,
-      150,  135,    0,  163,  173,   74,  159,   65,  160,  173,
-        0,   75,   78,  141,   90,  134,  144,  144,  138,  144,
-      129,  129,  136,    0,  132,  126,  132,  136,    0,  173,
-        0,  123,  127,    0,    0,    0,  130,  120,    0,  124,
-        0,  132,    0,  122,  113,    0,  126,  112,  118,  123,
-      121,  107,  101,  117,  112,  117,  119,   96,   90,   90,
-        0,   88,  105,  101,   92,   97,   83,    0,   91,   89,
-       97,   81,   91,   79,   75,   84,    0,   81,   76,   73,
-
-       77,   79,    0,   60,    0,   72,   56,    0,   43,    0,
-      173,   43,  122,  124,  126,  128
+        0,    0,  181,    0,  178,  182,  176,   37,   41,   38,
+      141,    0,   44,  163,   54,   58,   61,   45,  159,   53,
+       52,  154,  139,    0,  171,  182,   80,  167,   84,  168,
+      182,    0,   84,   87,  155,  144,   93,  137,  147,  147,
+      141,  147,  132,  132,  139,    0,  135,  129,  135,  139,
+        0,  182,    0,  145,  125,  129,    0,    0,    0,  132,
+      122,    0,  126,    0,  134,    0,  124,  115,    0,    0,
+      128,  114,  120,  125,  123,  109,  103,  119,  114,  119,
+      112,   98,   92,   92,    0,   90,  107,  103,   94,   99,
+       85,    0,   93,   91,   99,   83,   93,   81,   77,   86,
+
+        0,   83,   72,   64,   60,   59,    0,   42,    0,   52,
+       43,    0,   16,    0,  182,   40,  129,  131,  133,  135
     } ;
 
-static yyconst flex_int16_t yy_def[117] =
+static yyconst flex_int16_t yy_def[121] =
     {   0,
-      111,    1,  111,  112,  111,  111,  112,  113,  114,  112,
-       10,  112,   10,   10,   10,   10,  112,  112,  112,  112,
-      112,  112,  112,  111,  111,  113,  115,  114,  116,  111,
-       10,   10,   10,  112,   10,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  111,
-       33,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-        0,  111,  111,  111,  111,  111
+      115,    1,  115,  116,  115,  115,  116,  117,  118,  116,
+       10,  116,   10,  116,   10,   10,   10,  116,  116,  116,
+      116,  116,  116,  116,  115,  115,  117,  119,  118,  120,
+      115,   10,   10,   10,  116,  116,   10,  116,  116,  116,
+      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  115,   34,  116,  116,  116,  116,  116,  116,  116,
+      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+
+      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  116,  116,  116,    0,  115,  115,  115,  115,  115
     } ;
 
-static yyconst flex_int16_t yy_nxt[208] =
+static yyconst flex_int16_t yy_nxt[221] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   10,   12,
-       13,    4,   13,   13,   14,   15,   16,   13,    4,    4,
-       17,   18,    4,    4,   19,   20,    4,   21,   22,    4,
-        4,    4,    4,    4,   27,   27,   45,   23,   29,   30,
-       31,   31,   31,   23,   32,   46,   32,   32,   32,   32,
-       32,   32,   32,   32,   32,   32,   32,   32,   38,   32,
-       32,   32,   32,   32,   32,   43,   29,   30,   34,   35,
-      110,   44,  109,   39,   40,   27,   27,   41,   49,   37,
-       36,   32,   32,   32,   51,   51,   51,  108,   51,  107,
-       51,   51,   51,   51,   51,   51,   32,   32,   32,  106,
-
+       13,   13,   14,    4,    4,    4,   13,   13,   15,   16,
+       17,   13,    4,    4,   18,   19,    4,    4,   20,   21,
+        4,   22,   23,    4,    4,    4,    4,    4,   28,   28,
+       24,   24,   30,   31,   32,   32,   32,  114,   33,   33,
+       33,   33,   33,   40,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,  113,   33,   33,   33,   33,   33,   33,
+       47,  112,   41,   42,   45,  111,   43,   36,   37,   48,
+       46,   28,   28,  110,   51,   30,   31,  109,   39,   38,
+       33,   33,   33,   53,   53,   53,  108,   53,   53,   33,
+
+       33,   33,  107,   53,   53,   53,   53,   53,   53,  106,
       105,  104,  103,  102,  101,  100,   99,   98,   97,   96,
-       95,   94,   93,   92,   91,   90,   89,   88,   87,   86,
-       85,   53,   26,   26,   28,   28,   27,   27,   29,   29,
+       95,   94,   93,   92,   91,   90,   89,   88,   56,   27,
+       27,   29,   29,   28,   28,   30,   30,   87,   86,   85,
        84,   83,   82,   81,   80,   79,   78,   77,   76,   75,
        74,   73,   72,   71,   70,   69,   68,   67,   66,   65,
-       64,   63,   62,   61,   60,   59,   58,   57,   56,   55,
-       54,   52,   30,   50,   24,   48,   47,   42,   33,   25,
-       24,  111,    3,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
+       64,   63,   62,   61,   60,   59,   58,   57,   55,   54,
+       31,   52,   25,   50,   49,   44,   35,   34,   26,   25,
+      115,    3,  115,  115,  115,  115,  115,  115,  115,  115,
+      115,  115,  115,  115,  115,  115,  115,  115,  115,  115,
 
-      111,  111,  111,  111,  111,  111,  111
+      115,  115,  115,  115,  115,  115,  115,  115,  115,  115,
+      115,  115,  115,  115,  115,  115,  115,  115,  115,  115
     } ;
 
-static yyconst flex_int16_t yy_chk[208] =
+static yyconst flex_int16_t yy_chk[221] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    8,    8,   20,    8,    9,    9,
-       10,   10,   10,  112,   10,   20,   10,   10,   10,   10,
-       10,   10,   13,   13,   13,   14,   14,   14,   17,   15,
-       15,   15,   16,   16,   16,   19,   28,   28,   14,   15,
-      109,   19,  107,   17,   17,   26,   26,   17,   26,   16,
-       15,   32,   32,   32,   33,   33,   33,  106,   33,  104,
-       33,   33,   33,   33,   33,   33,   35,   35,   35,  102,
-
-      101,  100,   99,   98,   96,   95,   94,   93,   92,   91,
-       90,   89,   87,   86,   85,   84,   83,   82,   80,   79,
-       78,   35,  113,  113,  114,  114,  115,  115,  116,  116,
-       77,   76,   75,   74,   73,   72,   71,   70,   69,   68,
-       67,   65,   64,   62,   60,   58,   57,   53,   52,   48,
-       47,   46,   45,   43,   42,   41,   40,   39,   38,   37,
-       36,   34,   29,   27,   24,   22,   21,   18,   11,    7,
-        5,    3,  111,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-
-      111,  111,  111,  111,  111,  111,  111
+        1,    1,    1,    1,    1,    1,    1,    1,    8,    8,
+      116,    8,    9,    9,   10,   10,   10,  113,   10,   10,
+       13,   13,   13,   18,   10,   10,   10,   10,   10,   10,
+       15,   15,   15,  111,   16,   16,   16,   17,   17,   17,
+       21,  110,   18,   18,   20,  108,   18,   15,   16,   21,
+       20,   27,   27,  106,   27,   29,   29,  105,   17,   16,
+       33,   33,   33,   34,   34,   34,  104,   34,   34,   37,
+
+       37,   37,  103,   34,   34,   34,   34,   34,   34,  102,
+      100,   99,   98,   97,   96,   95,   94,   93,   91,   90,
+       89,   88,   87,   86,   84,   83,   82,   81,   37,  117,
+      117,  118,  118,  119,  119,  120,  120,   80,   79,   78,
+       77,   76,   75,   74,   73,   72,   71,   68,   67,   65,
+       63,   61,   60,   56,   55,   54,   50,   49,   48,   47,
+       45,   44,   43,   42,   41,   40,   39,   38,   36,   35,
+       30,   28,   25,   23,   22,   19,   14,   11,    7,    5,
+        3,  115,  115,  115,  115,  115,  115,  115,  115,  115,
+      115,  115,  115,  115,  115,  115,  115,  115,  115,  115,
+
+      115,  115,  115,  115,  115,  115,  115,  115,  115,  115,
+      115,  115,  115,  115,  115,  115,  115,  115,  115,  115
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -796,13 +798,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 112 )
+				if ( yy_current_state >= 116 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 173 );
+		while ( yy_base[yy_current_state] != 182 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -933,16 +935,20 @@ YY_RULE_SETUP
 {yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
 	YY_BREAK
 case 27:
-/* rule 27 can match eol */
 YY_RULE_SETUP
-{yylval.string = malloc(yyleng-1); strncpy(yylval.string, yytext+1, yyleng-2); yylval.string[yyleng-2]='\0'; return(STRING);}
+{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(PCIINT);}
 	YY_BREAK
 case 28:
+/* rule 28 can match eol */
 YY_RULE_SETUP
-{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);}
+{yylval.string = malloc(yyleng-1); strncpy(yylval.string, yytext+1, yyleng-2); yylval.string[yyleng-2]='\0'; return(STRING);}
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
+{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);}
+	YY_BREAK
+case 30:
+YY_RULE_SETUP
 ECHO;
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
@@ -1236,7 +1242,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 112 )
+			if ( yy_current_state >= 116 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1264,11 +1270,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 112 )
+		if ( yy_current_state >= 116 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 111);
+	yy_is_jam = (yy_current_state == 115);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }




More information about the coreboot mailing list