enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-06-06 19:57:58 +00:00
Code Issues Actions Releases Wiki Activity

Renamed "Tracker" to "MemMgr" because it could be used for shared memory and more useful features

Browse Source
This commit is contained in:
Alex 2022-12-24 01:51:55 +02:00
parent 48ef694d08
commit a9dacd1d21
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
8 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Core/Driver/DriverLoading/BindInput.cpp
View File

@ -18,8 +18,8 @@ namespace Driver
{ {
UNUSED(DrvExtHdr); UNUSED(DrvExtHdr);
UNUSED(IsElf); UNUSED(IsElf);
Memory::Tracker *Tracker = new Memory::Tracker; Memory::MemMgr *MemMgr = new Memory::MemMgr;
Fex *fex = (Fex *)Tracker->RequestPages(TO_PAGES(Size)); Fex *fex = (Fex *)MemMgr->RequestPages(TO_PAGES(Size));
memcpy(fex, (void *)DriverAddress, Size); memcpy(fex, (void *)DriverAddress, Size);
FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS); FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS);
debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size); debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size);
@ -30,16 +30,16 @@ namespace Driver
result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]); result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]);
kfree(result); kfree(result);
#endif #endif
KernelAPI *KAPI = (KernelAPI *)Tracker->RequestPages(TO_PAGES(sizeof(KernelAPI))); KernelAPI *KAPI = (KernelAPI *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelAPI)));
if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK) if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK)
{ {
delete Tracker; delete MemMgr;
return DriverCode::DRIVER_RETURNED_ERROR; return DriverCode::DRIVER_RETURNED_ERROR;
} }
debug("Starting driver %s (offset: %#lx)", fexExtended->Driver.Name, fex); debug("Starting driver %s (offset: %#lx)", fexExtended->Driver.Name, fex);
KernelCallback *KCallback = (KernelCallback *)Tracker->RequestPages(TO_PAGES(sizeof(KernelCallback))); KernelCallback *KCallback = (KernelCallback *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelCallback)));
switch (fexExtended->Driver.Type) switch (fexExtended->Driver.Type)
{ {
@ -52,13 +52,13 @@ namespace Driver
int CallbackRet = ((int (*)(KernelCallback *))((uintptr_t)fexExtended->Driver.Callback + (uintptr_t)fex))(KCallback); int CallbackRet = ((int (*)(KernelCallback *))((uintptr_t)fexExtended->Driver.Callback + (uintptr_t)fex))(KCallback);
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{ {
delete Tracker; delete MemMgr;
error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name); error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name);
break; break;
} }
else if (CallbackRet != DriverReturnCode::OK) else if (CallbackRet != DriverReturnCode::OK)
{ {
delete Tracker; delete MemMgr;
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
break; break;
} }
@ -68,7 +68,7 @@ namespace Driver
DriverFile *DrvFile = new DriverFile; DriverFile *DrvFile = new DriverFile;
DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->DriverUID = this->DriverUIDs - 1;
DrvFile->Address = (void *)fex; DrvFile->Address = (void *)fex;
DrvFile->MemTrk = Tracker; DrvFile->MemTrk = MemMgr;
DrvFile->InterruptHook[0] = nullptr; DrvFile->InterruptHook[0] = nullptr;
Drivers.push_back(DrvFile); Drivers.push_back(DrvFile);
break; break;
@ -76,7 +76,7 @@ namespace Driver
default: default:
{ {
warn("Unknown driver type: %d", fexExtended->Driver.Type); warn("Unknown driver type: %d", fexExtended->Driver.Type);
delete Tracker; delete MemMgr;
break; break;
} }
} }

36
Core/Driver/DriverLoading/BindInterrupt.cpp
View File

