d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tccrun: improve rt_printline output format

Browse source 
Prefix line with "file:linenumber:" such that editors
can easily jump to the source location
This commit is contained in:
grischka 2010-09-15 13:42:52 +02:00
parent df4c0892f3
commit af83993810
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
tccrun.c
View file

@ -222,7 +222,7 @@ static void set_pages_executable(void *ptr, unsigned long length)
/* print the position in the source file of PC value 'pc' by reading /* print the position in the source file of PC value 'pc' by reading
the stabs debug information */ the stabs debug information */
static uplong rt_printline(uplong wanted_pc) static uplong rt_printline(uplong wanted_pc, const char *msg)
{ {
Stab_Sym *sym, *sym_end; Stab_Sym *sym, *sym_end;
char func_name[128], last_func_name[128]; char func_name[128], last_func_name[128];
@ -231,8 +231,6 @@ static uplong rt_printline(uplong wanted_pc)
int incl_index, len, last_line_num, i; int incl_index, len, last_line_num, i;
const char *str, *p; const char *str, *p;
fprintf(stderr, "0x%08lx:", (unsigned long)wanted_pc);
func_name[0] = '\0'; func_name[0] = '\0';
func_addr = 0; func_addr = 0;
incl_index = 0; incl_index = 0;
@ -327,20 +325,28 @@ static uplong rt_printline(uplong wanted_pc)
} }
} }
/* did not find any info: */ /* did not find any info: */
fprintf(stderr, " ???\n"); fprintf(stderr, "%s %p ???\n", msg, (void*)wanted_pc);
fflush(stderr);
return 0; return 0;
found: found:
if (last_func_name[0] != '\0') { i = incl_index;
if (i > 0)
fprintf(stderr, "%s:%d: ", incl_files[--i], last_line_num);
fprintf(stderr, "%s %p", msg, (void*)wanted_pc);
if (last_func_name[0] != '\0')
fprintf(stderr, " %s()", last_func_name); fprintf(stderr, " %s()", last_func_name);
} if (--i >= 0) {
if (incl_index > 0) { fprintf(stderr, " (included from ");
fprintf(stderr, " (%s:%d", for (;;) {
incl_files[incl_index - 1], last_line_num); fprintf(stderr, "%s", incl_files[i]);
for(i = incl_index - 2; i >= 0; i--) if (--i < 0)
fprintf(stderr, ", included from %s", incl_files[i]); break;
fprintf(stderr, ", ");
}
fprintf(stderr, ")"); fprintf(stderr, ")");
} }
fprintf(stderr, "\n"); fprintf(stderr, "\n");
fflush(stderr);
return func_addr; return func_addr;
} }
@ -359,11 +365,7 @@ static void rt_error(ucontext_t *uc, const char *fmt, ...)
for(i=0;i<num_callers;i++) { for(i=0;i<num_callers;i++) {
if (rt_get_caller_pc(&pc, uc, i) < 0) if (rt_get_caller_pc(&pc, uc, i) < 0)
break; break;
if (i == 0) pc = rt_printline(pc, i ? "by" : "at");
fprintf(stderr, "at ");
else
fprintf(stderr, "by ");
pc = rt_printline(pc);
if (pc == (uplong)rt_prog_main && pc) if (pc == (uplong)rt_prog_main && pc)
break; break;
} }