portability: fix void* <-> target address conversion confusion

- #define addr_t as ElfW(Addr) - replace uplong by addr_t - #define TCC_HAS_RUNTIME_PLTGOT and use it

grischka committed 13 years ago

Commit 82bcbd01 parent 31864556 files · +136 −130Browse files

Unified · Split

6 files

libtcc.c +6 −6
tcc.h +60 −55
tcccoff.c +1 −1
tccelf.c +40 −37
tccpe.c +7 −7
tccrun.c +22 −24

@@ -423,7 +423,7 @@ ST_FUNC Section find_section(TCCState s1, const char *name) · 422 unmodified lines
423	423	/* update sym->c so that it points to an external symbol in section
424	424	'section' with value 'value' */
425	425	ST_FUNC void put_extern_sym2(Sym sym, Section section,
426		− uplong value, unsigned long size,
	426	+ addr_t value, unsigned long size,
427	427	int can_add_underscore)
428	428	{
429	429	int sym_type, sym_bind, sh_num, info, other;
@@ -527,7 +527,7 @@ ST_FUNC void put_extern_sym2(Sym sym, Section section, · 97 unmodified lines
527	527	}
528	528
529	529	ST_FUNC void put_extern_sym(Sym sym, Section section,
530		− uplong value, unsigned long size)
	530	+ addr_t value, unsigned long size)
531	531	{
532	532	put_extern_sym2(sym, section, value, size, 1);
533	533	}
@@ -1279,11 +1279,11 @@ LIBTCCAPI int tcc_add_library(TCCState s, const char libraryname) · 745 unmodified lines
1279	1279	LIBTCCAPI int tcc_add_symbol(TCCState s, const char name, const void *val)
1280	1280	{
1281	1281	#ifdef TCC_TARGET_PE
1282		− pe_putimport(s, 0, name, val);
	1282	+pe_putimport(s, 0, name, (uintptr_t)val);
1283	1283	#else
1284		− add_elf_sym(symtab_section, (uplong)val, 0,
1285		− ELFW(ST_INFO)(STB_GLOBAL, STT_NOTYPE), 0,
1286		− SHN_ABS, name);
	1284	+add_elf_sym(symtab_section, (uintptr_t)val, 0,
	1285	+ ELFW(ST_INFO)(STB_GLOBAL, STT_NOTYPE), 0,
	1286	+ SHN_ABS, name);
1287	1287	#endif
1288	1288	return 0;
1289	1289	}

tcc.h+60−55

@@ -42,25 +42,28 @@ · 41 unmodified lines
42	42	#include <setjmp.h>
43	43	#include <time.h>
44	44
45		−#ifdef _WIN32
46		−#include <windows.h>
47		−#include <sys/timeb.h>
48		−#include <io.h> /* open, close etc. */
49		−#include <direct.h> /* getcwd */
50		−#define inline __inline
51		−#define inp next_inp
52		−#ifdef LIBTCC_AS_DLL
53		−# define LIBTCCAPI __declspec(dllexport)
54		−# define PUB_FUNC LIBTCCAPI
55		−#endif
56		−#endif
57		−
58	45	#ifndef _WIN32
59		−#include <unistd.h>
60		−#include <sys/time.h>
61		−#include <sys/ucontext.h>
62		−#include <sys/mman.h>
63		−#include <dlfcn.h>
	46	+# include <unistd.h>
	47	+# include <sys/time.h>
	48	+# include <sys/ucontext.h>
	49	+# include <sys/mman.h>
	50	+# include <dlfcn.h>
	51	+#else
	52	+# include <windows.h>
	53	+# include <sys/timeb.h>
	54	+# include <io.h> /* open, close etc. */
	55	+# include <direct.h> /* getcwd */
	56	+# ifdef __GNUC__
	57	+# include <stdint.h>
	58	+# else
	59	+ typedef UINT_PTR uintptr_t;
	60	+# endif
	61	+# define inline __inline
	62	+# define inp next_inp
	63	+# ifdef LIBTCC_AS_DLL
	64	+# define LIBTCCAPI __declspec(dllexport)
	65	+# define PUB_FUNC LIBTCCAPI
	66	+# endif
64	67	#endif
65	68
66	69	#endif /* !CONFIG_TCCBOOT */
@@ -78,6 +81,27 @@ · 11 unmodified lines
78	81	#endif
79	82
80	83	#include "elf.h"
	84	+#ifdef TCC_TARGET_X86_64
	85	+# define ELFCLASSW ELFCLASS64
	86	+# define ElfW(type) Elf##64##_##type
	87	+# define ELFW(type) ELF##64##_##type
	88	+# define ElfW_Rel ElfW(Rela)
	89	+# define SHT_RELX SHT_RELA
	90	+# define REL_SECTION_FMT ".rela%s"
	91	+/* XXX: DLL with PLT would only work with x86-64 for now */
	92	+# define TCC_OUTPUT_DLL_WITH_PLT
	93	+#else
	94	+# define ELFCLASSW ELFCLASS32
	95	+# define ElfW(type) Elf##32##_##type
	96	+# define ELFW(type) ELF##32##_##type
	97	+# define ElfW_Rel ElfW(Rel)
	98	+# define SHT_RELX SHT_REL
	99	+# define REL_SECTION_FMT ".rel%s"
	100	+#endif
	101	+
	102	+/* target address type */
	103	+#define addr_t ElfW(Addr)
	104	+
