Create vesa.h

Add header for the base VLB VBE VESA driver

.clang-format

@@ -0,0 +1,24 @@
+BasedOnStyle: Google
+IndentWidth: 4
+TabWidth: 4
+UseTab: Never
+ColumnLimit: 80
+
+DerivePointerAlignment: false
+PointerAlignment: Right
+ReferenceAlignment: Right
+
+AlignConsecutiveMacros: Consecutive
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 0
+
+IncludeBlocks: Regroup
+IncludeCategories:
+  # Std headers
+  - Regex: '<[[:alnum:]_.]+>'
+    Priority: 2
+
+  # Other headers
+  - Regex: '.*'
+    Priority: 1

.clangd

@@ -0,0 +1,6 @@
+CompileFlags:
+  CompilationDatabase: build
+
+Diagnostics:
+  UnusedIncludes: Strict
+  MissingIncludes: Strict

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+indent_size = 8
+tab_width = 8

Makefile

@@ -18,9 +18,9 @@ KERNEL_OBJ += $(patsubst kernel/%.asm, $(BUILD_DIR)/asm_%.o, $(KERNEL_ASM_SRC))
 KLIBC_SRC = $(wildcard klibc/src/*.c)
 KLIBC_OBJ = $(patsubst klibc/src/%.c, $(BUILD_DIR)/klibc/%.o, $(KLIBC_SRC))
 
+.PHONY: all stage1 stage2 kernel compile-commands $(BUILD_DIR)/compile_commands.json run gdb clean clean-cross clean-all
 all: $(DISK_IMG)
 
-.PHONY: stage1 stage2 kernel run gdb clean
 stage1: $(BUILD_DIR)
 	$(AS) $(ASFLAGS) -o $(BUILD_DIR)/$@.o bootloader/$@.asm
 	$(LD) -Ttext=0x7c00 -melf_i386 -o $(BUILD_DIR)/$@.elf $(BUILD_DIR)/$@.o
@@ -57,6 +57,10 @@ $(BUILD_DIR):
 	mkdir -p $@
 	mkdir -p $(BUILD_DIR)/klibc
 
+compile-commands: $(BUILD_DIR)/compile_commands.json
+$(BUILD_DIR)/compile_commands.json: $(BUILD_DIR)
+	bear --output $@ -- make -B
+
 run:
 	qemu-system-i386 -s -S $(DISK_IMG)
 

kernel/cpu.c

@@ -3,6 +3,14 @@
 #include "terminal.h"
 #include "utils.h"
 
+void cpuid(uint32_t leaf, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) {
+    __asm__(
+        "cpuid"
+        : "=a"(*eax), "=b"(*ebx), "=c"(*ecx), "=d"(*edx)
+        : "a"(leaf)
+    );
+}
+
 // Helper to print a labeled decimal value
 void print_val(const char* label, uint32_t val) {
     char buf[12];

kernel/irq.h

@@ -1,7 +1,7 @@
 #ifndef IRQ_H
 #define IRQ_H
 
-#include "types.h"
+#include <stdint.h>
 
 void irq_remap(void);
 void irq_install(void);

kernel/isr.c

@@ -1,3 +1,4 @@
+#include <stdbool.h>
 #include "terminal.h"
 #include "serial.h"
 #include "isr.h"

kernel/paging.c

@@ -1,21 +1,17 @@
-#include "paging.h"
-#include "io.h"
 #include <stdint.h>
-#include <stddef.h>
+#include <string.h>
+#include "io.h"
+#include "paging.h"
 
 page_directory_entry_t *page_directory = (page_directory_entry_t *)0x200000;
 page_table_entry_t     *page_table     = (page_table_entry_t *)0x201000;
-page_table_entry_t     *heap_page_table = (page_table_entry_t *)0x202000;
 
 // Helper function to set up the page directory entry
 void set_page_directory(page_directory_entry_t *dir) {
-    for (int i = 0; i < PAGE_DIRECTORY_SIZE; i++) {
-        dir[i].present = 0;
-    }
+    // Set first PDE
     dir[0].present = 1;
     dir[0].rw = 1;
-    dir[0].user = 0;
-    dir[0].frame = (uint32_t)page_table >> 12;
+    dir[0].addr = (uint32_t)page_table >> 12;
 }
 
 // Helper function to set up the page table entry
@@ -23,12 +19,8 @@ void set_page_table(page_table_entry_t *table) {
     for (int i = 0; i < PAGE_TABLE_SIZE; i++) {
         // Set up page table entries with identity mapping
         table[i].present = 1;
-        table[i].rw = 1;          // Read/Write
-        table[i].user = 0;        // Kernel mode
-        table[i].write_through = 0;
-        table[i].cache_disabled = 0;
-        table[i].accessed = 0;
-        table[i].frame = i;       // Identity mapping
+        table[i].rw = 1;        // Read/Write
+        table[i].addr = i;      // Identity mapping
     }
 }
 
@@ -47,26 +39,13 @@ void enable_paging() {
 
 // Initialize paging: set up the page directory and enable paging
 void paging_init() {
+    // Zero out the tables
+    memset(page_directory, 0x00, PAGE_DIRECTORY_SIZE * sizeof *page_directory);
+    memset(page_table, 0x00, PAGE_TABLE_SIZE * sizeof *page_table);
+
     // Set up identity-mapped page directory + table
     set_page_directory(page_directory);
     set_page_table(page_table);
 
-    // === Set up heap mapping at 0xC0100000 ===
-    for (int i = 0; i < PAGE_TABLE_SIZE; i++) {
-        heap_page_table[i].present = 1;
-        heap_page_table[i].rw = 1;
-        heap_page_table[i].user = 0;
-        heap_page_table[i].write_through = 0;
-        heap_page_table[i].cache_disabled = 0;
-        heap_page_table[i].accessed = 0;
-        heap_page_table[i].frame = (256 + i); // Start physical heap at 1MB (256*4KB = 1MB)
-    }
-
-    // Index 772 = 0xC0100000 / 4MB
-    page_directory[772].present = 1;
-    page_directory[772].rw = 1;
-    page_directory[772].user = 0;
-    page_directory[772].frame = (uint32_t)heap_page_table >> 12;
-
     enable_paging();
 }

kernel/paging.h

@@ -10,31 +10,31 @@
 
 // Page Directory and Page Table structure
 typedef struct {
-    uint32_t present : 1;  // Present bit (1: page is present in memory)
-    uint32_t rw : 1;       // Read-Write bit (1: page is read-write)
-    uint32_t user : 1;     // User-supervisor bit (1: user mode access)
-    uint32_t write_through : 1;  // Write-through cache
-    uint32_t cache_disabled : 1; // Cache disabled
-    uint32_t accessed : 1;        // Accessed bit
-    uint32_t reserved : 1;        // Reserved bit
-    uint32_t page_size : 1;       // Page size (0: 4KB, 1: 4MB)
-    uint32_t global : 1;           // Global page (can be used across different processes)
-    uint32_t available : 3;        // Available bits for the system
-    uint32_t frame : 20;           // Frame address (physical address)
+    uint32_t present : 1;           // Present bit (1: page is present in memory)
+    uint32_t rw : 1;                // Read-Write bit (1: page is read-write)
+    uint32_t user : 1;              // User-supervisor bit (1: user mode access)
+    uint32_t write_through : 1;     // Write-through cache
+    uint32_t cache_disabled : 1;    // Cache disabled
+    uint32_t accessed : 1;          // Accessed bit
+    uint32_t dirty : 1;             // Dirty bit
+    uint32_t attribute : 1;         // Page size (0: 4KB, 1: 4MB)
+    uint32_t global : 1;            // Global page (can be used across different processes)
+    uint32_t reserved : 3;          // Unused
+    uint32_t addr : 20;             // Page frame address (physical address)
 } __attribute__((packed)) page_table_entry_t;
 
 // Define page directory entry
 typedef struct {
-    uint32_t present : 1;
-    uint32_t rw : 1;
-    uint32_t user : 1;
-    uint32_t write_through : 1;
-    uint32_t cache_disabled : 1;
-    uint32_t accessed : 1;
-    uint32_t reserved : 1;
-    uint32_t zero : 5;           // Must be zero for page directory
-    uint32_t reserved_2 : 7;     // Reserved bits
-    uint32_t frame : 20;         // Frame address of the page table
+    uint32_t present : 1;           // Present bit (1: PTE is present in memory)
+    uint32_t rw : 1;                // Read-Write bit (1: pages are read-write)
+    uint32_t user : 1;              // User-supervisor bit (1: user mode access)
+    uint32_t write_through : 1;     // Write-through cache
+    uint32_t cache_disabled : 1;    // Cache disabled
+    uint32_t accessed : 1;          // Accessed bit
+    uint32_t available : 1;         // Unused
+    uint32_t page_size : 1;         // Page size (0: 4KB, 1: 4MB)
+    uint32_t available_2 : 4;       // Unused
+    uint32_t addr : 20;             // Page table address
 } __attribute__((packed)) page_directory_entry_t;
 
 extern page_directory_entry_t *page_directory;

kernel/print.h

@@ -1,7 +1,7 @@
 #ifndef PRINT_H
 #define PRINT_H
 
-#include "types.h"
+#include <stdint.h>
 
 void print_string(const char *str);
 void my_printf(const char *format, ...);

kernel/threading.c

@@ -1,9 +1,8 @@
+#include <stdbool.h>
+#include <string.h>
 #include "malloc.h"
 #include "print.h"
 #include "threading.h"
-#include "types.h"
-#include "utils.h"
-#include <stdint.h>
 
 #define MAX_THREADS 16           // Maximum number of threads
 #define THREAD_STACK_SIZE 8192   // Stack size for each thread

kernel/types.c

@@ -1 +0,0 @@
-#include "types.h"

kernel/types.h

@@ -1,61 +0,0 @@
-#ifndef TYPES_H
-#define TYPES_H
-
-// ----------------------------
-// Fixed-width integer types
-// ----------------------------
-typedef unsigned char      uint8_t;
-typedef signed char        int8_t;
-typedef unsigned short     uint16_t;
-typedef signed short       int16_t;
-typedef unsigned int       uint32_t;
-typedef signed int         int32_t;
-typedef unsigned long long uint64_t;
-typedef signed long long   int64_t;
-
-// ----------------------------
-// Boolean & NULL definitions
-// ----------------------------
-#ifndef __cplusplus
-typedef enum { false = 0, true = 1 } bool;
-#endif
-
-#ifndef NULL
-#define NULL ((void*)0)
-#endif
-
-// ----------------------------
-// OS subsystem types
-// ----------------------------
-typedef int32_t  ssize_t;
-
-typedef uint32_t phys_addr_t; // Physical address
-typedef uint32_t virt_addr_t; // Virtual address
-
-typedef uint32_t pid_t;       // Process ID
-typedef uint32_t tid_t;       // Thread ID
-
-// ----------------------------
-// Bitfield & utility macros
-// ----------------------------
-#define BIT(n) (1U << (n))
-#define BITS(m, n) (((1U << ((n) - (m) + 1)) - 1) << (m))
-
-// Align value to next multiple of alignment
-#define ALIGN_UP(val, align) (((val) + ((align)-1)) & ~((align)-1))
-#define ALIGN_DOWN(val, align) ((val) & ~((align)-1))
-
-// ----------------------------
-// Attributes for structures
-// ----------------------------
-#define PACKED      __attribute__((packed))
-#define ALIGN(x)    __attribute__((aligned(x)))
-
-// ----------------------------
-// Likely/unlikely branch hints
-// (for future optimization use)
-// ----------------------------
-#define likely(x)   __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
-
-#endif // TYPES_H

kernel/utils.h

@@ -3,14 +3,10 @@
 
 #include <stddef.h>
 
-#include "types.h"
-
 // Convert integer to string (base is typically 10, 16, etc.)
 char* itoa(int value, char* str, int base);
 
 // Convert unsigned integer to string (base is typically 10, 16, etc.)
 char* utoa(unsigned int value, char* str, int base);
 
-void *memset(void *dest, int value, size_t len);
-
 #endif // UTILS_H

kernel/vesa.c

@@ -0,0 +1,98 @@
+#include "vesa.h"
+#include "io.h"
+#include "print.h"
+
+// VESA mode and controller information
+#define VESA_BIOS_INT 0x10
+#define VESA_BIOS_FUNC 0x4F
+
+// Function to call BIOS with specific VESA function
+static bool vesa_bios_call(uint16_t function, uint16_t* eax, uint32_t* ebx, uint32_t* ecx, uint32_t* edx) {
+    // Set up registers for VESA function call
+    __asm__ __volatile__(
+        "movw %1, %%ax\n"           // Move function number into AX
+        "int $0x10\n"                // Call BIOS interrupt 0x10 (VESA)
+        "movw %%ax, %0\n"            // Move return value in AX to the return variable
+        : "=m"(*eax)                 // Output operand (eax)
+        : "m"(function)              // Input operand (function number)
+        : "%eax", "%ebx", "%ecx", "%edx", "memory"
+    );
+    // Check for success (return values vary depending on the function)
+    return *eax == 0x004F;
+}
+
+// Set the VESA video mode
+bool vesa_set_mode(uint16_t mode) {
+    uint16_t eax = VBE_FUNCTION_SET_MODE;
+    uint32_t ebx = mode;
+    uint32_t ecx = 0;
+    uint32_t edx = 0;
+    
+    if (vesa_bios_call(VBE_FUNCTION_SET_MODE, &eax, &ebx, &ecx, &edx)) {
+        return true;
+    }
+    return false;
+}
+
+// Get the VESA mode information
+bool vesa_get_mode_info(uint16_t mode, vbe_mode_info_t* info) {
+    uint16_t eax = VBE_FUNCTION_GET_MODE_INFO;
+    uint32_t ebx = mode;
+    uint32_t ecx = 0;
+    uint32_t edx = 0;
+
+    if (vesa_bios_call(VBE_FUNCTION_GET_MODE_INFO, &eax, &ebx, &ecx, &edx)) {
+        // Copy the information into the provided struct
+        uint32_t base = (uint32_t)info;
+        __asm__ __volatile__(
+            "movw %%bx, %%es:%%di\n"
+            : 
+            : "b" (base)
+            : "%es", "%di", "memory"
+        );
+        return true;
+    }
+    return false;
+}
+
+// Get the VESA controller information
+bool vesa_get_controller_info(vbe_controller_info_t* info) {
+    uint16_t eax = VBE_FUNCTION_GET_CONTROLLER_INFO;
+    uint32_t ebx = 0;
+    uint32_t ecx = 0;
+    uint32_t edx = 0;
+
+    if (vesa_bios_call(VBE_FUNCTION_GET_CONTROLLER_INFO, &eax, &ebx, &ecx, &edx)) {
+        // Copy controller information into the provided struct
+        uint32_t base = (uint32_t)info;
+        __asm__ __volatile__(
+            "movw %%bx, %%es:%%di\n"
+            : 
+            : "b" (base)
+            : "%es", "%di", "memory"
+        );
+        return true;
+    }
+    return false;
+}
+
+// Return pointer to the VESA framebuffer
+void* vesa_get_framebuffer(void) {
+    vbe_mode_info_t mode_info;
+    if (vesa_get_mode_info(0x101, &mode_info)) {
+        return (void*)mode_info.PhysBasePtr;
+    }
+    return NULL;
+}
+
+// Clear the screen with a color
+void vesa_clear_screen(uint32_t color) {
+    uint32_t* framebuffer = (uint32_t*)vesa_get_framebuffer();
+    if (framebuffer) {
+        for (int y = 0; y < 480; y++) { // For 640x480 mode
+            for (int x = 0; x < 640; x++) {
+                framebuffer[y * 640 + x] = color;
+            }
+        }
+    }
+}

kernel/vesa.h

@@ -0,0 +1,67 @@
+#ifndef VESA_H
+#define VESA_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+// VESA BIOS Extension 2.0 Function Calls
+#define VBE_FUNCTION_SET_MODE        0x4F02
+#define VBE_FUNCTION_GET_MODE_INFO   0x4F01
+#define VBE_FUNCTION_GET_CONTROLLER_INFO 0x4F00
+#define VBE_FUNCTION_SET_DISPLAY_START 0x4F05
+
+// VESA Mode Information Structure (VBE 2.0)
+typedef struct {
+    uint16_t ModeAttributes;      // Mode attributes
+    uint8_t WinAAttributes;       // Window A attributes
+    uint8_t WinBAttributes;       // Window B attributes
+    uint16_t WinGranularity;      // Window granularity
+    uint16_t WinSize;             // Window size
+    uint16_t WinASegment;         // Window A segment address
+    uint16_t WinBSegment;         // Window B segment address
+    uint32_t WinFuncPtr;          // Function pointer for window
+    uint16_t BytesPerScanLine;    // Bytes per scanline
+    uint16_t XResolution;         // Horizontal resolution in pixels
+    uint16_t YResolution;         // Vertical resolution in pixels
+    uint8_t XCharSize;            // Character cell width
+    uint8_t YCharSize;            // Character cell height
+    uint8_t NumberOfPlanes;       // Number of memory planes
+    uint8_t BitsPerPixel;         // Bits per pixel
+    uint8_t NumberOfBanks;        // Number of banks
+    uint8_t MemoryModel;          // Memory model type
+    uint8_t BankSize;             // Bank size in kB
+    uint8_t NumberOfImagePages;   // Number of image pages
+    uint8_t Reserved0;            // Reserved
+    uint8_t RedMaskSize;          // Red mask size
+    uint8_t RedFieldPosition;     // Red field position
+    uint8_t GreenMaskSize;        // Green mask size
+    uint8_t GreenFieldPosition;   // Green field position
+    uint8_t BlueMaskSize;         // Blue mask size
+    uint8_t BlueFieldPosition;    // Blue field position
+    uint8_t RsvdMaskSize;         // Reserved mask size
+    uint8_t RsvdFieldPosition;    // Reserved field position
+    uint8_t DirectColorModeInfo;  // Direct color mode info
+    uint32_t PhysBasePtr;         // Physical base address of the linear framebuffer
+    uint32_t OffScreenMemOff;     // Offset to off-screen memory
+    uint16_t OffScreenMemSize;    // Size of off-screen memory
+    uint8_t Reserved1[206];       // Reserved
+} __attribute__((packed)) vbe_mode_info_t;
+
+// VESA Controller Information
+typedef struct {
+    uint8_t VESAVersion[2];       // VESA version
+    uint32_t OEMStringPtr;        // Pointer to OEM string
+    uint8_t Capabilities[4];      // Capabilities of the controller
+    uint32_t VideoModePtr;        // Pointer to supported video modes
+    uint16_t TotalMemory;         // Total video memory (in 64KB)
+    uint8_t Reserved[4];          // Reserved
+} __attribute__((packed)) vbe_controller_info_t;
+
+// Function Prototypes
+bool vesa_set_mode(uint16_t mode);
+bool vesa_get_mode_info(uint16_t mode, vbe_mode_info_t* info);
+bool vesa_get_controller_info(vbe_controller_info_t* info);
+void* vesa_get_framebuffer(void);
+void vesa_clear_screen(uint32_t color);
+
+#endif // VESA_H

klibc/include/stdbool.h

@@ -1,6 +1,12 @@
 #ifndef CLASSICOS_KLIBC_STDBOOL_H
 #define CLASSICOS_KLIBC_STDBOOL_H
 
-typedef enum { false = 0, true = 1 } bool;
+#ifndef __cplusplus
+#define bool _Bool
+#define true 1
+#define false 0
+#endif
+
+#define __bool_true_false_are_defined 1
 
 #endif  // CLASSICOS_KLIBC_STDBOOL_H