mirror of
https://github.com/EnderIce2/Fennix.git
synced 2025-07-02 19:09:16 +00:00
fix(kernel/vfs): 🎉 a complete rewrite of the vfs
This is the fourth time re-writing the VFS, hope this will be the last. Tried to make it as modular as possible so this won't be necessary in the future. 🙏
This change required the entire kernel code to be modified.
This commit is contained in:
@ -21,7 +21,7 @@
|
||||
|
||||
namespace Execute
|
||||
{
|
||||
std::vector<Elf_Dyn> ELFGetDynamicTag(FileNode *fd, DynamicArrayTags Tag)
|
||||
std::vector<Elf_Dyn> ELFGetDynamicTag(Node &fd, DynamicArrayTags Tag)
|
||||
{
|
||||
std::vector<Elf_Dyn> ret;
|
||||
std::vector<Elf_Phdr> phdrs = ELFGetSymbolType(fd, PT_DYNAMIC);
|
||||
@ -37,7 +37,7 @@ namespace Execute
|
||||
Elf_Dyn dyn;
|
||||
for (size_t i = 0; i < phdr.p_filesz / sizeof(Elf_Dyn); i++)
|
||||
{
|
||||
fd->Read(&dyn, sizeof(Elf_Dyn), phdr.p_offset + (i * sizeof(Elf_Dyn)));
|
||||
fs->Read(fd, &dyn, sizeof(Elf_Dyn), phdr.p_offset + (i * sizeof(Elf_Dyn)));
|
||||
if (dyn.d_tag != Tag)
|
||||
continue;
|
||||
|
||||
|
@ -21,18 +21,18 @@
|
||||
|
||||
namespace Execute
|
||||
{
|
||||
std::vector<Elf_Shdr> ELFGetSections(FileNode *fd, const char *SectionName)
|
||||
std::vector<Elf_Shdr> ELFGetSections(Node fd, const char *SectionName)
|
||||
{
|
||||
std::vector<Elf_Shdr> ret;
|
||||
|
||||
Elf_Ehdr ehdr;
|
||||
fd->Read(&ehdr, sizeof(Elf_Ehdr), 0);
|
||||
fs->Read(fd, &ehdr, sizeof(Elf_Ehdr), 0);
|
||||
|
||||
std::unique_ptr<Elf_Shdr[]> sections(new Elf_Shdr[ehdr.e_shnum]);
|
||||
fd->Read(sections.get(), sizeof(Elf_Shdr) * ehdr.e_shnum, ehdr.e_shoff);
|
||||
fs->Read(fd, sections.get(), sizeof(Elf_Shdr) * ehdr.e_shnum, ehdr.e_shoff);
|
||||
|
||||
std::string sectionNames(sections[ehdr.e_shstrndx].sh_size, '\0');
|
||||
fd->Read(sectionNames.data(), sections[ehdr.e_shstrndx].sh_size, sections[ehdr.e_shstrndx].sh_offset);
|
||||
fs->Read(fd, sectionNames.data(), sections[ehdr.e_shstrndx].sh_size, sections[ehdr.e_shstrndx].sh_offset);
|
||||
|
||||
for (Elf_Half i = 0; i < ehdr.e_shnum; ++i)
|
||||
{
|
||||
|
@ -21,15 +21,15 @@
|
||||
|
||||
namespace Execute
|
||||
{
|
||||
std::vector<Elf_Phdr> ELFGetSymbolType(FileNode *fd, SegmentTypes Tag)
|
||||
std::vector<Elf_Phdr> ELFGetSymbolType(Node &fd, SegmentTypes Tag)
|
||||
{
|
||||
std::vector<Elf_Phdr> ret;
|
||||
|
||||
Elf_Ehdr ehdr;
|
||||
fd->Read(&ehdr, sizeof(Elf_Ehdr), 0);
|
||||
fs->Read(fd, &ehdr, sizeof(Elf_Ehdr), 0);
|
||||
|
||||
Elf_Phdr phdr;
|
||||
fd->Read(&phdr, sizeof(Elf_Phdr), ehdr.e_phoff);
|
||||
fs->Read(fd, &phdr, sizeof(Elf_Phdr), ehdr.e_phoff);
|
||||
|
||||
off_t off = ehdr.e_phoff;
|
||||
for (Elf_Half i = 0; i < ehdr.e_phnum; i++)
|
||||
@ -38,7 +38,7 @@ namespace Execute
|
||||
ret.push_back(phdr);
|
||||
|
||||
off += sizeof(Elf_Phdr);
|
||||
fd->Read(&phdr, sizeof(Elf_Phdr), off);
|
||||
fs->Read(fd, &phdr, sizeof(Elf_Phdr), off);
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
Reference in New Issue
Block a user