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

Fix preprocessor line directive for macos

Browse source 
Macos has an offset of 1 for DW_LNS_set_file.

Also rewrite dwarf_file to not scan list twice and
move check for <command line> to this function.
This commit is contained in:
herman ten brugge 2023-01-16 20:26:44 +01:00
parent ee3fef2ce2
commit d0efbc5d3a
2 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
tccdbg.c
View file

@ -571,12 +571,16 @@ static void dwarf_file(TCCState *s1)
int i, j; int i, j;
char *filename; char *filename;
if (!strcmp(file->filename, "<command line>")) {
dwarf_line.cur_file = 1;
return;
}
filename = strrchr(file->filename, '/'); filename = strrchr(file->filename, '/');
if (filename == NULL) { if (filename == NULL) {
for (i = 1; i < dwarf_line.filename_size; i++) for (i = 1; i < dwarf_line.filename_size; i++)
if (dwarf_line.filename_table[i].dir_entry == 0 && if (dwarf_line.filename_table[i].dir_entry == 0 &&
strcmp(dwarf_line.filename_table[i].name, strcmp(dwarf_line.filename_table[i].name,
file->filename) == 0) { file->filename) == 0) {
dwarf_line.cur_file = i; dwarf_line.cur_file = i;
return; return;
} }
@ -593,7 +597,7 @@ static void dwarf_file(TCCState *s1)
for (j = 1; j < dwarf_line.filename_size; j++) for (j = 1; j < dwarf_line.filename_size; j++)
if (dwarf_line.filename_table[j].dir_entry == i && if (dwarf_line.filename_table[j].dir_entry == i &&
strcmp(dwarf_line.filename_table[j].name, strcmp(dwarf_line.filename_table[j].name,
filename) == 0) { filename) == 0) {
*undo = '/'; *undo = '/';
dwarf_line.cur_file = j; dwarf_line.cur_file = j;
return; return;
@ -610,21 +614,15 @@ static void dwarf_file(TCCState *s1)
} }
*undo = '/'; *undo = '/';
} }
for (j = 1; j < dwarf_line.filename_size; j++) dwarf_line.filename_table =
if (dwarf_line.filename_table[j].dir_entry == i && (struct dwarf_filename_struct *)
strcmp (dwarf_line.filename_table[j].name, filename) == 0) tcc_realloc(dwarf_line.filename_table,
break; (dwarf_line.filename_size + 1) *
if (j == dwarf_line.filename_size) { sizeof (struct dwarf_filename_struct));
dwarf_line.filename_table = dwarf_line.filename_table[dwarf_line.filename_size].dir_entry = i;
(struct dwarf_filename_struct *) dwarf_line.filename_table[dwarf_line.filename_size].name =
tcc_realloc(dwarf_line.filename_table, tcc_strdup(filename);
(dwarf_line.filename_size + 1) * dwarf_line.cur_file = dwarf_line.filename_size++;
sizeof (struct dwarf_filename_struct));
dwarf_line.filename_table[dwarf_line.filename_size].dir_entry = i;
dwarf_line.filename_table[dwarf_line.filename_size++].name =
tcc_strdup(filename);
dwarf_line.cur_file = j;
}
return; return;
} }
@ -1054,14 +1052,10 @@ ST_FUNC void tcc_debug_bincl(TCCState *s1)
{ {
if (!s1->do_debug) if (!s1->do_debug)
return; return;
if (s1->dwarf) { if (s1->dwarf)
if (strcmp(file->filename, "<command line>")) dwarf_file(s1);
dwarf_file(s1);
}
else else
{
put_stabs(s1, file->filename, N_BINCL, 0, 0, 0); put_stabs(s1, file->filename, N_BINCL, 0, 0, 0);
}
new_file = 1; new_file = 1;
} }
@ -1101,7 +1095,11 @@ ST_FUNC void tcc_debug_line(TCCState *s1)
if (dwarf_line.cur_file != dwarf_line.last_file) { if (dwarf_line.cur_file != dwarf_line.last_file) {
dwarf_line.last_file = dwarf_line.cur_file; dwarf_line.last_file = dwarf_line.cur_file;
dwarf_line_op(s1, DW_LNS_set_file); dwarf_line_op(s1, DW_LNS_set_file);
#ifdef TCC_TARGET_MACHO
dwarf_uleb128_op(s1, dwarf_line.cur_file + 1);
#else
dwarf_uleb128_op(s1, dwarf_line.cur_file); dwarf_uleb128_op(s1, dwarf_line.cur_file);
#endif
} }
if (len_pc && if (len_pc &&
len_line >= DWARF_LINE_BASE && len_line <= (DWARF_OPCODE_BASE + DWARF_LINE_BASE) && len_line >= DWARF_LINE_BASE && len_line <= (DWARF_OPCODE_BASE + DWARF_LINE_BASE) &&

3
tccrun.c
View file

@ -975,6 +975,9 @@ check_pc:
break; break;
case DW_LNS_set_file: case DW_LNS_set_file:
i = dwarf_read_uleb128(&ln, end); i = dwarf_read_uleb128(&ln, end);
#ifdef TCC_TARGET_MACHO
i--;
#endif
if (i < FILE_TABLE_SIZE && i < filename_size) if (i < FILE_TABLE_SIZE && i < filename_size)
filename = filename_table[i].name; filename = filename_table[i].name;
break; break;