RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 16:07:45 +00:00
Code Issues Activity Actions

Userland: Use /proc/kernel_base to determine the kernel base address

Browse source 
This removes all the hard-coded kernel base addresses from userspace
tools.

One downside for this is that e.g. Profiler no longer uses a different
color for kernel symbols when run as a non-root user.
This commit is contained in:
Gunnar Beutner 2021-07-22 18:41:52 +02:00 • committed by Andreas Kling
parent 6115258a5c
commit 60d6137e73
9 changed files with 63 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Utilities/bt.cpp
View file

@ -9,6 +9,7 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/DirIterator.h>
#include <LibCore/EventLoop.h>
#include <LibCore/File.h>
#include <LibSymbolication/Symbolication.h>
#include <unistd.h>
@ -44,13 +45,8 @@ int main(int argc, char** argv)
auto frame_number = symbols.size() - 1;
for (auto& symbol : symbols) {
// Make kernel stack frames stand out.
// FIXME: Use /proc for this
#if ARCH(I386)
FlatPtr kernel_base = 0xc0000000;
#else
FlatPtr kernel_base = 0x2000000000;
#endif
int color = symbol.address < kernel_base ? 35 : 31;
auto maybe_kernel_base = Symbolication::kernel_base();
int color = maybe_kernel_base.has_value() && symbol.address < maybe_kernel_base.value() ? 35 : 31;
out("{:3}: \033[{};1m{:p}\033[0m | ", frame_number, color, symbol.address);
if (!symbol.name.is_empty())
out("{} ", symbol.name);