summaryrefslogtreecommitdiffhomepage
path: root/dev/ZKA/Sources/FS
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-09-03 15:34:28 +0200
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-09-03 15:34:28 +0200
commit441c1460b29f5003a5478032f17a6c5f486dd1fd (patch)
treec74f48a17b83b62dbd9badde686e09e1bdf49f1f /dev/ZKA/Sources/FS
parent7fdb28714eb98d58c55324db51cc7caf97c631bf (diff)
[ FIX ] Almost fixed the ring-3 switch code, which currently gives an UD
error. [ REFACTOR ] Kernel is now a EXE, instead of being a DLL. [ FIX ] Fixed some parts of the user scheduler and kernel, cleaned it up also. Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/ZKA/Sources/FS')
-rw-r--r--dev/ZKA/Sources/FS/NewFS.cxx70
1 files changed, 35 insertions, 35 deletions
diff --git a/dev/ZKA/Sources/FS/NewFS.cxx b/dev/ZKA/Sources/FS/NewFS.cxx
index 43cc22b5..bf55a56f 100644
--- a/dev/ZKA/Sources/FS/NewFS.cxx
+++ b/dev/ZKA/Sources/FS/NewFS.cxx
@@ -67,7 +67,7 @@ _Output NFS_FORK_STRUCT* NewFSParser::CreateFork(_Input NFS_CATALOG_STRUCT* cata
Lba lba = (theFork.Kind == kNewFSDataForkKind) ? catalog->DataFork
: catalog->ResourceFork;
- kcout << "newoskrnl.dll: fork lba: " << hex_number(lba) << endl;
+ kcout << "newoskrnl.exe: fork lba: " << hex_number(lba) << endl;
if (lba <= kNewFSCatalogStartAddress)
return nullptr;
@@ -96,22 +96,22 @@ _Output NFS_FORK_STRUCT* NewFSParser::CreateFork(_Input NFS_CATALOG_STRUCT* cata
if (curFork.NextSibling > kBadAddress)
{
- kcout << "newoskrnl.dll: bad fork: " << hex_number(curFork.NextSibling) << endl;
+ kcout << "newoskrnl.exe: bad fork: " << hex_number(curFork.NextSibling) << endl;
break;
}
- kcout << "newoskrnl.dll: next fork: " << hex_number(curFork.NextSibling) << endl;
+ kcout << "newoskrnl.exe: next fork: " << hex_number(curFork.NextSibling) << endl;
if (curFork.Flags == kNewFSFlagCreated)
{
- kcout << "newoskrnl.dll: fork already exists.\r";
+ kcout << "newoskrnl.exe: fork already exists.\r";
/// sanity check.
if (StringBuilder::Equals(curFork.ForkName, theFork.ForkName) &&
StringBuilder::Equals(curFork.CatalogName, catalog->Name))
return nullptr;
- kcout << "newoskrnl.dll: next fork: " << hex_number(curFork.NextSibling) << endl;
+ kcout << "newoskrnl.exe: next fork: " << hex_number(curFork.NextSibling) << endl;
lbaOfPreviousFork = lba;
lba = curFork.NextSibling;
@@ -153,10 +153,10 @@ _Output NFS_FORK_STRUCT* NewFSParser::CreateFork(_Input NFS_CATALOG_STRUCT* cata
drv.fOutput(&drv.fPacket);
/// log what we have now.
- kcout << "newoskrnl.dll: Wrote fork data at: " << hex_number(theFork.DataOffset)
+ kcout << "newoskrnl.exe: Wrote fork data at: " << hex_number(theFork.DataOffset)
<< endl;
- kcout << "newoskrnl.dll: Wrote fork at: " << hex_number(lba) << endl;
+ kcout << "newoskrnl.exe: Wrote fork at: " << hex_number(lba) << endl;
return &theFork;
}
@@ -241,11 +241,11 @@ _Output NFS_CATALOG_STRUCT* NewFSParser::CreateCatalog(_Input const Char* name,
_Input const Int32& flags,
_Input const Int32& kind)
{
- kcout << "newoskrnl.dll: CreateCatalog(...)\r";
+ kcout << "newoskrnl.exe: CreateCatalog(...)\r";
Lba out_lba = 0UL;
- kcout << "newoskrnl.dll: Checking for extension...\r";
+ kcout << "newoskrnl.exe: Checking for extension...\r";
/// a directory should have a slash in the end.
if (kind == kNewFSCatalogKindDir &&
@@ -261,7 +261,7 @@ _Output NFS_CATALOG_STRUCT* NewFSParser::CreateCatalog(_Input const Char* name,
if (catalog_copy)
{
- kcout << "newoskrnl.dll: Catalog already exists: " << name << ".\r";
+ kcout << "newoskrnl.exe: Catalog already exists: " << name << ".\r";
ErrLocal() = kErrorFileExists;
return catalog_copy;
@@ -276,7 +276,7 @@ _Output NFS_CATALOG_STRUCT* NewFSParser::CreateCatalog(_Input const Char* name,
if (*parentName == 0)
{
- kcout << "newoskrnl.dll: Parent name is NUL.\r";
+ kcout << "newoskrnl.exe: Parent name is NUL.\r";
ErrLocal() = kErrorFileNotFound;
return nullptr;
}
@@ -308,7 +308,7 @@ _Output NFS_CATALOG_STRUCT* NewFSParser::CreateCatalog(_Input const Char* name,
if (catalog && catalog->Kind == kNewFSCatalogKindFile)
{
- kcout << "newoskrnl.dll: Parent name is file.\r";
+ kcout << "newoskrnl.exe: Parent name is file.\r";
delete catalog;
return nullptr;
}
@@ -433,9 +433,9 @@ _Output NFS_CATALOG_STRUCT* NewFSParser::CreateCatalog(_Input const Char* name,
drive.fOutput(&drive.fPacket);
- kcout << "newoskrnl.dll: Create new catalog, status: "
+ kcout << "newoskrnl.exe: Create new catalog, status: "
<< hex_number(catalogChild->Flags) << endl;
- kcout << "newoskrnl.dll: Create new catalog, name: " << catalogChild->Name
+ kcout << "newoskrnl.exe: Create new catalog, name: " << catalogChild->Name
<< endl;
delete catalog;
@@ -599,14 +599,14 @@ bool NewFSParser::Format(_Input _Output DriveTrait* drive, _Input const Lba endL
drive->fOutput(&drive->fPacket);
- kcout << "newoskrnl.dll: drive kind: " << drive->fDriveKind() << endl;
+ kcout << "newoskrnl.exe: drive kind: " << drive->fDriveKind() << endl;
- kcout << "newoskrnl.dll: partition name: " << partBlock->PartitionName << endl;
- kcout << "newoskrnl.dll: start: " << hex_number(partBlock->StartCatalog) << endl;
- kcout << "newoskrnl.dll: number of catalogs: " << hex_number(partBlock->CatalogCount) << endl;
- kcout << "newoskrnl.dll: free catalog: " << hex_number(partBlock->FreeCatalog) << endl;
- kcout << "newoskrnl.dll: free sectors: " << hex_number(partBlock->FreeSectors) << endl;
- kcout << "newoskrnl.dll: sector size: " << hex_number(partBlock->SectorSize) << endl;
+ kcout << "newoskrnl.exe: partition name: " << partBlock->PartitionName << endl;
+ kcout << "newoskrnl.exe: start: " << hex_number(partBlock->StartCatalog) << endl;
+ kcout << "newoskrnl.exe: number of catalogs: " << hex_number(partBlock->CatalogCount) << endl;
+ kcout << "newoskrnl.exe: free catalog: " << hex_number(partBlock->FreeCatalog) << endl;
+ kcout << "newoskrnl.exe: free sectors: " << hex_number(partBlock->FreeSectors) << endl;
+ kcout << "newoskrnl.exe: sector size: " << hex_number(partBlock->SectorSize) << endl;
// write the root catalog.
this->CreateCatalog(kNewFSRoot, 0, kNewFSCatalogKindDir);
@@ -614,7 +614,7 @@ bool NewFSParser::Format(_Input _Output DriveTrait* drive, _Input const Lba endL
return true;
}
- kcout << "newoskrnl.dll: partition block already exists.\r";
+ kcout << "newoskrnl.exe: partition block already exists.\r";
start += partBlock->DiskSize;
@@ -659,7 +659,7 @@ bool NewFSParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, Bool
{
ErrLocal() = kErrorDiskIsCorrupted;
- kcout << "newoskrnl.dll: Invalid fork offset.\r";
+ kcout << "newoskrnl.exe: Invalid fork offset.\r";
return false;
}
@@ -688,7 +688,7 @@ bool NewFSParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, Bool
drive.fPacket.fPacketSize = sizeOfData;
drive.fPacket.fLba = startFork + sizeof(NFS_FORK_STRUCT);
- kcout << "newoskrnl.dll: data offset: " << hex_number(forkDataIn->DataOffset) << endl;
+ kcout << "newoskrnl.exe: data offset: " << hex_number(forkDataIn->DataOffset) << endl;
drive.fOutput(&drive.fPacket);
@@ -698,7 +698,7 @@ bool NewFSParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, Bool
drive.fOutput(&drive.fPacket);
- kcout << "newoskrnl.dll: wrote fork at offset: " << hex_number(forkDataIn->DataOffset) << endl;
+ kcout << "newoskrnl.exe: wrote fork at offset: " << hex_number(forkDataIn->DataOffset) << endl;
delete catalog;
@@ -721,7 +721,7 @@ bool NewFSParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, Bool
_Output NFS_CATALOG_STRUCT* NewFSParser::FindCatalog(_Input const Char* catalogName,
Lba& out_lba)
{
- kcout << "newoskrnl.dll: start finding catalog...\r";
+ kcout << "newoskrnl.exe: start finding catalog...\r";
NFS_ROOT_PARTITION_BLOCK fs_buf{0};
auto drive = sMountpointInterface.A();
@@ -789,7 +789,7 @@ _Output NFS_CATALOG_STRUCT* NewFSParser::FindCatalog(_Input const Char* catalogN
}
}
- kcout << "newoskrnl.dll: fetching catalog...\r";
+ kcout << "newoskrnl.exe: fetching catalog...\r";
NewFSSearchThroughCatalogList:
while (drive.fPacket.fPacketGood)
@@ -813,8 +813,8 @@ NewFSSearchThroughCatalogList:
NFS_CATALOG_STRUCT* catalogPtr = new NFS_CATALOG_STRUCT();
rt_copy_memory(catalog, catalogPtr, sizeof(NFS_CATALOG_STRUCT));
- kcout << "newoskrnl.dll: found catalog at: " << hex_number(startCatalogList) << endl;
- kcout << "newoskrnl.dll: found catalog at: " << catalog->Name << endl;
+ kcout << "newoskrnl.exe: found catalog at: " << hex_number(startCatalogList) << endl;
+ kcout << "newoskrnl.exe: found catalog at: " << catalog->Name << endl;
out_lba = startCatalogList;
return catalogPtr;
@@ -944,7 +944,7 @@ VoidPtr NewFSParser::ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog,
Lba dataForkLba = (!isRsrcFork) ? catalog->DataFork : catalog->ResourceFork;
Size dataForkSize = (!isRsrcFork) ? catalog->DataForkSize : catalog->ResourceForkSize;
- kcout << "newoskrnl.dll: catalog " << catalog->Name
+ kcout << "newoskrnl.exe: catalog " << catalog->Name
<< ", fork: " << hex_number(dataForkLba) << endl;
NFS_FORK_STRUCT* fs_buf = new NFS_FORK_STRUCT();
@@ -965,8 +965,8 @@ VoidPtr NewFSParser::ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog,
fs_fork_data = fs_buf;
- kcout << "newoskrnl.dll: ForkName: " << fs_fork_data->ForkName << endl;
- kcout << "newoskrnl.dll: CatalogName: " << fs_fork_data->CatalogName << endl;
+ kcout << "newoskrnl.exe: ForkName: " << fs_fork_data->ForkName << endl;
+ kcout << "newoskrnl.exe: CatalogName: " << fs_fork_data->CatalogName << endl;
if (StringBuilder::Equals(forkName, fs_fork_data->ForkName) &&
StringBuilder::Equals(catalog->Name, fs_fork_data->CatalogName))
@@ -1028,18 +1028,18 @@ namespace Kernel::Detail
/***********************************************************************************/
Boolean fs_init_newfs(Void) noexcept
{
- kcout << "newoskrnl.dll: Creating drives...\r";
+ kcout << "newoskrnl.exe: Creating drives...\r";
sMountpointInterface.A() = io_construct_main_drive();
sMountpointInterface.B() = io_construct_drive();
sMountpointInterface.C() = io_construct_drive();
sMountpointInterface.D() = io_construct_drive();
- kcout << "newoskrnl.dll: Testing main drive...\r";
+ kcout << "newoskrnl.exe: Testing main drive...\r";
sMountpointInterface.A().fVerify(&sMountpointInterface.A().fPacket);
- kcout << "newoskrnl.dll: Testing main drive [ OK ]...\r";
+ kcout << "newoskrnl.exe: Testing main drive [ OK ]...\r";
return true;
}