Finish the huge build system rework

sasdallas · Aug 7, 2024 · 559ca70 · 559ca70
1 parent a0c3fb3
commit 559ca70
Show file tree

Hide file tree

Showing 284 changed files with 10,236 additions and 18,900 deletions.
diff --git a/cppreduceOS.code-workspace b/cppreduceOS.code-workspace
@@ -27,7 +27,12 @@
 			"pmm.h": "c",
 			"panic.h": "c",
 			"floppy.h": "c",
-			"syscall.h": "c"
+			"syscall.h": "c",
+			"mem.h": "c",
+			"list.h": "c",
+			"hashmap.h": "c",
+			"liballoc_forwarder.h": "c",
+			"vmm.h": "c"
 		}
 	}
 }
diff --git a/obj/assembly/bios.o b/obj/assembly/bios.o
diff --git a/obj/assembly/bochs.o b/obj/assembly/bochs.o
diff --git a/obj/assembly/boot.o b/obj/assembly/boot.o
diff --git a/obj/assembly/crtbegin.o b/obj/assembly/crtbegin.o
diff --git a/obj/assembly/crtend.o b/obj/assembly/crtend.o
diff --git a/obj/assembly/crti.o b/obj/assembly/crti.o
diff --git a/obj/assembly/crtn.o b/obj/assembly/crtn.o
diff --git a/obj/assembly/gdt.o b/obj/assembly/gdt.o
diff --git a/obj/assembly/idt.o b/obj/assembly/idt.o
diff --git a/obj/assembly/isr.o b/obj/assembly/isr.o
diff --git a/obj/assembly/tss.o b/obj/assembly/tss.o
diff --git a/obj/assembly/usermode.o b/obj/assembly/usermode.o
diff --git a/obj/base/bios32.o b/obj/base/bios32.o
diff --git a/obj/base/gdt.o b/obj/base/gdt.o
diff --git a/obj/base/hal.o b/obj/base/hal.o
diff --git a/obj/base/idt.o b/obj/base/idt.o
diff --git a/obj/base/isr.o b/obj/base/isr.o
diff --git a/obj/base/pic.o b/obj/base/pic.o
diff --git a/obj/base/processor.o b/obj/base/processor.o
diff --git a/obj/drivers/acpi.o b/obj/drivers/acpi.o
diff --git a/obj/drivers/floppy.o b/obj/drivers/floppy.o
diff --git a/obj/drivers/ide_ata.o b/obj/drivers/ide_ata.o
diff --git a/obj/drivers/io_apic.o b/obj/drivers/io_apic.o
diff --git a/obj/drivers/keyboard.o b/obj/drivers/keyboard.o
diff --git a/obj/drivers/local_apic.o b/obj/drivers/local_apic.o
diff --git a/obj/drivers/pci.o b/obj/drivers/pci.o
diff --git a/obj/drivers/pit.o b/obj/drivers/pit.o
diff --git a/obj/drivers/rtc.o b/obj/drivers/rtc.o
diff --git a/obj/drivers/serial.o b/obj/drivers/serial.o
diff --git a/obj/fonts/font.o b/obj/fonts/font.o
diff --git a/obj/fs/ext2.o b/obj/fs/ext2.o
diff --git a/obj/fs/fat.o b/obj/fs/fat.o
diff --git a/obj/fs/initrd.o b/obj/fs/initrd.o
diff --git a/obj/fs/vfs.o b/obj/fs/vfs.o
diff --git a/obj/gfx/bitmap.o b/obj/gfx/bitmap.o
diff --git a/obj/gfx/font.o b/obj/gfx/font.o
diff --git a/obj/gfx/font_data.o b/obj/gfx/font_data.o
diff --git a/obj/gfx/gfx.o b/obj/gfx/gfx.o
diff --git a/obj/gfx/terminal.o b/obj/gfx/terminal.o
diff --git a/obj/gfx/vesa.o b/obj/gfx/vesa.o
diff --git a/obj/kernel/cmds.o b/obj/kernel/cmds.o
diff --git a/obj/kernel/command.o b/obj/kernel/command.o
diff --git a/obj/kernel/kernel.o b/obj/kernel/kernel.o
diff --git a/obj/kernel/panic.o b/obj/kernel/panic.o
diff --git a/obj/kernel/test.o b/obj/kernel/test.o
diff --git a/obj/libc/list.o b/obj/libc/list.o
diff --git a/obj/libc/ordered_array.o b/obj/libc/ordered_array.o
diff --git a/obj/libc/printf.o b/obj/libc/printf.o
diff --git a/obj/libc/putchar.o b/obj/libc/putchar.o
diff --git a/obj/libc/sleep.o b/obj/libc/sleep.o
diff --git a/obj/libc/spinlock.o b/obj/libc/spinlock.o
diff --git a/obj/libc/stdlib.o b/obj/libc/stdlib.o
diff --git a/obj/libc/string.o b/obj/libc/string.o
diff --git a/obj/libc/tree.o b/obj/libc/tree.o
diff --git a/obj/mem/dma.o b/obj/mem/dma.o
diff --git a/obj/mem/liballoc/liballoc.o b/obj/mem/liballoc/liballoc.o
diff --git a/obj/mem/liballoc/liballoc_forwarder.o b/obj/mem/liballoc/liballoc_forwarder.o
diff --git a/obj/mem/liballoc/liballoc_wrapper.o b/obj/mem/liballoc/liballoc_wrapper.o
diff --git a/obj/mem/pmm.o b/obj/mem/pmm.o
diff --git a/obj/mem/vmm.o b/obj/mem/vmm.o
diff --git a/obj/mem/vmm_pde.o b/obj/mem/vmm_pde.o
diff --git a/obj/mem/vmm_pte.o b/obj/mem/vmm_pte.o
diff --git a/obj/misc/hashmap.o b/obj/misc/hashmap.o
diff --git a/obj/misc/list.o b/obj/misc/list.o
diff --git a/obj/misc/tree.o b/obj/misc/tree.o
diff --git a/obj/tasks/syscall.o b/obj/tasks/syscall.o
diff --git a/obj/tasks/tss.o b/obj/tasks/tss.o
diff --git a/source/initial_ramdisk/generate_initrd b/source/initial_ramdisk/generate_initrd
diff --git a/source/initial_ramdisk/obj/generate_initrd.o b/source/initial_ramdisk/obj/generate_initrd.o
diff --git a/source/kernel/Makefile b/source/kernel/Makefile
@@ -19,7 +19,7 @@ OUT_KERNEL = .
 ASM_SOURCE_DIR = assembly
 
 # Directories (EDIT ME)
