misc fixes

misc fixes including: - tcc.c: fix "tcc -vv" for libtcc1.a on win32/PE - tccelf.c: fix a crash when GOT has no relocs (witn -nostdlib) - tccelf.c: fix stab linkage for zero n_strx - tccgen.c: fix stdcall decoration for array parameters int __stdcall func(char buf[10]) is _func@4 (was _func@12) - tccgen.c: fix static variables with nocode/nodata_wanted see tests2/96_nodata_wanted.c - tccrun.c: align sections using sh_addralign (for reliable function_alignment) - tests2/Makefile sort 100 after 99 - win32/include/sys/stat.h fix _stat and _wstat - x86_64-gen.c: win64/gfunc_call: fix a bug with xmmN register args previously overwrote valid other xmmN registers eventually

grischka committed 8 years ago

Commit 8f6fcb71 parent 2b155a89 files · +73 −49Browse files

Unified · Split

9 files

tcc.c +3 −1
tccelf.c +7 −2
tccgen.c +11 −8
tccrun.c +20 −24
tests/tests2/96_nodata_wanted.c +19 −5
tests/tests2/96_nodata_wanted.expect +3 −0
tests/tests2/Makefile +3 −1
win32/include/sys/stat.h +2 −2
x86_64-gen.c +5 −6

tcc.c+3−1

     /* print_dirs("programs", NULL, 0); */
     print_dirs("include", s->sysinclude_paths, s->nb_sysinclude_paths);
     print_dirs("libraries", s->library_paths, s->nb_library_paths);
+#ifdef TCC_TARGET_PE
+    printf("libtcc1:\n  %s/lib/"TCC_LIBTCC1"\n", s->tcc_lib_path);
+#else
     printf("libtcc1:\n  %s/"TCC_LIBTCC1"\n", s->tcc_lib_path);
-#ifndef TCC_TARGET_PE
     print_dirs("crt", s->crt_paths, s->nb_crt_paths);
     printf("elfinterp:\n  %s\n",  DEFAULT_ELFINTERP(s));
 #endif

