diff --git a/arch/x86_64/interrupts/Interrupts.c b/arch/x86_64/interrupts/Interrupts.c index 94d7256..fe5e530 100644 --- a/arch/x86_64/interrupts/Interrupts.c +++ b/arch/x86_64/interrupts/Interrupts.c @@ -1,6 +1,6 @@ #include -#include <../../../drivers/APIC/APIC.h> -#include <../../../drivers/storage/Ide.h> +#include +#include #include #include #include diff --git a/cmake/ccache.cmake b/cmake/ccache.cmake index 92d0fd7..c1ab992 100644 --- a/cmake/ccache.cmake +++ b/cmake/ccache.cmake @@ -2,7 +2,7 @@ # CCache Configuration for Faster Builds # ============================================================================ -option(VF_ENABLE_CCACHE "Enable ccache for faster compilation" ON) +option(VF_ENABLE_CCACHE "Enable ccache for faster compilation" OFF) if(VF_ENABLE_CCACHE) find_program(CCACHE_PROGRAM ccache) diff --git a/cmake/source.cmake b/cmake/source.cmake index a431884..677c066 100644 --- a/cmake/source.cmake +++ b/cmake/source.cmake @@ -144,58 +144,63 @@ set(OBJ_SOURCES) # ============================================================================ include_directories( . - include - kernel/atomic - kernel/core - kernel/ipc - kernel/sched - kernel/etc - kernel/execf - kernel/execf/elf - kernel/execf/pe - kernel/execf/aout + arch/x86_64 + arch/x86_64/asm + arch/x86_64/features + arch/x86_64/gdt + arch/x86_64/idt + arch/x86_64/interrupts + arch/x86_64/syscall + crypto drivers - drivers/PCI + drivers/APIC drivers/ethernet drivers/ethernet/intel drivers/ethernet/realtek drivers/ethernet/interface - drivers/RTC - drivers/xHCI + drivers/input drivers/ISA + drivers/LPT + drivers/OPIC + drivers/PCI + drivers/RTC drivers/sound drivers/storage - drivers/virtio - drivers/vmware - drivers/APIC - drivers/OPIC drivers/usb drivers/usb/hid - drivers/input + drivers/virtio + drivers/vmware + drivers/xHCI fs - fs/FAT + fs/devfs fs/EXT + fs/FAT fs/NTFS - fs/devfs + fs/procfs + include + include/Switch + include/Vector + kernel/atomic + kernel/core + kernel/etc + kernel/execf + kernel/execf/elf + kernel/execf/pe + kernel/execf/aout + kernel/execf/macho + kernel/ipc + kernel/sched mm + mm/asm mm/dynamic mm/dynamic/c mm/dynamic/rust - mm/trace mm/security - ports/6502 + mm/trace ports - ports/raytracer - arch/x86_64 - arch/x86_64/asm - arch/x86_64/features - arch/x86_64/gdt - arch/x86_64/idt - arch/x86_64/interrupts - arch/x86_64/syscall + ports/6502 vfcompositor vfcompositor/app - crypto ) # ============================================================================ diff --git a/drivers/APIC/APIC.c b/drivers/APIC/APIC.c index 13fc969..a7799d0 100644 --- a/drivers/APIC/APIC.c +++ b/drivers/APIC/APIC.c @@ -1,9 +1,9 @@ #include -#include <../../include/Io.h> -#include <../../kernel/core/Kernel.h> -#include <../../kernel/etc/Console.h> -#include <../../mm/VMem.h> -#include <../sound/Generic.h> +#include +#include +#include +#include +#include #include #include diff --git a/drivers/ISA/ISA.c b/drivers/ISA/ISA.c index e5d017c..5bed05c 100644 --- a/drivers/ISA/ISA.c +++ b/drivers/ISA/ISA.c @@ -1,5 +1,5 @@ #include -#include <../../mm/KernelHeap.h> +#include #include #include #include diff --git a/drivers/OPIC/OPIC.c b/drivers/OPIC/OPIC.c index a1c4c17..ac54122 100644 --- a/drivers/OPIC/OPIC.c +++ b/drivers/OPIC/OPIC.c @@ -10,10 +10,10 @@ */ #include -#include <../../include/Io.h> -#include <../../kernel/core/Kernel.h> -#include <../../kernel/etc/Console.h> -#include <../../mm/VMem.h> +#include +#include +#include +#include #include #include diff --git a/drivers/Random.c b/drivers/Random.c index e4a204c..fd975cb 100644 --- a/drivers/Random.c +++ b/drivers/Random.c @@ -1,6 +1,6 @@ #include -#include <../crypto/RNG.h> -#include <../fs/CharDevice.h> +#include +#include static int RandomDevRead(struct CharDevice* dev, void* buffer, uint32_t size) { uint8_t* buf = (uint8_t*)buffer; diff --git a/drivers/Serial.c b/drivers/Serial.c index 3f60e4d..5222120 100644 --- a/drivers/Serial.c +++ b/drivers/Serial.c @@ -1,7 +1,7 @@ #include #include -#include <../fs/CharDevice.h> -#include <../kernel/etc/Console.h> +#include +#include // Serial port register offsets #define SERIAL_DATA_REG 0 // Data register (DLAB=0) diff --git a/drivers/Vesa.c b/drivers/Vesa.c index af48464..2a633ae 100644 --- a/drivers/Vesa.c +++ b/drivers/Vesa.c @@ -1,5 +1,5 @@ #include -#include <../mm/MemOps.h> +#include #include #include #include diff --git a/drivers/ethernet/intel/E1000.c b/drivers/ethernet/intel/E1000.c index 116f024..26c28b0 100644 --- a/drivers/ethernet/intel/E1000.c +++ b/drivers/ethernet/intel/E1000.c @@ -1,6 +1,6 @@ #include -#include <../interface/Arp.h> -#include <../interface/Ip.h> +#include +#include #include #include #include diff --git a/drivers/ethernet/interface/Arp.c b/drivers/ethernet/interface/Arp.c index c45baa2..d2a4e65 100644 --- a/drivers/ethernet/interface/Arp.c +++ b/drivers/ethernet/interface/Arp.c @@ -1,5 +1,5 @@ #include -#include <../Network.h> +#include #include #include #include diff --git a/drivers/ethernet/interface/Arp.h b/drivers/ethernet/interface/Arp.h index 0730e6e..18297bd 100644 --- a/drivers/ethernet/interface/Arp.h +++ b/drivers/ethernet/interface/Arp.h @@ -2,7 +2,7 @@ #define ARP_H #include -#include <../Packet.h> +#include #include #define ARP_CACHE_SIZE 16 diff --git a/drivers/ethernet/interface/Ip.c b/drivers/ethernet/interface/Ip.c index 71147da..5c9c881 100644 --- a/drivers/ethernet/interface/Ip.c +++ b/drivers/ethernet/interface/Ip.c @@ -1,5 +1,5 @@ #include -#include <../Network.h> +#include #include #include #include diff --git a/drivers/ethernet/realtek/RTL8139.c b/drivers/ethernet/realtek/RTL8139.c index 466ca6b..c724aa6 100644 --- a/drivers/ethernet/realtek/RTL8139.c +++ b/drivers/ethernet/realtek/RTL8139.c @@ -1,9 +1,9 @@ #include -#include <../../../mm/KernelHeap.h> -#include <../../../mm/MemOps.h> -#include <../../../mm/VMem.h> -#include <../interface/Arp.h> -#include <../interface/Ip.h> +#include +#include +#include +#include +#include #include #include #include diff --git a/drivers/input/Keyboard.c b/drivers/input/Keyboard.c index 14fc71e..4009a37 100644 --- a/drivers/input/Keyboard.c +++ b/drivers/input/Keyboard.c @@ -1,6 +1,6 @@ #include -#include <../PS2.h> -#include <../usb/hid/USBKeyboard.h> +#include +#include /** * @brief Checks for input, prioritizing USB keyboards over PS/2. diff --git a/drivers/storage/Ide.c b/drivers/storage/Ide.c index 109cf98..9f35e85 100644 --- a/drivers/storage/Ide.c +++ b/drivers/storage/Ide.c @@ -1,5 +1,5 @@ #include -#include <../APIC/APIC.h> +#include #include #include #include diff --git a/drivers/usb/hid/USBKeyboard.h b/drivers/usb/hid/USBKeyboard.h index af16bf4..83f9b43 100644 --- a/drivers/usb/hid/USBKeyboard.h +++ b/drivers/usb/hid/USBKeyboard.h @@ -1,7 +1,7 @@ #ifndef USB_KEYBOARD_H #define USB_KEYBOARD_H -#include <../../xHCI/xHCI.h> +#include // Represents the 8-byte report sent by a standard USB HID keyboard. typedef struct { diff --git a/drivers/vmware/SVGAII.c b/drivers/vmware/SVGAII.c index 9a047d2..d40e496 100644 --- a/drivers/vmware/SVGAII.c +++ b/drivers/vmware/SVGAII.c @@ -1,8 +1,8 @@ #include -#include <../../drivers/PCI/PCI.h> -#include <../../include/Io.h> -#include <../../mm/VMem.h> -#include <../../kernel/etc/Console.h> +#include +#include +#include +#include // Global device info instance SVGAII_DeviceInfo svgaII_device; diff --git a/drivers/xHCI/xHCI.c b/drivers/xHCI/xHCI.c index 2028fa0..b77e4a4 100644 --- a/drivers/xHCI/xHCI.c +++ b/drivers/xHCI/xHCI.c @@ -1,7 +1,7 @@ #include #include -#include <../../mm/MemOps.h> -#include <../../mm/VMem.h> +#include +#include #include #include diff --git a/fs/CharDevice.c b/fs/CharDevice.c index 4e891f9..f8082c5 100644 --- a/fs/CharDevice.c +++ b/fs/CharDevice.c @@ -1,5 +1,5 @@ #include -#include <../kernel/etc/StringOps.h> +#include static CharDevice_t* g_char_devices[MAX_CHAR_DEVICES]; static int g_num_char_devices = 0; diff --git a/fs/EXT/Ext2.c b/fs/EXT/Ext2.c index 101658c..ee698b3 100644 --- a/fs/EXT/Ext2.c +++ b/fs/EXT/Ext2.c @@ -1,10 +1,10 @@ #include -#include <../../kernel/etc/Console.h> -#include <../../kernel/etc/StringOps.h> +#include +#include #include -#include <../../mm/KernelHeap.h> -#include <../../mm/MemOps.h> -#include <../VFS.h> +#include +#include +#include #include #include #include diff --git a/fs/FsUtils.h b/fs/FsUtils.h index e091bda..815896b 100644 --- a/fs/FsUtils.h +++ b/fs/FsUtils.h @@ -1,7 +1,7 @@ #ifndef FS_UTILS_H #define FS_UTILS_H -#include <../mm/MemOps.h> +#include #include #define MAX_PATH_COMPONENTS 32 diff --git a/fs/Iso9660.c b/fs/Iso9660.c index 9d37d5b..b99cd0a 100644 --- a/fs/Iso9660.c +++ b/fs/Iso9660.c @@ -1,8 +1,8 @@ #include -#include <../drivers/storage/Ide.h> -#include <../kernel/etc/StringOps.h> -#include <../mm/KernelHeap.h> +#include +#include +#include #include #include #include diff --git a/fs/VFS.c b/fs/VFS.c index 8a43381..801329b 100644 --- a/fs/VFS.c +++ b/fs/VFS.c @@ -1,5 +1,5 @@ #include -#include <../mm/MemOps.h> +#include #include #include #include diff --git a/fs/devfs/DevFS.c b/fs/devfs/DevFS.c index cd688bb..9f54bc1 100644 --- a/fs/devfs/DevFS.c +++ b/fs/devfs/DevFS.c @@ -1,7 +1,7 @@ #include -#include <../CharDevice.h> -#include <../../kernel/etc/Console.h> -#include <../../kernel/etc/StringOps.h> +#include +#include +#include int DevfsMount(struct BlockDevice* device, const char* mount_point) { // DevFS is a virtual filesystem and doesn't need a device. diff --git a/fs/devfs/DevFS.h b/fs/devfs/DevFS.h index fa296e4..72d145c 100644 --- a/fs/devfs/DevFS.h +++ b/fs/devfs/DevFS.h @@ -1,7 +1,7 @@ #ifndef VOIDFRAME_DEVFS_H #define VOIDFRAME_DEVFS_H -#include <../BlockDevice.h> +#include // This is a virtual filesystem, so it doesn't have a block device. // The mount function is just a placeholder to satisfy the FileSystemDriver struct. diff --git a/fs/procfs/ProcFS.h b/fs/procfs/ProcFS.h index 72425b1..69da338 100644 --- a/fs/procfs/ProcFS.h +++ b/fs/procfs/ProcFS.h @@ -1,7 +1,7 @@ #ifndef VOIDFRAME_PROCFS_H #define VOIDFRAME_PROCFS_H -#include <../BlockDevice.h> +#include #include #include diff --git a/kernel/core/Panic.c b/kernel/core/Panic.c index 519e13e..1e8522a 100644 --- a/kernel/core/Panic.c +++ b/kernel/core/Panic.c @@ -2,13 +2,13 @@ #include // The ONLY necessary includes for display are now Console and Serial #include -#include <../../mm/KernelHeap.h> -#include <../../mm/PMem.h> +#include +#include #include #include -#include <../../mm/MemOps.h> -#include <../../mm/VMem.h> +#include +#include #include // For Registers struct in PanicFromInterrupt #include #include diff --git a/kernel/etc/Shell.c b/kernel/etc/Shell.c index fd66b2f..005a675 100644 --- a/kernel/etc/Shell.c +++ b/kernel/etc/Shell.c @@ -1,8 +1,8 @@ #include #include #include -#include <../../drivers/APIC/APIC.h> -#include <../../drivers/ethernet/interface/Icmp.h> +#include +#include #include <6502/6502.h> #include #include @@ -17,7 +17,7 @@ #include #include #include -#include <../../mm/dynamic/rust/KernelHeapRust.h> +#include #include #include #include diff --git a/kernel/etc/VBEConsole.c b/kernel/etc/VBEConsole.c index 0a068b2..0c39db9 100644 --- a/kernel/etc/VBEConsole.c +++ b/kernel/etc/VBEConsole.c @@ -1,6 +1,6 @@ #include -#include <../../mm/MemOps.h> +#include #include #include #include diff --git a/kernel/execf/aout/AoutLoader.c b/kernel/execf/aout/AoutLoader.c index 6e8b46a..146b41b 100644 --- a/kernel/execf/aout/AoutLoader.c +++ b/kernel/execf/aout/AoutLoader.c @@ -1,6 +1,6 @@ #include -#include <../../mm/VMem.h> -#include <../../mm/MemOps.h> +#include +#include #include #include #include diff --git a/kernel/execf/elf/ELFloader.c b/kernel/execf/elf/ELFloader.c index 1163d77..9c8c47d 100644 --- a/kernel/execf/elf/ELFloader.c +++ b/kernel/execf/elf/ELFloader.c @@ -1,7 +1,7 @@ #include -#include <../../mm/KernelHeap.h> -#include <../../mm/MemOps.h> -#include <../../mm/VMem.h> +#include +#include +#include #include #include #include diff --git a/kernel/execf/pe/PEloader.c b/kernel/execf/pe/PEloader.c index c954b5a..8983c56 100644 --- a/kernel/execf/pe/PEloader.c +++ b/kernel/execf/pe/PEloader.c @@ -1,7 +1,7 @@ #include -#include <../../mm/KernelHeap.h> -#include <../../mm/MemOps.h> -#include <../../mm/VMem.h> +#include +#include +#include #include #include #include diff --git a/kernel/ipc/Ipc.c b/kernel/ipc/Ipc.c index 3171c9e..9964c40 100644 --- a/kernel/ipc/Ipc.c +++ b/kernel/ipc/Ipc.c @@ -1,5 +1,5 @@ #include -#include <../../mm/MemOps.h> +#include #include static uint32_t next_sequence_id = 1; diff --git a/mm/dynamic/c/Magazine.c b/mm/dynamic/c/Magazine.c index e22dfac..08dd56d 100644 --- a/mm/dynamic/c/Magazine.c +++ b/mm/dynamic/c/Magazine.c @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include #include #include #ifndef KHEAP_VALIDATION_NONE @@ -71,10 +71,6 @@ static Magazine* magazine_pool_head = NULL; static Magazine* DepotRefill(int size_class_index); static void DepotReturn(Magazine* mag, int size_class_index); static Slab* FindSlabForPointer(void* ptr); -#ifdef VF_CONFIG_HEAP_HYBRID -#include -#include -#endif // ================================================================================================= // Helper Functions @@ -307,22 +303,15 @@ void MagazineFree(void* ptr) { VMemFree((void*)large_header, large_header->size + sizeof(LargeBlockHeader)); return; } - -#ifdef VF_CONFIG_HEAP_HYBRID // Delegate to Rust heap for unknown blocks rust_kfree(ptr); - return; -#else - PANIC("MagazineFree: unknown pointer freed"); -#endif + PrintKernelWarning("Magazine: Received and freed uknown pointer with rust"); } // ================================================================================================= // Depot Logic (Slow Path) - Implementation // ================================================================================================= - - /** * @brief Gets a new or partially full magazine from the depot. * This is the slow path for allocation. diff --git a/vfcompositor/app/GUIShell.c b/vfcompositor/app/GUIShell.c index 3857355..b584b63 100644 --- a/vfcompositor/app/GUIShell.c +++ b/vfcompositor/app/GUIShell.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include