Commit 91feabc2 authored by Rob Herring's avatar Rob Herring
Browse files

scripts/dtc: Update to upstream commit b06e55c88b9b 



Sync to upstream dtc commit b06e55c88b9b ("Prevent crash on modulo by
zero"). This adds the following commits from upstream:

b06e55c Prevent crash on modulo by zero
b433450 Fix some bugs in processing of line directives
d728ad5 Fix crash on nul character in string escape sequence
1ab2205 Gracefully handle bad octal literals
1937095 Prevent crash on division by zero
d0b3ab0 libfdt: Fix undefined behaviour in fdt_offset_ptr()
d4c7c25 libfdt: check for potential overrun in _fdt_splice()
f58799b libfdt: Add some missing symbols to version.lds
af9f26d Remove duplicated -Werror in dtc Makefile
604e61e fdt: Add functions to retrieve strings
8702bd1 fdt: Add a function to get the index of a string
2218387 fdt: Add a function to count strings
554fde2 libfdt: fix comment block of fdt_get_property_namelen()
e5e6df7 fdtdump: Fix bug printing bytestrings with negative values
067829e Remove redundant fdtdump test code
897a429 Move fdt_path_offset alias tests to right tests section
2d1417c Add simple .travis.yml
f6dbc6c guess output file format
5e78dff guess input file format based on file content or file name
8b927bf tests: convert `echo -n` to `printf`
64c46b0 Fix crash with poorly defined #size-cells

Cc: Grant Likely <grant.likely@linaro.org>
Tested-by: default avatarFrank Rowand <frank.rowand@sonymobile.com>
Reviewed-by: default avatarFrank Rowand <frank.rowand@sonymobile.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 76df6980

scripts/dtc/checks.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -560,7 +560,7 @@ static void check_reg_format(struct check *c, struct node *dt, 
	size_cells = node_size_cells(node->parent);

	size_cells = node_size_cells(node->parent);

	entrylen = (addr_cells + size_cells) * sizeof(cell_t);

	entrylen = (addr_cells + size_cells) * sizeof(cell_t);





	if ((prop->val.len % entrylen) != 0)

	if (!entrylen || (prop->val.len % entrylen) != 0)

		FAIL(c, "\"reg\" property in %s has invalid length (%d bytes) "

		FAIL(c, "\"reg\" property in %s has invalid length (%d bytes) "

		     "(#address-cells == %d, #size-cells == %d)",

		     "(#address-cells == %d, #size-cells == %d)",

		     node->fullpath, prop->val.len, addr_cells, size_cells);

		     node->fullpath, prop->val.len, addr_cells, size_cells);

scripts/dtc/dtc-lexer.l

+25 −14
Original line number Original line Diff line number Diff line
@@ -73,24 +73,32 @@ static void lexical_error(const char *fmt, ...); 
		}

		}





<*>^"#"(line)?[ \t]+[0-9]+[ \t]+{STRING}([ \t]+[0-9]+)? {

<*>^"#"(line)?[ \t]+[0-9]+[ \t]+{STRING}([ \t]+[0-9]+)? {

			char *line, *tmp, *fn;

			char *line, *fnstart, *fnend;

			struct data fn;

			/* skip text before line # */

			/* skip text before line # */

			line = yytext;

			line = yytext;

			while (!isdigit((unsigned char)*line))

			while (!isdigit((unsigned char)*line))

				line++;

				line++;

			/* skip digits in line # */



			tmp = line;

			/* regexp ensures that first and list "

			while (!isspace((unsigned char)*tmp))

			 * in the whole yytext are those at

				tmp++;

			 * beginning and end of the filename string */

			/* "NULL"-terminate line # */

			fnstart = memchr(yytext, '"', yyleng);

			*tmp = '\0';

			for (fnend = yytext + yyleng - 1;

			/* start of filename */

			     *fnend != '"'; fnend--)

			fn = strchr(tmp + 1, '"') + 1;

				;

			/* strip trailing " from filename */

			assert(fnstart && fnend && (fnend > fnstart));

			tmp = strchr(fn, '"');



			*tmp = 0;

			fn = data_copy_escape_string(fnstart + 1,

						     fnend - fnstart - 1);



			/* Don't allow nuls in filenames */

			if (memchr(fn.val, '\0', fn.len - 1))

				lexical_error("nul in line number directive");



			/* -1 since #line is the number of the next line */

			/* -1 since #line is the number of the next line */

			srcpos_set_line(xstrdup(fn), atoi(line) - 1);

			srcpos_set_line(xstrdup(fn.val), atoi(line) - 1);

			data_free(fn);

		}

		}





