Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-30 00:08:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Send ElfFile too

Browse Source
This commit is contained in:
Alex 2023-03-20 06:56:09 +02:00
parent 45cd4bb13c
commit aaa458f407
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Execute/Elf/BaseLoad.cpp
View File

@ -25,12 +25,13 @@ namespace Execute
typedef struct typedef struct
{ {
char Path[256]; char Path[256];
void *ElfFile;
void *MemoryImage; void *MemoryImage;
struct InterpreterIPCDataLibrary Libraries[64]; struct InterpreterIPCDataLibrary Libraries[64];
} InterpreterIPCData; } InterpreterIPCData;
/* Passing arguments as a sanity check and debugging. */ /* Passing arguments as a sanity check and debugging. */
void ELFInterpreterIPCThread(PCB *Process, char *Path, void *MemoryImage, Vector<String> NeededLibraries) void ELFInterpreterIPCThread(PCB *Process, char *Path, void *MemoryImage, void *ElfFile, Vector<String> NeededLibraries)
{ {
debug("Interpreter thread started for %s", Path); debug("Interpreter thread started for %s", Path);
// Interpreter will create an IPC with token "LOAD". // Interpreter will create an IPC with token "LOAD".
@ -49,6 +50,7 @@ namespace Execute
debug("IPC found, sending data..."); debug("IPC found, sending data...");
InterpreterIPCData *TmpBuffer = new InterpreterIPCData; InterpreterIPCData *TmpBuffer = new InterpreterIPCData;
strcpy(TmpBuffer->Path, Path); strcpy(TmpBuffer->Path, Path);
TmpBuffer->ElfFile = ElfFile;
TmpBuffer->MemoryImage = MemoryImage; TmpBuffer->MemoryImage = MemoryImage;
if (NeededLibraries.size() > 256) if (NeededLibraries.size() > 256)
warn("Too many libraries! (max 256)"); warn("Too many libraries! (max 256)");
@ -58,7 +60,17 @@ namespace Execute
} }
#ifdef DEBUG #ifdef DEBUG
debug("OUTSIDE DATA");
debug("Path: %s", Path);
debug("ElfFile: %p", ElfFile);
debug("MemoryImage: %p", MemoryImage);
for (size_t i = 0; i < NeededLibraries.size(); i++)
{
debug("Library: %s", NeededLibraries[i].c_str());
}
debug("INSIDE DATA");
debug("Path: %s", TmpBuffer->Path); debug("Path: %s", TmpBuffer->Path);
debug("ElfFile: %p", TmpBuffer->ElfFile);
debug("MemoryImage: %p", TmpBuffer->MemoryImage); debug("MemoryImage: %p", TmpBuffer->MemoryImage);
for (size_t i = 0; i < NeededLibraries.size(); i++) for (size_t i = 0; i < NeededLibraries.size(); i++)
{ {
@ -83,10 +95,11 @@ namespace Execute
PCB *InterpreterTargetProcess; PCB *InterpreterTargetProcess;
String *InterpreterTargetPath; /* We can't have String as a constructor :( */ String *InterpreterTargetPath; /* We can't have String as a constructor :( */
void *InterpreterMemoryImage; void *InterpreterMemoryImage;
void *InterpreterElfFile;
Vector<String> InterpreterNeededLibraries; Vector<String> InterpreterNeededLibraries;
void ELFInterpreterThreadWrapper() void ELFInterpreterThreadWrapper()
{ {
ELFInterpreterIPCThread(InterpreterTargetProcess, (char *)InterpreterTargetPath->c_str(), InterpreterMemoryImage, InterpreterNeededLibraries); ELFInterpreterIPCThread(InterpreterTargetProcess, (char *)InterpreterTargetPath->c_str(), InterpreterMemoryImage, InterpreterElfFile, InterpreterNeededLibraries);
delete InterpreterTargetPath, InterpreterTargetPath = nullptr; delete InterpreterTargetPath, InterpreterTargetPath = nullptr;
return; return;
} }
@ -214,9 +227,12 @@ namespace Execute
if (bl.Interpreter) if (bl.Interpreter)
{ {
debug("ElfFile: %p ELFHeader: %p", ElfFile, ELFHeader);
InterpreterTargetProcess = Process; InterpreterTargetProcess = Process;
InterpreterTargetPath = new String(Path); /* We store in a String because Path may get changed while outside ELFLoad(). */ InterpreterTargetPath = new String(Path); /* We store in a String because Path may get changed while outside ELFLoad(). */
InterpreterMemoryImage = bl.VirtualMemoryImage; InterpreterMemoryImage = bl.VirtualMemoryImage;
InterpreterElfFile = ElfFile;
InterpreterNeededLibraries = bl.NeededLibraries; InterpreterNeededLibraries = bl.NeededLibraries;
__sync; __sync;
TCB *InterpreterIPCThread = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (IP)ELFInterpreterThreadWrapper); TCB *InterpreterIPCThread = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (IP)ELFInterpreterThreadWrapper);