mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-24 14:22:28 +00:00
Add C++ demangling to privileged runtime
Cosmo will now print C++ symbols correctly in --ftrace logs and backtraces. Doing this required reducing the memory requirement of the __demangle() function by 3x. This was accomplished using 16-bit indices and 16-bit malloc granularity. That puts a limit on the longest symbol we can successfully decode, which I think would be around 6553 characters long, given a 65536-byte buffer
This commit is contained in:
parent
dcd626edf8
commit
165c6b37e2
13 changed files with 727 additions and 284 deletions
|
@ -15,6 +15,7 @@ TEST_LIBCXX_DIRECTDEPS = \
|
|||
LIBC_CALLS \
|
||||
LIBC_INTRIN \
|
||||
LIBC_LOG \
|
||||
LIBC_MEM \
|
||||
LIBC_NEXGEN32E \
|
||||
LIBC_RUNTIME \
|
||||
LIBC_STDIO \
|
||||
|
@ -22,6 +23,8 @@ TEST_LIBCXX_DIRECTDEPS = \
|
|||
LIBC_THREAD \
|
||||
LIBC_TINYMATH \
|
||||
THIRD_PARTY_LIBCXX \
|
||||
THIRD_PARTY_LIBCXXABI \
|
||||
THIRD_PARTY_LIBUNWIND \
|
||||
THIRD_PARTY_OPENMP
|
||||
|
||||
TEST_LIBCXX_DEPS := \
|
||||
|
@ -39,7 +42,7 @@ o/$(MODE)/test/libcxx/%.dbg: \
|
|||
$(APE_NO_MODIFY_SELF)
|
||||
@$(APELINK)
|
||||
|
||||
$(TEST_LIBCXX_OBJS): private CCFLAGS += -fexceptions -frtti
|
||||
$(TEST_LIBCXX_OBJS): private OVERRIDE_CXXFLAGS += -fexceptions -frtti
|
||||
|
||||
o/$(MODE)/test/libcxx/openmp_test.o: private CXXFLAGS += -fopenmp
|
||||
o/$(MODE)/test/libcxx/openmp_test.runs: private QUOTA += -C100
|
||||
|
|
80
test/libcxx/cexception_test.cc
Normal file
80
test/libcxx/cexception_test.cc
Normal file
|
@ -0,0 +1,80 @@
|
|||
/*-*-mode:c++;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8-*-│
|
||||
│ vi: set et ft=c++ ts=2 sts=2 sw=2 fenc=utf-8 :vi │
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ Copyright 2024 Justine Alexandra Roberts Tunney │
|
||||
│ │
|
||||
│ Permission to use, copy, modify, and/or distribute this software for │
|
||||
│ any purpose with or without fee is hereby granted, provided that the │
|
||||
│ above copyright notice and this permission notice appear in all copies. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
|
||||
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
|
||||
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
|
||||
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
|
||||
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
|
||||
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
|
||||
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
|
||||
│ PERFORMANCE OF THIS SOFTWARE. │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/mem/alg.h"
|
||||
#include "libc/mem/mem.h"
|
||||
#include "libc/runtime/runtime.h"
|
||||
|
||||
// this dontthrow keyword SHOULD break this test. it's probably passing
|
||||
// because we're currently using SjLj exceptions. the day we can change
|
||||
// things, remove `dontthrow` and this test will still be a useful help
|
||||
extern "C" dontthrow void qsort_(void *, size_t, size_t,
|
||||
int (*)(const void *,
|
||||
const void *)) asm("qsort");
|
||||
|
||||
struct Resource {
|
||||
char *p;
|
||||
Resource() {
|
||||
p = new char;
|
||||
}
|
||||
~Resource() {
|
||||
delete p;
|
||||
}
|
||||
};
|
||||
|
||||
void Poke(char *p) {
|
||||
*p = 1;
|
||||
}
|
||||
void (*pPoke)(char *) = Poke;
|
||||
|
||||
void Throw(void) {
|
||||
throw 42;
|
||||
}
|
||||
void (*pThrow)(void) = Throw;
|
||||
|
||||
int cmp(const void *x, const void *y) {
|
||||
Resource r;
|
||||
pPoke(r.p);
|
||||
if (*r.p)
|
||||
pThrow();
|
||||
exit(5);
|
||||
}
|
||||
|
||||
int A[3] = {3, 2, 1};
|
||||
int Work(void) {
|
||||
Resource r;
|
||||
pPoke(r.p);
|
||||
qsort_(A, 3, sizeof(int), cmp);
|
||||
return A[0];
|
||||
}
|
||||
int (*pWork)(void) = Work;
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
try {
|
||||
Resource r;
|
||||
if (pWork() != 1)
|
||||
return 1;
|
||||
pPoke(r.p);
|
||||
if (r.p)
|
||||
return 2;
|
||||
} catch (int e) {
|
||||
if (e != 42)
|
||||
return 3;
|
||||
}
|
||||
CheckForMemoryLeaks();
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue