RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 21:08:12 +00:00
Code Issues Activity Actions

LibELF: Remove (FlatPtr)something.as_ptr() idiom

Browse source 
This is equivalent to `something.get()`, but more verbose.
This commit is contained in:
Daniel Bertalan 2021-08-09 22:50:51 +02:00 • committed by Gunnar Beutner
parent e0e3198d51
commit 18b2484985
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -468,9 +468,9 @@ DynamicLoader::RelocationResult DynamicLoader::do_relocation(const ELF::DynamicO
// We could explicitly do them first using m_number_of_relocations from DT_RELCOUNT
// However, our compiler is nice enough to put them at the front of the relocations for us :)
if (relocation.addend_used())
*patch_ptr = (FlatPtr)m_dynamic_object->base_address().as_ptr() + relocation.addend();
*patch_ptr = m_dynamic_object->base_address().offset(relocation.addend()).get();
else
*patch_ptr += (FlatPtr)m_dynamic_object->base_address().as_ptr();
*patch_ptr += m_dynamic_object->base_address().get();
break;
}
#if ARCH(I386)
@ -508,10 +508,10 @@ DynamicLoader::RelocationResult DynamicLoader::do_relocation(const ELF::DynamicO
// The patch method returns the address for the LAZY fixup path, but we don't need it here
m_dynamic_object->patch_plt_entry(relocation.offset_in_section());
} else {
u8* relocation_address = relocation.address().as_ptr();
auto relocation_address = (FlatPtr*)relocation.address().as_ptr();
if (m_elf_image.is_dynamic())
*(FlatPtr*)relocation_address += (FlatPtr)m_dynamic_object->base_address().as_ptr();
*relocation_address += m_dynamic_object->base_address().get();
}
break;
}