81	105	#include "stab.h"
82	106	#include "libtcc.h"
83	107
@@ -139,13 +163,6 @@ · 55 unmodified lines
139	163	# define CONFIG_TCC_BACKTRACE
140	164	#endif
141	165
142		−/* target address type */
143		−#if defined TCC_TARGET_X86_64 && (!defined __x86_64__ \|\| defined _WIN32)
144		−# define uplong unsigned long long
145		−#else
146		−# define uplong unsigned long
147		−#endif
148		−
149	166	/* ------------ path configuration ------------ */
150	167
151	168	#ifndef CONFIG_SYSROOT
@@ -327,7 +344,7 @@ typedef struct Section { · 175 unmodified lines
327	344	int sh_addralign; /* elf section alignment */
328	345	int sh_entsize; /* elf entry size */
329	346	unsigned long sh_size; /* section size (only used during output) */
330		− uplong sh_addr; /* address at which the section is relocated */
	347	+ addr_t sh_addr; /* address at which the section is relocated */
331	348	unsigned long sh_offset; /* file offset */
332	349	int nb_hashed_syms; /* used to resize the hash table */
333	350	struct Section link; / link to another section */
@@ -552,7 +569,7 @@ struct TCCState { · 218 unmodified lines
552	569	int alacarte_link;
553	570
554	571	/* address of text section */
555		− uplong text_addr;
	572	+ addr_t text_addr;
556	573	int has_text_addr;
557	574
558	575	/* symbols to call at load-time / unload-time */
@@ -644,12 +661,12 @@ struct TCCState { · 85 unmodified lines
644	661	#endif
645	662	#endif
646	663
647		−#ifndef TCC_TARGET_PE
648		−#if defined TCC_TARGET_X86_64 \|\| defined TCC_TARGET_ARM
	664	+#if defined TCC_IS_NATIVE && !defined TCC_TARGET_PE \
	665	+ && (defined TCC_TARGET_X86_64 \|\| defined TCC_TARGET_ARM)
649	666	/* write PLT and GOT here */
650	667	char *runtime_plt_and_got;
651	668	unsigned int runtime_plt_and_got_offset;
652		−#endif
	669	+# define TCC_HAS_RUNTIME_PLTGOT
653	670	#endif
654	671	};
655	672
@@ -1007,8 +1024,8 @@ ST_FUNC void section_ptr_add(Section sec, unsigned long size); · 351 unmodified lines
1007	1024	ST_FUNC void section_reserve(Section *sec, unsigned long size);
1008	1025	ST_FUNC Section find_section(TCCState s1, const char *name);
1009	1026
1010		−ST_FUNC void put_extern_sym2(Sym sym, Section section, uplong value, unsigned long size, int can_add_underscore);
1011		−ST_FUNC void put_extern_sym(Sym sym, Section section, uplong value, unsigned long size);
	1027	+ST_FUNC void put_extern_sym2(Sym sym, Section section, addr_t value, unsigned long size, int can_add_underscore);
	1028	+ST_FUNC void put_extern_sym(Sym sym, Section section, addr_t value, unsigned long size);
1012	1029	ST_FUNC void greloc(Section s, Sym sym, unsigned long offset, int type);
1013	1030
1014	1031	ST_INLN void sym_free(Sym *sym);
@@ -1187,8 +1204,8 @@ typedef struct { · 172 unmodified lines
1187	1204	ST_FUNC Section new_symtab(TCCState s1, const char symtab_name, int sh_type, int sh_flags, const char strtab_name, const char *hash_name, int hash_sh_flags);
1188	1205
1189	1206	ST_FUNC int put_elf_str(Section s, const char sym);
1190		−ST_FUNC int put_elf_sym(Section s, uplong value, unsigned long size, int info, int other, int shndx, const char name);
1191		−ST_FUNC int add_elf_sym(Section s, uplong value, unsigned long size, int info, int other, int sh_num, const char name);
	1207	+ST_FUNC int put_elf_sym(Section s, addr_t value, unsigned long size, int info, int other, int shndx, const char name);
	1208	+ST_FUNC int add_elf_sym(Section s, addr_t value, unsigned long size, int info, int other, int sh_num, const char name);
1192	1209	ST_FUNC int find_elf_sym(Section s, const char name);
1193	1210	ST_FUNC void put_elf_reloc(Section symtab, Section s, unsigned long offset, int type, int symbol);
1194	1211
@@ -1204,12 +1221,16 @@ ST_FUNC void relocate_section(TCCState s1, Section s); · 9 unmodified lines
1204	1221	ST_FUNC void tcc_add_linker_symbols(TCCState *s1);
1205	1222	ST_FUNC int tcc_load_object_file(TCCState *s1, int fd, unsigned long file_offset);
1206	1223	ST_FUNC int tcc_load_archive(TCCState *s1, int fd);
1207		−ST_FUNC void tcc_get_symbol_err(TCCState s, const char *name);
1208	1224	ST_FUNC void tcc_add_bcheck(TCCState *s1);
1209	1225
1210	1226	ST_FUNC void build_got_entries(TCCState *s1);
1211	1227	ST_FUNC void tcc_add_runtime(TCCState *s1);
1212	1228
	1229	+ST_FUNC addr_t get_elf_sym_addr(TCCState s, const char name, int err);
	1230	+#ifdef TCC_IS_NATIVE
	1231	+ST_FUNC void tcc_get_symbol_err(TCCState s, const char *name);
	1232	+#endif
	1233	+
1213	1234	#ifndef TCC_TARGET_PE
1214	1235	ST_FUNC int tcc_load_dll(TCCState s1, int fd, const char filename, int level);
1215	1236	ST_FUNC int tcc_load_ldscript(TCCState *s1);
@@ -1219,24 +1240,6 @@ ST_INLN void inp(void); · 3 unmodified lines
1219	1240	ST_FUNC int handle_eob(void);
1220	1241	#endif
1221	1242
1222		−#ifdef TCC_TARGET_X86_64
1223		−# define ELFCLASSW ELFCLASS64
1224		−# define ElfW(type) Elf##64##_##type
1225		−# define ELFW(type) ELF##64##_##type
1226		−# define ElfW_Rel ElfW(Rela)
1227		−# define SHT_RELX SHT_RELA
1228		−# define REL_SECTION_FMT ".rela%s"
1229		−/* XXX: DLL with PLT would only work with x86-64 for now */
1230		−# define TCC_OUTPUT_DLL_WITH_PLT
1231		−#else
1232		−# define ELFCLASSW ELFCLASS32
1233		−# define ElfW(type) Elf##32##_##type
1234		−# define ELFW(type) ELF##32##_##type
1235		−# define ElfW_Rel ElfW(Rel)
1236		−# define SHT_RELX SHT_REL
1237		−# define REL_SECTION_FMT ".rel%s"
1238		−#endif
1239		−
1240	1243	/* ------------ xxx-gen.c ------------ */
1241	1244
1242	1245	ST_FUNC void gsym_addr(int t, int a);
@@ -1319,7 +1322,7 @@ ST_FUNC void asm_clobber(uint8_t clobber_regs, const char str); · 76 unmodified lines
1319	1322	#ifdef TCC_TARGET_PE
1320	1323	ST_FUNC int pe_load_file(struct TCCState s1, const char filename, int fd);
1321	1324	ST_FUNC int pe_output_file(TCCState * s1, const char *filename);
1322		−ST_FUNC int pe_putimport(TCCState s1, int dllindex, const char name, const void *value);
	1325	+ST_FUNC int pe_putimport(TCCState s1, int dllindex, const char name, addr_t value);
1323	1326	ST_FUNC SValue pe_getimport(SValue sv, SValue *v2);
1324	1327	/* tiny_impdef.c */
1325	1328	ST_FUNC char get_export_names(FILE fp);
@@ -1329,6 +1332,7 @@ ST_FUNC void pe_add_unwind_data(unsigned start, unsigned end, unsigned stack); · 3 unmodified lines
1329	1332	#endif
1330	1333
1331	1334	/* ------------ tccrun.c ----------------- */
	1335	+#ifdef TCC_IS_NATIVE
1332	1336	#ifdef CONFIG_TCC_STATIC
1333	1337	#define RTLD_LAZY 0x001
1334	1338	#define RTLD_NOW 0x002
@@ -1339,7 +1343,7 @@ ST_FUNC void dlopen(const char filename, int flag); · 4 unmodified lines
1339	1343	ST_FUNC void dlclose(void *p);
1340	1344	//ST_FUNC const char *dlerror(void);
1341	1345	ST_FUNC void resolve_sym(TCCState s1, const char *symbol);
1342		−#elif !defined TCC_TARGET_PE \|\| !defined _WIN32
	1346	+#elif !defined _WIN32
1343	1347	ST_FUNC void resolve_sym(TCCState s1, const char *symbol);
1344	1348	#endif
1345	1349
@@ -1349,6 +1353,7 @@ ST_DATA const char **rt_bound_error_msg; · 3 unmodified lines
1349	1353	ST_DATA void *rt_prog_main;
1350	1354	PUB_FUNC void tcc_set_num_callers(int n);
1351	1355	#endif
	1356	+#endif
1352	1357
1353	1358	/********************************************************/
1354	1359	/* include the target specific definitions */

tcccoff.c+1−1

@@ -933,7 +933,7 @@ ST_FUNC int tcc_load_coff(TCCState * s1, int fd) · 932 unmodified lines
933	933	if (name[0] == '_' && strcmp(name, "_main") != 0)
934	934	name++;
935	935
936		− tcc_add_symbol(s1, name, (void*)(uplong)csym.n_value);
	936	+ tcc_add_symbol(s1, name, (void*)(uintptr_t)csym.n_value);
937	937	}
938	938	// skip any aux records
939	939

tccelf.c+40−37

@@ -84,7 +84,7 @@ static void rebuild_hash(Section *s, unsigned int nb_buckets) · 83 unmodified lines
84	84	}
85	85
86	86	/* return the symbol number */
87		−ST_FUNC int put_elf_sym(Section *s, uplong value, unsigned long size,
	87	+ST_FUNC int put_elf_sym(Section *s, addr_t value, unsigned long size,
88	88	int info, int other, int shndx, const char *name)
89	89	{
90	90	int name_offset, sym_index;
@@ -157,7 +157,7 @@ ST_FUNC int find_elf_sym(Section s, const char name) · 66 unmodified lines
157	157	}
158	158
159	159	/* return elf symbol value, signal error if 'err' is nonzero */
160		−static void get_elf_sym_addr(TCCState s, const char *name, int err)
	160	+ST_FUNC addr_t get_elf_sym_addr(TCCState s, const char name, int err)
161	161	{
162	162	int sym_index;
163	163	ElfW(Sym) *sym;
@@ -167,26 +167,28 @@ static void get_elf_sym_addr(TCCState s, const char *name, int err) · 3 unmodified lines
167	167	if (!sym_index \|\| sym->st_shndx == SHN_UNDEF) {
168	168	if (err)
169	169	tcc_error("%s not defined", name);
170		− return NULL;
	170	+ return 0;
171	171	}
172		− return (void*)(uplong)sym->st_value;
	172	+ return sym->st_value;
173	173	}
174	174
	175	+#ifdef TCC_IS_NATIVE
175	176	/* return elf symbol value */
176	177	LIBTCCAPI void tcc_get_symbol(TCCState s, const char *name)
177	178	{
178		− return get_elf_sym_addr(s, name, 0);
	179	+ return (void*)get_elf_sym_addr(s, name, 0);
179	180	}
180	181
181	182	/* return elf symbol value or error */
182		−ST_FUNC void tcc_get_symbol_err(TCCState s, const char *name)
	183	+ST_FUNC void* tcc_get_symbol_err(TCCState s, const char name)
183	184	{
184		− return get_elf_sym_addr(s, name, 1);
	185	+ return (void*)get_elf_sym_addr(s, name, 1);
185	186	}
	187	+#endif
186	188
187	189	/* add an elf symbol : check if it is already defined and patch
188	190	it. Return symbol index. NOTE that sh_num can be SHN_UNDEF. */
189		−ST_FUNC int add_elf_sym(Section *s, uplong value, unsigned long size,
	191	+ST_FUNC int add_elf_sym(Section *s, addr_t value, unsigned long size,
190	192	int info, int other, int sh_num, const char *name)
191	193	{
192	194	ElfW(Sym) *esym;
@@ -431,12 +433,12 @@ ST_FUNC void relocate_syms(TCCState *s1, int do_resolve) · 238 unmodified lines
431	433	if (sh_num == SHN_UNDEF) {
432	434	name = strtab_section->data + sym->st_name;
433	435	if (do_resolve) {
434		−#if !defined TCC_TARGET_PE \|\| !defined _WIN32
	436	+#if defined TCC_IS_NATIVE && !defined _WIN32
435	437	void *addr;
436	438	name = symtab_section->link->data + sym->st_name;
437	439	addr = resolve_sym(s1, name);
438	440	if (addr) {
439		− sym->st_value = (uplong)addr;
	441	+ sym->st_value = (addr_t)addr;
440	442	goto found;
441	443	}
442	444	#endif
@@ -469,10 +471,10 @@ ST_FUNC void relocate_syms(TCCState *s1, int do_resolve) · 26 unmodified lines
469	471	}
470	472	}
471	473
472		−#ifndef TCC_TARGET_PE
	474	+#ifdef TCC_HAS_RUNTIME_PLTGOT
473	475	#ifdef TCC_TARGET_X86_64
474	476	#define JMP_TABLE_ENTRY_SIZE 14
475		−static uplong add_jmp_table(TCCState *s1, uplong val)
	477	+static addr_t add_jmp_table(TCCState *s1, addr_t val)
476	478	{
477	479	char *p = s1->runtime_plt_and_got + s1->runtime_plt_and_got_offset;
478	480	s1->runtime_plt_and_got_offset += JMP_TABLE_ENTRY_SIZE;
@@ -480,30 +482,30 @@ static uplong add_jmp_table(TCCState *s1, uplong val) · 1 unmodified line
480	482	p[0] = 0xff;
481	483	p[1] = 0x25;
482	484	(int )(p + 2) = 0;
483		− (uplong )(p + 6) = val;
484		− return (uplong)p;
	485	+ (addr_t )(p + 6) = val;
	486	+ return (addr_t)p;
485	487	}
486	488
487		−static uplong add_got_table(TCCState *s1, uplong val)
	489	+static addr_t add_got_table(TCCState *s1, addr_t val)
488	490	{
489		− uplong p = (uplong )(s1->runtime_plt_and_got + s1->runtime_plt_and_got_offset);
490		− s1->runtime_plt_and_got_offset += sizeof(uplong);
	491	+ addr_t p = (addr_t )(s1->runtime_plt_and_got + s1->runtime_plt_and_got_offset);
	492	+ s1->runtime_plt_and_got_offset += sizeof(addr_t);
491	493	*p = val;
492		− return (uplong)p;
	494	+ return (addr_t)p;
493	495	}
494	496	#elif defined TCC_TARGET_ARM
495	497	#define JMP_TABLE_ENTRY_SIZE 8
496		−static uplong add_jmp_table(TCCState *s1, int val)
	498	+static addr_t add_jmp_table(TCCState *s1, int val)
497	499	{
498	500	uint32_t p = (uint32_t )(s1->runtime_plt_and_got + s1->runtime_plt_and_got_offset);
499	501	s1->runtime_plt_and_got_offset += JMP_TABLE_ENTRY_SIZE;
500	502	/* ldr pc, [pc, #-4] */
501	503	p[0] = 0xE51FF004;
502	504	p[1] = val;
503		− return (uplong)p;
	505	+ return (addr_t)p;
504	506	}
505	507	#endif
506		−#endif
	508	+#endif /* def TCC_HAS_RUNTIME_PLTGOT */
507	509
508	510	/* relocate a given section (CPU dependent) */
509	511	ST_FUNC void relocate_section(TCCState s1, Section s)
@@ -513,7 +515,7 @@ ST_FUNC void relocate_section(TCCState s1, Section s) · 3 unmodified lines
513	515	ElfW(Sym) *sym;
514	516	int type, sym_index;
515	517	unsigned char *ptr;
516		− uplong val, addr;
	518	+ addr_t val, addr;
517	519	#if defined TCC_TARGET_I386 \|\| defined TCC_TARGET_X86_64
518	520	int esym_index;
519	521	#endif
@@ -612,13 +614,14 @@ ST_FUNC void relocate_section(TCCState s1, Section s) · 92 unmodified lines
612	614	is_call = (type == R_ARM_CALL);
613	615	x += val - addr;
614	616	h = x & 2;
615		−#ifndef TCC_TARGET_PE
616		− if ((x & 3) \|\| x >= 0x2000000 \|\| x < -0x2000000)
617		− if (!(x & 3) \|\| !blx_avail \|\| !is_call)
618		− if (s1->output_type == TCC_OUTPUT_MEMORY) {
	617	+#ifdef TCC_HAS_RUNTIME_PLTGOT
	618	+ if (s1->output_type == TCC_OUTPUT_MEMORY) {
	619	+ if ((x & 3) \|\| x >= 0x2000000 \|\| x < -0x2000000)
	620	+ if (!(x & 3) \|\| !blx_avail \|\| !is_call) {
619	621	x += add_jmp_table(s1, val) - val; /* add veneer */
620	622	is_thumb = 0; /* Veneer uses ARM instructions */
621	623	}
	624	+ }
622	625	#endif
623	626	if ((x & 3) \|\| x >= 0x2000000 \|\| x < -0x2000000)
624	627	if (!(x & 3) \|\| !blx_avail \|\| !is_call)
@@ -770,8 +773,8 @@ ST_FUNC void relocate_section(TCCState s1, Section s) · 145 unmodified lines
770	773	(int)ptr ^= 0xE12FFF10 ^ 0xE1A0F000; /* BX Rm -> MOV PC, Rm */
771	774	break;
772	775	default:
773		− fprintf(stderr,"FIXME: handle reloc type %x at %x [%.8x] to %x\n",
774		− type, (unsigned)addr, (unsigned)(uplong)ptr, (unsigned)val);
	776	+ fprintf(stderr,"FIXME: handle reloc type %x at %x [%p] to %x\n",
	777	+ type, (unsigned)addr, ptr, (unsigned)val);
775	778	break;
776	779	#elif defined(TCC_TARGET_C67)
777	780	case R_C60_32:
@@ -796,8 +799,8 @@ ST_FUNC void relocate_section(TCCState s1, Section s) · 18 unmodified lines
796	799	case R_C60HI16:
797	800	break;
798	801	default:
799		− fprintf(stderr,"FIXME: handle reloc type %x at %x [%.8x] to %x\n",
800		− type, (unsigned)addr, (unsigned)(uplong)ptr, (unsigned)val);
	802	+ fprintf(stderr,"FIXME: handle reloc type %x at %x [%p] to %x\n",
	803	+ type, (unsigned)addr, ptr, (unsigned)val);
801	804	break;
802	805	#elif defined(TCC_TARGET_X86_64)
803	806	case R_X86_64_64:
@@ -837,7 +840,7 @@ ST_FUNC void relocate_section(TCCState s1, Section s) · 33 unmodified lines
837	840	long long diff;
838	841	diff = (long long)val - addr;
839	842	if (diff <= -2147483647 \|\| diff > 2147483647) {
840		−#ifndef TCC_TARGET_PE
	843	+#ifdef TCC_HAS_RUNTIME_PLTGOT
841	844	/* XXX: naive support for over 32bit jump */
842	845	if (s1->output_type == TCC_OUTPUT_MEMORY) {
843	846	val = (add_jmp_table(s1, val - rel->r_addend) +
@@ -858,7 +861,7 @@ ST_FUNC void relocate_section(TCCState s1, Section s) · 14 unmodified lines
858	861	(int )ptr = val - rel->r_addend;
859	862	break;
860	863	case R_X86_64_GOTPCREL:
861		−#ifndef TCC_TARGET_PE
	864	+#ifdef TCC_HAS_RUNTIME_PLTGOT
862	865	if (s1->output_type == TCC_OUTPUT_MEMORY) {
863	866	val = add_got_table(s1, val - rel->r_addend) + rel->r_addend;
864	867	(int )ptr += val - addr;
@@ -1275,7 +1278,7 @@ ST_FUNC Section new_symtab(TCCState s1, · 410 unmodified lines
1275	1278	}
1276	1279
1277	1280	/* put dynamic tag */
1278		−static void put_dt(Section *dynamic, int dt, uplong val)
	1281	+static void put_dt(Section *dynamic, int dt, addr_t val)
1279	1282	{
1280	1283	ElfW(Dyn) *dyn;
1281	1284	dyn = section_ptr_add(dynamic, sizeof(ElfW(Dyn)));
@@ -1545,7 +1548,7 @@ static int elf_output_file(TCCState s1, const char filename) · 263 unmodified lines
1545	1548	int *section_order;
1546	1549	int shnum, i, phnum, file_offset, offset, size, j, sh_order_index, k;
1547	1550	long long tmp;
1548		− uplong addr;
	1551	+ addr_t addr;
1549	1552	Section strsec, s;
1550	1553	ElfW(Shdr) shdr, *sh;
1551	1554	ElfW(Phdr) phdr, ph;
@@ -1553,9 +1556,9 @@ static int elf_output_file(TCCState s1, const char filename) · 1 unmodified line
1553	1556	unsigned long saved_dynamic_data_offset;
1554	1557	ElfW(Sym) *sym;
1555	1558	int type, file_type;
1556		− uplong rel_addr, rel_size;
	1559	+ addr_t rel_addr, rel_size;
1557	1560	#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)
1558		− uplong bss_addr, bss_size;
	1561	+ addr_t bss_addr, bss_size;
1559	1562	#endif
1560	1563
1561	1564	file_type = s1->output_type;
@@ -2191,7 +2194,7 @@ static int elf_output_file(TCCState s1, const char filename) · 629 unmodified lines
2191	2194
2192	2195	/* get entry point address */
2193	2196	if (file_type == TCC_OUTPUT_EXE)
2194		− ehdr.e_entry = (uplong)tcc_get_symbol_err(s1, "_start");
	2197	+ ehdr.e_entry = get_elf_sym_addr(s1, "_start", 1);
2195	2198	else
2196	2199	ehdr.e_entry = text_section->sh_addr; /* XXX: is it correct ? */
2197	2200	}

tccpe.c+7−7

@@ -1,4 +1,4 @@
1		− /*
	1	+/*
2	2	* TCCPE.C - PE file output for the Tiny C Compiler
3	3	*
4	4	* Copyright (c) 2005-2007 grischka
@@ -1480,11 +1480,11 @@ ST_FUNC SValue pe_getimport(SValue sv, SValue *v2) · 1475 unmodified lines
1480	1480	return v2;
1481	1481	}
1482	1482
1483		−ST_FUNC int pe_putimport(TCCState s1, int dllindex, const char name, const void *value)
	1483	+ST_FUNC int pe_putimport(TCCState s1, int dllindex, const char name, addr_t value)
1484	1484	{
1485	1485	return add_elf_sym(
1486	1486	s1->dynsymtab_section,
1487		− (uplong)value,
	1487	+ value,
1488	1488	dllindex, /* st_size */
1489	1489	ELFW(ST_INFO)(STB_GLOBAL, STT_NOTYPE),
1490	1490	0,
@@ -1613,7 +1613,7 @@ static int pe_load_def(TCCState s1, FILE fp) · 122 unmodified lines
1613	1613	++state;
1614	1614
1615	1615	default:
1616		− pe_putimport(s1, dllindex, p, NULL);
	1616	+ pe_putimport(s1, dllindex, p, 0);
1617	1617	continue;
1618	1618	}
1619	1619	}
@@ -1635,7 +1635,7 @@ static int pe_load_dll(TCCState s1, const char dllname, FILE *fp) · 15 unmodified lines
1635	1635	return -1;
1636	1636	index = add_dllref(s1, dllname);
1637	1637	for (q = p; *q; q += 1 + strlen(q))
1638		− pe_putimport(s1, index, q, NULL);
	1638	+ pe_putimport(s1, index, q, 0);
1639	1639	tcc_free(p);
1640	1640	return 0;
1641	1641	}
@@ -1729,7 +1729,7 @@ ST_FUNC void pe_add_unwind_data(unsigned start, unsigned end, unsigned stack) · 87 unmodified lines
1729	1729	static void pe_add_runtime_ex(TCCState s1, struct pe_info pe)
1730	1730	{
1731	1731	const char *start_symbol;
1732		− unsigned long addr = 0;
	1732	+ ADDR3264 addr = 0;
1733	1733	int pe_type = 0;
1734	1734
1735	1735	if (find_elf_sym(symtab_section, PE_STDSYM("WinMain","@16")))
@@ -1781,7 +1781,7 @@ static void pe_add_runtime_ex(TCCState s1, struct pe_info pe) · 45 unmodified lines
1781	1781	pe_type = PE_RUN;
1782	1782
1783	1783	if (start_symbol) {
1784		− addr = (uplong)tcc_get_symbol_err(s1, start_symbol);
	1784	+ addr = get_elf_sym_addr(s1, start_symbol, 1);
1785	1785	if (PE_RUN == pe_type && addr)
1786	1786	/* for -run GUI's, put '_runwinmain' instead of 'main' */
1787	1787	add_elf_sym(symtab_section,

tccrun.c+22−24

@@ -35,7 +35,7 @@ ST_DATA void *rt_prog_main; · 34 unmodified lines
35	35
36	36	static void set_pages_executable(void *ptr, unsigned long length);
37	37	static void set_exception_handler(void);
38		−static int rt_get_caller_pc(uplong paddr, ucontext_t uc, int level);
	38	+static int rt_get_caller_pc(addr_t paddr, ucontext_t uc, int level);
39	39	static void rt_error(ucontext_t uc, const char fmt, ...);
40	40	static int tcc_relocate_ex(TCCState s1, void ptr);
41	41
@@ -127,7 +127,7 @@ static int tcc_relocate_ex(TCCState s1, void ptr) · 85 unmodified lines
127	127	{
128	128	Section *s;
129	129	unsigned long offset, length;
130		− uplong mem;
	130	+ addr_t mem;
131	131	int i;
132	132
133	133	if (0 == s1->runtime_added) {
@@ -145,7 +145,7 @@ static int tcc_relocate_ex(TCCState s1, void ptr) · 11 unmodified lines
145	145	return -1;
146	146	}
147	147
148		− offset = 0, mem = (uplong)ptr;
	148	+ offset = 0, mem = (addr_t)ptr;
149	149	for(i = 1; i < s1->nb_sections; i++) {
150	150	s = s1->sections[i];
151	151	if (0 == (s->sh_flags & SHF_ALLOC))
@@ -161,7 +161,7 @@ static int tcc_relocate_ex(TCCState s1, void ptr) · 9 unmodified lines
161	161	if (s1->nb_errors)
162	162	return -1;
163	163
164		−#if (defined TCC_TARGET_X86_64 \|\| defined TCC_TARGET_ARM) && !defined TCC_TARGET_PE
	164	+#ifdef TCC_HAS_RUNTIME_PLTGOT
165	165	s1->runtime_plt_and_got_offset = 0;
166	166	s1->runtime_plt_and_got = (char *)(mem + offset);
167	167	/* double the size of the buffer for got and plt entries
@@ -185,7 +185,7 @@ static int tcc_relocate_ex(TCCState s1, void ptr) · 17 unmodified lines
185	185	continue;
186	186	length = s->data_offset;
187	187	// printf("%-12s %08x %04x\n", s->name, s->sh_addr, length);
188		− ptr = (void*)(uplong)s->sh_addr;
	188	+ ptr = (void*)s->sh_addr;
189	189	if (NULL == s->data \|\| s->sh_type == SHT_NOBITS)
190	190	memset(ptr, 0, length);
191	191	else
@@ -195,7 +195,7 @@ static int tcc_relocate_ex(TCCState s1, void ptr) · 3 unmodified lines
195	195	set_pages_executable(ptr, length);
196	196	}
197	197
198		−#if (defined TCC_TARGET_X86_64 \|\| defined TCC_TARGET_ARM) && !defined TCC_TARGET_PE
	198	+#ifdef TCC_HAS_RUNTIME_PLTGOT
199	199	set_pages_executable(s1->runtime_plt_and_got,
200	200	s1->runtime_plt_and_got_offset);
201	201	#endif
@@ -215,17 +215,15 @@ static void set_pages_executable(void *ptr, unsigned long length) · 13 unmodified lines
215	215	unsigned long old_protect;
216	216	VirtualProtect(ptr, length, PAGE_EXECUTE_READWRITE, &old_protect);
217	217	#else
218		− unsigned long start, end;
219		− start = (uplong)ptr & ~(PAGESIZE - 1);
220		− end = (uplong)ptr + length;
	218	+ addr_t start, end;
	219	+ start = (addr_t)ptr & ~(PAGESIZE - 1);
	220	+ end = (addr_t)ptr + length;
221	221	end = (end + PAGESIZE - 1) & ~(PAGESIZE - 1);
222	222	mprotect((void *)start, end - start, PROT_READ \| PROT_WRITE \| PROT_EXEC);
223	223	#endif
224	224	}
225	225
226	226	/* ------------------------------------------------------------- */
227		−#endif /* TCC_IS_NATIVE */
228		−
229	227	#ifdef CONFIG_TCC_BACKTRACE
230	228
231	229	PUB_FUNC void tcc_set_num_callers(int n)
@@ -235,10 +233,10 @@ PUB_FUNC void tcc_set_num_callers(int n) · 3 unmodified lines
235	233
236	234	/* print the position in the source file of PC value 'pc' by reading
237	235	the stabs debug information */
238		−static uplong rt_printline(uplong wanted_pc, const char *msg)
	236	+static addr_t rt_printline(addr_t wanted_pc, const char *msg)
239	237	{
240	238	char func_name[128], last_func_name[128];
241		− uplong func_addr, last_pc, pc;
	239	+ addr_t func_addr, last_pc, pc;
242	240	const char *incl_files[INCLUDE_STACK_SIZE];
243	241	int incl_index, len, last_line_num, i;
244	242	const char str, p;
@@ -257,7 +255,7 @@ static uplong rt_printline(uplong wanted_pc, const char *msg) · 12 unmodified lines
257	255	func_addr = 0;
258	256	incl_index = 0;
259	257	last_func_name[0] = '\0';
260		− last_pc = (uplong)-1;
	258	+ last_pc = (addr_t)-1;
261	259	last_line_num = 1;
262	260
263	261	if (!stab_sym)
@@ -380,7 +378,7 @@ no_stabs: · 116 unmodified lines
380	378	static void rt_error(ucontext_t uc, const char fmt, ...)
381	379	{
382	380	va_list ap;
383		− uplong pc;
	381	+ addr_t pc;
384	382	int i;
385	383
386	384	fprintf(stderr, "Runtime error: ");
@@ -393,7 +391,7 @@ static void rt_error(ucontext_t uc, const char fmt, ...) · 6 unmodified lines
393	391	if (rt_get_caller_pc(&pc, uc, i) < 0)
394	392	break;
395	393	pc = rt_printline(pc, i ? "by" : "at");
396		− if (pc == (uplong)rt_prog_main && pc)
	394	+ if (pc == (addr_t)rt_prog_main && pc)
397	395	break;
398	396	}
399	397	}
@@ -464,7 +462,7 @@ static void set_exception_handler(void) · 64 unmodified lines
464	462	#endif
465	463
466	464	/* return the PC at frame level 'level'. Return non zero if not found */
467		−static int rt_get_caller_pc(unsigned long paddr, ucontext_t uc, int level)
	465	+static int rt_get_caller_pc(addr_t paddr, ucontext_t uc, int level)
468	466	{
469	467	unsigned long fp;
470	468	int i;
@@ -634,17 +632,17 @@ static void set_exception_handler(void) · 163 unmodified lines
634	632	static void win64_add_function_table(TCCState *s1)
635	633	{
636	634	RtlAddFunctionTable(
637		− (RUNTIME_FUNCTION*)(uplong)s1->uw_pdata->sh_addr,
	635	+ (RUNTIME_FUNCTION*)s1->uw_pdata->sh_addr,
638	636	s1->uw_pdata->data_offset / sizeof (RUNTIME_FUNCTION),
639		− (uplong)text_section->sh_addr
	637	+ text_section->sh_addr
640	638	);
641	639	}
642	640	#endif
643	641
644	642	/* return the PC at frame level 'level'. Return non zero if not found */
645		−static int rt_get_caller_pc(uplong paddr, CONTEXT uc, int level)
	643	+static int rt_get_caller_pc(addr_t paddr, CONTEXT uc, int level)
646	644	{
647		− uplong fp, pc;
	645	+ addr_t fp, pc;
648	646	int i;
649	647	#ifdef _WIN64
650	648	pc = uc->Rip;
@@ -658,9 +656,9 @@ static int rt_get_caller_pc(uplong paddr, CONTEXT uc, int level) · 7 unmodified lines
658	656	/* XXX: check address validity with program info */
659	657	if (fp <= 0x1000 \|\| fp >= 0xc0000000)
660	658	return -1;
661		− fp = ((uplong*)fp)[0];
	659	+ fp = ((addr_t*)fp)[0];
662	660	}
663		− pc = ((uplong*)fp)[1];
	661	+ pc = ((addr_t*)fp)[1];
664	662	}
665	663	*paddr = pc;
666	664	return 0;
@@ -730,5 +728,5 @@ ST_FUNC void resolve_sym(TCCState s1, const char *sym) · 63 unmodified lines
730	728	}
731	729
732	730	#endif /* CONFIG_TCC_STATIC */
733		−
	731	+#endif /* TCC_IS_NATIVE */
734	732	/* ------------------------------------------------------------- */

portability: fix void* <-> target address conversion confusion

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code