A reverse of the commit 14745bdeb because of the problems while compiling linux 2.4.26 A test program: /////////// typedef unsigned int u32; static inline const u32 fswab32(u32 x) { return ({ u32 tmp = (x) ; _swab32(tmp); }); } void func() { int aaa = 1; int snd_wnd = 2; int TCP_FLAG_ACK = 3; int pred_flags = (__builtin_constant_p((u32) (((aaa << 26) | (builtin_constant_p((__u32)((TCP_FLAG_ACK))) ? ({ u32 x = (((TCP_FLAG_ACK))); ((u32)( (((u32)(x) & (u32)0x000000ffUL) << 24) | (((u32)(x) & (u32)0x0000ff00UL) << 8) | (((u32)(x) & (u32)0x00ff0000UL) >> 8) | (((u32)(x) & (u32)0xff000000UL) >> 24) )); }) : fswab32(((TCP_FLAG_ACK)))) | snd_wnd))) ? ({ u32 x = ((((aaa << 26) | (__builtin_constant_p((__u32)((TCP_FLAG_ACK))) ? ({ u32 x = (((TCP_FLAG_ACK))); ((u32)( (((u32)(x) & (u32)0x000000ffUL) << 24) | (((u32)(x) & (u32)0x0000ff00UL) << 8) | (((u32)(x) & (u32)0x00ff0000UL) >> 8) | (((u32)(x) & (u32)0xff000000UL) >> 24) )); }) : fswab32(((TCP_FLAG_ACK)))) | snd_wnd))); ((u32)( (((u32)(x) & (u32)0x000000ffUL) << 24) | (((u32)(x) & (u32)0x0000ff00UL) << 8) | (((u32)(x) & (u32)0x00ff0000UL) >> 8) | (((u32)(x) & (u32)0xff000000UL) >> 24) )); }) : fswab32((((aaa << 26) | (__builtin_constant_p((__u32)((TCP_FLAG_ACK))) ? ({ u32 x = (((TCP_FLAG_ACK))); ((u32)( (((u32)(x) & (u32)0x000000ffUL) << 24) | (((u32)(x) & (u32)0x0000ff00UL) << 8) | (((u32)(x) & (u32)0x00ff0000UL) >> 8) | (((u32)(x) & (u32)0xff000000UL) >> 24) )); }) : fswab32(((TCP_FLAG_ACK)))) | snd_wnd)))); } //////////// error: ';' expected (got "(")

seyko committed 11 years ago

Commit c45a8691 parent 6fd4e5b2 files · +16 −18Browse files

Unified · Split

2 files

libtcc.c +1 −0
tccgen.c +15 −18

@@ -786,6 +786,7 @@ static int tcc_compile(TCCState *s1) · 785 unmodified lines
786	#endif	786	#endif
787		787
788	define_start = define_stack;	788	define_start = define_stack;
		789	nocode_wanted = 1;
789		790
790	if (setjmp(s1->error_jmp_buf) == 0) {	791	if (setjmp(s1->error_jmp_buf) == 0) {
791	s1->nb_errors = 0;	792	s1->nb_errors = 0;

tccgen.c+15−18

        literals). It also simplifies local
        initializers handling */
     tok_str_new(&init_str);
-    if ((size < 0 || flexible_array) && has_init) {
+    if (size < 0 || (flexible_array && has_init)) {
+        if (!has_init)
+            tcc_error("unknown type size");
         /* get all init string */
         if (has_init == 2) {
             /* only get strings */
         macro_ptr = init_str.str;
         next();
+        /* if still unknown size, error */
         size = type_size(type, &align);
+        if (size < 0)
+            tcc_error("unknown type size");
     }
-    /* if still unknown size, error */
-    if (size < 0)
-        tcc_error("unknown type size");
-    if (nocode_wanted) {
-        //tcc_warning("nocode_wanted set for decl_initializer_alloc");
-        vset(type, r, 0);
-        goto no_alloc;
-    }
     if (flexible_array)
         size += flexible_array->type.ref->c * pointed_size(&flexible_array->type);
     /* take into account specified alignment if bigger */
     }
     if (has_init || (type->t & VT_VLA)) {
         decl_initializer(type, sec, addr, 1, 0);
+        /* restore parse state if needed */
+        if (init_str.str) {
+            tok_str_free(init_str.str);
+            restore_parse_state(&saved_parse_state);
+        }
         /* patch flexible array member size back to -1, */
         /* for possible subsequent similar declarations */
         if (flexible_array)
             flexible_array->type.ref->c = -1;
     }
-no_alloc:
+ no_alloc: ;
-    /* restore parse state if needed */
-    if (init_str.str) {
-        tok_str_free(init_str.str);
-        restore_parse_state(&saved_parse_state);
-    }
 }
 static void put_func_debug(Sym *sym)
    'cur_text_section' */
 static void gen_function(Sym *sym)
 {
+    int saved_nocode_wanted = nocode_wanted;
+    nocode_wanted = 0;
     ind = cur_text_section->data_offset;
     /* NOTE: we patch the symbol size later */
     put_extern_sym(sym, cur_text_section, ind, 0);
     func_vt.t = VT_VOID; /* for safety */
     func_var = 0; /* for safety */
     ind = 0; /* for safety */
+    nocode_wanted = saved_nocode_wanted;
 }
 ST_FUNC void gen_inline_functions(void)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code