diff --git a/README.md b/README.md index b8c12ef..878078e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,23 @@ # OS220 +Research kernel in C++ +### Implemented (kernel) +- Global Descriptor Table +- Output via Flanterm by mintsuki +- Memory map scanning +- Kernel-mode heap allocator -# Roadmap -[x] GDT +### In progress (kernel) +- ISR handling (interrupts) +- Virtual memory paging +- UEFI runtime service support +- ACPI & AML support -[ ] IDT/ISRs/Interrupts +### Implemented (kernel C++ library) +- new/delete operators via kernel heap +- String stream (`cstringstream`) +- Console output stream (`kout`, `kerr`) -[ ] Page frame allocator - -[ ] Paging - -[ ] Heap allocator -... \ No newline at end of file +### In progress (kernel C++ library) +- Vector/array class +- String class \ No newline at end of file diff --git a/kernel/src/Cpp/CppSupport.cpp b/kernel/src/Cpp/CppSupport.cpp index 2efa742..1147856 100644 --- a/kernel/src/Cpp/CppSupport.cpp +++ b/kernel/src/Cpp/CppSupport.cpp @@ -4,7 +4,7 @@ */ #include -#include +#include void* operator new(std::size_t size) { diff --git a/kernel/src/CppLib/Stream.cpp b/kernel/src/CppLib/Stream.cpp index ff5d2d7..10fafe1 100644 --- a/kernel/src/CppLib/Stream.cpp +++ b/kernel/src/CppLib/Stream.cpp @@ -5,7 +5,7 @@ */ #include "Stream.hpp" -#include +#include #include #include diff --git a/kernel/src/Memory/MemoryAllocator.cpp b/kernel/src/Memory/Heap.cpp similarity index 99% rename from kernel/src/Memory/MemoryAllocator.cpp rename to kernel/src/Memory/Heap.cpp index 4e57484..a445c7c 100644 --- a/kernel/src/Memory/MemoryAllocator.cpp +++ b/kernel/src/Memory/Heap.cpp @@ -4,7 +4,7 @@ * Copyright (c) 2025 Daniel Hammer */ -#include "MemoryAllocator.hpp" +#include "Heap.hpp" #include "Memmap.hpp" #include "HHDM.hpp" diff --git a/kernel/src/Memory/MemoryAllocator.hpp b/kernel/src/Memory/Heap.hpp similarity index 100% rename from kernel/src/Memory/MemoryAllocator.hpp rename to kernel/src/Memory/Heap.hpp diff --git a/kernel/src/Memory/Memmap.cpp b/kernel/src/Memory/Memmap.cpp index 3f7f13b..375fdc5 100644 --- a/kernel/src/Memory/Memmap.cpp +++ b/kernel/src/Memory/Memmap.cpp @@ -2,7 +2,7 @@ #include #include -#include "MemoryAllocator.hpp" +#include "Heap.hpp" using namespace Kt; diff --git a/kernel/src/main.cpp b/kernel/src/main.cpp index 7817ad9..ce9d521 100644 --- a/kernel/src/main.cpp +++ b/kernel/src/main.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include