tccpe: adjust for new 'hidden' symbols feature

in order to avoid conflicts with windows specific (ab)usage of the Elf32_Sym -> st_other field.

grischka committed 12 years ago

Commit 2ac238f1 parent 6b7a6fc3 files · +17 −15Browse files

Unified · Split

3 files

libtcc.c +5 −7
tcc.h +4 −0
tccpe.c +8 −8

 #ifdef TCC_TARGET_PE
         if (sym->type.t & VT_EXPORT)
-            other |= 1;
+            other |= ST_PE_EXPORT;
         if (sym_type == STT_FUNC && sym->type.ref) {
             Sym *ref = sym->type.ref;
             if (ref->a.func_export)
-                other |= 1;
+                other |= ST_PE_EXPORT;
             if (ref->a.func_call == FUNC_STDCALL && can_add_underscore) {
                 sprintf(buf1, "_%s@%d", name, ref->a.func_args * PTR_SIZE);
                 name = buf1;
-                other |= 2;
+                other |= ST_PE_STDCALL;
                 can_add_underscore = 0;
             }
         } else {
             if (find_elf_sym(tcc_state->dynsymtab_section, name))
-                other |= 4;
+                other |= ST_PE_IMPORT;
             if (sym->type.t & VT_IMPORT)
-                other |= 4;
+                other |= ST_PE_IMPORT;
         }
 #else
         if (! (sym->type.t & VT_STATIC))
        So it is handled here as if it were in a DLL. */
     pe_putimport(s, 0, name, (uintptr_t)val);
 #else
-    /* XXX: Same problem on linux but currently "solved" elsewhere
-       via the rather dirty 'runtime_plt_and_got' hack. */
     add_elf_sym(symtab_section, (uintptr_t)val, 0,
         ELFW(ST_INFO)(STB_GLOBAL, STT_NOTYPE), 0,
         SHN_ABS, name);

tcc.h+4−0

 #ifdef TCC_TARGET_X86_64
 ST_FUNC void pe_add_unwind_data(unsigned start, unsigned end, unsigned stack);
 #endif
+/* symbol properties stored in Elf32_Sym->st_other */
+# define ST_PE_EXPORT 0x10
+# define ST_PE_IMPORT 0x20
+# define ST_PE_STDCALL 0x40
 #endif
 /* ------------ tccrun.c ----------------- */

tccpe.c+8−8

