github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2024-12-28 04:00:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

added tcc_relocate() and tcc_get_symbol()

Browse Source
This commit is contained in:
bellard 2002-09-08 22:46:32 +00:00
parent 10f5d44f43
commit d8ef07df04
5 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -2,6 +2,7 @@
# Tiny C Compiler Makefile # Tiny C Compiler Makefile
# #
prefix=/usr/local prefix=/usr/local
manpath=$(prefix)/man
CFLAGS=-O2 -g -Wall CFLAGS=-O2 -g -Wall
LIBS=-ldl LIBS=-ldl
@ -117,7 +118,7 @@ bcheck.o: bcheck.c
install: tcc libtcc1.o bcheck.o install: tcc libtcc1.o bcheck.o
$(INSTALL) -m755 tcc $(prefix)/bin $(INSTALL) -m755 tcc $(prefix)/bin
$(INSTALL) tcc.1 $(prefix)/man/man1 $(INSTALL) tcc.1 $(manpath)/man1
mkdir -p $(prefix)/lib/tcc mkdir -p $(prefix)/lib/tcc
mkdir -p $(prefix)/lib/tcc/include mkdir -p $(prefix)/lib/tcc/include
$(INSTALL) -m644 libtcc1.o bcheck.o $(prefix)/lib/tcc $(INSTALL) -m644 libtcc1.o bcheck.o $(prefix)/lib/tcc

8
libtcc.h
View File

@ -63,10 +63,16 @@ int tcc_add_library(TCCState *s, const char *libraryname);
/* add a symbol to the compiled program */ /* add a symbol to the compiled program */
int tcc_add_symbol(TCCState *s, const char *name, unsigned long val); int tcc_add_symbol(TCCState *s, const char *name, unsigned long val);
/* output an executable file */ /* output an executable, library or object file */
int tcc_output_file(TCCState *s, const char *filename); int tcc_output_file(TCCState *s, const char *filename);
/* link and run main() function and return its value */ /* link and run main() function and return its value */
int tcc_run(TCCState *s, int argc, char **argv); int tcc_run(TCCState *s, int argc, char **argv);
/* do all relocations (needed before using tcc_get_symbol()) */
void tcc_relocate(TCCState *s);
/* return symbol value or error */
void *tcc_get_symbol(TCCState *s, const char *name);
#endif #endif

14
libtcc_test.c
View File

@ -23,10 +23,8 @@ char my_program[] =
" return fib(n-1) + fib(n-2);\n" " return fib(n-1) + fib(n-2);\n"
"}\n" "}\n"
"\n" "\n"
"int main(int argc, char **argv)\n" "int foo(int n)\n"
"{\n" "{\n"
" int n;\n"
" n = atoi(argv[1]);\n"
" printf(\"Hello World!\\n\");\n" " printf(\"Hello World!\\n\");\n"
" printf(\"fib(%d) = %d\\n\", n, fib(n));\n" " printf(\"fib(%d) = %d\\n\", n, fib(n));\n"
" printf(\"add(%d, %d) = %d\\n\", n, 2 * n, add(n, 2 * n));\n" " printf(\"add(%d, %d) = %d\\n\", n, 2 * n, add(n, 2 * n));\n"
@ -36,7 +34,7 @@ char my_program[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
TCCState *s; TCCState *s;
char *args[3]; int (*func)(int);
s = tcc_new(); s = tcc_new();
if (!s) { if (!s) {
@ -54,11 +52,11 @@ int main(int argc, char **argv)
with tcc_add_dll(() and using its symbols directly. */ with tcc_add_dll(() and using its symbols directly. */
tcc_add_symbol(s, "add", (unsigned long)&add); tcc_add_symbol(s, "add", (unsigned long)&add);
args[0] = ""; tcc_relocate(s);
args[1] = "32";
args[2] = NULL;
tcc_run(s, 2, args); func = tcc_get_symbol(s, "foo");
func(32);
tcc_delete(s); tcc_delete(s);
return 0; return 0;

19
tcc.c
View File

@ -7070,11 +7070,10 @@ static void sig_error(int signum, siginfo_t *siginf, void *puc)
} }
#endif #endif
/* launch the compiled program with the given arguments */ /* do all relocations (needed before using tcc_get_symbol()) */
int tcc_run(TCCState *s1, int argc, char **argv) void tcc_relocate(TCCState *s1)
{ {
Section *s; Section *s;
int (*prog_main)(int, char **);
int i; int i;
tcc_add_runtime(s1); tcc_add_runtime(s1);
@ -7104,8 +7103,16 @@ int tcc_run(TCCState *s1, int argc, char **argv)
if (s->reloc) if (s->reloc)
relocate_section(s1, s); relocate_section(s1, s);
} }
}
prog_main = (void *)get_elf_sym_val("main"); /* launch the compiled program with the given arguments */
int tcc_run(TCCState *s1, int argc, char **argv)
{
int (*prog_main)(int, char **);
tcc_relocate(s1);
prog_main = tcc_get_symbol(s1, "main");
if (do_debug) { if (do_debug) {
#ifdef WIN32 #ifdef WIN32
@ -7131,11 +7138,11 @@ int tcc_run(TCCState *s1, int argc, char **argv)
void **bound_error_func; void **bound_error_func;
/* set error function */ /* set error function */
bound_error_func = (void **)get_elf_sym_val("__bound_error_func"); bound_error_func = (void **)tcc_get_symbol(s1, "__bound_error_func");
*bound_error_func = rt_error; *bound_error_func = rt_error;
/* 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 *)get_elf_sym_val("__bound_init"); bound_init = (void *)tcc_get_symbol(s1, "__bound_init");
bound_init(); bound_init();
} }
#endif #endif

6
tccelf.c
View File

@ -154,7 +154,7 @@ static int find_elf_sym(Section *s, const char *name)
} }
/* return elf symbol value or error */ /* return elf symbol value or error */
static unsigned long get_elf_sym_val(const char *name) void *tcc_get_symbol(TCCState *s, const char *name)
{ {
int sym_index; int sym_index;
Elf32_Sym *sym; Elf32_Sym *sym;
@ -163,7 +163,7 @@ static unsigned long get_elf_sym_val(const char *name)
if (!sym_index) if (!sym_index)
error("%s not defined", name); error("%s not defined", name);
sym = &((Elf32_Sym *)symtab_section->data)[sym_index]; sym = &((Elf32_Sym *)symtab_section->data)[sym_index];
return sym->st_value; return (void *)sym->st_value;
} }
/* add an elf symbol : check if it is already defined and patch /* add an elf symbol : check if it is already defined and patch
@ -1294,7 +1294,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 = get_elf_sym_val("_start"); ehdr.e_entry = (unsigned long)tcc_get_symbol(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 ? */
} }