tccelf.c+7−2

 static void fill_local_got_entries(TCCState *s1)
 {
     ElfW_Rel *rel;
+    if (!s1->got->reloc)
+        return;
     for_each_elem(s1->got->reloc, 0, rel, ElfW_Rel) {
 	if (ELFW(R_TYPE)(rel->r_info) == R_RELATIVE) {
 	    int sym_index = ELFW(R_SYM) (rel->r_info);
         a = (Stab_Sym *)(s->data + sm_table[stab_index].offset);
         b = (Stab_Sym *)(s->data + s->data_offset);
         o = sm_table[stabstr_index].offset;
-        while (a < b)
+        while (a < b) {
-            a->n_strx += o, a++;
+            if (a->n_strx)
+                a->n_strx += o;
+            a++;
+        }
     }
     /* second short pass to update sh_link and sh_info fields of new

tccgen.c+11−8

                     type_decl(&pt, &ad1, &n, TYPE_DIRECT | TYPE_ABSTRACT);
                     if ((pt.t & VT_BTYPE) == VT_VOID)
                         tcc_error("parameter declared as void");
-                    arg_size += (type_size(&pt, &align) + PTR_SIZE - 1) / PTR_SIZE;
                 } else {
                     n = tok;
                     if (n < TOK_UIDENT)
                     next();
                 }
                 convert_parameter_type(&pt);
+                arg_size += (type_size(&pt, &align) + PTR_SIZE - 1) / PTR_SIZE;
                 s = sym_push(n | SYM_FIELD, &pt, 0, 0);
                 *plast = s;
                 plast = &s->next;
     Sym *sym = NULL;
     int saved_nocode_wanted = nocode_wanted;
 #ifdef CONFIG_TCC_BCHECK
-    int bcheck = tcc_state->do_bounds_check && !NODATA_WANTED;
+    int bcheck;
 #endif
-    if (type->t & VT_STATIC)
+    /* Always allocate static or global variables */
-        nocode_wanted |= NODATA_WANTED ? 0x40000000 : 0x80000000;
+    if (v && (r & VT_VALMASK) == VT_CONST)
+        nocode_wanted |= 0x80000000;
+#ifdef CONFIG_TCC_BCHECK
+    bcheck = tcc_state->do_bounds_check && !NODATA_WANTED;
+#endif
     flexible_array = NULL;
     if ((type->t & VT_BTYPE) == VT_STRUCT) {
         align = 1;
     }
-    if (NODATA_WANTED)
+    if (!v && NODATA_WANTED)
         size = 0, align = 1;
     if ((r & VT_VALMASK) == VT_LOCAL) {
     if (sym->a.aligned) {
 	size_t newoff = section_add(cur_text_section, 0,
 				    1 << (sym->a.aligned - 1));
-	if (ind != newoff)
+	gen_fill_nops(newoff - ind);
-	  gen_fill_nops(newoff - ind);
-	ind = newoff;
     }
     /* NOTE: we patch the symbol size later */
     put_extern_sym(sym, cur_text_section, ind, 0);

tccrun.c+20−24

 }
 #if defined TCC_TARGET_I386 || defined TCC_TARGET_X86_64
+/* To avoid that x86 processors would reload cached instructions
+   each time when data is written in the near, we need to make
+   sure that code and data do not share the same 64 byte unit */
  #define RUN_SECTION_ALIGNMENT 63
 #else
- #define RUN_SECTION_ALIGNMENT 15
+ #define RUN_SECTION_ALIGNMENT 0
 #endif
 /* relocate code. Return -1 on error, required size if ptr is NULL,
 static int tcc_relocate_ex(TCCState *s1, void *ptr, addr_t ptr_diff)
 {
     Section *s;
-    unsigned offset, length, fill, i, k;
+    unsigned offset, length, align, max_align, i, k, f;
-    addr_t mem;
+    addr_t mem, addr;
     if (NULL == ptr) {
         s1->nb_errors = 0;
             return -1;
     }
-    offset = 0, mem = (addr_t)ptr;
+    offset = max_align = 0, mem = (addr_t)ptr;
-    fill = -mem & RUN_SECTION_ALIGNMENT;
 #ifdef _WIN64
-    offset += sizeof (void*);
+    offset += sizeof (void*); /* space for function_table pointer */
 #endif
     for (k = 0; k < 2; ++k) {
+        f = 0, addr = k ? mem : mem + ptr_diff;
         for(i = 1; i < s1->nb_sections; i++) {
             s = s1->sections[i];
             if (0 == (s->sh_flags & SHF_ALLOC))
                 continue;
             if (k != !(s->sh_flags & SHF_EXECINSTR))
                 continue;
-            offset += fill;
+            align = s->sh_addralign - 1;
-            if (!mem)
+            if (++f == 1 && align < RUN_SECTION_ALIGNMENT)
-                s->sh_addr = 0;
+                align = RUN_SECTION_ALIGNMENT;
-            else if (s->sh_flags & SHF_EXECINSTR)
+            if (max_align < align)
-                s->sh_addr = mem + offset + ptr_diff;
+                max_align = align;
-            else
+            offset += -(addr + offset) & align;
-                s->sh_addr = mem + offset;
+            s->sh_addr = mem ? addr + offset : 0;
+            offset += s->data_offset;
 #if 0
             if (mem)
-                printf("%-16s +%02lx %p %04x\n",
+                printf("%-16s %p  len %04x  align %2d\n",
-                    s->name, fill, (void*)s->sh_addr, (unsigned)s->data_offset);
+                    s->name, (void*)s->sh_addr, (unsigned)s->data_offset, align + 1);
 #endif
-            offset += s->data_offset;
-            fill = -(mem + offset) & 15;
         }
-#if RUN_SECTION_ALIGNMENT > 15
-        /* To avoid that x86 processors would reload cached instructions each time
-           when data is written in the near, we need to make sure that code and data
-           do not share the same 64 byte unit */
-        fill = -(mem + offset) & RUN_SECTION_ALIGNMENT;
-#endif
     }
     /* relocate symbols */
         return -1;
     if (0 == mem)
-        return offset + RUN_SECTION_ALIGNMENT;
+        return offset + max_align;
 #ifdef TCC_TARGET_PE
     s1->pe_imagebase = mem;

tests/tests2/96_nodata_wanted.c+19−5

@@ -55,11 +55,10 @@ te0:; · 54 unmodified lines
55	static char ds1 = 0;	55	static char ds1 = 0;
56	ts1:;	56	ts1:;
57	if (!SKIP) {	57	if (!SKIP) {
58	static void p = (void)&main;	58	void p = (void)&main;
59	static char cc[] = "static string";	59	char cc[] = "static string";
60	static double d = 8.0;	60	double d = 8.0;
61		61	struct __attribute__((packed)) {
62	static struct __attribute__((packed)) {
63	unsigned x : 12;	62	unsigned x : 12;
64	unsigned char y : 7;	63	unsigned char y : 7;
65	unsigned z : 28, a: 4, b: 5;	64	unsigned z : 28, a: 4, b: 5;
@@ -81,4 +80,19 @@ te1:; · 15 unmodified lines
81	/printf("# %d/%d\n", dl, tl);/	80	/printf("# %d/%d\n", dl, tl);/
82	}	81	}
83		82
		83	#elif defined test_static_data
		84
		85	#include <stdio.h>
		86	int main(int argc, char **argv)
		87	{
		88	goto there;
		89	if (0) {
		90	static int a = 1;
		91	printf("hello\n"); /* the "hello\n" string is still suppressed */
		92	there:
		93	printf("a = %d\n", a);
		94	}
		95	return 0;
		96	}
		97
84	#endif	98	#endif

tests/tests2/96_nodata_wanted.expect+3−0

@@ -21,3 +21,6 @@ size of data/text: · 20 unmodified lines
21	[test_data_suppression_on]	21	[test_data_suppression_on]
22	size of data/text:	22	size of data/text:
23	zero/zero	23	zero/zero
		24
		25	[test_static_data]
		26	a = 1

tests/tests2/Makefile+3−1

@@ -3,7 +3,9 @@ include $(TOP)/Makefile · 2 unmodified lines
3	SRC = $(TOPSRC)/tests/tests2	3	SRC = $(TOPSRC)/tests/tests2
4	VPATH = $(SRC)	4	VPATH = $(SRC)
5		5
6	TESTS = $(patsubst %.c,%.test,$(sort $(notdir $(wildcard $(SRC)/*.c))))	6	TESTS = $(patsubst %.c,%.test,\
		7	$(sort $(notdir $(wildcard $(SRC)/??_*.c)))\
		8	$(sort $(notdir $(wildcard $(SRC)/???_*.c))))
7		9
8	# some tests do not pass on all platforms, remove them for now	10	# some tests do not pass on all platforms, remove them for now
9	SKIP = 34_array_assignment.test # array assignment is not in C standard	11	SKIP = 34_array_assignment.test # array assignment is not in C standard

win32/include/sys/stat.h+2−2

@@ -81,9 +81,9 @@ extern "C" { · 80 unmodified lines
81	#else	81	#else
82	#define _fstat _fstat64i32	82	#define _fstat _fstat64i32
83	#define _fstati64 _fstat64	83	#define _fstati64 _fstat64
84	#define _stat _stat64i32	84	#define _stat _stat64
85	#define _stati64 _stat64	85	#define _stati64 _stat64
86	#define _wstat _wstat64i32	86	#define _wstat _wstat64
87	#define _wstati64 _wstat64	87	#define _wstati64 _wstat64
88	#endif	88	#endif
89		89

x86_64-gen.c+5−6

             if (is_sse_float(vtop->type.t)) {
 		if (tcc_state->nosse)
 		  tcc_error("SSE disabled");
-                gv(RC_XMM0); /* only use one float register */
                 if (arg >= REGN) {
+                    gv(RC_XMM0);
                     /* movq %xmm0, j*8(%rsp) */
                     gen_offs_sp(0xd60f66, 0x100, arg*8);
                 } else {
-                    /* movaps %xmm0, %xmmN */
+                    /* Load directly to xmmN register */
-                    o(0x280f);
+                    gv(RC_XMM0 << arg);
-                    o(0xc0 + (arg << 3));
                     d = arg_prepare_reg(arg);
-                    /* mov %xmm0, %rxx */
+                    /* mov %xmmN, %rxx */
                     o(0x66);
                     orex(1,d,0, 0x7e0f);
-                    o(0xc0 + REG_VALUE(d));
+                    o(0xc0 + arg*8 + REG_VALUE(d));
                 }
             } else {
                 if (bt == VT_STRUCT) {

misc fixes

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code