@ -17,8 +17,8 @@ namespace Driver
DriverCode Driver::DriverLoadBindInterrupt(void *DrvExtHdr, uintptr_t DriverAddress, size_t Size, bool IsElf) DriverCode Driver::DriverLoadBindInterrupt(void *DrvExtHdr, uintptr_t DriverAddress, size_t Size, bool IsElf)
{ {
UNUSED(IsElf); UNUSED(IsElf);
Memory::Tracker *Tracker = new Memory::Tracker; Memory::MemMgr *MemMgr = new Memory::MemMgr;
Fex *fex = (Fex *)Tracker->RequestPages(TO_PAGES(Size)); Fex *fex = (Fex *)MemMgr->RequestPages(TO_PAGES(Size));
memcpy(fex, (void *)DriverAddress, Size); memcpy(fex, (void *)DriverAddress, Size);
FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS); FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS);
debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size); debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size);
@ -29,16 +29,16 @@ namespace Driver
result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]); result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]);
kfree(result); kfree(result);
#endif #endif
KernelAPI *KAPI = (KernelAPI *)Tracker->RequestPages(TO_PAGES(sizeof(KernelAPI))); KernelAPI *KAPI = (KernelAPI *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelAPI)));
if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK) if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK)
{ {
delete Tracker; delete MemMgr;
return DriverCode::DRIVER_RETURNED_ERROR; return DriverCode::DRIVER_RETURNED_ERROR;
} }
debug("Starting driver %s (offset: %#lx)", fexExtended->Driver.Name, fex); debug("Starting driver %s (offset: %#lx)", fexExtended->Driver.Name, fex);
KernelCallback *KCallback = (KernelCallback *)Tracker->RequestPages(TO_PAGES(sizeof(KernelCallback))); KernelCallback *KCallback = (KernelCallback *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelCallback)));
switch (fexExtended->Driver.Type) switch (fexExtended->Driver.Type)
{ {
@ -48,20 +48,20 @@ namespace Driver
DriverFile *DrvFile = new DriverFile; DriverFile *DrvFile = new DriverFile;
DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->DriverUID = this->DriverUIDs - 1;
DrvFile->Address = (void *)fex; DrvFile->Address = (void *)fex;
DrvFile->MemTrk = Tracker; DrvFile->MemTrk = MemMgr;
Drivers.push_back(DrvFile); Drivers.push_back(DrvFile);
break; break;
} }
case FexDriverType::FexDriverType_Display: case FexDriverType::FexDriverType_Display:
{ {
fixme("Display driver: %s", fexExtended->Driver.Name); fixme("Display driver: %s", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
case FexDriverType::FexDriverType_Network: case FexDriverType::FexDriverType_Network:
{ {
fixme("Network driver: %s", fexExtended->Driver.Name); fixme("Network driver: %s", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
case FexDriverType::FexDriverType_Storage: case FexDriverType::FexDriverType_Storage:
@ -75,7 +75,7 @@ namespace Driver
} }
fixme("Not implemented"); fixme("Not implemented");
delete Tracker; delete MemMgr;
break; break;
KCallback->RawPtr = nullptr; KCallback->RawPtr = nullptr;
@ -84,27 +84,27 @@ namespace Driver
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{ {
error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name); error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
else if (CallbackRet != DriverReturnCode::OK) else if (CallbackRet != DriverReturnCode::OK)
{ {
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete Tracker; delete MemMgr;
break; break;
} }
DriverFile *DrvFile = new DriverFile; DriverFile *DrvFile = new DriverFile;
DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->DriverUID = this->DriverUIDs - 1;
DrvFile->Address = (void *)fex; DrvFile->Address = (void *)fex;
DrvFile->MemTrk = Tracker; DrvFile->MemTrk = MemMgr;
Drivers.push_back(DrvFile); Drivers.push_back(DrvFile);
break; break;
} }
case FexDriverType::FexDriverType_FileSystem: case FexDriverType::FexDriverType_FileSystem:
{ {
fixme("Filesystem driver: %s", fexExtended->Driver.Name); fixme("Filesystem driver: %s", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
case FexDriverType::FexDriverType_Input: case FexDriverType::FexDriverType_Input:
@ -132,14 +132,14 @@ namespace Driver
{ {
error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name); error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name);
delete InterruptHook; delete InterruptHook;
delete Tracker; delete MemMgr;
break; break;
} }
else if (CallbackRet != DriverReturnCode::OK) else if (CallbackRet != DriverReturnCode::OK)
{ {
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete InterruptHook; delete InterruptHook;
delete Tracker; delete MemMgr;
break; break;
} }
@ -149,7 +149,7 @@ namespace Driver
DriverFile *DrvFile = new DriverFile; DriverFile *DrvFile = new DriverFile;
DrvFile->DriverUID = this->DriverUIDs - 1; DrvFile->DriverUID = this->DriverUIDs - 1;
DrvFile->Address = (void *)fex; DrvFile->Address = (void *)fex;
DrvFile->MemTrk = Tracker; DrvFile->MemTrk = MemMgr;
DrvFile->InterruptHook[0] = InterruptHook; DrvFile->InterruptHook[0] = InterruptHook;
Drivers.push_back(DrvFile); Drivers.push_back(DrvFile);
break; break;
@ -157,13 +157,13 @@ namespace Driver
case FexDriverType::FexDriverType_Audio: case FexDriverType::FexDriverType_Audio:
{ {
fixme("Audio driver: %s", fexExtended->Driver.Name); fixme("Audio driver: %s", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
default: default:
{ {
warn("Unknown driver type: %d", fexExtended->Driver.Type); warn("Unknown driver type: %d", fexExtended->Driver.Type);
delete Tracker; delete MemMgr;
break; break;
} }
} }

30
Core/Driver/DriverLoading/BindPCI.cpp
View File

@ -32,8 +32,8 @@ namespace Driver
foreach (auto PCIDevice in devices) foreach (auto PCIDevice in devices)
{ {
debug("[%ld] VendorID: %#x; DeviceID: %#x", devices.size(), PCIDevice->VendorID, PCIDevice->DeviceID); debug("[%ld] VendorID: %#x; DeviceID: %#x", devices.size(), PCIDevice->VendorID, PCIDevice->DeviceID);
Memory::Tracker *Tracker = new Memory::Tracker(); Memory::MemMgr *MemMgr = new Memory::MemMgr();
Fex *fex = (Fex *)Tracker->RequestPages(TO_PAGES(Size)); Fex *fex = (Fex *)MemMgr->RequestPages(TO_PAGES(Size));
memcpy(fex, (void *)DriverAddress, Size); memcpy(fex, (void *)DriverAddress, Size);
FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS); FexExtended *fexExtended = (FexExtended *)((uintptr_t)fex + EXTENDED_SECTION_ADDRESS);
debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size); debug("Driver allocated at %#lx-%#lx", fex, (uintptr_t)fex + Size);
@ -44,16 +44,16 @@ namespace Driver
result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]); result[8], result[9], result[10], result[11], result[12], result[13], result[14], result[15]);
kfree(result); kfree(result);
#endif #endif
KernelAPI *KAPI = (KernelAPI *)Tracker->RequestPages(TO_PAGES(sizeof(KernelAPI))); KernelAPI *KAPI = (KernelAPI *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelAPI)));
if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK) if (CallDriverEntryPoint(fex, KAPI) != DriverCode::OK)
{ {
delete Tracker; delete MemMgr;
return DriverCode::DRIVER_RETURNED_ERROR; return DriverCode::DRIVER_RETURNED_ERROR;
} }
debug("Starting driver %s", fexExtended->Driver.Name); debug("Starting driver %s", fexExtended->Driver.Name);
KernelCallback *KCallback = (KernelCallback *)Tracker->RequestPages(TO_PAGES(sizeof(KernelCallback))); KernelCallback *KCallback = (KernelCallback *)MemMgr->RequestPages(TO_PAGES(sizeof(KernelCallback)));
debug("Type: %d; IOBase: %#x; MemoryBase: %#x", debug("Type: %d; IOBase: %#x; MemoryBase: %#x",
((PCI::PCIHeader0 *)PCIDevice)->BAR0 & 1, ((PCI::PCIHeader0 *)PCIDevice)->BAR0 & 1,
@ -86,13 +86,13 @@ namespace Driver
case FexDriverType::FexDriverType_Generic: case FexDriverType::FexDriverType_Generic:
{ {
fixme("Generic driver: %s", fexExtended->Driver.Name); fixme("Generic driver: %s", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
case FexDriverType::FexDriverType_Display: case FexDriverType::FexDriverType_Display:
{ {
fixme("Display driver: %s", fexExtended->Driver.Name); fixme("Display driver: %s", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
case FexDriverType::FexDriverType_Network: case FexDriverType::FexDriverType_Network:
@ -107,7 +107,7 @@ namespace Driver
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{ {
error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name); error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
delete InterruptHook; delete InterruptHook;
continue; continue;
} }
@ -116,7 +116,7 @@ namespace Driver
else else
{ {
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete Tracker; delete MemMgr;
delete InterruptHook; delete InterruptHook;
continue; continue;
} }
@ -139,7 +139,7 @@ namespace Driver
if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED) if (CallbackRet == DriverReturnCode::NOT_IMPLEMENTED)
{ {
error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name); error("Driver %s does not implement the configuration callback", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
continue; continue;
} }
else if (CallbackRet == DriverReturnCode::OK) else if (CallbackRet == DriverReturnCode::OK)
@ -147,7 +147,7 @@ namespace Driver
else else
{ {
error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet); error("Driver %s returned error %d", fexExtended->Driver.Name, CallbackRet);
delete Tracker; delete MemMgr;
continue; continue;
} }
@ -161,25 +161,25 @@ namespace Driver
case FexDriverType::FexDriverType_FileSystem: case FexDriverType::FexDriverType_FileSystem:
{ {
fixme("Filesystem driver: %s", fexExtended->Driver.Name); fixme("Filesystem driver: %s", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
case FexDriverType::FexDriverType_Input: case FexDriverType::FexDriverType_Input:
{ {
fixme("Input driver: %s", fexExtended->Driver.Name); fixme("Input driver: %s", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
case FexDriverType::FexDriverType_Audio: case FexDriverType::FexDriverType_Audio:
{ {
fixme("Audio driver: %s", fexExtended->Driver.Name); fixme("Audio driver: %s", fexExtended->Driver.Name);
delete Tracker; delete MemMgr;
break; break;
} }
default: default:
{ {
warn("Unknown driver type: %d", fexExtended->Driver.Type); warn("Unknown driver type: %d", fexExtended->Driver.Type);
delete Tracker; delete MemMgr;
break; break;
} }
} }

14
Core/Memory/Tracker.cpp → Core/Memory/MemMgr.cpp
View File

@ -3,7 +3,7 @@
namespace Memory namespace Memory
{ {
uint64_t Tracker::GetAllocatedMemorySize() uint64_t MemMgr::GetAllocatedMemorySize()
{ {
uint64_t Size = 0; uint64_t Size = 0;
foreach (auto var in AllocatedPagesList) foreach (auto var in AllocatedPagesList)
@ -11,7 +11,7 @@ namespace Memory
return FROM_PAGES(Size); return FROM_PAGES(Size);
} }
void *Tracker::RequestPages(size_t Count) void *MemMgr::RequestPages(size_t Count)
{ {
void *Address = KernelAllocator.RequestPages(Count); void *Address = KernelAllocator.RequestPages(Count);
for (size_t i = 0; i < Count; i++) for (size_t i = 0; i < Count; i++)
@ -20,7 +20,7 @@ namespace Memory
return Address; return Address;
} }
void Tracker::FreePages(void *Address, size_t Count) void MemMgr::FreePages(void *Address, size_t Count)
{ {
for (size_t i = 0; i < AllocatedPagesList.size(); i++) for (size_t i = 0; i < AllocatedPagesList.size(); i++)
if (AllocatedPagesList[i].Address == Address) if (AllocatedPagesList[i].Address == Address)
@ -41,16 +41,16 @@ namespace Memory
} }
} }
Tracker::Tracker(PageTable4 *PageTable) MemMgr::MemMgr(PageTable4 *PageTable)
{ {
if (PageTable) if (PageTable)
this->PageTable = PageTable; this->PageTable = PageTable;
else else
this->PageTable = (PageTable4 *)CPU::x64::readcr3().raw; this->PageTable = (PageTable4 *)CPU::x64::readcr3().raw;
debug("Tracker initialized."); debug("MemMgr initialized.");
} }
Tracker::~Tracker() MemMgr::~MemMgr()
{ {
foreach (auto var in AllocatedPagesList) foreach (auto var in AllocatedPagesList)
{ {
@ -58,6 +58,6 @@ namespace Memory
for (size_t i = 0; i < var.PageCount; i++) for (size_t i = 0; i < var.PageCount; i++)
Memory::Virtual(this->PageTable).Remap((void *)((uintptr_t)var.Address + (i * PAGE_SIZE)), (void *)((uintptr_t)var.Address + (i * PAGE_SIZE)), Memory::PTFlag::RW); Memory::Virtual(this->PageTable).Remap((void *)((uintptr_t)var.Address + (i * PAGE_SIZE)), (void *)((uintptr_t)var.Address + (i * PAGE_SIZE)), Memory::PTFlag::RW);
} }
debug("Tracker destroyed."); debug("MemMgr destroyed.");
} }
} }

2
Tasking/Task.cpp
View File

@ -762,7 +762,7 @@ namespace Tasking
case TaskTrustLevel::User: case TaskTrustLevel::User:
{ {
Thread->Stack = new Memory::StackGuard(true, Parent->PageTable); Thread->Stack = new Memory::StackGuard(true, Parent->PageTable);
Thread->Memory = new Memory::Tracker(Parent->PageTable); Thread->Memory = new Memory::MemMgr(Parent->PageTable);
#if defined(__amd64__) #if defined(__amd64__)
SecurityManager.TrustToken(Thread->Security.UniqueToken, TokenTrustLevel::Untrusted); SecurityManager.TrustToken(Thread->Security.UniqueToken, TokenTrustLevel::Untrusted);
Thread->GSBase = 0; Thread->GSBase = 0;

2
include/driver.hpp
View File

@ -47,7 +47,7 @@ namespace Driver
{ {
unsigned long DriverUID; unsigned long DriverUID;
void *Address; void *Address;
Memory::Tracker *MemTrk; Memory::MemMgr *MemTrk;
DriverInterruptHook *InterruptHook[16]; DriverInterruptHook *InterruptHook[16];
}; };

6
include/memory.hpp
View File

@ -631,7 +631,7 @@ namespace Memory
~StackGuard(); ~StackGuard();
}; };
class Tracker class MemMgr
{ {
private: private:
Bitmap PageBitmap; Bitmap PageBitmap;
@ -651,8 +651,8 @@ namespace Memory
void *RequestPages(size_t Count); void *RequestPages(size_t Count);
void FreePages(void *Address, size_t Count); void FreePages(void *Address, size_t Count);
Tracker(PageTable4 *PageTable = nullptr); MemMgr(PageTable4 *PageTable = nullptr);
~Tracker(); ~MemMgr();
}; };
} }

2
include/task.hpp
View File

@ -89,7 +89,7 @@ namespace Tasking
IPOffset Offset; IPOffset Offset;
int ExitCode; int ExitCode;
Memory::StackGuard *Stack; Memory::StackGuard *Stack;
Memory::Tracker *Memory; Memory::MemMgr *Memory;
TaskStatus Status; TaskStatus Status;
#if defined(__amd64__) #if defined(__amd64__)
CPU::x64::TrapFrame Registers; CPU::x64::TrapFrame Registers;