diff options
| author | Amlal <amlal@nekernel.org> | 2025-04-25 08:37:12 +0200 |
|---|---|---|
| committer | Amlal <amlal@nekernel.org> | 2025-04-25 08:37:12 +0200 |
| commit | 97f5407670a796ba41e107175f8242abba0c81cc (patch) | |
| tree | 931e6e6dc703485129769b71f4dafa5e0bfcbb2a /dev/kernel/src | |
| parent | 2a34afdf04a5ec24d091469fa50a09882c898881 (diff) | |
dev, boot, kernel: improvements, and fixing the VEPM formatter.
Signed-off-by: Amlal <amlal@nekernel.org>
Diffstat (limited to 'dev/kernel/src')
| -rw-r--r-- | dev/kernel/src/ACPIFactoryInterface.cc | 16 | ||||
| -rw-r--r-- | dev/kernel/src/BitMapMgr.cc | 18 | ||||
| -rw-r--r-- | dev/kernel/src/CxxAbi-AMD64.cc | 6 | ||||
| -rw-r--r-- | dev/kernel/src/CxxAbi-ARM64.cc | 4 | ||||
| -rw-r--r-- | dev/kernel/src/FS/NeFS.cc | 52 | ||||
| -rw-r--r-- | dev/kernel/src/IndexableProperty.cc | 2 | ||||
| -rw-r--r-- | dev/kernel/src/MemoryMgr.cc | 6 | ||||
| -rw-r--r-- | dev/kernel/src/UserProcessScheduler.cc | 8 |
8 files changed, 56 insertions, 56 deletions
diff --git a/dev/kernel/src/ACPIFactoryInterface.cc b/dev/kernel/src/ACPIFactoryInterface.cc index b85d6ab3..9a3c30d0 100644 --- a/dev/kernel/src/ACPIFactoryInterface.cc +++ b/dev/kernel/src/ACPIFactoryInterface.cc @@ -43,10 +43,10 @@ namespace Kernel this->fEntries = num; - (void)(kout << "ACPI: Number of entries: " << number(this->fEntries) << kendl); - (void)(kout << "ACPI: Revision: " << number(xsdt->Revision) << kendl); - (void)(kout << "ACPI: Signature: " << xsdt->Signature << kendl); - (void)(kout << "ACPI: Address of XSDT: " << hex_number((UIntPtr)xsdt) << kendl); + (Void)(kout << "ACPI: Number of entries: " << number(this->fEntries) << kendl); + (Void)(kout << "ACPI: Revision: " << number(xsdt->Revision) << kendl); + (Void)(kout << "ACPI: Signature: " << xsdt->Signature << kendl); + (Void)(kout << "ACPI: Address of XSDT: " << hex_number((UIntPtr)xsdt) << kendl); const short cAcpiSignatureLength = 4; @@ -54,8 +54,8 @@ namespace Kernel { SDT* sdt = reinterpret_cast<SDT*>(xsdt->AddressArr[index]); - (void)(kout << "ACPI: Checksum: " << number(sdt->Checksum) << kendl); - (void)(kout << "ACPI: Revision: " << number(sdt->Revision) << kendl); + (Void)(kout << "ACPI: Checksum: " << number(sdt->Checksum) << kendl); + (Void)(kout << "ACPI: Revision: " << number(sdt->Revision) << kendl); for (short signature_index = 0; signature_index < cAcpiSignatureLength; ++signature_index) { @@ -64,8 +64,8 @@ namespace Kernel if (signature_index == (cAcpiSignatureLength - 1)) { - (void)(kout << "ACPI: SDT Signature: " << sdt->Signature << kendl); - (void)(kout << "ACPI: SDT OEM ID: " << sdt->OemId << kendl); + (Void)(kout << "ACPI: SDT Signature: " << sdt->Signature << kendl); + (Void)(kout << "ACPI: SDT OEM ID: " << sdt->OemId << kendl); return ErrorOr<voidPtr>(reinterpret_cast<voidPtr>(xsdt->AddressArr[index])); } } diff --git a/dev/kernel/src/BitMapMgr.cc b/dev/kernel/src/BitMapMgr.cc index 1a1e2c0d..83efe4eb 100644 --- a/dev/kernel/src/BitMapMgr.cc +++ b/dev/kernel/src/BitMapMgr.cc @@ -161,18 +161,18 @@ namespace Kernel { if (!this->IsBitMap(ptr_bit_set)) { - (void)(kout << "Not a BitMap: " << hex_number((UIntPtr)ptr_bit_set) << kendl); + (Void)(kout << "Not a BitMap: " << hex_number((UIntPtr)ptr_bit_set) << kendl); return; } - (void)(kout << "Magic: " << hex_number(ptr_bit_set[kBitMapMagIdx]) << kendl); - (void)(kout << "Is Allocated? " << (ptr_bit_set[kBitMapUsedIdx] ? "YES" : "NO") << kendl); - (void)(kout << "Size of BitMap (B): " << number(ptr_bit_set[kBitMapSizeIdx]) << kendl); - (void)(kout << "Size of BitMap (KIB): " << number(KIB(ptr_bit_set[kBitMapSizeIdx])) << kendl); - (void)(kout << "Size of BitMap (MIB): " << number(MIB(ptr_bit_set[kBitMapSizeIdx])) << kendl); - (void)(kout << "Size of BitMap (GIB): " << number(GIB(ptr_bit_set[kBitMapSizeIdx])) << kendl); - (void)(kout << "Size of BitMap (TIB): " << number(TIB(ptr_bit_set[kBitMapSizeIdx])) << kendl); - (void)(kout << "BitMap Address: " << hex_number((UIntPtr)ptr_bit_set) << kendl); + (Void)(kout << "Magic: " << hex_number(ptr_bit_set[kBitMapMagIdx]) << kendl); + (Void)(kout << "Is Allocated? " << (ptr_bit_set[kBitMapUsedIdx] ? "YES" : "NO") << kendl); + (Void)(kout << "Size of BitMap (B): " << number(ptr_bit_set[kBitMapSizeIdx]) << kendl); + (Void)(kout << "Size of BitMap (KIB): " << number(KIB(ptr_bit_set[kBitMapSizeIdx])) << kendl); + (Void)(kout << "Size of BitMap (MIB): " << number(MIB(ptr_bit_set[kBitMapSizeIdx])) << kendl); + (Void)(kout << "Size of BitMap (GIB): " << number(GIB(ptr_bit_set[kBitMapSizeIdx])) << kendl); + (Void)(kout << "Size of BitMap (TIB): " << number(TIB(ptr_bit_set[kBitMapSizeIdx])) << kendl); + (Void)(kout << "BitMap Address: " << hex_number((UIntPtr)ptr_bit_set) << kendl); } }; } // namespace Detail diff --git a/dev/kernel/src/CxxAbi-AMD64.cc b/dev/kernel/src/CxxAbi-AMD64.cc index 6bf5d009..950e0c02 100644 --- a/dev/kernel/src/CxxAbi-AMD64.cc +++ b/dev/kernel/src/CxxAbi-AMD64.cc @@ -19,13 +19,13 @@ Kernel::UIntPtr __dso_handle; EXTERN_C Kernel::Void __cxa_pure_virtual(void* self) { - (void)(Kernel::kout << "object: " << Kernel::number(reinterpret_cast<Kernel::UIntPtr>(self))); - (void)(Kernel::kout << ", has unimplemented virtual functions.\r"); + (Kernel::Void)(Kernel::kout << "object: " << Kernel::number(reinterpret_cast<Kernel::UIntPtr>(self))); + (Kernel::Void)(Kernel::kout << ", has unimplemented virtual functions.\r"); } EXTERN_C void ___chkstk_ms(void) { - (void)(Kernel::kout << "Stack smashing detected!\r"); + (Kernel::Void)(Kernel::kout << "Stack smashing detected!\r"); dbg_break_point(); } diff --git a/dev/kernel/src/CxxAbi-ARM64.cc b/dev/kernel/src/CxxAbi-ARM64.cc index 34dab83a..b3db3815 100644 --- a/dev/kernel/src/CxxAbi-ARM64.cc +++ b/dev/kernel/src/CxxAbi-ARM64.cc @@ -83,8 +83,8 @@ namespace cxxabiv1 EXTERN_C Kernel::Void _purecall(void* self) { - kout << "object: " << Kernel::number(reinterpret_cast<Kernel::UIntPtr>(self)); - kout << ", has unimplemented virtual functions.\r"; + (Kernel::Void)(Kernel::kout << "object: " << Kernel::number(reinterpret_cast<Kernel::UIntPtr>(self))); + (Kernel::Void)(Kernel::kout << ", has unimplemented virtual functions.\r"); } EXTERN_C Kernel::Void _Init_thread_footer(Kernel::Int* thread_obj) diff --git a/dev/kernel/src/FS/NeFS.cc b/dev/kernel/src/FS/NeFS.cc index e8e3804c..8ebd551f 100644 --- a/dev/kernel/src/FS/NeFS.cc +++ b/dev/kernel/src/FS/NeFS.cc @@ -73,7 +73,7 @@ _Output BOOL NeFileSystemParser::CreateFork(_Input NEFS_FORK_STRUCT& the_fork) Lba lba = catalog->DataFork; - (void)(kout << "Fork LBA: " << hex_number(lba) << kendl); + (Void)(kout << "Fork LBA: " << hex_number(lba) << kendl); if (lba < kNeFSCatalogStartAddress) return NO; @@ -94,7 +94,7 @@ _Output BOOL NeFileSystemParser::CreateFork(_Input NEFS_FORK_STRUCT& the_fork) drv.fInput(drv.fPacket); - (void)(kout << "Next fork: " << hex_number(cur_fork.NextSibling) << kendl); + (Void)(kout << "Next fork: " << hex_number(cur_fork.NextSibling) << kendl); if (cur_fork.Flags & kNeFSFlagCreated) { @@ -144,10 +144,10 @@ _Output BOOL NeFileSystemParser::CreateFork(_Input NEFS_FORK_STRUCT& the_fork) fs_ifs_write(&kMountpoint, drv, MountpointInterface::kDriveIndexA); /// log what we have now. - (void)(kout << "Fork offset is at: " << hex_number(the_fork.DataOffset) + (Void)(kout << "Fork offset is at: " << hex_number(the_fork.DataOffset) << kendl); - (void)(kout << "Wrote fork metadata at: " << hex_number(lba) << kendl); + (Void)(kout << "Wrote fork metadata at: " << hex_number(lba) << kendl); return YES; } @@ -461,7 +461,7 @@ _Output Bool NeFileSystemParser::FormatGPT(_Input _Output DriveTrait* drive, _In NE_UNUSED(flags); NE_UNUSED(part_name); - (void)(kout << "FormatGPT: Not implemented yet.\r"); + (Void)(kout << "FormatGPT: Not implemented yet.\r"); return NO; } @@ -600,14 +600,14 @@ bool NeFileSystemParser::FormatEPM(_Input _Output DriveTrait* drive, _Input cons drive->fOutput(drive->fPacket); - (void)(kout << "drive kind: " << drive->fProtocol() << kendl); + (Void)(kout << "drive kind: " << drive->fProtocol() << kendl); - (void)(kout << "partition name: " << part_block->PartitionName << kendl); - (void)(kout << "start: " << hex_number(part_block->StartCatalog) << kendl); - (void)(kout << "number of catalogs: " << hex_number(part_block->CatalogCount) << kendl); - (void)(kout << "free catalog: " << hex_number(part_block->FreeCatalog) << kendl); - (void)(kout << "free sectors: " << hex_number(part_block->FreeSectors) << kendl); - (void)(kout << "sector size: " << hex_number(part_block->SectorSize) << kendl); + (Void)(kout << "partition name: " << part_block->PartitionName << kendl); + (Void)(kout << "start: " << hex_number(part_block->StartCatalog) << kendl); + (Void)(kout << "number of catalogs: " << hex_number(part_block->CatalogCount) << kendl); + (Void)(kout << "free catalog: " << hex_number(part_block->FreeCatalog) << kendl); + (Void)(kout << "free sectors: " << hex_number(part_block->FreeSectors) << kendl); + (Void)(kout << "sector size: " << hex_number(part_block->SectorSize) << kendl); // write the root catalog. this->CreateCatalog(kNeFSRoot, 0, kNeFSCatalogKindDir); @@ -666,7 +666,7 @@ bool NeFileSystemParser::WriteCatalog(_Input const Char* catalog_name, Bool is_r NEFS_FORK_STRUCT* fork_data_input = new NEFS_FORK_STRUCT(); NEFS_FORK_STRUCT prev_fork{}; - (void)(kout << hex_number(startFork) << kendl); + (Void)(kout << hex_number(startFork) << kendl); // sanity check of the fork position as the condition to run the loop. while (startFork >= kNeFSCatalogStartAddress) @@ -677,13 +677,13 @@ bool NeFileSystemParser::WriteCatalog(_Input const Char* catalog_name, Bool is_r drive.fInput(drive.fPacket); - (void)(kout << hex_number(fork_data_input->DataSize) << kendl); - (void)(kout << hex_number(size_of_data) << kendl); - (void)(kout << hex_number(fork_data_input->Flags) << kendl); - (void)(kout << fork_name << kendl); - (void)(kout << fork_data_input->ForkName << kendl); - (void)(kout << fork_data_input->CatalogName << kendl); - (void)(kout << catalog_name << kendl); + (Void)(kout << hex_number(fork_data_input->DataSize) << kendl); + (Void)(kout << hex_number(size_of_data) << kendl); + (Void)(kout << hex_number(fork_data_input->Flags) << kendl); + (Void)(kout << fork_name << kendl); + (Void)(kout << fork_data_input->ForkName << kendl); + (Void)(kout << fork_data_input->CatalogName << kendl); + (Void)(kout << catalog_name << kendl); if ((fork_data_input->Flags & kNeFSFlagCreated) && KStringBuilder::Equals(fork_data_input->ForkName, fork_name) && @@ -698,11 +698,11 @@ bool NeFileSystemParser::WriteCatalog(_Input const Char* catalog_name, Bool is_r drive.fPacket.fPacketSize = size_of_data; drive.fPacket.fPacketLba = fork_data_input->DataOffset; - (void)(kout << "data offset: " << hex_number(fork_data_input->DataOffset) << kendl); + (Void)(kout << "data offset: " << hex_number(fork_data_input->DataOffset) << kendl); drive.fOutput(drive.fPacket); - (void)(kout << "wrote data at offset: " << hex_number(fork_data_input->DataOffset) << kendl); + (Void)(kout << "wrote data at offset: " << hex_number(fork_data_input->DataOffset) << kendl); delete fork_data_input; delete[] buf; @@ -841,8 +841,8 @@ kNeFSSearchThroughCatalogList: goto NeFSContinueSearch; } - (void)(kout << "Found available catalog at: " << hex_number(start_catalog_lba) << kendl); - (void)(kout << "Found available catalog at: " << temporary_catalog.Name << kendl); + (Void)(kout << "Found available catalog at: " << hex_number(start_catalog_lba) << kendl); + (Void)(kout << "Found available catalog at: " << temporary_catalog.Name << kendl); NEFS_CATALOG_STRUCT* catalog_ptr = new NEFS_CATALOG_STRUCT(); rt_copy_memory(&temporary_catalog, catalog_ptr, sizeof(NEFS_CATALOG_STRUCT)); @@ -998,8 +998,8 @@ VoidPtr NeFileSystemParser::ReadCatalog(_Input _Output NEFS_CATALOG_STRUCT* cata fs_fork_data = fs_buf; - (void)(kout << "ForkName: " << fs_fork_data->ForkName << kendl); - (void)(kout << "CatalogName: " << fs_fork_data->CatalogName << kendl); + (Void)(kout << "ForkName: " << fs_fork_data->ForkName << kendl); + (Void)(kout << "CatalogName: " << fs_fork_data->CatalogName << kendl); if (KStringBuilder::Equals(forkName, fs_fork_data->ForkName) && KStringBuilder::Equals(catalog->Name, fs_fork_data->CatalogName)) diff --git a/dev/kernel/src/IndexableProperty.cc b/dev/kernel/src/IndexableProperty.cc index d586398d..05440ee9 100644 --- a/dev/kernel/src/IndexableProperty.cc +++ b/dev/kernel/src/IndexableProperty.cc @@ -50,7 +50,7 @@ namespace Kernel indexer.AddFlag(kIndexerClaimed); rt_copy_memory((VoidPtr)indexer.Leak().Path, (VoidPtr)filename, filenameLen); - (void)(kout << "FSKit: Indexed new file: " << filename << kendl); + (Void)(kout << "FSKit: Indexed new file: " << filename << kendl); } } } // namespace Indexer diff --git a/dev/kernel/src/MemoryMgr.cc b/dev/kernel/src/MemoryMgr.cc index eff54435..2f70d85f 100644 --- a/dev/kernel/src/MemoryMgr.cc +++ b/dev/kernel/src/MemoryMgr.cc @@ -150,7 +150,7 @@ namespace Kernel auto result = reinterpret_cast<VoidPtr>(heap_info_ptr->fOffset); - (void)(kout << "Registered heap address: " << hex_number(reinterpret_cast<UIntPtr>(heap_info_ptr)) << kendl); + (Void)(kout << "Registered heap address: " << hex_number(reinterpret_cast<UIntPtr>(heap_info_ptr)) << kendl); return result; } @@ -172,7 +172,7 @@ namespace Kernel heap_info_ptr->fPage = true; - (void)(kout << "Registered page address: " << hex_number(reinterpret_cast<UIntPtr>(heap_info_ptr)) << kendl); + (Void)(kout << "Registered page address: " << hex_number(reinterpret_cast<UIntPtr>(heap_info_ptr)) << kendl); return kErrorSuccess; } @@ -239,7 +239,7 @@ namespace Kernel heap_info_ptr->fMagic = 0; heap_info_ptr->fPad = 0; - (void)(kout << "Address has been successfully freed: " << hex_number((UIntPtr)heap_info_ptr) << kendl); + (Void)(kout << "Address has been successfully freed: " << hex_number((UIntPtr)heap_info_ptr) << kendl); PTEWrapper page_wrapper(No, No, No, reinterpret_cast<UIntPtr>(heap_info_ptr) - sizeof(Detail::MM_INFORMATION_BLOCK)); Ref<PTEWrapper> pte_address{page_wrapper}; diff --git a/dev/kernel/src/UserProcessScheduler.cc b/dev/kernel/src/UserProcessScheduler.cc index fb33e447..d6be0f5f 100644 --- a/dev/kernel/src/UserProcessScheduler.cc +++ b/dev/kernel/src/UserProcessScheduler.cc @@ -60,7 +60,7 @@ namespace Kernel if (this->Status != ProcessStatusKind::kRunning) return; - (void)(kout << this->Name << ": crashed, error id: " << number(-kErrorProcessFault) << kendl); + (Void)(kout << this->Name << ": crashed, error id: " << number(-kErrorProcessFault) << kendl); this->Exit(-kErrorProcessFault); } @@ -439,7 +439,7 @@ namespace Kernel break; } default: { - (void)(kout << "Unknown process kind: " << hex_number(process.Kind) << kendl); + (Void)(kout << "Unknown process kind: " << hex_number(process.Kind) << kendl); break; } } @@ -468,8 +468,8 @@ namespace Kernel process.Status = ProcessStatusKind::kStarting; process.PTime = (UIntPtr)AffinityKind::kStandard; - (void)(kout << "PID: " << number(process.ProcessId) << kendl); - (void)(kout << "Name: " << process.Name << kendl); + (Void)(kout << "PID: " << number(process.ProcessId) << kendl); + (Void)(kout << "Name: " << process.Name << kendl); return pid; } |