-SOURCE_DIRECTORIES = kernel libc drivers base gfx fs mem tasks misc
+SOURCE_DIRECTORIES = kernel drivers base gfx fs mem tasks misc
 SOURCE_SUBDIRECTORIES = mem/liballoc # We do this because shell find will pick up anything in subdirectories twice
 DIRECTORIES = $(addprefix $(OUT_OBJ)/,$(SOURCE_DIRECTORIES)) $(addprefix $(OUT_OBJ)/,$(SOURCE_SUBDIRECTORIES))
 
@@ -51,11 +51,11 @@ TARGET_DISABLED:
 
 $(OUT_KERNEL)/kernel_debug.elf:  MAKE_OUTPUT_DIRS DELETE_OLD_KERNEL_OBJ BUILDSCRIPTS_DEBUG PRINT_ASM_HEADER $(ASM_OBJS) PRINT_C_HEADER $(C_OBJS)
 	@echo "-- Linking $(OUT_KERNEL)/kernel.elf for DEBUG target..."
-	$(LD) $(LDFLAGS) -T linker.ld $(C_OBJS) $(ASM_OBJS) $(OUT_OBJ)/fonts/*.o -o kernel.elf $(LIBS) -lgcc
+	$(LD) $(LDFLAGS) -T linker.ld $(C_OBJS) $(ASM_OBJS) $(OUT_OBJ)/fonts/*.o -o kernel.elf $(LIBS)
 
 $(OUT_KERNEL)/kernel_release.elf:  MAKE_OUTPUT_DIRS DELETE_OLD_KERNEL_OBJ BUILDSCRIPTS_RELEASE PRINT_ASM_HEADER $(ASM_OBJS) PRINT_C_HEADER $(C_OBJS)
 	@echo "-- Linking $(OUT_KERNEL)/kernel.elf for RELEASE target..."
-	$(LD) $(LDFLAGS) -T linker.ld $(C_OBJS) $(ASM_OBJS) $(OUT_OBJ)/fonts/*.o -o kernel.elf $(LIBS) -lgcc
+	$(LD) $(LDFLAGS) -T linker.ld $(C_OBJS) $(ASM_OBJS) $(OUT_OBJ)/fonts/*.o -o kernel.elf $(LIBS)
 
 	@echo "-- Stripping debug symbols..."
 	objcopy --strip-debug kernel.elf
@@ -106,7 +106,7 @@ $(OUT_OBJ)/%.o: %.c Makefile
 
 
 $(OUT_ASMOBJ)/crtbegin.o $(OUT_ASMOBJ)/crtend.o:
-	OBJ=`$(CC) $(CFLAGS) $(LDFLAGS) -print-file-name=$(@F)` && cp "$$OBJ" $@
+	OBJ=`$(CC) $(CFLAGS) -print-file-name=$(@F)` && cp "$$OBJ" $@
 
 # Installation functions
 

diff --git a/source/kernel/base/bios32.c b/source/kernel/base/bios32.c
@@ -1,62 +1,62 @@
-// ======================================================================
-// bios32.c - Handles real-mode interrupt calls in protected mode
-// ======================================================================
-
-#include "include/bios32.h" // Main header file
-
-idtPtr_t realModeGDT;
-idtPtr_t realModeIDT;
-
-extern gdtEntry_t gdtEntries[8];
-
-void (*bios32_execute)() = (void *)0x7c00;
-
-void bios32_init() {
-    // Set up the 16-bit code and data segment in GDT.
-    gdtSetGate(6, 0, 0xFFFFFFFF, 0x9A, 0x0F);
-    gdtSetGate(7, 0, 0xFFFFFFFF, 0x92, 0x0F);
-
-    // Setup the real mode GDT ptr
-    realModeGDT.base_addr = (uint32_t)gdtEntries;
-    realModeGDT.limit = sizeof(gdtEntries) - 1;
-
-    // Setup the real mode IDT ptr
-    realModeIDT.base_addr = 0;
-    realModeIDT.limit = 0x3FF;
-}
-
-// bios32_call(uint8_t interrupt, REGISTERS_16 *in, REGISTERS_16 *out) - Calls bios32.
-void bios32_call(uint8_t interrupt, REGISTERS_16 *in, REGISTERS_16 *out) {
-    serialPrintf("Preparing to call BIOS32 for int 0x%x...\n\tAX = 0x%x BX = 0x%x CX = 0x%x DX = 0x%x\n", interrupt, in->ax, in->bx, in->cx, in->dx);
-    void *newCodeBase = (void *)0x7c00;
-
-    // Copy the GDT entries to the BIOS32 GDT entries.
-    memcpy(&bios32_gdt_entries, gdtEntries, sizeof(gdtEntries));
-
-    // Update the base address of the GDT entries, starting from 0x7C00.
-    realModeGDT.base_addr = (uint32_t)REBASE_ADDRESS((&bios32_gdt_entries));
-
-    // Copy the real mode GDT and IDT to their respective pointers.
-    memcpy(&bios32_gdt_ptr, &realModeGDT, sizeof(idtPtr_t));
-    memcpy(&bios32_idt_ptr, &realModeIDT, sizeof(idtPtr_t));
-
-    // Copy the in registers to their pointers.
-    memcpy(&bios32_in_reg16_ptr, in, sizeof(REGISTERS_16));
-
-    // Get the in registers' address.
-    void *in_reg16_address = REBASE_ADDRESS(&bios32_in_reg16_ptr);
-
-    // Copy the BIOS interrupt number to its respective pointer.
-    memcpy(&bios32_int_number_ptr, &interrupt, sizeof(uint8_t));
-
-    // Copy the bios32 code to a new address.
-    uint32_t size = (uint32_t)BIOS32_END - (uint32_t)BIOS32_START;
-    memcpy(newCodeBase, BIOS32_START, size);
-
-    // Start executing the BIOS32 code.
-    bios32_execute();
-
-    // Copy the output registers to the out ptr.
-    in_reg16_address = REBASE_ADDRESS(&bios32_out_reg16_ptr);
-    memcpy(out, in_reg16_address, sizeof(REGISTERS_16));
-}
+// ======================================================================
+// bios32.c - Handles real-mode interrupt calls in protected mode
+// ======================================================================
+
+#include <kernel/bios32.h> // Main header file
+
+idtPtr_t realModeGDT;
+idtPtr_t realModeIDT;
+
+extern gdtEntry_t gdtEntries[8];
+
+void (*bios32_execute)() = (void *)0x7c00;
+
+void bios32_init() {
+    // Set up the 16-bit code and data segment in GDT.
+    gdtSetGate(6, 0, 0xFFFFFFFF, 0x9A, 0x0F);
+    gdtSetGate(7, 0, 0xFFFFFFFF, 0x92, 0x0F);
+
+    // Setup the real mode GDT ptr
+    realModeGDT.base_addr = (uint32_t)gdtEntries;
+    realModeGDT.limit = sizeof(gdtEntries) - 1;
+
+    // Setup the real mode IDT ptr
+    realModeIDT.base_addr = 0;
+    realModeIDT.limit = 0x3FF;
+}
+
+// bios32_call(uint8_t interrupt, REGISTERS_16 *in, REGISTERS_16 *out) - Calls bios32.
+void bios32_call(uint8_t interrupt, REGISTERS_16 *in, REGISTERS_16 *out) {
+    serialPrintf("Preparing to call BIOS32 for int 0x%x...\n\tAX = 0x%x BX = 0x%x CX = 0x%x DX = 0x%x\n", interrupt, in->ax, in->bx, in->cx, in->dx);
+    void *newCodeBase = (void *)0x7c00;
+
+    // Copy the GDT entries to the BIOS32 GDT entries.
+    memcpy(&bios32_gdt_entries, gdtEntries, sizeof(gdtEntries));
+
+    // Update the base address of the GDT entries, starting from 0x7C00.
+    realModeGDT.base_addr = (uint32_t)REBASE_ADDRESS((&bios32_gdt_entries));
+
+    // Copy the real mode GDT and IDT to their respective pointers.
+    memcpy(&bios32_gdt_ptr, &realModeGDT, sizeof(idtPtr_t));
+    memcpy(&bios32_idt_ptr, &realModeIDT, sizeof(idtPtr_t));
+
+    // Copy the in registers to their pointers.
+    memcpy(&bios32_in_reg16_ptr, in, sizeof(REGISTERS_16));
+
+    // Get the in registers' address.
+    void *in_reg16_address = REBASE_ADDRESS(&bios32_in_reg16_ptr);
+
+    // Copy the BIOS interrupt number to its respective pointer.
+    memcpy(&bios32_int_number_ptr, &interrupt, sizeof(uint8_t));
+
+    // Copy the bios32 code to a new address.
+    uint32_t size = (uint32_t)BIOS32_END - (uint32_t)BIOS32_START;
+    memcpy(newCodeBase, BIOS32_START, size);
+
+    // Start executing the BIOS32 code.
+    bios32_execute();
+
+    // Copy the output registers to the out ptr.
+    in_reg16_address = REBASE_ADDRESS(&bios32_out_reg16_ptr);
+    memcpy(out, in_reg16_address, sizeof(REGISTERS_16));
+}
diff --git a/source/kernel/base/gdt.c b/source/kernel/base/gdt.c
@@ -1,56 +1,56 @@
-// ==================================================
-// gdt.c - Global Descriptor Table initializer
-// ==================================================
-// This file is a part of the reduceOS C kernel. Please credit me if you use this code.
-
-/* Developer note: When reduceOS switched to multiboot, I totally forgot about this file. I'm not sure if this is why paging is failing, but it would be pretty funny if so. */
-
-#include "include/gdt.h" // Main header file
-
-// Variable definitions
-gdtEntry_t gdtEntries[MAX_DESCRIPTORS];
-gdtPtr_t gdtPtr;
-
-extern void tssFlush();
-
-// Functions
-
-// gdtSetGate(int32_t num, uint32_t base, uint32_t limit, uint8_t access, uint8_t gran) - Set the value of 1 GDT entry.
-void gdtSetGate(int32_t num, uint32_t base, uint32_t limit, uint8_t access, uint8_t gran) {
-    // Sanity check first!
-    ASSERT(num < MAX_DESCRIPTORS, "gdtSetGate()", "invalid descriptor number");
-
-    // Now set the proper values in the gdt entries.
-    gdtEntries[num].baseLow = (base & 0xFFFF);
-    gdtEntries[num].baseMiddle = (base >> 16) & 0xFF;
-    gdtEntries[num].baseHigh = (base >> 24) & 0xFF;
-
-    gdtEntries[num].limitLow = (limit & 0xFFFF);
-    gdtEntries[num].granularity = (limit >> 16) & 0x0F;
-
-    gdtEntries[num].granularity |= gran & 0xF0;
-    gdtEntries[num].access = access;
-}
-
-
-// gdtInit() - Initializes GDT and sets up all the pointers
-void gdtInit() {
-    // Setup the gdtPtr to point to our gdtEntires
-    gdtPtr.limit = sizeof(gdtEntries)-1;
-    gdtPtr.base = (uint32_t)&gdtEntries;
-
-    // Now setup the GDT entries
-    gdtSetGate(0, 0, 0, 0, 0); // Null segment
-    gdtSetGate(1, 0, 0xFFFFFFFF, 0x9A, 0xCF); // Code segment
-    gdtSetGate(2, 0, 0xFFFFFFFF, 0x92, 0xCF); // Data segment
-    gdtSetGate(3, 0, 0xFFFFFFFF, 0xFA, 0xCF); // User mode code segment
-    gdtSetGate(4, 0, 0xFFFFFFFF, 0xF2, 0xCF); // User mode data segment.
-    tssWrite(5, 0x10, 0x0); // Task state segment
-
-    // Install the GDT.
-    install_gdt((uint32_t)&gdtPtr);
-
-    // Flush TSS.
-    tssFlush();
-
-}
+// ==================================================
+// gdt.c - Global Descriptor Table initializer
+// ==================================================
+// This file is a part of the reduceOS C kernel. Please credit me if you use this code.
+
+/* Developer note: When reduceOS switched to multiboot, I totally forgot about this file. I'm not sure if this is why paging is failing, but it would be pretty funny if so. */
+
+#include <kernel/gdt.h> // Main header file
+
+// Variable definitions
+gdtEntry_t gdtEntries[MAX_DESCRIPTORS];
+gdtPtr_t gdtPtr;
+
+extern void tssFlush();
+
+// Functions
+
+// gdtSetGate(int32_t num, uint32_t base, uint32_t limit, uint8_t access, uint8_t gran) - Set the value of 1 GDT entry.
+void gdtSetGate(int32_t num, uint32_t base, uint32_t limit, uint8_t access, uint8_t gran) {
+    // Sanity check first!
+    ASSERT(num < MAX_DESCRIPTORS, "gdtSetGate()", "invalid descriptor number");
+
+    // Now set the proper values in the gdt entries.
+    gdtEntries[num].baseLow = (base & 0xFFFF);
+    gdtEntries[num].baseMiddle = (base >> 16) & 0xFF;
+    gdtEntries[num].baseHigh = (base >> 24) & 0xFF;
+
+    gdtEntries[num].limitLow = (limit & 0xFFFF);
+    gdtEntries[num].granularity = (limit >> 16) & 0x0F;
+
+    gdtEntries[num].granularity |= gran & 0xF0;
+    gdtEntries[num].access = access;
+}
+
+
+// gdtInit() - Initializes GDT and sets up all the pointers
+void gdtInit() {
+    // Setup the gdtPtr to point to our gdtEntires
+    gdtPtr.limit = sizeof(gdtEntries)-1;
+    gdtPtr.base = (uint32_t)&gdtEntries;
+
+    // Now setup the GDT entries
+    gdtSetGate(0, 0, 0, 0, 0); // Null segment
+    gdtSetGate(1, 0, 0xFFFFFFFF, 0x9A, 0xCF); // Code segment
+    gdtSetGate(2, 0, 0xFFFFFFFF, 0x92, 0xCF); // Data segment
+    gdtSetGate(3, 0, 0xFFFFFFFF, 0xFA, 0xCF); // User mode code segment
+    gdtSetGate(4, 0, 0xFFFFFFFF, 0xF2, 0xCF); // User mode data segment.
+    tssWrite(5, 0x10, 0x0); // Task state segment
+
+    // Install the GDT.
+    install_gdt((uint32_t)&gdtPtr);
+
+    // Flush TSS.
+    tssFlush();
+
+}