mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 19:07:34 +00:00
Userland: Hardcode the x86_64 kernel base address for now
This commit is contained in:
parent
4fdee56ba3
commit
60b52cfb02
6 changed files with 43 additions and 6 deletions
|
@ -40,7 +40,13 @@ DisassemblyModel::DisassemblyModel(Profile& profile, ProfileNode& node)
|
|||
OwnPtr<ELF::Image> kernel_elf;
|
||||
const ELF::Image* elf;
|
||||
FlatPtr base_address = 0;
|
||||
if (m_node.address() >= 0xc0000000) {
|
||||
// FIXME: Use /proc for this
|
||||
#if ARCH(I386)
|
||||
FlatPtr kernel_base = 0xc0000000;
|
||||
#else
|
||||
FlatPtr kernel_base = 0x2000000000;
|
||||
#endif
|
||||
if (m_node.address() >= kernel_base) {
|
||||
if (!m_kernel_file) {
|
||||
auto file_or_error = MappedFile::map("/boot/Kernel.debug");
|
||||
if (file_or_error.is_error())
|
||||
|
|
|
@ -301,6 +301,13 @@ Result<NonnullOwnPtr<Profile>, String> Profile::load_from_perfcore_file(const St
|
|||
continue;
|
||||
}
|
||||
|
||||
// FIXME: Use /proc for this
|
||||
#if ARCH(I386)
|
||||
FlatPtr kernel_base = 0xc0000000;
|
||||
#else
|
||||
FlatPtr kernel_base = 0x2000000000;
|
||||
#endif
|
||||
|
||||
auto* stack = perf_event.get_ptr("stack");
|
||||
VERIFY(stack);
|
||||
auto& stack_array = stack->as_array();
|
||||
|
@ -311,7 +318,7 @@ Result<NonnullOwnPtr<Profile>, String> Profile::load_from_perfcore_file(const St
|
|||
FlyString object_name;
|
||||
String symbol;
|
||||
|
||||
if (ptr >= 0xc0000000) {
|
||||
if (ptr >= kernel_base) {
|
||||
if (kernel_elf) {
|
||||
symbol = kernel_elf->symbolicate(ptr, &offset);
|
||||
} else {
|
||||
|
@ -338,7 +345,7 @@ Result<NonnullOwnPtr<Profile>, String> Profile::load_from_perfcore_file(const St
|
|||
continue;
|
||||
|
||||
FlatPtr innermost_frame_address = event.frames.at(1).address;
|
||||
event.in_kernel = innermost_frame_address >= 0xc0000000;
|
||||
event.in_kernel = innermost_frame_address >= kernel_base;
|
||||
|
||||
events.append(move(event));
|
||||
}
|
||||
|
|
|
@ -105,7 +105,13 @@ GUI::Variant ProfileModel::data(const GUI::ModelIndex& index, GUI::ModelRole rol
|
|||
if (node->is_root()) {
|
||||
return GUI::FileIconProvider::icon_for_executable(node->process().executable);
|
||||
}
|
||||
if (node->address() >= 0xc0000000)
|
||||
// FIXME: Use /proc for this
|
||||
#if ARCH(I386)
|
||||
FlatPtr kernel_base = 0xc0000000;
|
||||
#else
|
||||
FlatPtr kernel_base = 0x2000000000;
|
||||
#endif
|
||||
if (node->address() >= kernel_base)
|
||||
return m_kernel_frame_icon;
|
||||
return m_user_frame_icon;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue