mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-27 23:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Document __demangle() and fix a const func ptr bug

Browse source
This commit is contained in:
Justine Tunney 2024-06-02 04:15:48 -07:00
parent c67faf61df
commit 9aa353d88b
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
7 changed files with 618 additions and 670 deletions
Download patch file Download diff file Expand all files Collapse all files

1156
libc/intrin/demangle.c
View file

File diff suppressed because it is too large Load diff

3
libc/intrin/kprintf.greg.c
View file

@ -810,7 +810,8 @@ privileged static size_t kformat(char *b, size_t n, const char *fmt,
/* *p++ = '&'; */
s = (*_weaken(__symtab))->name_base +
(*_weaken(__symtab))->names[idx];
if (__is_mangled(s) && __demangle(cxxbuf, s, sizeof(cxxbuf)) != -1)
if (_weaken(__is_mangled) && _weaken(__is_mangled)(s) &&
_weaken(__demangle)(cxxbuf, s, sizeof(cxxbuf)) != -1)
s = cxxbuf;
goto FormatString;
}

5
libc/log/backtrace3.c
View file

@ -90,8 +90,9 @@ dontinstrument dontasan int PrintBacktraceUsingSymbols(
symbol = 0;
addend = 0;
}
if ((name = __get_symbol_name(st, symbol)) && __is_mangled(name)) {
__demangle(cxxbuf, name, sizeof(cxxbuf));
if ((name = __get_symbol_name(st, symbol)) &&
(_weaken(__is_mangled) && _weaken(__is_mangled)(name))) {
_weaken(__demangle)(cxxbuf, name, sizeof(cxxbuf));
kprintf("%012lx %lx %s%+d\n", frame, addr, cxxbuf, addend);
name = cxxbuf;
} else {