MahnoKropotkinvich/tinycc
1
0
Fork 0
mirror of git://repo.or.cz/tinycc.git synced 2026-11-04 21:26:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Small debug cleanup
Some checks are pending
build and test / test-x86_64-linux (push) Waiting to run
Details
build and test / test-x86_64-osx (push) Waiting to run
Details
build and test / test-aarch64-osx (push) Waiting to run
Details
build and test / test-x86_64-win32 (push) Waiting to run
Details
build and test / test-i386-win32 (push) Waiting to run
Details
build and test / test-armv7-linux (push) Waiting to run
Details
build and test / test-aarch64-linux (push) Waiting to run
Details
build and test / test-riscv64-linux (push) Waiting to run
Details

Browse Source 
A little bit better string hashing
Move free code to seperate function
This commit is contained in:
herman ten brugge 2025-08-22 16:45:06 +02:00
parent e5e3dc687b
commit 4e6c4db340
1 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tccdbg.c
View File

@ -554,6 +554,20 @@ static void dwarf_reloc(Section *s, int sym, int rel)
put_elf_reloca(symtab_section, s, s->data_offset, rel, sym, 0); put_elf_reloca(symtab_section, s, s->data_offset, rel, sym, 0);
} }
static void free_str(struct dwarf_str_hash **str)
{
int i;
for (i = 0; i < N_STR_HASH; i++) {
while (str[i]) {
struct dwarf_str_hash *next = str[i]->next;
tcc_free(str[i]);
str[i] = next;
}
}
}
static unsigned str_hash(const char *s) static unsigned str_hash(const char *s)
{ {
unsigned h = 5381; unsigned h = 5381;
@ -575,22 +589,36 @@ static void dwarf_string(Section *s, Section *dw, int sym, const char *str)
len = strlen(str) + 1; len = strlen(str) + 1;
new_hash = dw_hash[hash]; new_hash = dw_hash[hash];
while (new_hash) { while (new_hash) {
if (new_hash->len == len && if (new_hash->len == len &&
!memcmp(str, dw->data + new_hash->data_offset, len)) !memcmp(str, dw->data + new_hash->data_offset, len))
break; break;
new_hash = new_hash->next; new_hash = new_hash->next;
} }
if (new_hash == NULL) { if (new_hash == NULL) {
unsigned long offset = dw->data_offset;
new_hash = dw_hash[hash];
while (new_hash) {
unsigned long n = new_hash->data_offset + new_hash->len - len;
if (new_hash->len > len &&
!memcmp(str, dw->data + n, len)) {
offset = n;
break;
}
new_hash = new_hash->next;
}
if (new_hash == NULL) {
ptr = section_ptr_add(dw, len);
memmove(ptr, str, len);
}
new_hash = (struct dwarf_str_hash *) new_hash = (struct dwarf_str_hash *)
tcc_malloc(sizeof(struct dwarf_str_hash)); tcc_malloc(sizeof(struct dwarf_str_hash));
new_hash->len = len; new_hash->len = len;
new_hash->data_offset = dw->data_offset; new_hash->data_offset = offset;
new_hash->next = dw_hash[hash]; new_hash->next = dw_hash[hash];
dw_hash[hash] = new_hash; dw_hash[hash] = new_hash;
ptr = section_ptr_add(dw, len);
memmove(ptr, str, len);
} }
else
put_elf_reloca(symtab_section, s, s->data_offset, R_DATA_32DW, sym, put_elf_reloca(symtab_section, s, s->data_offset, R_DATA_32DW, sym,
PTR_SIZE == 4 ? 0 : new_hash->data_offset); PTR_SIZE == 4 ? 0 : new_hash->data_offset);
dwarf_data4(s, PTR_SIZE == 4 ? new_hash->data_offset : 0); dwarf_data4(s, PTR_SIZE == 4 ? new_hash->data_offset : 0);
@ -1249,7 +1277,6 @@ static void fix_debug_forw_hash(TCCState *s1, int global, int start);
/* put end of translation unit info */ /* put end of translation unit info */
ST_FUNC void tcc_debug_end(TCCState *s1) ST_FUNC void tcc_debug_end(TCCState *s1)
{ {
int i;
if (!s1->do_debug || debug_next_type == 0) if (!s1->do_debug || debug_next_type == 0)
return; return;
@ -1258,6 +1285,7 @@ ST_FUNC void tcc_debug_end(TCCState *s1)
tcc_debug_funcend(s1, 0); /* free stuff in case of errors */ tcc_debug_funcend(s1, 0); /* free stuff in case of errors */
if (s1->dwarf) { if (s1->dwarf) {
int i;
int start_aranges; int start_aranges;
unsigned char *ptr; unsigned char *ptr;
int text_size = text_section->data_offset; int text_size = text_section->data_offset;
@ -1365,18 +1393,8 @@ ST_FUNC void tcc_debug_end(TCCState *s1)
put_stabs_r(s1, NULL, N_SO, 0, 0, put_stabs_r(s1, NULL, N_SO, 0, 0,
text_section->data_offset, text_section, section_sym); text_section->data_offset, text_section, section_sym);
} }
for (i = 0; i < N_STR_HASH; i++) { free_str (dwarf_str);
while (dwarf_str[i]) { free_str (dwarf_line_str);
struct dwarf_str_hash *next = dwarf_str[i]->next;
tcc_free(dwarf_str[i]);
dwarf_str[i] = next;
}
while (dwarf_line_str[i]) {
struct dwarf_str_hash *next = dwarf_line_str[i]->next;
tcc_free(dwarf_line_str[i]);
dwarf_line_str[i] = next;
}
}
tcc_free (debug_forw_hash_global); tcc_free (debug_forw_hash_global);
tcc_free (debug_forw_hash_local); tcc_free (debug_forw_hash_local);
tcc_free(debug_hash_global); tcc_free(debug_hash_global);