Merge pull request #93 from vmttmv/fix/91-header-cleanup

Remove types.c/.h, use klibc headers, amend stdbool.h, reimplement cpuid()

kernel/cpu.c

@@ -2,36 +2,106 @@
 #include "serial.h"
 #include "terminal.h"
 #include "utils.h"
-#include "print.h"
 
-void cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) {
+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"(function)
+        : "a"(leaf)
     );
 }
 
+// Helper to print a labeled decimal value
+void print_val(const char* label, uint32_t val) {
+    char buf[12];
+    utoa(val, buf, 10);
+    terminal_write(label);
+    terminal_write(buf);
+    terminal_write(" ");
+}
+
+// Safely check if CPUID is supported by attempting to flip bit 21 of EFLAGS
+int check_cpuid_supported() {
+    uint32_t f1, f2;
+    __asm__ volatile (
+        "pushfl\n\t"
+        "pushfl\n\t"
+        "popl %0\n\t"
+        "movl %0, %1\n\t"
+        "xorl $0x200000, %0\n\t"
+        "pushl %0\n\t"
+        "popfl\n\t"
+        "pushfl\n\t"
+        "popl %0\n\t"
+        "popfl\n\t"
+        : "=&r" (f1), "=&r" (f2));
+    return ((f1 ^ f2) & 0x200000) != 0;
+}
+
 void identify_cpu() {
+    if (!check_cpuid_supported()) {
+        terminal_write("CPUID not supported. Likely a 386 or early 486.\n");
+        return;
+    }
+
     uint32_t eax, ebx, ecx, edx;
     char vendor[13];
 
+    // Leaf 0: Vendor String & Max Leaf
     cpuid(0, &eax, &ebx, &ecx, &edx);
-
+    uint32_t max_leaf = eax;
     *(uint32_t *)&vendor[0] = ebx;
     *(uint32_t *)&vendor[4] = edx;
     *(uint32_t *)&vendor[8] = ecx;
     vendor[12] = '\0';
 
-    terminal_write("CPU Vendor: ");
+    terminal_write("Vendor: ");
     terminal_write(vendor);
     terminal_write("\n");
 
-    serial_write("CPU Vendor: ");
-    serial_write(vendor);
-    serial_write("\n");
+    // Leaf 1: Family, Model, Stepping
+    if (max_leaf >= 1) {
+        cpuid(1, &eax, &ebx, &ecx, &edx);
         
-    terminal_write("CPUID max leaf: ");
-    print_hex(eax, false, false);  // You must implement this (see below)
+        uint32_t stepping = eax & 0xF;
+        uint32_t model = (eax >> 4) & 0xF;
+        uint32_t family = (eax >> 8) & 0xF;
+        uint32_t type = (eax >> 12) & 0x3;
+
+        // Handle Extended Family/Model (Required for Pentium 4 and newer)
+        if (family == 0xF) {
+            family += (eax >> 20) & 0xFF;
+            model += ((eax >> 16) & 0xF) << 4;
+        }
+
+        print_val("Family:", family);
+        print_val("Model:", model);
+        print_val("Step:", stepping);
         terminal_write("\n");
     }
+
+    // Leaf 2: Cache Descriptors
+    if (max_leaf >= 2) {
+        cpuid(2, &eax, &ebx, &ecx, &edx);
+        
+        terminal_write("Cache Descriptors: ");
+        // Note: Leaf 2 returns a list of 1-byte descriptors in the registers.
+        // We look for common Intel ones:
+        uint32_t regs[4] = {eax, ebx, ecx, edx};
+        for (int i = 0; i < 4; i++) {
+            if (regs[i] & 0x80000000) continue; // Reserved bit
+            for (int j = 0; j < 4; j++) {
+                uint8_t desc = (regs[i] >> (j * 8)) & 0xFF;
+                if (desc == 0) continue;
+                
+                // Example decoding for specific chips you mentioned:
+                if (desc == 0x06) terminal_write("8KB L1 I-Cache ");
+                if (desc == 0x0A) terminal_write("8KB L1 D-Cache ");
+                if (desc == 0x41) terminal_write("128KB L2 ");
+                if (desc == 0x43) terminal_write("512KB L2 ");
+                if (desc == 0x2C) terminal_write("32KB L1 D-Cache ");
+            }
+        }
+        terminal_write("\n");
+    }
+}

