Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-07-11 15:29:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added stub interpreter support

Browse Source
This commit is contained in:
Alex
2023-02-10 16:31:33 +02:00
parent 5bbef13d6a
commit a99a2ef34b
3 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Execute/Elf/Exec.cpp
View File

@ -81,8 +81,6 @@ namespace Execute
}
}
Vector<char *> NeededLibraries;
if (!DynamicString)
DynamicString = StringTable;
@ -137,10 +135,9 @@ namespace Execute
break;
}
char *ReqLib = (char *)kmalloc(256);
strcpy(ReqLib, (char *)((uintptr_t)ElfFile + DynamicString->sh_offset + Dynamic[i].d_un.d_ptr));
debug("DT_NEEDED - Name[%ld]: %s", i, ReqLib);
NeededLibraries.push_back(ReqLib);
String ReqLib = (char *)((uintptr_t)ElfFile + DynamicString->sh_offset + Dynamic[i].d_un.d_val);
debug("DT_NEEDED - Name[%ld]: %s", i, ReqLib.c_str());
ELFBase.NeededLibraries.push_back(ReqLib);
}
else if (Dynamic[i].d_tag == DT_NULL)
break;
@ -179,7 +176,11 @@ namespace Execute
}
}
EntryPoint = LoadELFInterpreter(ELFBase.TmpMem, pV, InterpreterPath);
if (strlen(InterpreterPath) > 1)
{
EntryPoint = LoadELFInterpreter(ELFBase.TmpMem, pV, InterpreterPath);
ELFBase.Interpreter = true;
}
debug("Entry Point: %#lx", EntryPoint);
@ -197,9 +198,7 @@ namespace Execute
ELFBase.auxv.push_back({.archaux = {.a_type = AT_PHDR, .a_un = {.a_val = (uint64_t)ELFHeader->e_phoff}}});
ELFBase.InstructionPointer = EntryPoint;
foreach (auto var in NeededLibraries)
kfree(var);
ELFBase.MemoryImage = MemoryImage;
ELFBase.Success = true;
return ELFBase;