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

Fix preprocessor line directive update

Browse source 
The last commit was not a problem with macos.
The problem was that dwarf version < 5 uses different indexes for
files and directories.
They start at 1 for dwarf version < 5 and 0 for dwarf version >= 5.
This commit is contained in:
herman ten brugge 2023-01-17 20:08:14 +01:00
parent 7874397373
commit 4dc7662a07
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tccdbg.c
View file

@ -570,6 +570,7 @@ static void dwarf_file(TCCState *s1)
{ {
int i, j; int i, j;
char *filename; char *filename;
int index_offset = s1->dwarf < 5;
if (!strcmp(file->filename, "<command line>")) { if (!strcmp(file->filename, "<command line>")) {
dwarf_line.cur_file = 1; dwarf_line.cur_file = 1;
@ -581,10 +582,10 @@ static void dwarf_file(TCCState *s1)
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 + index_offset;
return; return;
} }
i = 0; i = -index_offset;
filename = file->filename; filename = file->filename;
} }
else { else {
@ -595,11 +596,12 @@ static void dwarf_file(TCCState *s1)
for (i = 0; i < dwarf_line.dir_size; i++) for (i = 0; i < dwarf_line.dir_size; i++)
if (strcmp(dwarf_line.dir_table[i], dir) == 0) { if (strcmp(dwarf_line.dir_table[i], dir) == 0) {
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 - index_offset
== 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 + index_offset;
return; return;
} }
break; break;
@ -619,10 +621,11 @@ static void dwarf_file(TCCState *s1)
tcc_realloc(dwarf_line.filename_table, tcc_realloc(dwarf_line.filename_table,
(dwarf_line.filename_size + 1) * (dwarf_line.filename_size + 1) *
sizeof (struct dwarf_filename_struct)); sizeof (struct dwarf_filename_struct));
dwarf_line.filename_table[dwarf_line.filename_size].dir_entry = i; dwarf_line.filename_table[dwarf_line.filename_size].dir_entry =
i + index_offset;
dwarf_line.filename_table[dwarf_line.filename_size].name = dwarf_line.filename_table[dwarf_line.filename_size].name =
tcc_strdup(filename); tcc_strdup(filename);
dwarf_line.cur_file = dwarf_line.filename_size++; dwarf_line.cur_file = dwarf_line.filename_size++ + index_offset;
return; return;
} }
@ -1095,11 +1098,7 @@ 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) &&

4
tccrun.c
View file

@ -975,9 +975,7 @@ 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 -= i > 0 && version < 5;
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;