Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

ktcc: Fixed tcc_find_symbol_me.

Browse Source 
git-svn-id: svn://kolibrios.org@9617 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
turbocat 2022-01-12 00:24:09 +00:00
parent 70dba2afa0
commit 4f51865ee3
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
programs/develop/ktcc/trunk/source/tccmeos.c
View File

@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "tcc.h"
typedef struct { typedef struct {
char magic[8]; char magic[8];
int version; int version;
@ -242,13 +244,10 @@ const char *tcc_get_symbol_name(int st_name)
return sym_name; return sym_name;
} }
int tcc_find_symbol_me(me_info* me, const char *sym_name) int tcc_find_symbol_me(me_info* me, const char *sym_name, int* addr)
{ {
int i; int i, symtab = 0, strtab = 0;
int symtab; *addr = 0;
int strtab;
symtab=0;
strtab=0;
for (i=1;i<me->s1->nb_sections;i++) for (i=1;i<me->s1->nb_sections;i++)
{ {
Section* s; Section* s;
@ -276,7 +275,8 @@ int tcc_find_symbol_me(me_info* me, const char *sym_name)
{ {
if (strcmp(name+s->st_name,sym_name)==0) if (strcmp(name+s->st_name,sym_name)==0)
{ {
return s->st_value+findsection(me,s->st_shndx)->sh_addr; *addr = s->st_value+findsection(me,s->st_shndx)->sh_addr;
return 1;
} }
s++; s++;
} }
@ -303,12 +303,10 @@ int tcc_output_me(TCCState* s1,const char *filename)
if (s1->do_debug) if (s1->do_debug)
tcc_output_dbgme(filename, &me); tcc_output_dbgme(filename, &me);
me.header.entry_point=tcc_find_symbol_me(&me,"start"); if (!tcc_find_symbol_me(&me, "start", &me.header.entry_point) |
me.header.params= tcc_find_symbol_me(&me,"__argv"); // <-- !tcc_find_symbol_me(&me, "__argv", &me.header.params) |
me.header.argv= tcc_find_symbol_me(&me,"__path"); // <-- !tcc_find_symbol_me(&me, "__path", &me.header.argv)) {
exit(1);
if (!me.header.entry_point || !me.header.params || me.header.argv) {
exit(1);
} }
if((f=fopen(filename,"wb"))==NULL){ if((f=fopen(filename,"wb"))==NULL){
@ -484,7 +482,7 @@ int tcc_output_dbgme(const char *filename, me_info* me)
strcpy(cur_fun, stabstr_section->data + stab->n_strx); strcpy(cur_fun, stabstr_section->data + stab->n_strx);
str = strchr(cur_fun, ':'); str = strchr(cur_fun, ':');
if (str) *str = '\0'; if (str) *str = '\0';
cur_fun_addr = tcc_find_symbol_me(me, cur_fun); tcc_find_symbol_me(me, cur_fun, &cur_fun_addr);
cur_line = stab->n_desc; cur_line = stab->n_desc;
fun_flag = 1; fun_flag = 1;
//fprintf(fdbg, "0x%X %s() line(%d)\n", cur_fun_addr, cur_fun, cur_line); // commented as conflicted with direct address //fprintf(fdbg, "0x%X %s() line(%d)\n", cur_fun_addr, cur_fun, cur_line); // commented as conflicted with direct address