RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:28:11 +00:00
Code Issues Activity Actions

Kernel: Demangle kernel C++ symbols correctly again

Browse source 
I broke this while implementing module linking. Also move the actual
demangling work to AK, in AK::demangle(const char*)
This commit is contained in:
Andreas Kling 2019-11-29 14:55:07 +01:00
parent 422e5166f2
commit f75a6b9daa
4 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/KSyms.cpp
View file

@ -1,3 +1,4 @@
#include <AK/Demangle.h>
#include <AK/TemporaryChange.h>
#include <Kernel/FileSystem/FileDescription.h>
#include <Kernel/KSyms.h>
@ -115,11 +116,6 @@ static void load_ksyms_from_data(const ByteBuffer& buffer)
return;
}
ASSERT(recognized_symbol_count <= max_recognized_symbol_count);
size_t bytes_needed = 0;
for (int i = 0; i < recognized_symbol_count; ++i) {
auto& symbol = recognized_symbols[i];
bytes_needed += (symbol.ksym ? strlen(symbol.ksym->name) : 0) + 8 + 16;
}
for (int i = 0; i < recognized_symbol_count; ++i) {
auto& symbol = recognized_symbols[i];
if (!symbol.address)
@ -136,7 +132,7 @@ static void load_ksyms_from_data(const ByteBuffer& buffer)
if (symbol.ksym->address == ksym_highest_address && offset > 4096)
dbgprintf("%p\n", symbol.address);
else
dbgprintf("%p %s +%u\n", symbol.address, symbol.ksym->name, offset);
dbgprintf("%p %s +%u\n", symbol.address, demangle(symbol.ksym->name).characters(), offset);
}
}