Fennix/Userspace
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Userspace.git synced 2025-05-25 22:14:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup code

Browse Source
This commit is contained in:
Alex 2023-05-04 05:00:47 +03:00
parent 4953000370
commit f4ca629a8f
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libc/ElfInterpreter/ld.c
View File

@ -141,6 +141,16 @@ void PrintNL__(char *String)
#define Print(x) Print__(x)
#define PrintNL(x) PrintNL__(x)
#if (0)
#define PrintDbg(x) Print__(x)
#define PrintDbgNL(x) PrintNL__(x)
#define ltoaDbg(x, y, z) ltoa(x, y, z)
#else
#define PrintDbg(x)
#define PrintDbgNL(x)
#define ltoaDbg(x, y, z)
#endif
void *memcpy(void *dest, const void *src, size_t n)
{
uint8_t *d = dest;
@ -249,16 +259,16 @@ void (*ELF_LAZY_RESOLVE_MAIN(struct LibAddressCollection *Info, long RelIndex))(
if (Info)
{
struct LibAddressCollection *CurLib = Info;
// PrintNL("_______");
PrintDbgNL("_______");
// The last entry is the null entry (Valid == false) which determines the end of the list.
while (CurLib->Valid)
{
// Print("-- ");
// Print(CurLib->Name);
// Print(" ");
// ltoa(RelIndex, DbgBuff, 10);
// Print(DbgBuff);
// PrintNL(" --");
PrintDbg("-- ");
PrintDbg(CurLib->Name);
PrintDbg(" ");
ltoaDbg(RelIndex, DbgBuff, 10);
PrintDbg(DbgBuff);
PrintDbgNL(" --");
uintptr_t lib_BaseAddress = __UINTPTR_MAX__;
uintptr_t app_BaseAddress = __UINTPTR_MAX__;
@ -338,10 +348,10 @@ void (*ELF_LAZY_RESOLVE_MAIN(struct LibAddressCollection *Info, long RelIndex))(
{
case R_X86_64_NONE:
{
// PrintNL("R_X86_64_NONE");
PrintDbgNL("R_X86_64_NONE");
if (*GOTEntry == 0)
{
// PrintNL("GOTEntry is 0");
PrintDbgNL("GOTEntry is 0");
break;
}
Lock = 0;
@ -349,34 +359,34 @@ void (*ELF_LAZY_RESOLVE_MAIN(struct LibAddressCollection *Info, long RelIndex))(
}
case R_X86_64_JUMP_SLOT:
{
// PrintNL("R_X86_64_JUMP_SLOT");
PrintDbgNL("R_X86_64_JUMP_SLOT");
int SymIndex = ELF64_R_SYM(Rel->r_info);
Elf64_Sym *Sym = _app_SymTab + SymIndex;
if (Sym->st_name)
{
char *SymName = app_DynStr + Sym->st_name;
// Print("SymName: ");
// PrintNL(SymName);
PrintDbg("SymName: ");
PrintDbgNL(SymName);
Elf64_Sym *LibSym = ELFLookupSymbol((Elf64_Ehdr *)CurLib->ElfFile, SymName);
// Print("LibSym: 0x");
// ltoa((long)LibSym, DbgBuff, 16);
// PrintNL(DbgBuff);
PrintDbg("LibSym: 0x");
ltoaDbg((long)LibSym, DbgBuff, 16);
PrintDbgNL(DbgBuff);
if (LibSym)
{
*GOTEntry = (Elf64_Addr)(CurLib->MemoryImage + LibSym->st_value);
// ltoa(*GOTEntry, DbgBuff, 16);
// Print("*GOTEntry: 0x");
// PrintNL(DbgBuff);
ltoa(*GOTEntry, DbgBuff, 16);
PrintDbg("*GOTEntry: 0x");
PrintDbgNL(DbgBuff);
Lock = 0;
return (void (*)()) * GOTEntry;
}
// PrintNL("Not found in lib");
PrintDbgNL("Not found in lib");
}
break;
}
@ -390,7 +400,7 @@ void (*ELF_LAZY_RESOLVE_MAIN(struct LibAddressCollection *Info, long RelIndex))(
}
RetryNextLib:
// PrintNL("Retrying next lib");
PrintDbgNL("Retrying next lib");
CurLib = CurLib->Next;
}
}

2
libc/src/InitArray.c
View File

@ -9,8 +9,6 @@ typedef void (*fct)(void);
extern fct __init_array_start[0], __init_array_end[0];
extern fct __fini_array_start[0], __fini_array_end[0];
// TODO: This is not working properly
void __libc_init_array(void)
{
for (fct *func = __init_array_start; func != __init_array_end; func++)

1
libc/src/Makefile
View File

@ -33,6 +33,7 @@ build: $(OBJECT_NAME)
$(OBJECT_NAME): $(OBJ)
$(info Linking $@)
# $(CC) -nostdlib -shared -fPIC -fPIE -Wl,-soname,libc.so $(OBJ) -o $(OUTPUT_DIR)$@
$(AR) rcs $(OUTPUT_DIR)$@ $(OBJ)
%.o: %.c