Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-01-18 12:38:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Debug Kit: Handle more than two TEXT/DATA segments.

Browse Source 
ELF files may have more than one, in which case we need to collect
the addresses and sizes from all of them. (runtime_loader already
does this when building image_info.)

Fixes #19021.

Change-Id: I379c4065976e9569a7bd7a538f46787ebcf6d3e8
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8819
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Augustin Cavalier 2025-01-10 17:18:10 -05:00 committed by waddlesplash
parent 4c73b06622
commit ad85518214
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/kits/debug/Image.cpp
View File

@ -306,25 +306,43 @@ ImageFile::_LoadFile(const char* path, addr_t* _textAddress, size_t* _textSize,
}
// find the text and data segment -- we need load address and size
*_textAddress = 0;
*_textSize = 0;
*_dataAddress = 0;
*_dataSize = 0;
// in case of multiple segments of the same type, combine them
addr_t textBase = 0;
addr_t textEnd = 0;
addr_t dataBase = 0;
addr_t dataEnd = 0;
for (int32 i = 0; i < programHeaderCount; i++) {
elf_phdr* header = (elf_phdr*)
((uint8*)programHeaders + i * elfHeader->e_phentsize);
if (header->p_type == PT_LOAD) {
if ((header->p_flags & PF_WRITE) == 0) {
*_textAddress = header->p_vaddr;
*_textSize = header->p_memsz;
if (header->p_type != PT_LOAD)
continue;
addr_t base = header->p_vaddr;
addr_t end = base + header->p_memsz;
if ((header->p_flags & PF_WRITE) == 0) {
if (textEnd == 0) {
textBase = base;
textEnd = end;
} else {
*_dataAddress = header->p_vaddr;
*_dataSize = header->p_memsz;
break;
textBase = min_c(textBase, base);
textEnd = max_c(textEnd, end);
}
} else {
if (dataEnd == 0) {
dataBase = base;
dataEnd = end;
} else {
dataBase = min_c(dataBase, base);
dataEnd = max_c(dataEnd, end);
}
}
}
*_textAddress = textBase;
*_textSize = textEnd - textBase;
*_dataAddress = dataBase;
*_dataSize = dataEnd - dataBase;
status_t error = _FindTableInSection(elfHeader, SHT_SYMTAB);
if (error != B_OK)
error = _FindTableInSection(elfHeader, SHT_DYNSYM);