option to use an old algorithm of the array in struct initialization

This is for a case when no '{' is used in the initialization code. An option name is -fold-struct-init-code. A linux 2.4.26 can't find initrd when compiled with a new algorithm.

seyko committed 11 years ago

Commit 5c9dde71 parent 92efee63 files · +34 −4Browse files

Unified · Split

3 files

libtcc.c +1 −0
tcc.h +2 −0
tccgen.c +31 −4

libtcc.c+1−0

@@ -1478,6 +1478,7 @@ static const FlagDef flag_defs[] = { · 1477 unmodified lines
1478	{ offsetof(TCCState, nocommon), FD_INVERT, "common" },	1478	{ offsetof(TCCState, nocommon), FD_INVERT, "common" },
1479	{ offsetof(TCCState, leading_underscore), 0, "leading-underscore" },	1479	{ offsetof(TCCState, leading_underscore), 0, "leading-underscore" },
1480	{ offsetof(TCCState, ms_extensions), 0, "ms-extensions" },	1480	{ offsetof(TCCState, ms_extensions), 0, "ms-extensions" },
		1481	{ offsetof(TCCState, old_struct_init_code), 0, "old-struct-init-code" },
1481	};	1482	};
1482		1483
1483	/* set/reset a flag */	1484	/* set/reset a flag */

tcc.h+2−0

@@ -603,6 +603,8 @@ struct TCCState { · 602 unmodified lines
603	int char_is_unsigned;	603	int char_is_unsigned;
604	int leading_underscore;	604	int leading_underscore;
605	int ms_extensions; /* allow nested named struct w/o identifier behave like unnamed */	605	int ms_extensions; /* allow nested named struct w/o identifier behave like unnamed */
		606	int old_struct_init_code; /* use old algorithm to init array in struct when there is no '{' used.
		607	Liuux 2.4.26 can't find initrd when compiled with a new algorithm */
606		608
607	/* warning switches */	609	/* warning switches */
608	int warn_write_strings;	610	int warn_write_strings;

tccgen.c+31−4

            struct/union init */
         /* XXX: union needs only one init */
+        int par_count = 0;
         if (tok == '(') {
             AttributeDef ad1;
             CType type1;
             next();
-            if (tok != '(') {
+	    if (tcc_state->old_struct_init_code) {
+		/* an old version of struct initialization.
+		   It have a problems. But with a new version
+		   linux 2.4.26 can't load ramdisk.
+		 */
+        	while (tok == '(') {
+            	    par_count++;
+            	    next();
+        	}
+		if (!parse_btype(&type1, &ad1))
+            	    expect("cast");
+        	type_decl(&type1, &ad1, &n, TYPE_ABSTRACT);
+		#if 0
+		if (!is_assignable_types(type, &type1))
+            	    tcc_error("invalid type for cast");
+		#endif
+		skip(')');
+    	    }
+    	    else
+    	    {
+              if (tok != '(') {
         	if (!parse_btype(&type1, &ad1))
             	    expect("cast");
         	type_decl(&type1, &ad1, &n, TYPE_ABSTRACT);
-#if 0
+		#if 0
         	if (!is_assignable_types(type, &type1))
             	    tcc_error("invalid type for cast");
-#endif
+		#endif
         	skip(')');
-    	    } else
+    	      } else
 		unget_tok(tok);
+	    }
         }
         no_oblock = 1;
         if (first || tok == '{') {
             skip('{');
         }
         if (!no_oblock)
             skip('}');
+        while (par_count) {
+            skip(')');
+            par_count--;
+        }
     } else if (tok == '{') {
         next();
         decl_initializer(type, sec, c, first, size_only);

option to use an old algorithm of the array in struct initialization

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code