kernel/cpu.h

@@ -2,8 +2,42 @@
 #define CPU_H
 
 #include <stdint.h>
+#include <stdbool.h>
 
-void cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
+// Specific Intel Model Definitions for your targets
+#define INTEL_FAM4_486_DX      0x00 // Also 0x01
+#define INTEL_FAM4_486_SX      0x02
+#define INTEL_FAM4_486_DX2     0x03
+#define INTEL_FAM4_486_DX4     0x08
+#define INTEL_FAM5_PENTIUM     0x01 // P5
+#define INTEL_FAM5_PENTIUM_MMX 0x04 // P55C
+#define INTEL_FAM6_PENTIUM_PRO 0x01 // P6
+#define INTEL_FAM6_PENTIUM_II  0x05 // Deschutes
+#define INTEL_FAM6_PENTIUM_III 0x07 // Katmai/Coppermine
+#define INTEL_FAM15_P4_WILLY   0x00 // Willamette
+#define INTEL_FAM15_P4_NORTH   0x02 // Northwood
+#define INTEL_FAM15_P4_PRES    0x03 // Prescott
+
+typedef struct {
+    char vendor[13];
+    uint32_t family;
+    uint32_t model;
+    uint32_t stepping;
+    uint32_t type;
+    uint32_t max_leaf;
+    
+    // Feature flags (optional, but very helpful later)
+    bool has_fpu;
+    bool has_mmx;
+    bool has_sse;
+} cpu_info_t;
+
+// Function Prototypes
+void cpuid(uint32_t leaf, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
+bool cpu_check_cpuid_support(void);
 void identify_cpu(void);
 
+// Helper to get the current CPU info after identification
+cpu_info_t* cpu_get_info(void);
+
 #endif // CPU_H

kernel/fat12.c

@@ -15,9 +15,16 @@ static uint8_t g_sector_buffer[FAT12_SECTOR_SIZE];
 static int k_memcmp(const void *s1, const void *s2, uint32_t n) {
     const uint8_t *p1 = (const uint8_t *)s1;
     const uint8_t *p2 = (const uint8_t *)s2;
+
     for (uint32_t i = 0; i < n; i++) {
-        if (p1[i] != p2[i]) return p1[i] - p2[i];
+        if (p1[i] != p2[i]) {
+            // Correct way to return the difference:
+            // If p1[i] > p2[i], returns positive.
+            // If p1[i] < p2[i], returns negative.
+            return (int)p1[i] - (int)p2[i];
         }
+    }
+
     return 0;
 }
 
@@ -182,3 +189,8 @@ uint32_t fat12_read(file_t *file, uint8_t *buffer, uint32_t bytes_to_read) {
 
     return total_read;
 }
+
+int disk_read_sector(uint32_t lba, uint8_t *buffer) {
+    // For now, do nothing and return success
+    return 0; 
+}

kernel/fat12.h

@@ -58,7 +58,7 @@ typedef struct {
 
 // You must implement this in your disk driver (e.g., floppy.c)
 // Returns 0 on success, non-zero on error.
-extern int disk_read_sector(uint32_t lba, uint8_t *buffer);
+int disk_read_sector(uint32_t lba, uint8_t *buffer);
 
 void fat12_init();
 file_t fat12_open(const char *filename);

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
@@ -24,11 +20,7 @@ void set_page_table(page_table_entry_t *table) {
         // 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].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

@@ -16,25 +16,25 @@ typedef struct {
     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 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 available : 3;        // Available bits for the system
-    uint32_t frame : 20;           // Frame address (physical address)
+    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

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