@@ -363,7 +363,7 @@ struct pe_info { · 362 unmodified lines
363	static const char pe_export_name(TCCState s1, ElfW(Sym) *sym)	363	static const char pe_export_name(TCCState s1, ElfW(Sym) *sym)
364	{	364	{
365	const char *name = symtab_section->link->data + sym->st_name;	365	const char *name = symtab_section->link->data + sym->st_name;
366	if (s1->leading_underscore && name[0] == '_' && !(sym->st_other & 2))	366	if (s1->leading_underscore && name[0] == '_' && !(sym->st_other & ST_PE_STDCALL))
367	return name + 1;	367	return name + 1;
368	return name;	368	return name;
369	}	369	}
@@ -378,7 +378,7 @@ static int pe_find_import(TCCState * s1, ElfW(Sym) *sym) · 8 unmodified lines
378	s = pe_export_name(s1, sym);	378	s = pe_export_name(s1, sym);
379	if (n) {	379	if (n) {
380	/* second try: */	380	/* second try: */
381	if (sym->st_other & 2) {	381	if (sym->st_other & ST_PE_STDCALL) {
382	/* try w/0 stdcall deco (windows API convention) */	382	/* try w/0 stdcall deco (windows API convention) */
383	p = strrchr(s, '@');	383	p = strrchr(s, '@');
384	if (!p \|\| s[0] != '_')	384	if (!p \|\| s[0] != '_')
@@ -899,7 +899,7 @@ static void pe_build_exports(struct pe_info *pe) · 514 unmodified lines
899	for (sym_index = 1; sym_index < sym_end; ++sym_index) {	899	for (sym_index = 1; sym_index < sym_end; ++sym_index) {
900	sym = (ElfW(Sym)*)symtab_section->data + sym_index;	900	sym = (ElfW(Sym)*)symtab_section->data + sym_index;
901	name = pe_export_name(pe->s1, sym);	901	name = pe_export_name(pe->s1, sym);
902	if ((sym->st_other & 1)	902	if ((sym->st_other & ST_PE_EXPORT)
903	/* export only symbols from actually written sections */	903	/* export only symbols from actually written sections */
904	&& pe->s1->sections[sym->st_shndx]->sh_addr) {	904	&& pe->s1->sections[sym->st_shndx]->sh_addr) {
905	p = tcc_malloc(sizeof *p);	905	p = tcc_malloc(sizeof *p);
@@ -908,9 +908,9 @@ static void pe_build_exports(struct pe_info *pe) · 2 unmodified lines
908	dynarray_add((void***)&sorted, &sym_count, p);	908	dynarray_add((void***)&sorted, &sym_count, p);
909	}	909	}
910	#if 0	910	#if 0
911	if (sym->st_other & 1)	911	if (sym->st_other & ST_PE_EXPORT)
912	printf("export: %s\n", name);	912	printf("export: %s\n", name);
913	if (sym->st_other & 2)	913	if (sym->st_other & ST_PE_STDCALL)
914	printf("stdcall: %s\n", name);	914	printf("stdcall: %s\n", name);
915	#endif	915	#endif
916	}	916	}
@@ -1282,7 +1282,7 @@ static int pe_check_symbols(struct pe_info *pe) · 365 unmodified lines
1282	/* patch the original symbol */	1282	/* patch the original symbol */
1283	sym->st_value = offset;	1283	sym->st_value = offset;
1284	sym->st_shndx = text_section->sh_num;	1284	sym->st_shndx = text_section->sh_num;
1285	sym->st_other &= ~1; /* do not export */	1285	sym->st_other &= ~ST_PE_EXPORT; /* do not export */
1286	continue;	1286	continue;
1287	}	1287	}
1288		1288
@@ -1301,7 +1301,7 @@ static int pe_check_symbols(struct pe_info *pe) · 12 unmodified lines
1301	} else if (pe->s1->rdynamic	1301	} else if (pe->s1->rdynamic
1302	&& ELFW(ST_BIND)(sym->st_info) != STB_LOCAL) {	1302	&& ELFW(ST_BIND)(sym->st_info) != STB_LOCAL) {
1303	/* if -rdynamic option, then export all non local symbols */	1303	/* if -rdynamic option, then export all non local symbols */
1304	sym->st_other \|= 1;	1304	sym->st_other \|= ST_PE_EXPORT;
1305	}	1305	}
1306	}	1306	}
1307	return ret;	1307	return ret;
@@ -1463,7 +1463,7 @@ ST_FUNC SValue pe_getimport(SValue sv, SValue *v2) · 155 unmodified lines
1463	if (!sym->c)	1463	if (!sym->c)
1464	put_extern_sym(sym, NULL, 0, 0);	1464	put_extern_sym(sym, NULL, 0, 0);
1465	esym = &((ElfW(Sym) *)symtab_section->data)[sym->c];	1465	esym = &((ElfW(Sym) *)symtab_section->data)[sym->c];
1466	if (!(esym->st_other & 4))	1466	if (!(esym->st_other & ST_PE_IMPORT))
1467	return sv;	1467	return sv;
1468		1468
1469	// printf("import %04x %04x %04x %s\n", sv->type.t, sym->type.t, sv->r, get_tok_str(sv->sym->v, NULL));	1469	// printf("import %04x %04x %04x %s\n", sv->type.t, sym->type.t, sv->r, get_tok_str(sv->sym->v, NULL));

tccpe: adjust for new 'hidden' symbols feature

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code