RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 17:54:57 +00:00
Code Issues Activity Actions

LibELF: Simplify ELF load address calculations

Browse source 
These were unnecessarily complicated.
This commit is contained in:
Gunnar Beutner 2021-06-30 19:42:40 +02:00 • committed by Andreas Kling
parent 2dbd3f83c1
commit 1f93ffcd72
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibELF/DynamicLoader.cpp
View file

@ -321,10 +321,9 @@ void DynamicLoader::load_program_headers()
for (auto& text_region : text_regions) { for (auto& text_region : text_regions) {
FlatPtr ph_text_base = text_region.desired_load_address().page_base().get(); FlatPtr ph_text_base = text_region.desired_load_address().page_base().get();
FlatPtr ph_text_end = ph_text_base + round_up_to_power_of_two(text_region.size_in_memory() + (size_t)(text_region.desired_load_address().as_ptr() - ph_text_base), PAGE_SIZE); FlatPtr ph_text_end = ph_text_base + round_up_to_power_of_two(text_region.size_in_memory() + (size_t)(text_region.desired_load_address().as_ptr() - ph_text_base), PAGE_SIZE);
size_t text_segment_size = ph_text_end - ph_text_base;
auto text_segment_offset = ph_text_base - ph_load_base; auto* text_segment_address = (u8*)reservation + ph_text_base;
auto* text_segment_address = (u8*)reservation + text_segment_offset; size_t text_segment_size = ph_text_end - ph_text_base;
// Now we can map the text segment at the reserved address. // Now we can map the text segment at the reserved address.
auto* text_segment_begin = (u8*)mmap_with_name( auto* text_segment_begin = (u8*)mmap_with_name(
@ -359,10 +358,9 @@ void DynamicLoader::load_program_headers()
for (auto& data_region : data_regions) { for (auto& data_region : data_regions) {
FlatPtr ph_data_base = data_region.desired_load_address().page_base().get(); FlatPtr ph_data_base = data_region.desired_load_address().page_base().get();
FlatPtr ph_data_end = ph_data_base + round_up_to_power_of_two(data_region.size_in_memory() + (size_t)(data_region.desired_load_address().as_ptr() - ph_data_base), PAGE_SIZE); FlatPtr ph_data_end = ph_data_base + round_up_to_power_of_two(data_region.size_in_memory() + (size_t)(data_region.desired_load_address().as_ptr() - ph_data_base), PAGE_SIZE);
size_t data_segment_size = ph_data_end - ph_data_base;
auto data_segment_offset = ph_data_base - ph_load_base; auto* data_segment_address = (u8*)reservation + ph_data_base;
auto* data_segment_address = (u8*)reservation + data_segment_offset; size_t data_segment_size = ph_data_end - ph_data_base;
// Finally, we make an anonymous mapping for the data segment. Contents are then copied from the file. // Finally, we make an anonymous mapping for the data segment. Contents are then copied from the file.
auto* data_segment = (u8*)mmap_with_name( auto* data_segment = (u8*)mmap_with_name(