aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/dtc/dtc-parser.tab.c_shipped
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-01-26 10:04:11 -0500
committerRob Herring <robh@kernel.org>2016-02-11 20:45:09 -0500
commit91feabc2e2240ee80dc8ac08103cb83f497e4d12 (patch)
tree8bd53e02910f0d15b3516d7af298b03b19ca5dac /scripts/dtc/dtc-parser.tab.c_shipped
parent76df69806b7fafea013e2f4f82b0bd54498f3406 (diff)
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: Frank Rowand <frank.rowand@sonymobile.com> Reviewed-by: Frank Rowand <frank.rowand@sonymobile.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'scripts/dtc/dtc-parser.tab.c_shipped')
-rw-r--r--scripts/dtc/dtc-parser.tab.c_shipped84
1 files changed, 49 insertions, 35 deletions
diff --git a/scripts/dtc/dtc-parser.tab.c_shipped b/scripts/dtc/dtc-parser.tab.c_shipped
index 116458c8dfc4..31cec50a1265 100644
--- a/scripts/dtc/dtc-parser.tab.c_shipped
+++ b/scripts/dtc/dtc-parser.tab.c_shipped
@@ -499,9 +499,9 @@ static const yytype_uint16 yyrline[] =
499 298, 303, 322, 336, 343, 344, 345, 352, 356, 357, 499 298, 303, 322, 336, 343, 344, 345, 352, 356, 357,
500 361, 362, 366, 367, 371, 372, 376, 377, 381, 382, 500 361, 362, 366, 367, 371, 372, 376, 377, 381, 382,
501 386, 387, 388, 392, 393, 394, 395, 396, 400, 401, 501 386, 387, 388, 392, 393, 394, 395, 396, 400, 401,
502 402, 406, 407, 408, 412, 413, 414, 415, 419, 420, 502 402, 406, 407, 408, 412, 413, 422, 431, 435, 436,
503 421, 422, 427, 430, 434, 442, 445, 449, 457, 461, 503 437, 438, 443, 446, 450, 458, 461, 465, 473, 477,
504 465 504 481
505}; 505};
506#endif 506#endif
507 507
@@ -1909,111 +1909,125 @@ yyreduce:
1909 break; 1909 break;
1910 1910
1911 case 65: 1911 case 65:
1912#line 413 "dtc-parser.y" /* yacc.c:1646 */ 1912#line 414 "dtc-parser.y" /* yacc.c:1646 */
1913 { (yyval.integer) = (yyvsp[-2].integer) / (yyvsp[0].integer); } 1913 {
1914#line 1915 "dtc-parser.tab.c" /* yacc.c:1646 */ 1914 if ((yyvsp[0].integer) != 0) {
1915 (yyval.integer) = (yyvsp[-2].integer) / (yyvsp[0].integer);
1916 } else {
1917 ERROR(&(yyloc), "Division by zero");
1918 (yyval.integer) = 0;
1919 }
1920 }
1921#line 1922 "dtc-parser.tab.c" /* yacc.c:1646 */
1915 break; 1922 break;
1916 1923
1917 case 66: 1924 case 66:
1918#line 414 "dtc-parser.y" /* yacc.c:1646 */ 1925#line 423 "dtc-parser.y" /* yacc.c:1646 */
1919 { (yyval.integer) = (yyvsp[-2].integer) % (yyvsp[0].integer); } 1926 {
1920#line 1921 "dtc-parser.tab.c" /* yacc.c:1646 */ 1927 if ((yyvsp[0].integer) != 0) {
1928 (yyval.integer) = (yyvsp[-2].integer) % (yyvsp[0].integer);
1929 } else {
1930 ERROR(&(yyloc), "Division by zero");
1931 (yyval.integer) = 0;
1932 }
1933 }
1934#line 1935 "dtc-parser.tab.c" /* yacc.c:1646 */
1921 break; 1935 break;
1922 1936
1923 case 69: 1937 case 69:
1924#line 420 "dtc-parser.y" /* yacc.c:1646 */ 1938#line 436 "dtc-parser.y" /* yacc.c:1646 */
1925 { (yyval.integer) = -(yyvsp[0].integer); } 1939 { (yyval.integer) = -(yyvsp[0].integer); }
1926#line 1927 "dtc-parser.tab.c" /* yacc.c:1646 */ 1940#line 1941 "dtc-parser.tab.c" /* yacc.c:1646 */
1927 break; 1941 break;
1928 1942
1929 case 70: 1943 case 70:
1930#line 421 "dtc-parser.y" /* yacc.c:1646 */ 1944#line 437 "dtc-parser.y" /* yacc.c:1646 */
1931 { (yyval.integer) = ~(yyvsp[0].integer); } 1945 { (yyval.integer) = ~(yyvsp[0].integer); }
1932#line 1933 "dtc-parser.tab.c" /* yacc.c:1646 */ 1946#line 1947 "dtc-parser.tab.c" /* yacc.c:1646 */
1933 break; 1947 break;
1934 1948
1935 case 71: 1949 case 71:
1936#line 422 "dtc-parser.y" /* yacc.c:1646 */ 1950#line 438 "dtc-parser.y" /* yacc.c:1646 */
1937 { (yyval.integer) = !(yyvsp[0].integer); } 1951 { (yyval.integer) = !(yyvsp[0].integer); }
1938#line 1939 "dtc-parser.tab.c" /* yacc.c:1646 */ 1952#line 1953 "dtc-parser.tab.c" /* yacc.c:1646 */
1939 break; 1953 break;
1940 1954
1941 case 72: 1955 case 72:
1942#line 427 "dtc-parser.y" /* yacc.c:1646 */ 1956#line 443 "dtc-parser.y" /* yacc.c:1646 */
1943 { 1957 {
1944 (yyval.data) = empty_data; 1958 (yyval.data) = empty_data;
1945 } 1959 }
1946#line 1947 "dtc-parser.tab.c" /* yacc.c:1646 */ 1960#line 1961 "dtc-parser.tab.c" /* yacc.c:1646 */
1947 break; 1961 break;
1948 1962
1949 case 73: 1963 case 73:
1950#line 431 "dtc-parser.y" /* yacc.c:1646 */ 1964#line 447 "dtc-parser.y" /* yacc.c:1646 */
1951 { 1965 {
1952 (yyval.data) = data_append_byte((yyvsp[-1].data), (yyvsp[0].byte)); 1966 (yyval.data) = data_append_byte((yyvsp[-1].data), (yyvsp[0].byte));
1953 } 1967 }
1954#line 1955 "dtc-parser.tab.c" /* yacc.c:1646 */ 1968#line 1969 "dtc-parser.tab.c" /* yacc.c:1646 */
1955 break; 1969 break;
1956 1970
1957 case 74: 1971 case 74:
1958#line 435 "dtc-parser.y" /* yacc.c:1646 */ 1972#line 451 "dtc-parser.y" /* yacc.c:1646 */
1959 { 1973 {
1960 (yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref)); 1974 (yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref));
1961 } 1975 }
1962#line 1963 "dtc-parser.tab.c" /* yacc.c:1646 */ 1976#line 1977 "dtc-parser.tab.c" /* yacc.c:1646 */
1963 break; 1977 break;
1964 1978
1965 case 75: 1979 case 75:
1966#line 442 "dtc-parser.y" /* yacc.c:1646 */ 1980#line 458 "dtc-parser.y" /* yacc.c:1646 */
1967 { 1981 {
1968 (yyval.nodelist) = NULL; 1982 (yyval.nodelist) = NULL;
1969 } 1983 }
1970#line 1971 "dtc-parser.tab.c" /* yacc.c:1646 */ 1984#line 1985 "dtc-parser.tab.c" /* yacc.c:1646 */
1971 break; 1985 break;
1972 1986
1973 case 76: 1987 case 76:
1974#line 446 "dtc-parser.y" /* yacc.c:1646 */ 1988#line 462 "dtc-parser.y" /* yacc.c:1646 */
1975 { 1989 {
1976 (yyval.nodelist) = chain_node((yyvsp[-1].node), (yyvsp[0].nodelist)); 1990 (yyval.nodelist) = chain_node((yyvsp[-1].node), (yyvsp[0].nodelist));
1977 } 1991 }
1978#line 1979 "dtc-parser.tab.c" /* yacc.c:1646 */ 1992#line 1993 "dtc-parser.tab.c" /* yacc.c:1646 */
1979 break; 1993 break;
1980 1994
1981 case 77: 1995 case 77:
1982#line 450 "dtc-parser.y" /* yacc.c:1646 */ 1996#line 466 "dtc-parser.y" /* yacc.c:1646 */
1983 { 1997 {
1984 ERROR(&(yylsp[0]), "Properties must precede subnodes"); 1998 ERROR(&(yylsp[0]), "Properties must precede subnodes");
1985 YYERROR; 1999 YYERROR;
1986 } 2000 }
1987#line 1988 "dtc-parser.tab.c" /* yacc.c:1646 */ 2001#line 2002 "dtc-parser.tab.c" /* yacc.c:1646 */
1988 break; 2002 break;
1989 2003
1990 case 78: 2004 case 78:
1991#line 458 "dtc-parser.y" /* yacc.c:1646 */ 2005#line 474 "dtc-parser.y" /* yacc.c:1646 */
1992 { 2006 {
1993 (yyval.node) = name_node((yyvsp[0].node), (yyvsp[-1].propnodename)); 2007 (yyval.node) = name_node((yyvsp[0].node), (yyvsp[-1].propnodename));
1994 } 2008 }
1995#line 1996 "dtc-parser.tab.c" /* yacc.c:1646 */ 2009#line 2010 "dtc-parser.tab.c" /* yacc.c:1646 */
1996 break; 2010 break;
1997 2011
1998 case 79: 2012 case 79:
1999#line 462 "dtc-parser.y" /* yacc.c:1646 */ 2013#line 478 "dtc-parser.y" /* yacc.c:1646 */
2000 { 2014 {
2001 (yyval.node) = name_node(build_node_delete(), (yyvsp[-1].propnodename)); 2015 (yyval.node) = name_node(build_node_delete(), (yyvsp[-1].propnodename));
2002 } 2016 }
2003#line 2004 "dtc-parser.tab.c" /* yacc.c:1646 */ 2017#line 2018 "dtc-parser.tab.c" /* yacc.c:1646 */
2004 break; 2018 break;
2005 2019
2006 case 80: 2020 case 80:
2007#line 466 "dtc-parser.y" /* yacc.c:1646 */ 2021#line 482 "dtc-parser.y" /* yacc.c:1646 */
2008 { 2022 {
2009 add_label(&(yyvsp[0].node)->labels, (yyvsp[-1].labelref)); 2023 add_label(&(yyvsp[0].node)->labels, (yyvsp[-1].labelref));
2010 (yyval.node) = (yyvsp[0].node); 2024 (yyval.node) = (yyvsp[0].node);
2011 } 2025 }
2012#line 2013 "dtc-parser.tab.c" /* yacc.c:1646 */ 2026#line 2027 "dtc-parser.tab.c" /* yacc.c:1646 */
2013 break; 2027 break;
2014 2028
2015 2029
2016#line 2017 "dtc-parser.tab.c" /* yacc.c:1646 */ 2030#line 2031 "dtc-parser.tab.c" /* yacc.c:1646 */
2017 default: break; 2031 default: break;
2018 } 2032 }
2019 /* User semantic actions sometimes alter yychar, and that requires 2033 /* User semantic actions sometimes alter yychar, and that requires
@@ -2248,7 +2262,7 @@ yyreturn:
2248#endif 2262#endif
2249 return yyresult; 2263 return yyresult;
2250} 2264}
2251#line 472 "dtc-parser.y" /* yacc.c:1906 */ 2265#line 488 "dtc-parser.y" /* yacc.c:1906 */
2252 2266
2253 2267
2254void yyerror(char const *s) 2268void yyerror(char const *s)