Browse Source

DynamicLoader: Implement self relocations for x86_64

Gunnar Beutner 4 years ago
parent
commit
d138424549
1 changed files with 6 additions and 4 deletions
  1. 6 4
      Userland/DynamicLoader/main.cpp

+ 6 - 4
Userland/DynamicLoader/main.cpp

@@ -49,11 +49,13 @@ static void perform_self_relocations(auxv_t* auxvp)
     auto dynamic_object = ELF::DynamicObject::create({}, (VirtualAddress(base_address)), (VirtualAddress(dynamic_section_addr)));
     auto dynamic_object = ELF::DynamicObject::create({}, (VirtualAddress(base_address)), (VirtualAddress(dynamic_section_addr)));
 
 
     dynamic_object->relocation_section().for_each_relocation([base_address](auto& reloc) {
     dynamic_object->relocation_section().for_each_relocation([base_address](auto& reloc) {
-        if (reloc.type() != R_386_RELATIVE)
-            return IterationDecision::Continue;
+#if ARCH(I386)
+        VERIFY(reloc.type() == R_386_RELATIVE);
+#else
+        VERIFY(reloc.type() == R_X86_64_RELATIVE);
+#endif
 
 
-        *(u32*)reloc.address().as_ptr() += base_address;
-        return IterationDecision::Continue;
+        *(FlatPtr*)reloc.address().as_ptr() += base_address;
     });
     });
 }
 }