RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:07:34 +00:00
Code Issues Activity Actions

Userland: Hardcode the x86_64 kernel base address for now

Browse source
This commit is contained in:
Gunnar Beutner 2021-07-20 13:40:35 +02:00 • committed by Andreas Kling
parent 4fdee56ba3
commit 60b52cfb02
6 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/DevTools/HackStudio/Debugger/DisassemblyModel.cpp
View file

@ -30,7 +30,14 @@ DisassemblyModel::DisassemblyModel(const Debug::DebugSession& debug_session, con
OwnPtr<ELF::Image> kernel_elf; OwnPtr<ELF::Image> kernel_elf;
const ELF::Image* elf = nullptr; const ELF::Image* elf = nullptr;
if (containing_function.value().address_low >= 0xc0000000) { // FIXME: Use /proc for this
#if ARCH(I386)
FlatPtr kernel_base = 0xc0000000;
#else
FlatPtr kernel_base = 0x2000000000;
#endif
if (containing_function.value().address_low >= kernel_base) {
auto file_or_error = MappedFile::map("/boot/Kernel.debug"); auto file_or_error = MappedFile::map("/boot/Kernel.debug");
if (file_or_error.is_error()) if (file_or_error.is_error())
return; return;

8
Userland/DevTools/Profiler/DisassemblyModel.cpp
View file

@ -40,7 +40,13 @@ DisassemblyModel::DisassemblyModel(Profile& profile, ProfileNode& node)
OwnPtr<ELF::Image> kernel_elf; OwnPtr<ELF::Image> kernel_elf;
const ELF::Image* elf; const ELF::Image* elf;
FlatPtr base_address = 0; 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) { if (!m_kernel_file) {
auto file_or_error = MappedFile::map("/boot/Kernel.debug"); auto file_or_error = MappedFile::map("/boot/Kernel.debug");
if (file_or_error.is_error()) if (file_or_error.is_error())

11
Userland/DevTools/Profiler/Profile.cpp
View file

@ -301,6 +301,13 @@ Result<NonnullOwnPtr<Profile>, String> Profile::load_from_perfcore_file(const St
continue; 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"); auto* stack = perf_event.get_ptr("stack");
VERIFY(stack); VERIFY(stack);
auto& stack_array = stack->as_array(); auto& stack_array = stack->as_array();
@ -311,7 +318,7 @@ Result<NonnullOwnPtr<Profile>, String> Profile::load_from_perfcore_file(const St
FlyString object_name; FlyString object_name;
String symbol; String symbol;
if (ptr >= 0xc0000000) { if (ptr >= kernel_base) {
if (kernel_elf) { if (kernel_elf) {
symbol = kernel_elf->symbolicate(ptr, &offset); symbol = kernel_elf->symbolicate(ptr, &offset);
} else { } else {
@ -338,7 +345,7 @@ Result<NonnullOwnPtr<Profile>, String> Profile::load_from_perfcore_file(const St
continue; continue;
FlatPtr innermost_frame_address = event.frames.at(1).address; 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)); events.append(move(event));
} }

8
Userland/DevTools/Profiler/ProfileModel.cpp
View file

@ -105,7 +105,13 @@ GUI::Variant ProfileModel::data(const GUI::ModelIndex& index, GUI::ModelRole rol
if (node->is_root()) { if (node->is_root()) {
return GUI::FileIconProvider::icon_for_executable(node->process().executable); 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_kernel_frame_icon;
return m_user_frame_icon; return m_user_frame_icon;
} }

5
Userland/Libraries/LibSymbolication/Symbolication.cpp
View file

@ -82,7 +82,12 @@ Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid)
Vector<RegionWithSymbols> regions; Vector<RegionWithSymbols> regions;
regions.append(RegionWithSymbols { regions.append(RegionWithSymbols {
// FIXME: Use /proc for this
#if ARCH(I386)
.base = 0xc0000000, .base = 0xc0000000,
#else
.base = 0x2000000000,
#endif
.size = 0x3fffffff, .size = 0x3fffffff,
.path = "/boot/Kernel.debug", .path = "/boot/Kernel.debug",
.is_relative = false }); .is_relative = false });

8
Userland/Utilities/bt.cpp
View file

@ -44,7 +44,13 @@ int main(int argc, char** argv)
auto frame_number = symbols.size() - 1; auto frame_number = symbols.size() - 1;
for (auto& symbol : symbols) { for (auto& symbol : symbols) {
// Make kernel stack frames stand out. // Make kernel stack frames stand out.
int color = symbol.address < 0xc0000000 ? 35 : 31; // 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;
out("{:3}: \033[{};1m{:p}\033[0m | ", frame_number, color, symbol.address); out("{:3}: \033[{};1m{:p}\033[0m | ", frame_number, color, symbol.address);
if (!symbol.name.is_empty()) if (!symbol.name.is_empty())
out("{} ", symbol.name); out("{} ", symbol.name);