<*><<EOF>>		{

<*><<EOF>>		{
@@ -153,7 +161,10 @@ static void lexical_error(const char *fmt, ...); 
			errno = 0;

			errno = 0;

			yylval.integer = strtoull(yytext, &e, 0);

			yylval.integer = strtoull(yytext, &e, 0);





			assert(!(*e) || !e[strspn(e, "UL")]);

			if (*e && e[strspn(e, "UL")]) {

				lexical_error("Bad integer literal '%s'",

					      yytext);

			}





			if (errno == ERANGE)

			if (errno == ERANGE)

				lexical_error("Integer literal '%s' out of range",

				lexical_error("Integer literal '%s' out of range",

scripts/dtc/dtc-lexer.lex.c_shipped

+56 −45
Original line number Original line Diff line number Diff line
@@ -951,31 +951,39 @@ case 2: 
YY_RULE_SETUP

YY_RULE_SETUP

#line 75 "dtc-lexer.l"

#line 75 "dtc-lexer.l"

{

{

			char *line, *tmp, *fn;

			char *line, *fnstart, *fnend;

			struct data fn;

			/* skip text before line # */

			/* skip text before line # */

			line = yytext;

			line = yytext;

			while (!isdigit((unsigned char)*line))

			while (!isdigit((unsigned char)*line))

				line++;

				line++;

			/* skip digits in line # */



			tmp = line;

			/* regexp ensures that first and list "

			while (!isspace((unsigned char)*tmp))

			 * in the whole yytext are those at

				tmp++;

			 * beginning and end of the filename string */

			/* "NULL"-terminate line # */

			fnstart = memchr(yytext, '"', yyleng);

			*tmp = '\0';

			for (fnend = yytext + yyleng - 1;

			/* start of filename */

			     *fnend != '"'; fnend--)

			fn = strchr(tmp + 1, '"') + 1;

				;

			/* strip trailing " from filename */

			assert(fnstart && fnend && (fnend > fnstart));

			tmp = strchr(fn, '"');



			*tmp = 0;

			fn = data_copy_escape_string(fnstart + 1,

						     fnend - fnstart - 1);



			/* Don't allow nuls in filenames */

			if (memchr(fn.val, '\0', fn.len - 1))

				lexical_error("nul in line number directive");



			/* -1 since #line is the number of the next line */

			/* -1 since #line is the number of the next line */

			srcpos_set_line(xstrdup(fn), atoi(line) - 1);

			srcpos_set_line(xstrdup(fn.val), atoi(line) - 1);

			data_free(fn);

		}

		}

	YY_BREAK

	YY_BREAK

case YY_STATE_EOF(INITIAL):

case YY_STATE_EOF(INITIAL):

case YY_STATE_EOF(BYTESTRING):

case YY_STATE_EOF(BYTESTRING):

case YY_STATE_EOF(PROPNODENAME):

case YY_STATE_EOF(PROPNODENAME):

case YY_STATE_EOF(V1):

case YY_STATE_EOF(V1):

#line 96 "dtc-lexer.l"

#line 104 "dtc-lexer.l"

{

{

			if (!pop_input_file()) {

			if (!pop_input_file()) {

				yyterminate();

				yyterminate();
@@ -985,7 +993,7 @@ case YY_STATE_EOF(V1): 
case 3:

case 3:

/* rule 3 can match eol */

/* rule 3 can match eol */

YY_RULE_SETUP

YY_RULE_SETUP

#line 102 "dtc-lexer.l"

#line 110 "dtc-lexer.l"

{

{

			DPRINT("String: %s\n", yytext);

			DPRINT("String: %s\n", yytext);

			yylval.data = data_copy_escape_string(yytext+1,

			yylval.data = data_copy_escape_string(yytext+1,
@@ -995,7 +1003,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 4:

case 4:

YY_RULE_SETUP

YY_RULE_SETUP

#line 109 "dtc-lexer.l"

#line 117 "dtc-lexer.l"

{

{

			DPRINT("Keyword: /dts-v1/\n");

			DPRINT("Keyword: /dts-v1/\n");

			dts_version = 1;

			dts_version = 1;
@@ -1005,7 +1013,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 5:

case 5:

YY_RULE_SETUP

YY_RULE_SETUP

#line 116 "dtc-lexer.l"

#line 124 "dtc-lexer.l"

{

{

			DPRINT("Keyword: /memreserve/\n");

			DPRINT("Keyword: /memreserve/\n");

			BEGIN_DEFAULT();

			BEGIN_DEFAULT();
@@ -1014,7 +1022,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 6:

case 6:

YY_RULE_SETUP

YY_RULE_SETUP

#line 122 "dtc-lexer.l"

#line 130 "dtc-lexer.l"

{

{

			DPRINT("Keyword: /bits/\n");

			DPRINT("Keyword: /bits/\n");

			BEGIN_DEFAULT();

			BEGIN_DEFAULT();
@@ -1023,7 +1031,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 7:

case 7:

YY_RULE_SETUP

YY_RULE_SETUP

#line 128 "dtc-lexer.l"

#line 136 "dtc-lexer.l"

{

{

			DPRINT("Keyword: /delete-property/\n");

			DPRINT("Keyword: /delete-property/\n");

			DPRINT("<PROPNODENAME>\n");

			DPRINT("<PROPNODENAME>\n");
@@ -1033,7 +1041,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 8:

case 8:

YY_RULE_SETUP

YY_RULE_SETUP

#line 135 "dtc-lexer.l"

#line 143 "dtc-lexer.l"

{

{

			DPRINT("Keyword: /delete-node/\n");

			DPRINT("Keyword: /delete-node/\n");

			DPRINT("<PROPNODENAME>\n");

			DPRINT("<PROPNODENAME>\n");
@@ -1043,7 +1051,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 9:

case 9:

YY_RULE_SETUP

YY_RULE_SETUP

#line 142 "dtc-lexer.l"

#line 150 "dtc-lexer.l"

{

{

			DPRINT("Label: %s\n", yytext);

			DPRINT("Label: %s\n", yytext);

			yylval.labelref = xstrdup(yytext);

			yylval.labelref = xstrdup(yytext);
@@ -1053,7 +1061,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 10:

case 10:

YY_RULE_SETUP

YY_RULE_SETUP

#line 149 "dtc-lexer.l"

#line 157 "dtc-lexer.l"

{

{

			char *e;

			char *e;

			DPRINT("Integer Literal: '%s'\n", yytext);

			DPRINT("Integer Literal: '%s'\n", yytext);
@@ -1061,7 +1069,10 @@ YY_RULE_SETUP 
			errno = 0;

			errno = 0;

			yylval.integer = strtoull(yytext, &e, 0);

			yylval.integer = strtoull(yytext, &e, 0);





			assert(!(*e) || !e[strspn(e, "UL")]);

			if (*e && e[strspn(e, "UL")]) {

				lexical_error("Bad integer literal '%s'",

					      yytext);

			}





			if (errno == ERANGE)

			if (errno == ERANGE)

				lexical_error("Integer literal '%s' out of range",

				lexical_error("Integer literal '%s' out of range",
@@ -1076,7 +1087,7 @@ YY_RULE_SETUP 
case 11:

case 11:

/* rule 11 can match eol */

/* rule 11 can match eol */

YY_RULE_SETUP

YY_RULE_SETUP

#line 168 "dtc-lexer.l"

#line 179 "dtc-lexer.l"

{

{

			struct data d;

			struct data d;

			DPRINT("Character literal: %s\n", yytext);

			DPRINT("Character literal: %s\n", yytext);
@@ -1100,7 +1111,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 12:

case 12:

YY_RULE_SETUP

YY_RULE_SETUP

#line 189 "dtc-lexer.l"

#line 200 "dtc-lexer.l"

{	/* label reference */

{	/* label reference */

			DPRINT("Ref: %s\n", yytext+1);

			DPRINT("Ref: %s\n", yytext+1);

			yylval.labelref = xstrdup(yytext+1);

			yylval.labelref = xstrdup(yytext+1);
@@ -1109,7 +1120,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 13:

case 13:

YY_RULE_SETUP

YY_RULE_SETUP

#line 195 "dtc-lexer.l"

#line 206 "dtc-lexer.l"

{	/* new-style path reference */

{	/* new-style path reference */

			yytext[yyleng-1] = '\0';

			yytext[yyleng-1] = '\0';

			DPRINT("Ref: %s\n", yytext+2);

			DPRINT("Ref: %s\n", yytext+2);
@@ -1119,7 +1130,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 14:

case 14:

YY_RULE_SETUP

YY_RULE_SETUP

#line 202 "dtc-lexer.l"

#line 213 "dtc-lexer.l"

{

{

			yylval.byte = strtol(yytext, NULL, 16);

			yylval.byte = strtol(yytext, NULL, 16);

			DPRINT("Byte: %02x\n", (int)yylval.byte);

			DPRINT("Byte: %02x\n", (int)yylval.byte);
@@ -1128,7 +1139,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 15:

case 15:

YY_RULE_SETUP

YY_RULE_SETUP

#line 208 "dtc-lexer.l"

#line 219 "dtc-lexer.l"

{

{

			DPRINT("/BYTESTRING\n");

			DPRINT("/BYTESTRING\n");

			BEGIN_DEFAULT();

			BEGIN_DEFAULT();
@@ -1137,7 +1148,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 16:

case 16:

YY_RULE_SETUP

YY_RULE_SETUP

#line 214 "dtc-lexer.l"

#line 225 "dtc-lexer.l"

{

{

			DPRINT("PropNodeName: %s\n", yytext);

			DPRINT("PropNodeName: %s\n", yytext);

			yylval.propnodename = xstrdup((yytext[0] == '\\') ?

			yylval.propnodename = xstrdup((yytext[0] == '\\') ?
@@ -1148,7 +1159,7 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 17:

case 17:

YY_RULE_SETUP

YY_RULE_SETUP

#line 222 "dtc-lexer.l"

#line 233 "dtc-lexer.l"

{

{

			DPRINT("Binary Include\n");

			DPRINT("Binary Include\n");

			return DT_INCBIN;

			return DT_INCBIN;
@@ -1157,64 +1168,64 @@ YY_RULE_SETUP 
case 18:

case 18:

/* rule 18 can match eol */

/* rule 18 can match eol */

YY_RULE_SETUP

YY_RULE_SETUP

#line 227 "dtc-lexer.l"

#line 238 "dtc-lexer.l"

/* eat whitespace */

/* eat whitespace */

	YY_BREAK

	YY_BREAK

case 19:

case 19:

/* rule 19 can match eol */

/* rule 19 can match eol */

YY_RULE_SETUP

YY_RULE_SETUP

#line 228 "dtc-lexer.l"

#line 239 "dtc-lexer.l"

/* eat C-style comments */

/* eat C-style comments */

	YY_BREAK

	YY_BREAK

case 20:

case 20:

/* rule 20 can match eol */

/* rule 20 can match eol */

YY_RULE_SETUP

YY_RULE_SETUP

#line 229 "dtc-lexer.l"

#line 240 "dtc-lexer.l"

/* eat C++-style comments */

/* eat C++-style comments */

	YY_BREAK

	YY_BREAK

case 21:

case 21:

YY_RULE_SETUP

YY_RULE_SETUP

#line 231 "dtc-lexer.l"

#line 242 "dtc-lexer.l"

{ return DT_LSHIFT; };

{ return DT_LSHIFT; };

	YY_BREAK

	YY_BREAK

case 22:

case 22:

YY_RULE_SETUP

YY_RULE_SETUP

#line 232 "dtc-lexer.l"

#line 243 "dtc-lexer.l"

{ return DT_RSHIFT; };

{ return DT_RSHIFT; };

	YY_BREAK

	YY_BREAK

case 23:

case 23:

YY_RULE_SETUP

YY_RULE_SETUP

#line 233 "dtc-lexer.l"

#line 244 "dtc-lexer.l"

{ return DT_LE; };

{ return DT_LE; };

	YY_BREAK

	YY_BREAK

case 24:

case 24:

YY_RULE_SETUP

YY_RULE_SETUP

#line 234 "dtc-lexer.l"

#line 245 "dtc-lexer.l"

{ return DT_GE; };

{ return DT_GE; };

	YY_BREAK

	YY_BREAK

case 25:

case 25:

YY_RULE_SETUP

YY_RULE_SETUP

#line 235 "dtc-lexer.l"

#line 246 "dtc-lexer.l"

{ return DT_EQ; };

{ return DT_EQ; };

	YY_BREAK

	YY_BREAK

case 26:

case 26:

YY_RULE_SETUP

YY_RULE_SETUP

#line 236 "dtc-lexer.l"

#line 247 "dtc-lexer.l"

{ return DT_NE; };

{ return DT_NE; };

	YY_BREAK

	YY_BREAK

case 27:

case 27:

YY_RULE_SETUP

YY_RULE_SETUP

#line 237 "dtc-lexer.l"

#line 248 "dtc-lexer.l"

{ return DT_AND; };

{ return DT_AND; };

	YY_BREAK

	YY_BREAK

case 28:

case 28:

YY_RULE_SETUP

YY_RULE_SETUP

#line 238 "dtc-lexer.l"

#line 249 "dtc-lexer.l"

{ return DT_OR; };

{ return DT_OR; };

	YY_BREAK

	YY_BREAK

case 29:

case 29:

YY_RULE_SETUP

YY_RULE_SETUP

#line 240 "dtc-lexer.l"

#line 251 "dtc-lexer.l"

{

{

			DPRINT("Char: %c (\\x%02x)\n", yytext[0],

			DPRINT("Char: %c (\\x%02x)\n", yytext[0],

				(unsigned)yytext[0]);

				(unsigned)yytext[0]);
@@ -1232,10 +1243,10 @@ YY_RULE_SETUP 
	YY_BREAK

	YY_BREAK

case 30:

case 30:

YY_RULE_SETUP

YY_RULE_SETUP

#line 255 "dtc-lexer.l"

#line 266 "dtc-lexer.l"

ECHO;

ECHO;

	YY_BREAK

	YY_BREAK

#line 1239 "dtc-lexer.lex.c"

#line 1250 "dtc-lexer.lex.c"





	case YY_END_OF_BUFFER:

	case YY_END_OF_BUFFER:

		{

		{
@@ -2195,7 +2206,7 @@ void yyfree (void * ptr ) 




#define YYTABLES_NAME "yytables"

#define YYTABLES_NAME "yytables"





#line 254 "dtc-lexer.l"

#line 265 "dtc-lexer.l"

scripts/dtc/dtc-parser.tab.c_shipped

+49 −35
Original line number Original line Diff line number Diff line
@@ -499,9 +499,9 @@ static const yytype_uint16 yyrline[] = 
     298,   303,   322,   336,   343,   344,   345,   352,   356,   357,

     298,   303,   322,   336,   343,   344,   345,   352,   356,   357,

     361,   362,   366,   367,   371,   372,   376,   377,   381,   382,

     361,   362,   366,   367,   371,   372,   376,   377,   381,   382,

     386,   387,   388,   392,   393,   394,   395,   396,   400,   401,

     386,   387,   388,   392,   393,   394,   395,   396,   400,   401,

     402,   406,   407,   408,   412,   413,   414,   415,   419,   420,

     402,   406,   407,   408,   412,   413,   422,   431,   435,   436,

     421,   422,   427,   430,   434,   442,   445,   449,   457,   461,

     437,   438,   443,   446,   450,   458,   461,   465,   473,   477,

     465

     481

};

};

#endif

#endif
@@ -1909,111 +1909,125 @@ yyreduce: 
    break;

    break;





  case 65:

  case 65:

#line 413 "dtc-parser.y" /* yacc.c:1646  */

#line 414 "dtc-parser.y" /* yacc.c:1646  */

    { (yyval.integer) = (yyvsp[-2].integer) / (yyvsp[0].integer); }

    {

#line 1915 "dtc-parser.tab.c" /* yacc.c:1646  */

			if ((yyvsp[0].integer) != 0) {

				(yyval.integer) = (yyvsp[-2].integer) / (yyvsp[0].integer);

			} else {

				ERROR(&(yyloc), "Division by zero");

				(yyval.integer) = 0;

			}

		}

#line 1922 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 66:

  case 66:

#line 414 "dtc-parser.y" /* yacc.c:1646  */

#line 423 "dtc-parser.y" /* yacc.c:1646  */

    { (yyval.integer) = (yyvsp[-2].integer) % (yyvsp[0].integer); }

    {

#line 1921 "dtc-parser.tab.c" /* yacc.c:1646  */

			if ((yyvsp[0].integer) != 0) {

				(yyval.integer) = (yyvsp[-2].integer) % (yyvsp[0].integer);

			} else {

				ERROR(&(yyloc), "Division by zero");

				(yyval.integer) = 0;

			}

		}

#line 1935 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 69:

  case 69:

#line 420 "dtc-parser.y" /* yacc.c:1646  */

#line 436 "dtc-parser.y" /* yacc.c:1646  */

    { (yyval.integer) = -(yyvsp[0].integer); }

    { (yyval.integer) = -(yyvsp[0].integer); }

#line 1927 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 1941 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 70:

  case 70:

#line 421 "dtc-parser.y" /* yacc.c:1646  */

#line 437 "dtc-parser.y" /* yacc.c:1646  */

    { (yyval.integer) = ~(yyvsp[0].integer); }

    { (yyval.integer) = ~(yyvsp[0].integer); }

#line 1933 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 1947 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 71:

  case 71:

#line 422 "dtc-parser.y" /* yacc.c:1646  */

#line 438 "dtc-parser.y" /* yacc.c:1646  */

    { (yyval.integer) = !(yyvsp[0].integer); }

    { (yyval.integer) = !(yyvsp[0].integer); }

#line 1939 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 1953 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 72:

  case 72:

#line 427 "dtc-parser.y" /* yacc.c:1646  */

#line 443 "dtc-parser.y" /* yacc.c:1646  */

    {

    {

			(yyval.data) = empty_data;

			(yyval.data) = empty_data;

		}

		}

#line 1947 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 1961 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 73:

  case 73:

#line 431 "dtc-parser.y" /* yacc.c:1646  */

#line 447 "dtc-parser.y" /* yacc.c:1646  */

    {

    {

			(yyval.data) = data_append_byte((yyvsp[-1].data), (yyvsp[0].byte));

			(yyval.data) = data_append_byte((yyvsp[-1].data), (yyvsp[0].byte));

		}

		}

#line 1955 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 1969 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 74:

  case 74:

#line 435 "dtc-parser.y" /* yacc.c:1646  */

#line 451 "dtc-parser.y" /* yacc.c:1646  */

    {

    {

			(yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref));

			(yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref));

		}

		}

#line 1963 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 1977 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 75:

  case 75:

#line 442 "dtc-parser.y" /* yacc.c:1646  */

#line 458 "dtc-parser.y" /* yacc.c:1646  */

    {

    {

			(yyval.nodelist) = NULL;

			(yyval.nodelist) = NULL;

		}

		}

#line 1971 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 1985 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 76:

  case 76:

#line 446 "dtc-parser.y" /* yacc.c:1646  */

#line 462 "dtc-parser.y" /* yacc.c:1646  */

    {

    {

			(yyval.nodelist) = chain_node((yyvsp[-1].node), (yyvsp[0].nodelist));

			(yyval.nodelist) = chain_node((yyvsp[-1].node), (yyvsp[0].nodelist));

		}

		}

#line 1979 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 1993 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 77:

  case 77:

#line 450 "dtc-parser.y" /* yacc.c:1646  */

#line 466 "dtc-parser.y" /* yacc.c:1646  */

    {

    {

			ERROR(&(yylsp[0]), "Properties must precede subnodes");

			ERROR(&(yylsp[0]), "Properties must precede subnodes");

			YYERROR;

			YYERROR;

		}

		}

#line 1988 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 2002 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 78:

  case 78:

#line 458 "dtc-parser.y" /* yacc.c:1646  */

#line 474 "dtc-parser.y" /* yacc.c:1646  */

    {

    {

			(yyval.node) = name_node((yyvsp[0].node), (yyvsp[-1].propnodename));

			(yyval.node) = name_node((yyvsp[0].node), (yyvsp[-1].propnodename));

		}

		}

#line 1996 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 2010 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 79:

  case 79:

#line 462 "dtc-parser.y" /* yacc.c:1646  */

#line 478 "dtc-parser.y" /* yacc.c:1646  */

    {

    {

			(yyval.node) = name_node(build_node_delete(), (yyvsp[-1].propnodename));

			(yyval.node) = name_node(build_node_delete(), (yyvsp[-1].propnodename));

		}

		}

#line 2004 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 2018 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;





  case 80:

  case 80:

#line 466 "dtc-parser.y" /* yacc.c:1646  */

#line 482 "dtc-parser.y" /* yacc.c:1646  */

    {

    {

			add_label(&(yyvsp[0].node)->labels, (yyvsp[-1].labelref));

			add_label(&(yyvsp[0].node)->labels, (yyvsp[-1].labelref));

			(yyval.node) = (yyvsp[0].node);

			(yyval.node) = (yyvsp[0].node);

		}

		}

#line 2013 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 2027 "dtc-parser.tab.c" /* yacc.c:1646  */

    break;

    break;









#line 2017 "dtc-parser.tab.c" /* yacc.c:1646  */

#line 2031 "dtc-parser.tab.c" /* yacc.c:1646  */

      default: break;

      default: break;

    }

    }

  /* User semantic actions sometimes alter yychar, and that requires

  /* User semantic actions sometimes alter yychar, and that requires
@@ -2248,7 +2262,7 @@ yyreturn: 
#endif

#endif

  return yyresult;

  return yyresult;

}

}

#line 472 "dtc-parser.y" /* yacc.c:1906  */

#line 488 "dtc-parser.y" /* yacc.c:1906  */









void yyerror(char const *s)

void yyerror(char const *s)

scripts/dtc/dtc-parser.y

+18 −2
Original line number Original line Diff line number Diff line
@@ -410,8 +410,24 @@ integer_add: 




integer_mul:

integer_mul:

	  integer_mul '*' integer_unary { $$ = $1 * $3; }

	  integer_mul '*' integer_unary { $$ = $1 * $3; }

	| integer_mul '/' integer_unary { $$ = $1 / $3; }

	| integer_mul '/' integer_unary

	| integer_mul '%' integer_unary { $$ = $1 % $3; }

		{

			if ($3 != 0) {

				$$ = $1 / $3;

			} else {

				ERROR(&@$, "Division by zero");

				$$ = 0;

			}

		}

	| integer_mul '%' integer_unary

		{

			if ($3 != 0) {

				$$ = $1 % $3;

			} else {

				ERROR(&@$, "Division by zero");

				$$ = 0;

			}

		}

	| integer_unary

	| integer_unary

	;

	;

CRA Git | Maintained and supported by SUSTech CRA and CCSE