meesbs
/
tinycc
forked from Mirrors/tinycc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed tcc_get_symbol() prototype

tcc-xref
bellard 2003-07-20 19:19:58 +00:00
parent c5959b77b4
commit f8d0241764
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtcc.h
View File

@ -83,8 +83,8 @@ int tcc_run(TCCState *s, int argc, char **argv);
non zero if link error. */ non zero if link error. */
int tcc_relocate(TCCState *s); int tcc_relocate(TCCState *s);
/* return symbol value or error */ /* return symbol value. return 0 if OK, -1 if symbol not found */
void *tcc_get_symbol(TCCState *s, const char *name); int tcc_get_symbol(TCCState *s, unsigned long *pval, const char *name);
#ifdef __cplusplus #ifdef __cplusplus
} }

8
libtcc_test.c
View File

@ -35,7 +35,8 @@ int main(int argc, char **argv)
{ {
TCCState *s; TCCState *s;
int (*func)(int); int (*func)(int);
unsigned long val;
s = tcc_new(); s = tcc_new();
if (!s) { if (!s) {
fprintf(stderr, "Could not create tcc state\n"); fprintf(stderr, "Could not create tcc state\n");
@ -54,8 +55,9 @@ int main(int argc, char **argv)
tcc_relocate(s); tcc_relocate(s);
func = tcc_get_symbol(s, "foo"); tcc_get_symbol(s, &val, "foo");
func = (void *)val;
func(32); func(32);
tcc_delete(s); tcc_delete(s);

7
tcc.c
View File

@ -9115,7 +9115,7 @@ int tcc_run(TCCState *s1, int argc, char **argv)
if (tcc_relocate(s1) < 0) if (tcc_relocate(s1) < 0)
return -1; return -1;
prog_main = tcc_get_symbol(s1, "main"); prog_main = tcc_get_symbol_err(s1, "main");
if (do_debug) { if (do_debug) {
#ifdef WIN32 #ifdef WIN32
@ -9140,10 +9140,11 @@ int tcc_run(TCCState *s1, int argc, char **argv)
void (*bound_init)(void); void (*bound_init)(void);
/* set error function */ /* set error function */
rt_bound_error_msg = (void *)tcc_get_symbol(s1, "__bound_error_msg"); rt_bound_error_msg = (void *)tcc_get_symbol_err(s1,
"__bound_error_msg");
/* XXX: use .init section so that it also work in binary ? */ /* XXX: use .init section so that it also work in binary ? */
bound_init = (void *)tcc_get_symbol(s1, "__bound_init"); bound_init = (void *)tcc_get_symbol_err(s1, "__bound_init");
bound_init(); bound_init();
} }
#endif #endif

17
tccelf.c
View File

@ -154,16 +154,25 @@ static int find_elf_sym(Section *s, const char *name)
} }
/* return elf symbol value or error */ /* return elf symbol value or error */
void *tcc_get_symbol(TCCState *s, const char *name) int tcc_get_symbol(TCCState *s, unsigned long *pval, const char *name)
{ {
int sym_index; int sym_index;
Elf32_Sym *sym; Elf32_Sym *sym;
sym_index = find_elf_sym(symtab_section, name); sym_index = find_elf_sym(symtab_section, name);
if (!sym_index) if (!sym_index)
error("%s not defined", name); return -1;
sym = &((Elf32_Sym *)symtab_section->data)[sym_index]; sym = &((Elf32_Sym *)symtab_section->data)[sym_index];
return (void *)sym->st_value; *pval = sym->st_value;
return 0;
}
void *tcc_get_symbol_err(TCCState *s, const char *name)
{
unsigned long val;
if (tcc_get_symbol(s, &val, name) < 0)
error("%s not defined", name);
return (void *)val;
} }
/* add an elf symbol : check if it is already defined and patch /* add an elf symbol : check if it is already defined and patch
@ -1383,7 +1392,7 @@ int tcc_output_file(TCCState *s1, const char *filename)
/* get entry point address */ /* get entry point address */
if (file_type == TCC_OUTPUT_EXE) if (file_type == TCC_OUTPUT_EXE)
ehdr.e_entry = (unsigned long)tcc_get_symbol(s1, "_start"); ehdr.e_entry = (unsigned long)tcc_get_symbol_err(s1, "_start");
else else
ehdr.e_entry = text_section->sh_addr; /* XXX: is it correct ? */ ehdr.e_entry = text_section->sh_addr; /* XXX: is it correct ? */
} }