Added some fun GUI primitives

Makefile

@@ -3,9 +3,9 @@ EMULATOR = qemu-system-i386
 AS = ${HOME}/opt/cross/bin/i686-elf-as
 CC = ${HOME}/opt/cross/bin/i686-elf-gcc
 CPP = ${HOME}/opt/cross/bin/i686-elf-g++ 
-CFLAGS =  -ffreestanding -Og -ggdb  -Wall -Wextra
+CFLAGS =  -ffreestanding -O2 -Wall -Wextra
 
-OFILES =$(BUILD_DIR)/boot.o $(BUILD_DIR)/kterm.o $(BUILD_DIR)/kernel.o $(BUILD_DIR)/memory.o  $(BUILD_DIR)/paging.o	$(BUILD_DIR)/pit.o 	$(BUILD_DIR)/time.o	$(BUILD_DIR)/keyboard.o	 $(BUILD_DIR)/io.o 	$(BUILD_DIR)/gdtc.o $(BUILD_DIR)/idt.o $(BUILD_DIR)/pic.o $(BUILD_DIR)/sv-terminal.o $(BUILD_DIR)/string.o  
+OFILES =  $(BUILD_DIR)/boot.o $(BUILD_DIR)/window.o $(BUILD_DIR)/cursor.o $(BUILD_DIR)/kterm.o $(BUILD_DIR)/kernel.o  $(BUILD_DIR)/PhysicalMemoryManager.o $(BUILD_DIR)/io.o  $(BUILD_DIR)/vesa.o $(BUILD_DIR)/PageDirectory.o $(BUILD_DIR)/gdtc.o $(BUILD_DIR)/idt.o $(BUILD_DIR)/pic.o $(BUILD_DIR)/string.o
 
 SRC_DIR = src
 BUILD_DIR = build
@@ -23,6 +23,8 @@ all: clean build
 
 build: build_kernel iso
 
+
+
 clean_iso: 
 	if [[ -a isodir/boot ]] ; then rm root/boot -rd ; fi
 	if [ -f build/barinkOS.iso ] ; then rm build/barinkOS.iso ; fi
@@ -33,15 +35,14 @@ iso: clean_iso clean build
 	cp src/grub.cfg root/boot/grub/grub.cfg
 	grub-mkrescue -o build/barinkOS.iso root
 	
-run: all
+test:
-	$(EMULATOR) -cdrom build/barinkOS.iso -serial stdio -vga std -display gtk -m 2G -cpu core2duo
+	$(EMULATOR)  -kernel $(BUILD_DIR)/myos.bin -serial mon:stdio -vga std  -display gtk -m 2G -cpu core2duo # -monitor stdio
-
+test_iso:
-debug: all
+	$(EMULATOR) -cdrom build/barinkOS.iso -serial mon:stdio -vga std -display gtk -m 2G -cpu core2duo
-	$(EMULATOR) -cdrom build/barinkOS.iso -serial stdio -vga std -display gtk -m 2G -cpu core2duo -s -d int
 
 build_kernel: $(OBJ_LINK_LIST)
 	$(CC) -T $(SRC_DIR)/kernel//linker.ld -o $(BUILD_DIR)/myos.bin \
-	 -ffreestanding -ggdb -Og -nostdlib $(OBJ_LINK_LIST) -lgcc
+	 -ffreestanding -O2 -nostdlib $(OBJ_LINK_LIST) -lgcc
 
 build_x86_64: 
 	$(AS) $(SRC_DIR)/cgc/x86_64/crti.s -o $(BUILD_DIR)/crti_64.o
@@ -51,54 +52,47 @@ clean:
 	rm -f $(BUILD_DIR)/myos.bin $(INTERNAL_OBJS)
 
 $(BUILD_DIR)/kernel.o:
-	$(CPP) -c $(SRC_DIR)/kernel/kernel.cpp -o $(BUILD_DIR)/kernel.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/kernel.cpp -o $(BUILD_DIR)/kernel.o $(CFLAGS) -fno-exceptions -fno-rtti -fpermissive
 
 $(BUILD_DIR)/kterm.o:
-	$(CPP) -c $(SRC_DIR)/kernel/Terminal/kterm.cpp  -o $(BUILD_DIR)/kterm.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/tty/kterm.cpp  -o $(BUILD_DIR)/kterm.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/boot.o:
-	$(AS) $(SRC_DIR)/kernel/KernelLauncher/boot.s -o $(BUILD_DIR)/boot.o
+	$(AS) $(SRC_DIR)/kernel//boot.S -o $(BUILD_DIR)/boot.o
 
 $(BUILD_DIR)/crti.o:
-	$(AS) $(SRC_DIR)/kernel/KernelLauncher/crti.s -o $(BUILD_DIR)/crti.o
+	$(AS) $(SRC_DIR)/kernel/crti.s -o $(BUILD_DIR)/crti.o
 
 $(BUILD_DIR)/crtn.o:
-	$(AS) $(SRC_DIR)/kernel/KernelLauncher/crtn.s -o $(BUILD_DIR)/crtn.o
+	$(AS) $(SRC_DIR)/kernel/crtn.s -o $(BUILD_DIR)/crtn.o
 
 $(BUILD_DIR)/io.o:
 		$(CPP) -c $(SRC_DIR)/kernel/io.cpp  -o $(BUILD_DIR)/io.o $(CFLAGS) -fno-exceptions -fno-rtti
 
+$(BUILD_DIR)/PageDirectory.o:
+	$(CPP) -c $(SRC_DIR)/kernel/memory/PageDirectory.cpp -o $(BUILD_DIR)/PageDirectory.o $(CFLAGS) -fno-exceptions -fno-rtti 
 
 $(BUILD_DIR)/idt.o:
-	$(CPP) -c $(SRC_DIR)/kernel/Interrupts/idt/idt.cpp -o $(BUILD_DIR)/idt.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/idt/idt.cpp -o $(BUILD_DIR)/idt.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/gdtc.o:
-	$(CPP) -c $(SRC_DIR)/kernel/Memory/GDT/gdtc.cpp -o $(BUILD_DIR)/gdtc.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/gdt/gdtc.cpp -o $(BUILD_DIR)/gdtc.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 
 $(BUILD_DIR)/pic.o:
-	$(CPP) -c $(SRC_DIR)/kernel/Drivers/PIC/pic.cpp -o $(BUILD_DIR)/pic.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/pic/pic.cpp -o $(BUILD_DIR)/pic.o $(CFLAGS) -fno-exceptions -fno-rtti
 
 $(BUILD_DIR)/string.o:
-	$(CC) -c $(SRC_DIR)/kernel/Lib/string.c  -o $(BUILD_DIR)/string.o $(CFLAGS) -std=gnu99
+	$(CC) -c $(SRC_DIR)/libc/include/string.c  -o $(BUILD_DIR)/string.o $(CFLAGS) -std=gnu99
 
+$(BUILD_DIR)/PhysicalMemoryManager.o:
+	$(CPP) -c $(SRC_DIR)/kernel/memory/PhysicalMemoryManager.cpp  -o $(BUILD_DIR)/PhysicalMemoryManager.o $(CFLAGS) -fno-exceptions -fno-rtti
 
-$(BUILD_DIR)/pit.o:
+$(BUILD_DIR)/vesa.o:
-	$(CPP) -c $(SRC_DIR)/kernel/Drivers/PIT/pit.cpp  -o $(BUILD_DIR)/pit.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/kernel/drivers/vesa/vesa.cpp  -o $(BUILD_DIR)/vesa.o $(CFLAGS) -fno-exceptions -fno-rtti
 
+$(BUILD_DIR)/window.o:
+	$(CPP) -c $(SRC_DIR)/gui/window.cpp  -o $(BUILD_DIR)/window.o $(CFLAGS) -fno-exceptions -fno-rtti
 
-$(BUILD_DIR)/keyboard.o:
+$(BUILD_DIR)/cursor.o:
-	$(CPP) -c $(SRC_DIR)/kernel/Drivers/PS-2/keyboard.cpp  -o $(BUILD_DIR)/keyboard.o $(CFLAGS) -fno-exceptions -fno-rtti
+	$(CPP) -c $(SRC_DIR)/gui/cursor.cpp  -o $(BUILD_DIR)/cursor.o $(CFLAGS) -fno-exceptions -fno-rtti
-
-
-$(BUILD_DIR)/time.o:
-	$(CPP) -c $(SRC_DIR)/kernel/time.cpp  -o $(BUILD_DIR)/time.o $(CFLAGS) -fno-exceptions -fno-rtti
-
-$(BUILD_DIR)/sv-terminal.o:
-	$(CPP) -c $(SRC_DIR)/kernel/SuperVisorTerminal/superVisorTerminal.cpp  -o $(BUILD_DIR)/sv-terminal.o $(CFLAGS) -fno-exceptions -fno-rtti
-
-$(BUILD_DIR)/memory.o:
-	$(CPP) -c $(SRC_DIR)/kernel/Memory/memory.cpp  -o $(BUILD_DIR)/memory.o $(CFLAGS) -fno-exceptions -fno-rtti
-
-$(BUILD_DIR)/paging.o:
-	$(CPP) -c $(SRC_DIR)/kernel/Memory/paging.cpp -o $(BUILD_DIR)/paging.o $(CFLAGS) -fno-exceptions -fno-rtti

README.md

@@ -6,6 +6,9 @@
 
 ________________________
 ### Screenshot(s)
+![Graphics mode](screenshots/BarinkOS_VBE_GRAPHICS.png) \
+It may not look like much but I am proud of it! We are in graphics mode.
+
 ![Scrolling the terminal](screenshots/Screenshot1.png)   \
 The first scrolling boot screen. 😲
 
@@ -19,8 +22,7 @@ Multiboot information can be read by the kernel.
 ________________________
 
 ### The goal
-Writing a hobby operating system to better understand the basic building blocks of any operating system.Initially I'd like for my 
+Writing a hobby operating system to better understand the basic building blocks of any operating system.
-operating system to be able to run bash.
 
 ________________________
 ### Operating System Technical specs/details

features.md

@@ -1,30 +1,29 @@
 # TODO list 
-## Basics
+## Start planning
 <input type="checkbox" checked/> Setup Cross-Compiler \
 <input type="checkbox" checked/> Multiboot to kernel \
 <input type="checkbox" checked/> Printing string to the screen \
-<input type="checkbox" checked/> Printing values/numbers to the screen \
+<input type="checkbox" checked/> Printing values/numbers to the screen (a.k.k itoa) \
-<input type="checkbox" checked/> Basic Terminal \
 <input type="checkbox" checked/> Extend Multiboot implementation \
 <input type="checkbox" checked/> Output to serial port \
 <input type="checkbox" checked/> Move to protected mode \
 <input type="checkbox" checked/> Enabel CMOS clock \
-<input type="checkbox" checked/> Time measurement (PIC &| PIT) \
+<input type="checkbox" /> Time measurement (PIC &| PIT) \
 <input type="checkbox" /> Detect CPU speed \
 <input type="checkbox" checked/> Interrupt / exception system (API) \
-<input type="checkbox" checked/> PCI support \
+
-<input type="checkbox" checked/> ATA PIO Mode support \
+<input type="checkbox" checked/> Plan your memory map (virtual, and physical) : decide where you want the data to be. \
-<input type="checkbox" checked/> FAT Filesystem \
-<input type="checkbox" /> Virtual filesystem \
-<input type="checkbox" checked/> Keyboard support ( P/S2 Keyboard) \
-<input type="checkbox" checked/> Physical memory management \
-<input type="checkbox" />  Paging \
-<input type="checkbox" /> Virtual memory management \
 <input type="checkbox" /> The heap: allocating memory at runtime (malloc and free) is almost impossible to go without. \
 <input type="checkbox" /> Enable SIMD Extensions (SSE)
 
-<input type="checkbox" /> Hardware Management system
+## Other features I am thinking of:
-
+<input type="checkbox" /> PCI support \
+<input type="checkbox" /> ATA PIO Mode support \
+<input type="checkbox" /> USTAR Filesystem ( For its simplicity this is very likely the first filesystem the OS is going to support) \
+<input type="checkbox" /> ACPI support ( Or some other basic way to support shutdown, reboot and possibly hibernation ) \
+<input type="checkbox" /> ATAPI support \
+<input type="checkbox" /> Keyboard support ( P/S2 Keyboard) \
+<input type="checkbox" checked/> Memory Management (MMU)   
 <input type="checkbox" /> Preemptive multi tasking \
 <input type="checkbox" /> Processes  \
 <input type="checkbox" /> Threads  
@@ -33,11 +32,9 @@
 <input type="checkbox" /> POSIX compliance (partially) \
 <input type="checkbox" /> RPC - for interprocess communication \
 <input type="checkbox" /> Sync primitives  - Semaphores, Mutexes, spinlocks et al. \
-
+<input type="checkbox" /> Basic Terminal \
-<input type="checkbox" /> ACPI support  \
+<input type="checkbox" /> Extend hardware recognition ( CPU codename, memory, ATA harddisk, RAW diskSpace, CPU speed through SMBIOS et al. ) \
-<input type="checkbox" /> ATAPI support \
-
-## Optional 
 <input type="checkbox" /> Basic Window server/client \
+## Support for more filesystems if I like the challenge in writing these ...
+<input type="checkbox" /> FAT Filesystem \
 <input type="checkbox" /> EXT2 Filesystem 
-<input type="checkbox" /> USTAR Filesystem \

src/grub.cfg

@@ -1,8 +1,3 @@
-GRUB_DEFAULT=0
+menuentry "BarinkOS"{
-GRUB_TIMEOUT=-1
-GRUB_HIDDEN_TIMEOUT=0
-GRUB_HIDDEN_TIMEOUT_QUITE=true
-
-menuentry "BarinkOS" {
     multiboot /boot/myos.bin
 }

src/gui/Graphics.h

@@ -0,0 +1,5 @@
+#pragma once
+
+class Graphics {
+
+};

src/gui/Widget.h

@@ -0,0 +1,7 @@
+#pragma once
+
+
+class Widget{
+    virtual void draw();
+
+};

src/gui/cursor.cpp

@@ -0,0 +1,17 @@
+#include "cursor.h"
+
+    void Cursor::draw(){
+        for(int i = 0; i <  this->width; i++){
+            for(int j = 0; j <  this->height; j++){
+                if(this->bitmap[j * this->width + i] == 1 ){
+                        putPixel(i + this->x,j + this->y, 0xFF000000);
+                }
+            }
+        }
+    }
+
+
+    Cursor::Cursor(int x, int y){
+        this->x = x;
+        this->y = y;
+    }

src/gui/cursor.h

@@ -0,0 +1,38 @@
+#pragma once 
+#include "../kernel/drivers/vesa/vesa.h"
+
+
+class Cursor{
+    public:
+    void draw();
+    Cursor(int x, int y);
+
+
+
+    private:
+        int x;
+        int y;
+        const int width= 16;
+        const int height= 10;
+        const int bitmap [160] = {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+
+            0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,
+
+            0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,
+
+            0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,
+
+            0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,
+
+            0,0,0,0,0,1,1,1,1,1,1,1,1,1,0,0,
+
+            0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,
+
+            0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,
+
+            0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,
+
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+        };
+};

src/gui/window.cpp

@@ -0,0 +1,33 @@
+#include "window.h"
+
+int Window::getWidth(){
+    return this->rect.width;
+}
+
+int Window::getHeight(){
+    return this->rect.height;
+}
+
+void Window::setWidth(int& width){
+    this->rect.width = width;
+}
+void Window::setHeight(int& height){
+    this->rect.height = height;
+}
+
+int Window::getX(){
+    return this->rect.x;
+}
+
+int Window::getY(){
+    return this->rect.y;
+}
+
+Window::Window (Rect& rect , uint32_t colour){
+    this->rect = rect;
+    this->Background_colour = colour;
+}
+
+void Window::draw(){
+    drawRect(this->getX() , this->getY() , this->getWidth() , this->getHeight() ,this->Background_colour );
+}

src/gui/window.h

@@ -0,0 +1,37 @@
+#pragma once
+#include "../kernel/drivers/vesa/vesa.h"
+#include "Widget.h"
+
+struct Rect {
+    int width;
+    int height;
+    int x;
+    int y;
+
+};
+
+
+
+class Window : Widget{
+
+public:
+    int getX();
+    int getY();
+
+    int getWidth();
+    int getHeight();
+    void setWidth(int&);
+    void setHeight(int&);
+
+    Window (Rect& rect , uint32_t colour);
+    void draw();
+
+
+private:
+    Rect rect;
+    uint32_t Background_colour;
+
+
+
+
+};

src/kernel/Drivers/PIT/pit.cpp

@@ -1,54 +0,0 @@
-#include "pit.h"
-#include "../../Terminal/kterm.h"
-uint32_t pit_tick = 0;
-
-
-void pit_initialise()
-{
-    asm volatile("CLI");
-
-#ifdef __VERBOSE__
-    printf("Init PIT!\n");
-#endif
-    // clear mask for IRQ 0 
-    uint8_t value = inb(0x21) & ~(1<< 0);
-    outb(0x21, value);
-
-    io_wait();
-
-    const int freq = 500;
-
-    uint32_t divisor = 1193180 / freq;
-
-    outb(PIT_COMMAND, 0x36);
-
-    uint8_t l = (uint8_t) (divisor & 0xFF);
-    uint8_t h = (uint8_t) ( (divisor>>8) & 0xff);
-
-    outb(PIT_DATA_0, l);
-    outb(PIT_DATA_0,h);
-
-
-    asm volatile("STI");
-}
-
-
-void get_pit_count()
-{
-    asm volatile ("CLI");
-
-    outb(PIT_COMMAND, 0);
-    uint16_t count = inb(PIT_DATA_0);
-    count |= inb(PIT_DATA_0) << 8;
-
-    printf("PIT count: 0x%x\n", count); 
-
-    asm volatile("STI");   
-
-}
-
-void set_pit_count()
-{
-
-}
-

src/kernel/Drivers/PIT/pit.h

@@ -1,18 +0,0 @@
-#pragma once 
-#include <stdint.h>
-#include "../../io.h"
-#define PIT_DATA_0 0x40
-#define PIT_DATA_1 0x41
-#define PIT_DATA_2 0x42
-#define PIT_COMMAND 0x43
-
-
-extern uint32_t pit_tick;
-
-
-void pit_initialise();
-
-
-void get_pit_count();
-
-void set_pit_count();

src/kernel/Drivers/PS-2/keyboard.cpp

@@ -1,51 +0,0 @@
-#include "keyboard.h"
-
-KeyPressInfo keyPress {};
-
-void KeyHandled(){
-    keyPress.ScanCode= 0x00;
-    keyPress.PressedModifiers = 0x00;
-}
-
-
-char getASCIIKey(){
-    char keyPressed;
-    // Wait until a key is pressed  
-    while(keyPress.ScanCode == 0x00) {
-        asm volatile ("NOP");
-    }
-
-    
-    // Translate keycode to ascii 
-    // Probably a lookup table might be handy 
-    // Until 0x37
-     const char* ASCIILookUp =
-      "\01234567890-=\0\0QWERTYUIOP[]\0\0ASDFGHJKL;\'`\0\\ZXCVBNM,./\0"; 
-     
-     uint8_t ASCII_Index = keyPress.ScanCode - 3  ;
-     //printf("ASCII_INDEX: %x\n", ASCII_Index);
-     keyPressed = ASCIILookUp[ASCII_Index];
-
-    KeyHandled();
-
-    return keyPressed;
-}
-
-
-
-uint8_t getKey(){
-    // Wait until a key is pressed 
-    while(keyPress.ScanCode == 0x00){
-        asm volatile ("NOP");
-    }
-    
-    if( keyPress.ScanCode > 0x37){
-        keyPress.ScanCode = 0x00;
-        return 0;
-    }
-
-    uint8_t ScanCode = keyPress.ScanCode;
-   // KeyHandled();
-
-    return  ScanCode ;
-}

src/kernel/Drivers/PS-2/keyboard.h

@@ -1,34 +0,0 @@
-#pragma once
-#include <stdint.h>
-#include "../../Terminal/kterm.h"
-typedef enum ScanCodeSet{
-    None            =   0,
-    ScanCodeSet1    =   1,
-    ScanCodeSet2    =   2,
-    ScanCodeSet3    =   3,
-};
-
-typedef enum Modifiers{
-    LSHIFT  =   1,
-    RSHIFT  =   2,
-
-    LCTRL   =   3,
-    RCTRL   =   4,
-
-    LALT    =   5,
-    RALT    =   6
-};
-
-struct KeyPressInfo{ 
-    uint8_t PressedModifiers;
-    uint8_t ScanCode;
-};
-
-
-
-extern KeyPressInfo keyPress;
-
-void KeyHandled();
-
-char getASCIIKey();
-uint8_t getKey();

src/kernel/Drivers/cmos/cmos.cpp

@@ -1,38 +0,0 @@
-void ReadFromCMOS(unsigned char array[])
-{
-    unsigned char tvalue, index;
-
-    for (index = 0; index < 128; index++)
-    {
-        asm(
-            "cli\n\t"           // Disable interrupts
-            "mov al, index\n\t" // Move index address
-            // since the 0x80 bit of al is not set, NMI is active 
-            "out 0x70,al\n\t" // Copy address to CMOS register
-            // some kind of real delay here is probably best 
-            "in al,0x71\n\t" // Fetch 1 byte to al
-            "sti\n\t"        // Enable interrupts
-            "mov tvalue,al\n\t");
-
-        array[index] = tvalue;
-    }
-}
-
-void WriteTOCMOS(unsigned char array[])
-{
-   unsigned char index;
- 
-   for(index = 0; index < 128; index++)
-   {
-      unsigned char tvalue = array[index];
-      
-       asm("cli\n\t"       // Clear interrupts
-         "mov al,index\n\t"    // move index address
-         "out 0x70,al\n\t"     // copy address to CMOS register
-         // some kind of real delay here is probably best 
-         "mov al,tvalue\n\t"   // move value to al
-         "out 0x71,al\n\t"   // write 1 byte to CMOS
-         "sti\n\\t"   );        // Enable interrupts
-      
-   }
-}

src/kernel/FileSystem/FAT/FAT16.h

@@ -1,8 +0,0 @@
-#pragma once
-#include "../../vfs/File.h"
-
-
-class FAT16 : File  {
-public:
-    
-};

src/kernel/Interrupts/idt/idt.cpp

@@ -1,341 +0,0 @@
-#include "idt.h"
-#include "../../Drivers/PIT/pit.h"
-#include "../../Drivers/PS-2/keyboard.h"
-
-IDT_entry idt_table[256];
-IDT_ptr idt_ptr;
-
-void set_id_entry (uint8_t num , uint32_t base, uint16_t sel,  uint8_t flags){
-    idt_table[num].offset_1 = base & 0xFFFF;
-    idt_table[num].selector = sel;
-    idt_table[num].zero = 0;
-    idt_table[num].type_attr = flags;
-    idt_table[num].offset_2 = (base >> 16) & 0xFFFF;
-
-};
-
-void irs_handler (registers regs) {
-     
-        //printf("(IRS) Interrupt number: %d \r", regs.int_no);
-        switch (regs.int_no)
-        {
-        case 0:
-            // Divide Error #DE
-            printf("#DE\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 1:
-            // Debug Exception #DB
-            printf("#DB\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-
-        case 2:
-            // NMI Interrupt 
-            printf("#NMI\n");
-        break;
-        
-        case 3:
-            // Breakpoint Exception #BP
-            printf("#BP\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 4:
-            // Overflow Exception #OF
-            printf("#OF\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 5:
-            // BOUND Range Exceeded Exception #BR
-            printf("#BR\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 6:
-            // Invalid OpCode Exception #UD 
-            printf("#UD\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 7:
-            // Device Not Available Exception  #NM
-            printf("#NM\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 8:
-            // Double Fault Exception #DF
-            printf("#DF\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-
-        case 9:
-            // Coprocessor Segment Overrun
-            printf("Coprocessor Segment overrun!\n");
-        break;
-        
-        case 10:
-            // Invalid TSS Exception #TS
-            printf("#TS\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-
-        case 11:
-            // Segment Not Present #NP
-            printf("#NP\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 12:
-            // Stack Fault Exception #SS
-            printf("#SS\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 13:
-            // General Protection Exception #GP
-            printf("#GP\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 14:
-            // Page Fault Exception #PF
-            printf("#PF\n");
-
-            printf("EIP: 0x%x\n", regs.eip); // Points to faulting instruction ???
-            printf("EAX: 0x%x\n", regs.eax); 
-            printf("EBP: 0x%x\n", regs.ebp); // Base pointer pointing to the bottom of the stack 
- 
-
-            // Error code of 32 bits are on the stack
-            // CR2 register contains the 32-bit linear address that generated the exception
-            // See Intel Software Developers manual Volume 3A Part 1 page 236 for more info
-                   
-
-            /*
-                Check the error code to figure out what happened here
-            */
-
-
-            
-    
-        break;
-        
-        case 16:
-            // x87 FPU Floating-point Error #MF
-            printf("#MF\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp);
-        break;
-        
-        case 17:
-            // Alignment Check Exception #AC
-            printf("#AC\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp); 
-        break;
-        
-        case 18:
-            // Machine-Check Exception #MC
-            printf("#MC\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp); 
-        break;
-        
-        case 19:
-            // SIMD Floating-point Exception #XM
-            printf("#XM\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp); 
-        break;
-        
-        case 20:
-             // Virtualization Exception #VE
-            printf("#VE\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp); 
-        break;
-        
-        case 21:
-             // Control Protection Exception #CP
-            printf("#CP\n");
-            printf("EIP: 0x%x\n", regs.eip);
-            printf("EAX: 0x%x\n", regs.eax);
-            printf("EBP: 0x%x\n", regs.ebp); 
-        break;
-
-        default:
-            // PANIC!!!
-            break;
-        }
-
-      
-        
-}
-
-void irq_handler (registers regs) {
-
-    
-
-    switch (regs.int_no) {
-    case 0:
-            pit_tick++;
-        break;
-    case 1:
-        // Keyboard interrupt !!
-
-        int scan;
-        int i;/*register*/
-
-        // Read scancode 
-        scan = inb(0x60);
-        
-        // Send ack message!
-        i = inb(0x61);
-        outb(0x61, i|0x80);
-        outb(0x61, i);
-
-        // NOTE: check for special scan codes 
-        // e.g. modifiers etc..
-        if( scan < 0x37){
-            //printf("Read from IO: 0x%x\n", scan);
-            keyPress.ScanCode = scan ;
-            //printf( "[From Interrupt] Scancode: %x\n", keyPress.ScanCode);
-
-        }
-
-        
-        break;    
-    case 12:
-        // PS2 Mouse interrupt 
-        printf("Mouse event triggered!");
-        //int event = inb(0x60);
-        break;
-
-    default:
-        printf("Interrupt happened!");
-        printf("Received INT: 0x%x\n", regs.int_no);
-        break;
-    }        
-
-    outb(0x20, 0x20); // send end of interrupt to master
-
-    if ( regs.int_no > 8 && regs.int_no <= 15) {
-        outb(0xA0, 0x20); // send end of interrupt to slave 
-    }
-    
-    
-    if( regs.int_no == 13){
-        printf(" Error code: %d \n", regs.err_code);
-
-    }
-
-}
-
-void init_idt(){
-    // Initialise the IDT pointer
-    idt_ptr.length = sizeof(IDT_entry) * 255;
-    idt_ptr.base = (uint32_t)&idt_table;
-
-#ifdef __VERBOSE__
-    printf("Init IDT\n");
-#endif
-
-    // TODO: Set everything to zero first
-
-    set_id_entry(0,  (uint32_t) irs0 , 0x08, 0x8F);
-    set_id_entry(1,  (uint32_t) irs1 , 0x08, 0x8E);
-    set_id_entry(2,  (uint32_t) irs2 , 0x08, 0x8E);
-    set_id_entry(3,  (uint32_t) irs3 , 0x08, 0x8E);
-    set_id_entry(4,  (uint32_t) irs4 , 0x08, 0x8E);
-    set_id_entry(5,  (uint32_t) irs5 , 0x08, 0x8E);
-    set_id_entry(6,  (uint32_t) irs6 , 0x08, 0x8E);
-    set_id_entry(7,  (uint32_t) irs7 , 0x08, 0x8E);
-    set_id_entry(8,  (uint32_t) irs8 , 0x08, 0x8E);
-    set_id_entry(9,  (uint32_t) irs9 , 0x08, 0x8E);
-    set_id_entry(10, (uint32_t) irs10 , 0x08, 0x8E);
-    set_id_entry(11, (uint32_t) irs11 , 0x08, 0x8E);
-    set_id_entry(12, (uint32_t) irs12 , 0x08, 0x8E);
-    set_id_entry(13, (uint32_t) irs13 , 0x08, 0x8E);
-    set_id_entry(14, (uint32_t) irs14 , 0x08, 0x8E);
-    set_id_entry(15, (uint32_t) irs15 , 0x08, 0x8E);
-    set_id_entry(16, (uint32_t) irs16 , 0x08, 0x8E);
-    set_id_entry(17, (uint32_t) irs17 , 0x08, 0x8E);
-    set_id_entry(18, (uint32_t) irs18 , 0x08, 0x8E);
-    set_id_entry(19, (uint32_t) irs19 , 0x08, 0x8E); 
-    set_id_entry(20, (uint32_t) irs20 , 0x08, 0x8E);
-    set_id_entry(21, (uint32_t) irs21 , 0x08, 0x8E);
-    set_id_entry(22, (uint32_t) irs22 , 0x08, 0x8E);
-    set_id_entry(23, (uint32_t) irs23 , 0x08, 0x8E);
-    set_id_entry(24, (uint32_t) irs24 , 0x08, 0x8E);
-    set_id_entry(25, (uint32_t) irs25 , 0x08, 0x8E);
-    set_id_entry(26, (uint32_t) irs26 , 0x08, 0x8E);
-    set_id_entry(27, (uint32_t) irs27 , 0x08, 0x8E); 
-    set_id_entry(28, (uint32_t) irs28 , 0x08, 0x8E);
-    set_id_entry(29, (uint32_t) irs29 , 0x08, 0x8E);
-    set_id_entry(30, (uint32_t) irs30 , 0x08, 0x8E);
-    set_id_entry(31, (uint32_t) irs31 , 0x08, 0x8E);
-
-
-    //print_serial("Remapping PIC\n");
-    PIC_remap(0x20, 0x28);
-
-    // clear mask for IRQ 12
-    uint8_t value = inb(0x21) & ~(1<< 12);
-    outb(0x21, value);
-
-
-
-    // pic IRQ Table
-    set_id_entry(32, (uint32_t)irq0, 0x08, 0x8E);
-    set_id_entry(33, (uint32_t)irq1, 0x08, 0x8E); // PS2 Keyboard
-    set_id_entry(34, (uint32_t)irq2, 0x08, 0x8E);
-    set_id_entry(35, (uint32_t)irq3, 0x08, 0x8E);
-    set_id_entry(36, (uint32_t)irq4, 0x08, 0x8E);
-    set_id_entry(37, (uint32_t)irq5, 0x08, 0x8E);
-    set_id_entry(38, (uint32_t)irq6, 0x08, 0x8E);
-    set_id_entry(39, (uint32_t)irq7, 0x08, 0x8E);
-    set_id_entry(40, (uint32_t)irq8, 0x08, 0x8E);
-    set_id_entry(41, (uint32_t)irq9, 0x08, 0x8E);
-    set_id_entry(42, (uint32_t)irq10, 0x08, 0x8E);
-    set_id_entry(43, (uint32_t)irq11, 0x08, 0x8E);
-    set_id_entry(44, (uint32_t)irq12, 0x08, 0x8E); // PS2 Mouse
-    set_id_entry(45, (uint32_t)irq13, 0x08, 0x8E);
-    set_id_entry(46, (uint32_t)irq14, 0x08, 0x8E);
-    set_id_entry(47, (uint32_t)irq15, 0x08, 0x8E);
-
-    
-    idt_flush((uint32_t)&idt_ptr);
-}

src/kernel/KernelLauncher/boot.s

@@ -1,144 +0,0 @@
-/*
- * Multiboot 
- */
-.set ALIGN,    1<<0             /* align loaded modules on page boundaries */
-.set MEMINFO,  1<<1             /* provide memory map */
-.set FLAGS,    ALIGN | MEMINFO  /* this is the Multiboot 'flag' field */
-.set MAGIC,    0x1BADB002       /* 'magic number' lets bootloader find the header */
-.set CHECKSUM, -(MAGIC + FLAGS) /* checksum of above, to prove we are multiboot */
-
-.section .multiboot.data, "aw"
-.align 4
-.long MAGIC
-.long FLAGS
-.long CHECKSUM
- 
-/*
-*	Allocate initial stack
-*/
-.section .bootstrap_stack, "aw", @nobits
-stack_bottom:
-.skip 16384 # 16 KiB
-stack_top:
-
-/*
-* Preallocate a couple pages to get us bootstrapped 
-* Being carefull to not use any address the bootloader might 
-* be using for its multiboot structures
-*/
-.section .bss, "aw", @nobits
-	.align 4096
-boot_page_directory:
-	.skip 4096
-boot_page_table:
-	.skip 4096
-# More page tables may be required
-
-# Entry point
-.section .multiboot.text, "a"
-.global _start
-.type _start, @function 
-_start:
-	# Get physical address of the boot_page_table
-	movl $(boot_page_table - 0xC0000000), %edi
-	# Map address 0
-	movl $0, %esi
-	# Map 1023 pages the 1024th being the VGA text buffer
-	movl $1023, %ecx
-
-1:	# Map the kernel 
-	cmpl $_kernel_start, %esi
-	jl 2f
-	cmpl $(_kernel_end - 0xC0000000), %esi
-	jge 3f
-
-	# Map physical address as "present and writable"
-	movl %esi, %edx
-	orl $0x003, %edx
-	movl %edx, (%edi)
-
-2: # Size of page is 4096 bytes
-	addl $4096, %esi
-	# Size of entries in boot_page_table is 4 bytes
-	addl $4, %edi 
-	# Loop to the next entry if we haven't finished.
-	loop 1b
-
-3:	# Map VGA video memory to 0xC03FF00 as "present, writable"
-	movl $(0x000B8000 | 0x003), boot_page_table - 0xC0000000 + 1023 * 4
-
-
-	# IMPORTANT NOTE FROM WIKI.OSDEV.ORG/HIGHER_HALF_X86_BARE_BONES
-
-	# The page table is used at both page directory entry 0 (virtually from 0x0
-	# to 0x3FFFFF) (thus identity mapping the kernel) and page directory entry
-	# 768 (virtually from 0xC0000000 to 0xC03FFFFF) (thus mapping it in the
-	# higher half). The kernel is identity mapped because enabling paging does
-	# not change the next instruction, which continues to be physical. The CPU
-	# would instead page fault if there was no identity mapping.\
-	
-	# Map the page table to both virtual addresss 0x00000000 and 0xC0000000
-	movl $(boot_page_table - 0xC0000000 + 0x003), boot_page_directory - 0xC0000000 + 0
-	movl $(boot_page_table - 0xC0000000 + 0x003), boot_page_directory - 0xC0000000 + 768 * 4
-
-	# Set cr3 to the address of the boot_page_directory
-	movl $(boot_page_directory - 0xC0000000), %ecx
-	movl %ecx, %cr3
-
-	# Enable paging and the write-protect bit
-	movl %cr0, %ecx
-	orl $0x80010000, %ecx
-	movl %ecx, %cr0
-
-	# Jump to higher half with an absolute jump
-	lea 4f, %ecx
-	jmp *%ecx
-
-.section .text
-4:
-	# At this point, paging is fully set up and enabled
-isPaging:
-	# Unmap the identity mapping as it is now unnecessary 
-	movl $0, boot_page_directory + 0
-
-	# Reload cr3 to force tlb flush 
-	movl %cr3, %ecx
-	movl %ecx, %cr3
-
-	/*Setup the stack pointer to point to the beginning of our stack */
-	/* I believe its a high address growing down to lower adress for the stack on x86*/
-	mov $stack_top, %esp
-
-	/*Reset EFLAGS*/
-	pushl $0 
-	popf 
-
-	/* push the pointer to the Multiboot information structure*/
-	pushl %ebx
-
-	/* push the magic value */
-	pushl %eax
-
-	call early_main
-
-	mov %cr0, %eax 
-	or $1, %eax
-	mov %eax, %cr0 
-
-	
-	//call kernel_main
-
-
-	cli
-1:	hlt
-	jmp 1b
-
-
-.include "./src/kernel/Memory/GDT/gdt.s"
-.include "./src/kernel/irs_table.s"
-.include "./src/kernel/irq_table.s"
-.include "./src/kernel/Interrupts/idt/idt.s"
-.include "./src/kernel/Memory/paging.s"
-.include "./src/kernel/cpu.s"
-
-

src/kernel/KernelLauncher/bootcheck.h

@@ -1,91 +0,0 @@
-#pragma once 
-#include "../multiboot.h"
-#define CHECK_FLAG(flags, bit) ((flags) & (1 <<(bit)))
-
-#include "../Terminal/kterm.h"
-
-
-
-void CheckMBT ( multiboot_info_t*  mbt  ){
-      /* Set MBI to the addresss of the multiboot information structure*/
-        multiboot_info_t * mbi = (multiboot_info_t *) mbt;
-
-#ifdef __VERBOSE__
-        /* Print out the flags */
-        printf("flags = 0x%x\n", (unsigned) mbi->flags);
-#endif
-        /* Are mem_* valid? */
-        if ( CHECK_FLAG(mbi->flags,0)){
-                // Do nothing
-        }
-
-        /* is boot device valid ? */
-        if (CHECK_FLAG (mbi->flags, 1))
-        {
-#ifdef __VERBOSE__
-            printf("boot_device = 0x0%x\n", (unsigned) mbi->boot_device);
-#endif
-        }
-
-        /* is the command line passed? */
-        if (CHECK_FLAG ( mbi->flags,2))
-        {
-#ifdef  __VERBOSE__
-            printf("cmdline = %s\n", (char *) mbi->cmdline);
-#endif
-        }
-
-        /* Are mods_* valid? */
-        if(CHECK_FLAG ( mbi->flags, 3)){
-            multiboot_module_t *mod;
-            uint32_t i;
-#ifdef __VERBOSE__
-            printf("mods count = %d, mods_addr = 0x%x\n", (int) mbi->mods_count, (int) mbi->mods_addr);
-
-            for(i = 0, mod = (multiboot_module_t *) mbi->mods_addr; i < mbi->mods_count; i++ , mod++){
-                printf(" mod start = 0x%x, mod_end = 0x%x, cmdline = %s\n", (unsigned) mod->mod_start, (unsigned) mod->mod_end, (char*) mod->cmdline);
-            }
-#endif
-        }
-
-        /* Bits 4 and 5 are mutually exclusive! */
-        if (CHECK_FLAG (mbi->flags, 4) && CHECK_FLAG(mbi->flags, 5))
-        {
-#ifdef __VERBOSE__
-            printf("Both bits 4 and 5 are set.\n");
-#endif 
-            return;
-        }
-
-        /* Is the symbol table of a.out valid? */
-        if (CHECK_FLAG(mbi->flags, 4)){
-            multiboot_aout_symbol_table_t *multiboot_aout_sym = &(mbi->u.aout_sym);
-#ifdef __VERBOSE__
-            printf( "multiboot_aout_symbol_table: tabsize = 0x%0x, strsize = 0x%x, addr = 0x%x\n", 
-            (unsigned) multiboot_aout_sym->tabsize,
-            (unsigned) multiboot_aout_sym->strsize,
-            (unsigned) multiboot_aout_sym->addr);
-#endif
-        }
-
-        /* Is the section header table of ELF valid? */
-        if (CHECK_FLAG(mbi->flags, 5)){
-            multiboot_elf_section_header_table_t *multiboot_elf_sec = &(mbi->u.elf_sec);
-#ifdef __VERBOSE__
-            printf("multiboot_elf_sec: num = %u, size = 0x%x, addr = 0x%x, shnd = 0x%x\n",
-            
-            (unsigned) multiboot_elf_sec->num, (unsigned) multiboot_elf_sec->size,
-            (unsigned) multiboot_elf_sec->addr, (unsigned)  multiboot_elf_sec->shndx);
-#endif
-            
-        }
-
-        /* Draw diagonal blue line */
-        if (CHECK_FLAG (mbt->flags, 12)){
-#ifdef __VERBOSE__
-            printf("Can draw!\n");
-#endif
-        } 
-
-
-}

src/kernel/Lib/string.c

@@ -1,28 +0,0 @@
-#include "string.h"
-
-size_t strlen(const char* str) {
-    size_t len = 0;
-    while(str[len]){
-        len++;
-    }
-    return len;
-}
-
-
-
-int strncmp ( const char* str1, const char* str2, size_t num ){
-    for( int i = 0; i < num ; i++){
-        
-        if( str1[i] < str2[i]){
-            return -1;
-        } 
-
-        if( str1[i] > str2[i] ){
-            return 1;
-        }
-
-
-    }
-
-    return 0;
-}

src/kernel/Memory/memory.cpp

@@ -1,142 +0,0 @@
-#include "./memory.h"
-uint32_t* memoryBitMap;
-/*
-
-*/
-void PhysicalMemory::setup( MemoryInfo* memory) {
-
-    // calculate the maximum number of blocks
-    max_blocks = KB_TO_BLOCKS(memory->TotalMemory);
-
-    used_blocks = 0;
-
-    memoryBitMap = (uint32_t*) 0x00a00000;
-
-
-    printf("Maximum Number of blocks: 0x%x, Number of bytes for memMap: 0x%x\n", max_blocks , (max_blocks/8));
-
-    //Size of memory map 
-    uint32_t memMap_size = (max_blocks / 8 ) ; 
-    
-    printf("Memory Map size:  0x%x\n", memMap_size );
-    printf("size of int in bytes: 0x%x \n" , sizeof(int));
-
-    // Set all places in memory as free
-    memset(memoryBitMap, 0xFF, memMap_size  );
-}
-
-// NOTE: this can only give blocks of 4kb at a time!
-void* PhysicalMemory::allocate_block() {
-    uint8_t blocks_available = max_blocks - used_blocks;
-    // Are there any blocks available?
-    if( blocks_available <= 0)
-    {
-        printf("No blocks available. Blocks Delta: 0x%x\n", blocks_available);
-        return 0;
-    }
-
-    // Find 1 free block somewhere
-    int free_block_index = bitmap_first_unset(memoryBitMap, (max_blocks /8) /*memMap Size*/ );
-
-
-    
-    if(free_block_index == -1)
-    {
-        printf("Could not find a good block!\n");
-        // Could not find a block
-        return (void*)0xFFFF;
-    }
-
-    if(free_block_index == 0)
-        printf("Somethings wrong!!!\n");
-
-    // Set the block to be used!
-    bitmap_unset(memoryBitMap, free_block_index);
-    // Increase the used_block count!
-    used_blocks++;
-    printf("used blocks: 0x%x\n", used_blocks);
-    // return the pointer to the physical address
-    return (void*) (BLOCK_SIZE * free_block_index);
-}
-
-
-void PhysicalMemory::free_block(void* p) {
-    // If it is a null pointer we don't need to do anything.
-    if(p==0) {
-        return;
-    }
-    // calculate the index into the bitmap
-    int index  = ((uint32_t) p) / BLOCK_SIZE;
-    
-    // set the block to be free
-    bitmap_set(memoryBitMap, index);
-    used_blocks--;
-    printf("used blocks: 0x%x, after free\n", used_blocks);
-
-}
-
-
-
-void PhysicalMemory::allocate_region(uint32_t startAddress, uint32_t size) {
-    // every bit should be 4KiB 
-    // every byte is 8*4KiB = 32KiB
-    
-    int NumberOfBlocksToAllocate = ( size / 1024) / 4  / 8 + 1;
-    int startBlock = (startAddress / 1024) / 4 / 8 ;
-    
-   // printf("NumberOfBlocksToAllocate: 0x%x\n", NumberOfBlocksToAllocate);
-    //printf( "start block: 0x%x\n" , startBlock);
-    for( int i = 0; i < NumberOfBlocksToAllocate; i++)
-    {
-
-        //printf("ALLOCATE BLOCK: 0x%x\n" , startBlock + i );
-        bitmap_unset(memoryBitMap, startBlock+ i);
-        used_blocks++;
-    }
-
-
-}
-void PhysicalMemory::deallocate_region(uint32_t  StartAddress , uint32_t size ) {
-    // NOT IMPLEMENTED YET
-}
-
-
-void mapMultibootMemoryMap( MemoryInfo* memInfo , multiboot_info_t *mbt) {
-    printf("mmap_addr = 0x%x, mmap_length = 0x%x\n",
-    (unsigned) mbt->mmap_addr, (unsigned) mbt->mmap_length);
-    multiboot_memory_map_t *mmap = (multiboot_memory_map_t*) mbt->mmap_addr;
-
-    for (;  (unsigned long) mmap < mbt->mmap_addr + mbt->mmap_length;  mmap = (multiboot_memory_map_t *) ((unsigned long) mmap + mmap->size + sizeof(mmap->size))){
-
-            if ( mmap->type == MULTIBOOT_MEMORY_AVAILABLE){
-        
-                memInfo->TotalMemory +=  mmap->len;   
-            } else {
-                memInfo->ReservedMemory += mmap->len;
-            }
-            
-            print_Multiboot_memory_Map(mmap);
-            
-        }
-    
-}
-
-
-/**
- * @brief Debug Verbose functions
- * 
- * @param mmap 
- */
-
-void print_Multiboot_memory_Map(multiboot_memory_map_t* mmap) {
-    printf(
-        "size = 0x%x, base_addr = 0x%x%08x, length = 0x%x%08x, type = 0x%x\n",
-        (unsigned) mmap->size,
-        (unsigned) (mmap->addr >> 32),
-        (unsigned) (mmap->addr & 0xffffffff),
-        (unsigned) (mmap->len >> 32),
-        (unsigned) (mmap->len & 0xffffffff),
-        (unsigned) mmap->type
-    );
-}
-

src/kernel/Memory/memory.h

@@ -1,48 +0,0 @@
-#pragma once
-#include <stdint.h>
-#include <stddef.h>
-
-#include "memoryinfo.h"
-#include "../multiboot.h"
-#include "../Terminal/kterm.h"
-#include "../Lib/mem.h"
-#include "../bitmap.h"
-
-#define BLOCK_SIZE 4092
-#define BLOCKS_PER_WORD 32 // A word is 16 bit in x86 machines according to my google search results!
-
-#define KB_TO_BLOCKS(x) (x  / BLOCK_SIZE)
-#define IS_ALIGNED(addr, align) !((addr) & ~((align) - 1))
-#define ALIGN(addr, align) (((addr) & ~((align) - 1 )) + (align))
-
-extern uint32_t kernel_begin;
-extern uint32_t kernel_end;
-
-void initialise_available_regions(uint32_t memoryMapAddr, uint32_t memoryMapLastAddr, uint32_t* memoryBitMap, int* used_blocks);
-
-extern uint32_t* memoryBitMap;
-
-class PhysicalMemory
-{
-    public:
-        void setup(MemoryInfo* memory);
-        void destroy();
-        void free_block(void* ptr);
-        void* allocate_block();
-        void allocate_region(uint32_t, uint32_t);
-        void deallocate_region(uint32_t   , uint32_t );
-    
-    private:
-        size_t pmmap_size;
-        size_t max_blocks;
-        int used_blocks;
-};
-
-void mapMultibootMemoryMap( MemoryInfo* memInfo , multiboot_info_t *mbt);
-
-/**
- * @brief Debug Verbose Functions
- * 
- * @param mmap 
- */
-void print_Multiboot_memory_Map(multiboot_memory_map_t* mmap);

src/kernel/Memory/memoryinfo.h

@@ -1,20 +0,0 @@
-#pragma once
-#include <stdint.h>
-#include <stddef.h>
-
-struct MemoryArea{
-    void* StartAddress;
-    size_t Size;
-    unsigned int type;
-    MemoryArea* Next;
-
-}__attribute__((packed));
-
-struct MemoryInfo {
-    uint32_t TotalMemory;
-    uint32_t ReservedMemory;
-    MemoryArea* MemoryRegionList;
-}__attribute__((packed));
-
-
-

src/kernel/Memory/paging.cpp

@@ -1,170 +0,0 @@
-#include "paging.h"
-PageDirectoryEntry kernel_directory[MAX_DIRECTORY_ENTRIES]__attribute__((aligned(4096)));
-
-PageTableEntry first_page_table[MAX_PAGE_TABLE_ENTRIES]__attribute__((aligned(4096)));
-
-void IdentityMap (){
-        printf("\nInit paging\n");
-    // The basics as explained by wiki.osdev.org
-
-    // Set all page_directories to not present
-    int i = 0;
-    while ( i < 1024)
-    {
-        kernel_directory[i] = 0x2;
-        i++;
-    }
-
-
-    // map 4 megabytes 
-    unsigned int j ;
-    for( j = 0;  j < 1024; j++ )
-    {
-        first_page_table[j] = (j * 0x1000) | 3 ;
-        
-        //Attributes: 
-        //Supervisor Level ,
-        //read/write,
-        //present,
-        
-
-    }
-
-    // Put the page table in the page directory 
-    // attributes: supervisor level, read/write, present;
-    kernel_directory[0] = ((unsigned int)first_page_table) | 3;
-
-    printf("Init paging DONE\n");
-}
-
-void InitializePaging()
-{
-    /*
-        Initial kernel page directory
-         set all page tables to not present
-    */
-    for (int i = 0; i < MAX_DIRECTORY_ENTRIES; i++)
-    {
-        kernel_directory[i] = 0x2;
-    }
-
-    // BIOS Address Identity mapping 
-    // Identity map the first 8MiB ... Physical addresses 0x00000000 to 0x007A1200
-    PHYSICAL_ADDRESS BIOSAddr = 0x00000000;
-    PHYSICAL_ADDRESS BIOSAddr_Max = 0x800000;
-
-    // How many PDE's do we need
-    uint8_t NUM_PDE = BIOSAddr_Max / (4 * 1024 * 1024);
-
-    printf("The first 8MiB require %d Page Directory Entries\n", NUM_PDE);
-/*
-    for( int i = 0; i < NUM_PDE; i++)
-    {
-        // setup a page table 
-        PageTableEntry pagetable[MAX_PAGE_TABLE_ENTRIES] = PhysicalMemory::allocate_block(); // TODO :: Physical memory manager functions should be available here.
-
-        for(int j = 0; j < MAX_PAGE_TABLE_ENTRIES; j++)
-        {
-            pagetable[j] = ( j  *  4096 ) | 3;
-        }
-
-        // add page table as page directory entry 
-        kernel_directory[i] =  ( (unsigned int) pagetable ) | 3;
-    }
-*/
-    //  map the kernel space 
-    VIRTUAL_ADDRESS Vaddr = KERNEL_VRT_MEMORY_BEGIN;
-    PHYSICAL_ADDRESS KernelAddr = kernel_begin;
-    PHYSICAL_ADDRESS KernelEndAddr = kernel_end;
-
-    uint32_t KernelSizeInBytes = (KernelEndAddr - KernelAddr);
-    printf("Kernel is 0x%x bytes\n", KernelSizeInBytes);
-    NUM_PDE = KernelSizeInBytes / (4 * 1024* 1024);
-    printf("Kernel requires %d Page Directory Entries\n", NUM_PDE);
-
-/*
-    for(int i = 0; i < NUM_PDE; i++)
-    {
-        PageTableEntry pageTable [MAX_PAGE_TABLE_ENTRIES] = PhysicalMemory::allocate_block();
-
-        for(int j = 0; j < MAX_PAGE_TABLE_ENTRIES; j++)
-        {
-            pageTable[j] = ( j * 4096) | 3; // NOTE: Check if page is actually supposed to be present
-        }
-
-        // TODO: Calculate Page Directory index 
-        
-
-
-    }
-    */
-
-    
-
-
-    // Identity map VGA memory
-    // Calc which PDE adn 
-    
-}
-
-
-void AllocatePage(VIRTUAL_ADDRESS vaddr, PageDirectoryEntry& page_directory)
-{
-
-}
-
-void FreePage(VIRTUAL_ADDRESS vaddr , PageDirectoryEntry& page_directory)
-{
-
-}
-
-void Map ( PHYSICAL_ADDRESS paddr, VIRTUAL_ADDRESS vaddr, PageDirectoryEntry& page_directory)
-{
-
-
-
-}
-
-void Unmap(VIRTUAL_ADDRESS vaddr, PageDirectoryEntry& page_directory)
-{
-    // NOTE: I will implement lazy unmapping for now 
-    
-}
-
-void Enable()
-{ 
-
-    //TODO: Write  protect will not be turned on 
-    // for the moment altough according to the intel
-    // developer manual this should happen.
-
-    uint32_t CR0;
-    
-    CR0 =  GetCR0();
-    printf("PG bit = %d \n" , GET_PG_BIT(CR0));
-
-    printf("Load into CR3 address: 0x%x\n", (uint32_t)(&kernel_directory[0]));
-    loadPageDirectory(&kernel_directory[0]);
-    enablePaging();
-
-    printf("Paging enabled!\n");
-
-
-    CR0 = GetCR0();
-    uint32_t CR4 = GetCR4();
-    printf("PG bit = %d\n" , GET_PG_BIT(CR0) );
-    printf("PAE bit = %d\n", GET_PAE_BIT(CR4));
-
-    if(GET_PAE_BIT(CR4) == 0){
-        printf("Using 32bit paging\n");
-
-        if(GET_PSE_BIT(CR4) == 0 ){
-            printf("Page size is 4KiB\n");
-        } else { 
-            printf("Page size is 4MiB\n");
-        }
-    }  else {
-        printf("Using some extended version for paging\n");
-    }
-
-}

src/kernel/Memory/paging.definitions.h

@@ -1,56 +0,0 @@
-#pragma once
-#include <stdint.h>
-/*
-    This file contains some handy definitions for different types 
-    that have to do with paging in atleast 32 bit and maybe sometime in the future
-    also 64 bit mode.
-*/
-
-#define MAX_DIRECTORY_ENTRIES 1024
-#define MAX_PAGE_TABLE_ENTRIES 1024
-#define MAX_PAGES 1024
-
-#define PHYSICAL_ADDRESS uint32_t 
-#define VIRTUAL_ADDRESS uint32_t
-
-#define PageDirectoryEntry uint32_t
-#define PageTableEntry uint32_t
-
-
-#define KERNEL_VRT_MEMORY_BEGIN 0xC0000000
-#define KERNEL_VRT_MEMORY_END   0xCFFFFFFF
-#define PAGE_SIZE  4096;
-
-
-// NOTE: FIXME: I am fairly certain these masks are off by one!
-
-#define PD32_PRESENT_MASK                   (0x1 << 0)
-#define PD32_READ_WRITE_MASK                (0x1 << 1)
-#define PD32_SUPERVISOR_MASK                (0x1 << 2)
-#define PD32_WRITE_THROUGH_MASK             (0x1 << 3)
-#define PD32_CACHE_DISABLE_MASK             (0x1 << 4)
-#define PD32_ACCESSED_MASK                  (0x1 << 5)
-#define PD32_AVAILABLE_1_4KB_MASK           (0x1 << 6)
-#define PD32_DISABLE_4MB_MASK               (0x1 << 6)
-#define PD32_PAGE_SIZE_MASK                 (0x1 << 7)
-#define PD32_GLOBAL_4MB_MASK                (0x1 << 8)
-#define PD32_AVAILABLE_2_4MB_MASK           ( 14 << 9)
-#define PD32_AVAILABLE_2_4KB_MASK           ( 15 << 8)
-#define PD32_ADDRESS_4KB_MASK               (0x8FFFF << 12)
-#define PD32_PAGE_ATTRIBUTE_TABLE_4MB_MASK  (0x1 << 12)
-#define PD32_HIGH_HALF_ADDRESS_4MB_MASK     (0x7F<< 13)
-#define PD32_RESERVED_4MB_MASK              (0x1 << 21)
-#define PD32_LOWER_HALF_ADDRESS_4MB_MASK    (0x1FF << 22)
-
-#define PT32_PRESENT_MASK                   (0x1 << 0)
-#define PT32_READ_WRITE_MASK                (0x1 << 1)
-#define PT32_SUPERVISOR_MASK                (0x1 << 2)
-#define PT32_WRITE_THROUGH_MASK             (0x1 << 3)
-#define PT32_CACHE_DISABLE_MASK             (0x1 << 4)
-#define PT32_ACCESSED_MASK                  (0x1 << 5)
-#define PT32_DIRTY_MASK                     (0x1 << 6)
-#define PT32_PAGE_ATTRIBUTE_TABLE_MASK      (0x1 << 7)
-#define PT32_GLOBAL_MASK                    (0x1 << 8)
-#define PT32_AVAILABLE_MASK                 (0x7 << 9)
-#define PT32_CACHE_DISABLE_MASK             (0x7FFFF << 12)
-

src/kernel/Memory/paging.h

@@ -1,22 +0,0 @@
-#pragma once 
-#include "memory.h"
-#include "paging.definitions.h"
-#include "../Terminal/kterm.h"
-#include "../cpu.h"
-
-extern "C" void loadPageDirectory (uint32_t* addr );
-extern "C" void enablePaging();
-
-
-void IdentityMap();
-void InitializePaging();
-
-void Enable();
-
-void AllocatePage(VIRTUAL_ADDRESS, PageDirectoryEntry&);
-void FreePage(VIRTUAL_ADDRESS, PageDirectoryEntry&);
-
-void Map(PHYSICAL_ADDRESS, VIRTUAL_ADDRESS, PageDirectoryEntry&);
-void Unmap (VIRTUAL_ADDRESS, PageDirectoryEntry&);
-
-

src/kernel/Memory/paging.s

@@ -1,44 +0,0 @@
-# NOTE: I wish this wasn't AT&T Syntax its horrible
-# REMINDER: INSTRUCTION FROM_REGISTER, TO_REGISTER
-.globl enablePaging
-enablePaging:
-	# Create a new call frame 
-	push %ebp
-	mov %esp, %ebp
-
-	# Set the PG bit of CR0
-	mov %cr0, %eax
-	or $0x80000000, %eax
-	mov %eax, %cr0
-
-	# Restore to the previous call frame 
-	mov %ebp, %esp
-	pop %ebp
-	ret
-
-.globl loadPageDirectory
-loadPageDirectory:
-	push %ebp
-	mov %esp, %ebp
-
-	/* NOTE: We should probably check if paging is already enabled.
-		Changing the CR3 register whilst paging is enabled might 
-		result in unwanted behaviour (in the worst case) or cause a 
-		fault (in the best case).
-	*/
-
-	mov 8(%esp), %eax # Move the first argument in the eax register
-
-	mov %eax, %cr3  # Move the value of eax into the CR3 register
-
-	/*
-		Moving the value of the argument  passed to this function 
-		into the CR3 register will allow the MMU to access the paging 
-		structure we setup in memory once we enable paging
-	*/
-
-	mov %ebp, %esp
-	pop %ebp
-	ret
-
-

src/kernel/SuperVisorTerminal/superVisorTerminal.cpp

@@ -1,83 +0,0 @@
-#include "superVisorTerminal.h"
-
-void startSuperVisorTerminal(BootInfo* bootinfo){
-    while (true){
-           
-           printf("SUPERVISOR:>$ " );
-            int characterCount = 0;
-            char command[10] = "";
-         
-            // NOTE: lets just show a kernel prompt                
-            uint8_t ScanCode = getKey();
-            while( ScanCode  != 0x1C )
-            {
-                char character = getASCIIKey();
-                kterm_put(character );
-                // wHAT THE HELL
-
-                if( characterCount  < 10 ){
-                    command[characterCount] = character;  
-                    characterCount++;
-                }
-
-                ScanCode = getKey(); 
-            }
-            printf("\n");
-            KeyHandled();
-         
-
-            if ( strncmp("DATE", command , characterCount ) == 0 )
-            {
-                 read_rtc();
-                 printf("======= Time & Date ==========\n");
-                 printf("   - Date:     %02d-%02d-%02d\n",day, month, year);
-                 printf("   - Time:     %02d:%02d:%02d\n" , hour, minute, second);
-                 printf("   - Ticks:    %09d\n", pit_tick);            
-            }
-            else if( strncmp ("MEMORY" , command , characterCount) == 0 )
-            {
-                // Show memory layout
-                printf("========= Memory ==========\n");
-                printf("Kernel MemoryMap:\n");
-                printf("kernel: 0x%x - 0x%x\n", &kernel_begin , &kernel_end);         
-                printf("Frames used: 0x%x blocks of 4 KiB\n", 0);  
-                const int bytesInGiB = 1073741824;
-                int64_t bytesLeft = (bootinfo->memory->TotalMemory % bytesInGiB) / bytesInGiB;
-                int64_t effectiveNumberOfGib = bootinfo->memory->TotalMemory / bytesInGiB;
-
-                int64_t GiBs = effectiveNumberOfGib + bytesLeft;  
-
-                printf("Available Memory: %d bytes, %d GiB\n",  bootinfo->memory->TotalMemory, GiBs );
-                printf("Reserved Memory: %d bytes\n",  bootinfo->memory->ReservedMemory);
-
-                //printf("\n\n");
-                //PrintPhysicalMemoryAllocation(  );
-
-
-            }
-            else if(strncmp("TEST", command, characterCount) == 0)
-            {
-                // TEST #DE exception
-               asm volatile ("MOV $4, %AX ;  MOV $0, %BX ; DIV %BX"); // IRS 0
-            }
-            else if (strncmp("VERSION", command , characterCount) == 0)
-            {
-                // Show version information 
-                printf("========= Version ========\n");
-                printf("Kernel v%d\n", 0);
-
-            }
-            else if(strncmp("CLEAR", command, characterCount) == 0)
-            {
-                kterm_init();
-                printf("|===    BarinkOS       ===|\n");
-            }
-            else
-            {
-                printf("Unknown command\n");
-            }
-
-
-            delay(1000);
-        }   
-}

src/kernel/SuperVisorTerminal/superVisorTerminal.h

@@ -1,9 +0,0 @@
-#pragma once 
-#include "../Terminal/kterm.h"
-#include "../time.h"
-#include "../Drivers/PIT/pit.h"
-#include "../Drivers/PS-2/keyboard.h"
-#include "../Memory/memory.h"
-#include "../bootinfo.h"
-
-void startSuperVisorTerminal(BootInfo * );

src/kernel/bitmap.h

@@ -1,40 +0,0 @@
-#pragma once 
-#include <stddef.h>
-#include <stdint.h>
-
-
-inline void bitmap_set( uint32_t* map , int index )
-{
-    map[index/32] |= (1 << (index % 32));
-}
-
-inline void bitmap_unset(uint32_t* map , int index)
-{
-    map[index/32] &= ~(1 << (index % 32));
-}
-
-inline uint32_t bitmap_first_unset( uint32_t* map , int map_size)
-{
-    for ( int i = 0 ; i < map_size ; i ++ )
-    {
-        // a bit or more is set within this byte!
-        if( (map[i] & 0xFFFFFFFF) > 0 ){
-
-            // which bit is set? 
-            for(int j = 0 ; j < 32 ; j++){
-                if ( (map[i] & (0x00000001 << j)) > 0)
-                {
-                    printf("Found bit: byte 0x%x , bit 0x%x\n", i , j);
-                    return (i*32)+j;
-                }
-            }
-
-        
-        }
-
-
-    }
-
-    return -1;
-    
-}

src/kernel/boot.S

@@ -0,0 +1,87 @@
+/*
+ * Multiboot 
+ */
+.set ALIGN,    1<<0             		/* align loaded modules on page boundaries */
+.set MEMINFO,  1<<1             		/* provide memory map */
+.set VIDEO,	   1<<2						/* provide video mode */
+.set FLAGS,    ALIGN | MEMINFO | VIDEO  /* this is the Multiboot 'flag' field */
+.set MAGIC,    0x1BADB002       		/* 'magic number' lets bootloader find the header */
+.set CHECKSUM, -(MAGIC + FLAGS) 		/* checksum of above, to prove we are multiboot */
+
+.section .multiboot
+.align 4
+.long MAGIC
+.long FLAGS
+.long CHECKSUM
+.long 0 # unused
+.long 0 # .
+.long 0 # .
+.long 0 # .
+.long 0 # unused
+.long 0 # set graphics mode
+.long 800 # screen witdh
+.long 600 # screen height
+.long 32 # bpp
+
+.section .bss
+.align 16
+stack_bottom:
+.skip 16384 # 16 KiB
+stack_top:
+ 
+.section .text
+.include "./src/kernel/irs_table.s"
+.include "./src/kernel/irq_table.s"
+.include "./src/kernel/idt/idt.s"
+.include "./src/kernel/paging.s"
+
+
+.global _start
+.type _start, @function
+_start:
+	/*Setup the stack pointer to point to the beginning of our stack */
+	/* I believe its a high address growing down to lower adress for the stack on x86*/
+	mov $stack_top, %esp
+
+	/*Reset EFLAGS*/
+	pushl $0 
+	popf 
+
+	/* push the pointer to the Multiboot information structure*/
+	pushl %ebx
+
+	/* push the magic value */
+	pushl %eax
+	
+	call early_main
+	cli
+	
+	
+
+.include "./src/kernel/gdt/gdt.s"
+
+	loadIDT:
+		#load idt
+		call init_idt
+        sti
+        
+        # Try enable A20
+		# mov $0x2401, %ax
+		# int $0x15
+
+
+		# enable protected mode
+		mov %cr0, %eax 
+		or $1, %eax
+		mov %eax, %cr0
+
+		
+		call kernel_main
+
+
+		cli
+	1:	hlt
+		jmp 1b
+
+
+.size _start, . - _start

src/kernel/bootcheck.h

@@ -0,0 +1,108 @@
+#pragma once 
+#include "bootloader/multiboot.h"
+#define CHECK_FLAG(flags, bit) ((flags) & (1 <<(bit)))
+#include "../gui/window.h"
+#include "../gui/cursor.h"
+#include "tty/kterm.h"
+#include "drivers/vesa/vesa.h"
+
+void CheckMBT ( multiboot_info_t*  mbt  ){
+  /* Set MBI to the addresss of the multiboot information structure*/
+  multiboot_info_t * mbi = (multiboot_info_t *) mbt;
+
+  /* Print out the flags */
+  printf("flags = 0x%8x\n", (unsigned) mbi->flags);
+
+  /* Are mem_* valid? */
+  if ( CHECK_FLAG(mbi->flags,0)){
+      printf("mem_lower = %uKB, mem_upper = %uKB\n");
+  }
+
+  /* is boot device valid ? */
+  if (CHECK_FLAG (mbi->flags, 1)){
+      printf("boot_device = 0x0%x\n", (unsigned) mbi->boot_device);
+  }
+
+  /* is the command line passed? */
+  if (CHECK_FLAG ( mbi->flags,2)){
+      printf("cmdline = %s\n", (char *) mbi->cmdline);
+  }
+
+  /* Are mods_* valid? */
+  if(CHECK_FLAG ( mbi->flags, 3)){
+      multiboot_module_t *mod;
+      uint32_t i;
+
+      printf("mods count = %d, mods_addr = 0x%x\n", (int) mbi->mods_count, (int) mbi->mods_addr);
+
+      for(i = 0, mod = (multiboot_module_t *) mbi->mods_addr; i < mbi->mods_count; i++ , mod++){
+          printf(" mod start = 0x%x, mod_end = 0x%x, cmdline = %s\n", (unsigned) mod->mod_start, (unsigned) mod->mod_end, (char*) mod->cmdline);
+      }
+  }
+
+  /* Bits 4 and 5 are mutually exclusive! */
+  if (CHECK_FLAG (mbi->flags, 4) && CHECK_FLAG(mbi->flags, 5)){
+      printf("Both bits 4 and 5 are set.\n");
+      return;
+  }
+
+  /* Is the symbol table of a.out valid? */
+  if (CHECK_FLAG(mbi->flags, 4)){
+      multiboot_aout_symbol_table_t *multiboot_aout_sym = &(mbi->u.aout_sym);
+
+      printf( "multiboot_aout_symbol_table: tabsize = 0x%0x, strsize = 0x%x, addr = 0x%x\n", 
+      (unsigned) multiboot_aout_sym->tabsize,
+      (unsigned) multiboot_aout_sym->strsize,
+      (unsigned) multiboot_aout_sym->addr);
+
+  }
+
+  /* Is the section header table of ELF valid? */
+  if (CHECK_FLAG(mbi->flags, 5)){
+      multiboot_elf_section_header_table_t *multiboot_elf_sec = &(mbi->u.elf_sec);
+
+      printf("multiboot_elf_sec: num = %u, size = 0x%x, addr = 0x%x, shnd = 0x%x\n",
+      (unsigned) multiboot_elf_sec->num, (unsigned) multiboot_elf_sec->size,
+      (unsigned) multiboot_elf_sec->addr, (unsigned)  multiboot_elf_sec->shndx);
+      
+  }
+
+  /* Draw diagonal blue line */
+  if (CHECK_FLAG (mbt->flags, 11)){
+    printf("Can draw!");
+
+
+
+    // Init vesa driver
+    initVBEDevice(mbt); 
+
+    // Fill screen with blue
+                                                // colours AARRGGBB
+    drawRect(0, 0 , VbeModeInfo->width,VbeModeInfo->height, 0xFF0000FF);
+
+    // Create two windows
+    Rect rect_window1 {};
+    Rect rect_window2 {};
+    rect_window1.height =200;
+    rect_window1.width = 300;
+    rect_window1.x = 50;
+    rect_window1.y = 50;
+
+    rect_window2.height =200;
+    rect_window2.width = 300;
+    rect_window2.x = 300;
+    rect_window2.y = 200;
+
+    Window window_1 ( rect_window1, 0xFF00F0FF);
+    Window window_2 (rect_window2, 0xFFAACCDD);
+
+    window_1.draw();
+    window_2.draw();
+
+    Cursor cursor (70,100);
+
+    cursor.draw();
+
+
+  }
+}

src/kernel/bootinfo.h

@@ -1,8 +0,0 @@
-#pragma once
-#include "Memory/memoryinfo.h"
-
-struct BootInfo{
-    const char* BootStructureID = "BarinkOS";
-    MemoryInfo* memory;
-
-}; 

src/kernel/cpu.h

@@ -1,62 +1,17 @@
-#pragma once 
+#include <cpuid.h> // NOTE: Only available in GCC 
+// NOT currently usefull!
+/*    static int get_model(){
+        int ebx, unused;
+        __cpuid(0, unused, ebx, unused, unused);
+        return ebx;
+    }
 
-/*
+    enum {
-Based on Intel specifications.
+        CPUID_FEAT_EDX_APIC = 1 << 9
-
+    };
-C++ interface for the cpu.s assembly file.
+    static int check_apic (){
-
+        unsigned int eax, unused, edx;
-©Nigel Barink - 2022 
+        __get_cpuid(1, &eax, &unused, &unused, &edx);
-*/
+        return  edx & CPUID_FEAT_EDX_APIC;
-
+    }
-
+*/
-/*
-*       EFLAGS FUNCTIONS
-*/
-
-extern "C" uint32_t GetEFLAGS();
-
-
-
-/*
-*       CONTROL_REGISTER_0 FUNCTIONS
-*/
-extern "C" uint32_t GetCR0();
-
-/*
- struct CR0_Register  {
-        uint8_t PE :1; // Protection Mode Enabled 0
-        uint8_t MP :1; // Monitor co-processor 1
-        uint8_t EM :1; // Emulation 2
-        uint8_t TS :1; // Task switched 3
-        uint8_t ET :1; // Extension Type 4
-        uint8_t NE :1; // Numeric error 5
-        uint16_t Reserved :10; // 6,7,8,9,10,11,12,13,14,15
-        uint8_t WP :1; // Write Protect 16
-        uint8_t Reserved :1; // 17
-        uint8_t AM :1; // Alligment Task 18
-        uint16_t Reserved :10; // 19,20,21,22,23,24,25,26,27,28
-        uint8_t NW :1; // Not-write through 29
-        uint8_t CD :1; // Cache disable 30
-        uint8_t PG :1; // Paging 31
-    };*/
-
-
-
-#define GET_PE_BIT(CONTROL_REGISTER_0) (CONTROL_REGISTER_0&0x1)
-#define GET_MP_BIT(CONTROL_REGISTER_0) (CONTROL_REGISTER_0&0x2)
-#define GET_EM_BIT(CONTROL_REGISTER_0) (CONTROL_REGISTER_0&0x3)
-#define GET_TS_BIT(CONTROL_REGISTER_0) (CONTROL_REGISTER_0&0x4)
-#define GET_ET_BIT(CONTROL_REGISTER_0) (CONTROL_REGISTER_0&0x5)
-#define GET_NE_BIT(CONTROL_REGISTER_0) (CONTROL_REGISTER_0&0x6)
-
-
-#define GET_PG_BIT(CONTROL_REGISTER_0) (CONTROL_REGISTER_0>>31)
-
-/*
-*       CONTROL_REGISTER_4 FUNCTIONS
-*/
-
-extern "C" uint32_t GetCR4();
-
-#define GET_PSE_BIT(CONTROL_REGISTER_4) (CONTROL_REGISTER_4&0x4)
-#define GET_PAE_BIT(CONTROL_REGISTER_4) (CONTROL_REGISTER_4&0x5)

src/kernel/cpu.s

@@ -1,39 +0,0 @@
-# Basic cpu functions 
-.globl GetCR0
-GetCR0:
-	push %ebp # save the base pointer on the stack
-	mov %esp, %ebp  # Set the base pointer to the current stack pointer 
-
-	xor %eax, %eax # Clear EAX to make sure no weird stuff is going on
-	mov %cr0, %eax # Copy the value of the CR0 register into EAX
-
-	mov %ebp, %esp # restore the base pointer 
-	pop %ebp
-	ret
-
-.globl GetCR4
-GetCR4:
-	push %ebp
-	mov %esp, %ebp
-
-	xor %eax, %eax
-	mov %cr4, %eax 
-
-	mov %ebp, %esp 
-	pop %ebp
-	ret
-
-
-
-.globl GetEFLAGS
-GetEFLAGS:
-	push %ebp 
-	mov %esp, %ebp
-
-	xor %eax, %eax 
-	pushfl # Push the EFLAGS register content onto the stack, should be pushfd but GAS apparently doesn't agree
-	mov 4(%esp) , %eax
-
-	mov %ebp, %esp
-	pop %ebp
-	ret

src/kernel/definitions.h

@@ -1,9 +0,0 @@
-#pragma once 
-/**
- * Kernel definitions
- */
-
-#define __DEBUG__ false
-#define KERNEL_VERSION 0
-
-#define ARCHITECTURE "I386"

src/kernel/disk.h

@@ -0,0 +1,17 @@
+#pragma once
+
+// Let's write an ATA PIO | ATA driver for now. Mostly to show that I can in theory interact with a
+// storage device
+
+// PRIMARY_ATA_BUS
+// 0x1F0 through 0x1F7 
+
+// SECONDARY_ATA_BUS
+// 0x170 through 0x177
+
+#define DEVICE_CONTROL_REGISTER 0x3F6
+#define DEVICE_CONTROL_ALTERNATE 0x376
+
+
+// IRQ14 Primary bus interrupt
+// IRQ15 Secondary bus interrupt

src/kernel/drivers/vesa/vesa.cpp

@@ -0,0 +1,136 @@
+#include "vesa.h"
+VbeInfoBlock* vbeInfo;
+vbe_mode_info_structure* VbeModeInfo;
+
+void initVBEDevice(multiboot_info_t* mbt){
+    print_serial("initVBEDevice");
+
+    vbeInfo = (VbeInfoBlock*) mbt->vbe_control_info;
+    printf_serial("Signature: %s, V0x%x\n", vbeInfo->VbeSignature, vbeInfo->VbeVersion);
+
+    VbeModeInfo = (vbe_mode_info_structure*) mbt->vbe_mode_info;
+
+    printf_serial("VESA video mode info: Width: %d Height: %d BPP: %d\n", VbeModeInfo->width, VbeModeInfo->height , VbeModeInfo->bpp);
+    printf_serial("VideoMemory Location: 0x%x \n", VbeModeInfo->framebuffer );
+}
+
+void putPixel( int x, int y , uint32_t colour){
+   // printf_serial("putPixel x: %d, y: %d\n", x, y);
+                    ///fb + mbt->framebuffer_pitch * y + 4 * x ,NOTE: this calculation is very important 
+    *(uint32_t*) (  VbeModeInfo->framebuffer + VbeModeInfo->pitch * y + 4  * x ) = colour;
+}
+void drawLine(int x1, int y1, int x2, int y2, uint32_t colour ){
+    print_serial("drawline\n");
+    // See Bresenham's line algorithm
+    int deltaX = x2 - x1;
+    int deltaY = y2 - y1;
+    int D = 2 * deltaY - deltaX;
+    int y = y1;
+
+    for ( int x = x1; x < x2; x++){
+      putPixel(x,y, colour);
+      if( D > 0){
+        y +=1;
+        D = D - 2 * deltaX;
+      }
+      D = D + 2 * deltaY;
+    }
+
+
+
+}
+void drawRect ( int x, int y, int width, int height, uint32_t colour ){
+    print_serial("drawRect\n");
+    for ( int i = x; i < x + width; i ++)
+    {
+      for(int j = y; j < y + height; j++){
+        
+        putPixel(i,j, colour);
+      }
+    }
+
+}
+
+
+void blueDiagnalLineTest(multiboot_info_t* mbt){
+    multiboot_uint32_t color;
+    unsigned i;
+    void *fb = (void *) (unsigned long) mbt->framebuffer_addr;
+
+     switch (mbt->framebuffer_type)
+        {
+        case MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED:
+          {
+            unsigned best_distance, distance;
+            struct multiboot_color *palette;
+            
+            palette = (struct multiboot_color *) mbt->framebuffer_palette_addr;
+
+            color = 0;
+            best_distance = 4*256*256;
+            
+            for (i = 0; i < mbt->framebuffer_palette_num_colors; i++)
+              {
+                distance = (0xff - palette[i].blue) * (0xff - palette[i].blue)
+                  + palette[i].red * palette[i].red
+                  + palette[i].green * palette[i].green;
+                if (distance < best_distance)
+                  {
+                    color = i;
+                    best_distance = distance;
+                  }
+              }
+          }
+          break;
+
+        case MULTIBOOT_FRAMEBUFFER_TYPE_RGB:
+          color = ((1 << mbt->framebuffer_blue_mask_size) - 1) 
+            << mbt->framebuffer_blue_field_position;
+          break;
+
+        case MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT:
+          color = '\\' | 0x0100;
+          break;
+
+        default:
+          color = 0xffffffff;
+          break;
+        }
+      for (i = 0; i < mbt->framebuffer_width
+             && i < mbt->framebuffer_height; i++)
+        {
+          switch (mbt->framebuffer_bpp)
+            {
+            case 8:
+              {
+                multiboot_uint8_t *pixel = (multiboot_uint8_t*)fb + mbt->framebuffer_pitch * i + i;
+                *pixel = color;
+              }
+              break;
+            case 15:
+            case 16:
+              {
+                multiboot_uint16_t *pixel
+                  = (multiboot_uint16_t*)fb + mbt->framebuffer_pitch * i + 2 * i;
+                *pixel = color;
+              }
+              break;
+            case 24:
+              {
+                multiboot_uint32_t *pixel
+                  = (multiboot_uint32_t*)fb + mbt->framebuffer_pitch * i + 3 * i;
+                *pixel = (color & 0xffffff) | (*pixel & 0xff000000);
+              }
+              break;
+
+            case 32:
+              {
+                multiboot_uint32_t *pixel
+                  = (multiboot_uint32_t*)fb + mbt->framebuffer_pitch * i + 4 * i;
+                *pixel = color;
+              }
+              break;
+            }
+        }
+}
+

src/kernel/drivers/vesa/vesa.h

@@ -0,0 +1,66 @@
+#pragma once 
+#include <stdint.h>
+#include "../../bootloader/multiboot.h"
+#include "../../serial.h"
+
+struct vbe_mode_info_structure{
+        uint16_t attributes;
+        uint8_t window_a;
+        uint8_t window_b;
+        uint16_t granularity;
+        uint16_t window_size;
+        uint16_t segment_a;
+        uint16_t segment_b;
+        uint32_t win_func_ptr;
+        uint16_t pitch;
+        uint16_t width;
+        uint16_t height;
+        uint8_t w_char;
+        uint8_t y_char;
+        uint8_t planes;
+        uint8_t bpp;
+        uint8_t banks;
+        uint8_t memory_model;
+        uint8_t bank_size;
+        uint8_t image_pages;
+        uint8_t reserved0;
+
+        uint8_t red_mask;
+        uint8_t red_position;
+        uint8_t green_mask;
+        uint8_t green_position;
+        uint8_t blue_mask;
+        uint8_t blue_position;
+        uint8_t reserved_mask;
+        uint8_t reserved_position;
+        uint8_t direct_color_attributes;
+
+        uint32_t framebuffer;
+        uint32_t off_screen_mem_off;
+        uint16_t off_screen_mem_size;
+        uint8_t reserved1[206];
+      }__attribute__((packed));
+
+struct VbeInfoBlock {
+        char VbeSignature[4];
+        uint16_t VbeVersion;
+        uint16_t OemStringPtr;
+        uint8_t Capabilities;
+        uint16_t VideoModePtr;
+        uint16_t TotalMemory;
+      }__attribute__((packed));
+
+extern VbeInfoBlock* vbeInfo;
+extern vbe_mode_info_structure* VbeModeInfo;
+
+
+
+void initVBEDevice(multiboot_info_t* mbt);
+
+void blueDiagnalLineTest(multiboot_info_t* mbt);
+
+
+// Primitive drawing functions  
+void putPixel( int x, int y , uint32_t colour);
+void drawLine(int x1, int y1, int x2, int y2, uint32_t colour );
+void drawRect ( int x, int y, int width, int height, uint32_t colour );

src/kernel/gdt/gdtc.cpp

@@ -1,5 +1,5 @@
 #include "gdtc.h"
-#include "../../Terminal/kterm.h"
+#include "../tty/kterm.h"
 
 #define NULL_SEGMENT          0
 #define KERNEL_CODE_SEGMENT   1
@@ -29,9 +29,6 @@ void add_descriptor(int which , unsigned long base, unsigned long limit, unsigne
 
 void initGDT(){
 
-#ifdef __VERBOSE__
-      printf("Init GDT!\n");
-#endif
       // NULL segment
       add_descriptor(NULL_SEGMENT, 0,0,0,0);
 
@@ -51,8 +48,15 @@ void initGDT(){
       gdtDescriptor.limit = ((sizeof(SegmentDescriptor ) * 5 ) - 1);
       gdtDescriptor.base = (unsigned int) &GlobalDescriptorTable;
 
+      printf("Hello GDT!\n");
 
 
       LoadGlobalDescriptorTable();
 
+//      while (true)
+//         asm volatile("hlt");
+      
+
+
+
 }

src/kernel/idt/idt.cpp

@@ -0,0 +1,149 @@
+#include "idt.h"
+//#include "scancodes/set1.h"
+
+IDT_entry idt_table[256];
+IDT_ptr idt_ptr;
+
+void set_id_entry (uint8_t num , uint32_t base, uint16_t sel,  uint8_t flags){
+    idt_table[num].offset_1 = base & 0xFFFF;
+    idt_table[num].selector = sel;
+    idt_table[num].zero = 0;
+    idt_table[num].type_attr = flags;
+    idt_table[num].offset_2 = (base >> 16) & 0xFFFF;
+
+};
+
+
+void irs_handler (registers regs) {
+        kterm_writestring("received interrupt!\n");
+     
+        printf("(IRS) Interrupt number: %d \n", regs.int_no);
+
+        if( regs.int_no == 13){
+            printf(" Error code: %d \n", regs.err_code);
+
+        }
+        
+  
+       
+
+}
+
+
+
+void irq_handler (registers regs) {
+        
+     
+        if ( regs.int_no != 0) {
+            kterm_writestring("received interrupt!\n");
+            printf("(IRQ) Interrupt number: %d \n", regs.int_no);
+        
+        }
+        
+        if ( regs.int_no == 1 ){
+            // Keyboard interrupt !!
+
+            int scan;
+            /*register*/int i;
+
+            // Read scancode 
+
+            scan = inb(0x60);
+            
+            // Send ack message!
+            i = inb(0x61);
+            outb(0x61, i|0x80);
+            outb(0x61, i);
+            kterm_writestring("A key was pressed/released\n");
+            printf( "Scancode: %x\n", scan);
+
+    
+        }
+
+        
+        
+        outb(0x20, 0x20); // send end of interrupt to master
+
+        if ( regs.int_no > 8 && regs.int_no <= 15) {
+            outb(0xA0, 0x20); // send end of interrupt to slave 
+        }
+       
+       
+        if( regs.int_no == 13){
+            printf(" Error code: %d \n", regs.err_code);
+
+        }
+
+}
+
+
+
+
+
+void init_idt(){
+    // Initialise the IDT pointer
+    idt_ptr.length = sizeof(IDT_entry) * 255;
+    idt_ptr.base = (uint32_t)&idt_table;
+
+
+    // TODO: Set everything to zero first
+
+    set_id_entry(0,  (uint32_t) irs0 , 0x08, 0x8F);
+    set_id_entry(1,  (uint32_t) irs1 , 0x08, 0x8E);
+    set_id_entry(2,  (uint32_t) irs2 , 0x08, 0x8E);
+    set_id_entry(3,  (uint32_t) irs3 , 0x08, 0x8E);
+    set_id_entry(4,  (uint32_t) irs4 , 0x08, 0x8E);
+    set_id_entry(5,  (uint32_t) irs5 , 0x08, 0x8E);
+    set_id_entry(6,  (uint32_t) irs6 , 0x08, 0x8E);
+    set_id_entry(7,  (uint32_t) irs7 , 0x08, 0x8E);
+    set_id_entry(8,  (uint32_t) irs8 , 0x08, 0x8E);
+    set_id_entry(9,  (uint32_t) irs9 , 0x08, 0x8E);
+    set_id_entry(10, (uint32_t) irs10 , 0x08, 0x8E);
+    set_id_entry(11, (uint32_t) irs11 , 0x08, 0x8E);
+    set_id_entry(12, (uint32_t) irs12 , 0x08, 0x8E);
+    set_id_entry(13, (uint32_t) irs13 , 0x08, 0x8E);
+    set_id_entry(14, (uint32_t) irs14 , 0x08, 0x8E);
+    set_id_entry(15, (uint32_t) irs15 , 0x08, 0x8E);
+    set_id_entry(16, (uint32_t) irs16 , 0x08, 0x8E);
+    set_id_entry(17, (uint32_t) irs17 , 0x08, 0x8E);
+    set_id_entry(18, (uint32_t) irs18 , 0x08, 0x8E);
+    set_id_entry(19, (uint32_t) irs19 , 0x08, 0x8E); 
+    set_id_entry(20, (uint32_t) irs20 , 0x08, 0x8E);
+    set_id_entry(21, (uint32_t) irs21 , 0x08, 0x8E);
+    set_id_entry(22, (uint32_t) irs22 , 0x08, 0x8E);
+    set_id_entry(23, (uint32_t) irs23 , 0x08, 0x8E);
+    set_id_entry(24, (uint32_t) irs24 , 0x08, 0x8E);
+    set_id_entry(25, (uint32_t) irs25 , 0x08, 0x8E);
+    set_id_entry(26, (uint32_t) irs26 , 0x08, 0x8E);
+    set_id_entry(27, (uint32_t) irs27 , 0x08, 0x8E); 
+    set_id_entry(28, (uint32_t) irs28 , 0x08, 0x8E);
+    set_id_entry(29, (uint32_t) irs29 , 0x08, 0x8E);
+    set_id_entry(30, (uint32_t) irs30 , 0x08, 0x8E);
+    set_id_entry(31, (uint32_t) irs31 , 0x08, 0x8E);
+
+
+    //print_serial("Remapping PIC\n");
+    PIC_remap(0x20, 0x28);
+
+
+    // pic IRQ Table
+    set_id_entry(32, (uint32_t)irq0, 0x08, 0x8E);
+    set_id_entry(33, (uint32_t)irq1, 0x08, 0x8E);
+    set_id_entry(34, (uint32_t)irq2, 0x08, 0x8E);
+    set_id_entry(35, (uint32_t)irq3, 0x08, 0x8E);
+    set_id_entry(36, (uint32_t)irq4, 0x08, 0x8E);
+    set_id_entry(37, (uint32_t)irq5, 0x08, 0x8E);
+    set_id_entry(38, (uint32_t)irq6, 0x08, 0x8E);
+    set_id_entry(39, (uint32_t)irq7, 0x08, 0x8E);
+    set_id_entry(40, (uint32_t)irq8, 0x08, 0x8E);
+    set_id_entry(41, (uint32_t)irq9, 0x08, 0x8E);
+    set_id_entry(42, (uint32_t)irq10, 0x08, 0x8E);
+    set_id_entry(43, (uint32_t)irq11, 0x08, 0x8E);
+    set_id_entry(44, (uint32_t)irq12, 0x08, 0x8E);
+    set_id_entry(45, (uint32_t)irq13, 0x08, 0x8E);
+    set_id_entry(46, (uint32_t)irq14, 0x08, 0x8E);
+    set_id_entry(47, (uint32_t)irq15, 0x08, 0x8E);
+
+    
+    idt_flush((uint32_t)&idt_ptr);
+}

src/kernel/idt/idt.h

@@ -2,10 +2,10 @@
 
 #include "stdint.h"
 #include "stddef.h"
-#include "../../Drivers/VGA/colors.h"
+#include "../vga/colors.h"
-#include "../../Drivers/PIC/pic.h"
+#include "../pic/pic.h"
 
-#include "../../Terminal/kterm.h"
+#include "../tty/kterm.h"
 
 
 extern "C" {

src/kernel/io.cpp

@@ -22,7 +22,7 @@ unsigned int inl_p(unsigned short ){
 }
 
 
-void b_p(unsigned char , unsigned short ){
+void outb_p(unsigned char , unsigned short ){
 
 }
 void outw(unsigned short , unsigned short ){

src/kernel/kernel.cpp

@@ -1,128 +1,60 @@
 #include "kernel.h"
+#define GB4 524288
+#define GB2 262144
+extern "C" void kernel_main (void);
+extern "C" void putPixel(int pos_x, int pos_y, unsigned char VGA_COLOR , unsigned char addr , unsigned char pixelWidth, unsigned pitch );
 
 
-extern "C" void kernel_main (BootInfo* bootinfo) {
+    extern "C" void early_main(unsigned long magic, unsigned long addr){
-    init_serial();
+        /** initialize terminal interface */ 
-    //pit_initialise();
+       // kterm_init();
+        
+        printf("Magic flag 0x%8x\n", magic);
+        printf("Magic must be 0x%8x\n", MULTIBOOT_BOOTLOADER_MAGIC);
+        if (magic != MULTIBOOT_BOOTLOADER_MAGIC){
+            printf("Invalid magic number: 0x%8x\n",  magic);
+            return;
+        }
 
-    startSuperVisorTerminal(bootinfo);
+        CheckMBT(  (multiboot_info_t *) addr);
-}   
 
-
-extern "C" void early_main(unsigned long magic, unsigned long addr){
-    /** 
-     * Initialize terminal interface 
-     * NOTE: This should be done later on , the magic value should be checked first.
-     */ 
-    initGDT();
-    kterm_init();
-    init_serial();
-    print_serial("Hello Higher half kernel!");
-    printf("DDDDDDDDDDDDDDDD");
-    return;
-    /**
-     * Check Multiboot magic number
-     * NOTE: Printf call should not be a thing this early on ...
-    */ 
-    if (magic != MULTIBOOT_BOOTLOADER_MAGIC){
-        printf("Invalid magic number: 0x%x\n",  magic);
-        return;
-    }
-
-    /**
-     * Show a little banner for cuteness
-     */
-    printf("|===    BarinkOS       ===|\n");
-    printf("Kernel Begin AT(0x%x)", kernel_begin);
-
-    /**
-     * Use the address given as an argument as the pointer
-     * to a Multiboot information structure.
-     */
         multiboot_info_t* mbt = (multiboot_info_t*) addr;
 
-    /**
+        /* Are mmap_* valid? */
-     * Construct our own bootInfo structure
+        if (CHECK_FLAG(mbt->flags, 6)){
-     */
+            PhysicalMemoryManager_initialise( mbt->mmap_addr,  GB2/* Seriously dangerous hardcoded memory value*/);
-        BootInfo bootinfo = {};
+            PhysicalMemoryManager_initialise_available_regions(mbt->mmap_addr, mbt->mmap_addr + mbt->mmap_length);
+            PhysicalMemoryManager_deinitialise_kernel();
+            extern uint8_t* kernel_begin;
+            extern uint8_t* kernel_end;
+
+            printf("Kernel MemoryMap:\n");
+            printf("kernel: 0x%x - 0x%x\n", &kernel_begin , &kernel_end);         
+        }
+
+        initGDT();
+
+
+      kernel_main();
+
        
-        
-    /*
-        If we got a memory map from our bootloader we 
-        should be parsing it to find out the memory regions available.
-        */
-    if (CHECK_FLAG(mbt->flags, 6))
-    {  
-
-        /*
-            Setup Physical memory managment
-        */
-        MemoryInfo meminfo = {};
-        bootinfo.memory = &meminfo;
- 
-        mapMultibootMemoryMap(bootinfo.memory , mbt);        
-        printf("Memory size: 0x%x bytes\n", bootinfo.memory->TotalMemory );
-
-        PhysicalMemory memAlloc = PhysicalMemory{};
-        memAlloc.setup(bootinfo.memory );
-
-        /*
-         Mark already in use sections 
-        */
-        
-        // Mark kernel memory as used
-        printf("Kernel Begin Pointer: 0x%x, Kernel end pointer: 0x%x\n", kernel_begin , kernel_end );
-       
-        multiboot_memory_map_t *mmap = (multiboot_memory_map_t*) mbt->mmap_addr;
-
-        for (;  (unsigned long) mmap < mbt->mmap_addr + mbt->mmap_length;  mmap = (multiboot_memory_map_t *) ((unsigned long) mmap + mmap->size + sizeof(mmap->size))){
-
-            if ( mmap->type == MULTIBOOT_MEMORY_AVAILABLE){
-                  
-            } else{
-                printf("allocate region: 0x%x, size : 0x%x bytes\n", (unsigned) mmap->addr,(unsigned) mmap->len  );
-                memAlloc.allocate_region((unsigned)mmap->addr , (unsigned)mmap->len);
-            }
-          
-            
-        } 
-
-
-       printf("allocate region: 0x%x, size : 0x%x bytes\n", kernel_begin, kernel_end - kernel_begin );
-       memAlloc.allocate_region(kernel_end, kernel_end - kernel_begin);
-
-        // test alloc_block
-        /*
-        uint8_t* memory = (uint8_t*) memAlloc.allocate_block();
-        printf("Got a new pointer: 0x%x\n", memory);
-
-        uint8_t* memory2 = (uint8_t*) memAlloc.allocate_block();
-        printf("Got a new pointer: 0x%x\n", memory2);
-
-
-        memAlloc.free_block((void*) memory);
-
-        uint8_t* newBlockPlse = (uint8_t*) memAlloc.allocate_block();
-        */
-
-
-
-        //memAlloc.free_block((void*) memory);
-        //InitializePaging();
-        //IdentityMap();
-        //Enable();
     }
-    
-    //initGDT();
-    //init_idt();
-    // Enable interrupts
-    //asm volatile("STI");
-    
 
-    //CheckMBT(  (multiboot_info_t *) addr);
+    extern "C" void kernel_main (void) {
+
+        printf("call to init serial\n");
+        init_serial();
 
 
-    kernel_main(&bootinfo);
+        while (true){
-    
+            //Read time indefinetely 
-}
+            read_rtc();
+            printf( "UTC time: %02d-%02d-%02d %02d:%02d:%02d  [ Formatted as YY-MM-DD h:mm:ss]\r" ,year, month, day, hour, minute, second);
+            delay(1000);
+        }
+            
+
+        
+       
+    }   
 

src/kernel/kernel.h

@@ -1,34 +1,33 @@
 #pragma once
-extern "C" 
+extern "C"{
-{
+   #include "../libc/include/string.h" 
-   #include "Lib/string.h" 
 }
+#include "vga/VBE.h"
+#include "tty/kterm.h"
 
-#include "definitions.h"
+#include "./bootloader/multiboot.h"
+#include "bootcheck.h"
+#include "memory/PhysicalMemoryManager.h"
 
-#include "Drivers/VGA/VBE.h"
+#include "gdt/gdtc.h"
-#include "Terminal/kterm.h"
+#include "idt/idt.h"
 
-#include "multiboot.h"
-#include "bootinfo.h"
-
-#include "Memory/memory.h"
-#include "Memory/memoryinfo.h"
-#include "Memory/paging.h"
-#include "KernelLauncher/bootcheck.h"
-
-#include "Memory/GDT/gdtc.h"
-#include "Interrupts/idt/idt.h"
-
-#include "Drivers/PIT/pit.h"
 #include "io.h"
+#include "time.h"
 #include "cpu.h"
 #include "serial.h"
 
-#include "time.h"
-#include "SuperVisorTerminal/superVisorTerminal.h"
-
 #define CHECK_FLAG(flags, bit) ((flags) & (1 <<(bit)))
-#define PANIC(message) {return;} 
+#define PANIC(message) {  return; }
 
 
+/* This needs to be moved! */
+/**
+ *      simple delay function 
+ **/
+void delay(int t){
+    volatile int i,j;
+    for(i=0;i<t;i++)
+        for(j=0;j<25000;j++)
+            asm("NOP");
+}

src/kernel/kstructures/bitmap.h

@@ -0,0 +1,40 @@
+#pragma once 
+#include <stddef.h>
+#include <stdint.h>
+
+
+inline void bitmap_set( uint32_t* map , int index )
+{
+    map[index/32] |= (1 << (index % 32));
+}
+
+inline void bitmap_unset(uint32_t* map , int index)
+{
+    map[index/32] &= ~(1 << (index % 32));
+}
+
+inline int bitmap_first_unset( uint32_t* map , int size)
+{
+    uint32_t rem_bits = size % 32;
+    for(uint32_t i = 0; i < size/32; i++)
+    {
+        if(map[i] != 0xFFFFFFFF){
+            for(int j = 0; j < 32; j++){
+                if(!(map[i] & (1<< j))){
+                    return (i*32) + j;
+                }
+            }
+        }
+    }
+
+    if(rem_bits){
+        for(uint32_t j = 0; j < rem_bits; j++){
+            if(!(map[size/32] & (1 << j ))){
+                return size + j; // Original author divided size by 32 and then multiplied it by 32 which is a net zero calculation ?!?
+            }
+        }
+    }
+
+    return -1;
+    
+}

src/kernel/linker.ld

@@ -1,45 +1,47 @@
+/* The bootloader will look at this image and start execution at the symbol
+   designated as the entry point. */
 ENTRY(_start)
  
 /* Tell where the various sections of the object files will be put in the final
    kernel image. */
 SECTIONS
 {
-	. = 0x00100000;  /* place code at 1MB mark*/
+	
- 
+	/* Begin putting sections at 1 MiB, a conventional place for kernels to be
-	_kernel_start	= .;
+	   loaded at by the bootloader. */
-	kernel_begin	= .; /*  For legacy reasons */
+	. = 1M;
-
+ 	kernel_begin = .;
-
+	/* First put the multiboot header, as it is required to be put very early
-	.multiboot.data : {
+	   early in the image or the bootloader won't recognize the file format.
-		*(.multiboot.data)
+	   Next we'll put the .text section. */
-	}
+	.text BLOCK(4K) : ALIGN(4K)
-
-	.multiboot.text : {
-		*(multiboot.text)
-	}
-
-	. += 0xC0000000; /* Addresses in the following code need to be above the 3Gb mark */
-
-
-	.text ALIGN (4K) : AT (ADDR (.text) - 0xC0000000)
 	{
+		*(.multiboot)
 		*(.text)
 	}
-	.rodata ALIGN (4K) : AT (ADDR (.rodata) - 0xC0000000)
+ 
+	/* Read-only data. */
+	.rodata BLOCK(4K) : ALIGN(4K)
 	{
 		*(.rodata)
 	}
-	.data ALIGN (4K) : AT (ADDR (.data) - 0xC0000000)
+ 
+	/* Read-write data (initialized) */
+	.data BLOCK(4K) : ALIGN(4K)
 	{
 		*(.data)
 	}
-	.bss ALIGN (4K) : AT (ADDR (.bss) - 0xC0000000)
+ 
+	/* Read-write data (uninitialized) and stack */
+	.bss BLOCK(4K) : ALIGN(4K)
 	{
 		*(COMMON)
 		*(.bss)
-		*(.bootstrap_stack)
 	}
-	_kernel_end = .;
+ 
-	kernel_end = .; /* For legacy reasons */
+	/* The compiler may produce other sections, by default it will put them in
+	   a segment with the same name. Simply add stuff here as needed. */
+
+	kernel_end = .;
 }
 

src/kernel/memory/PageDirectory.cpp

@@ -0,0 +1,47 @@
+#include "PageDirectory.h"
+#include <stdint.h>
+
+
+
+void PageDirectory::enable(){
+    // https://wiki.osdev.org/Setting_Up_Paging
+    //set each entry to not present
+    int i;
+    for(i = 0; i < 1024; i++)
+    {
+        // This sets the following flags to the pages:
+        //   Supervisor: Only kernel-mode can access them
+        //   Write Enabled: It can be both read from and written to
+        //   Not Present: The page table is not present
+        this->page_directory[i] = 0x00000002;
+    }
+
+    // holds the physical address where we want to start mapping these pages to.
+    // in this case, we want to map these pages to the very beginning of memory.
+
+    //we will fill all 1024 entries in the table, mapping 4 megabytes
+    for(unsigned int i = 0; i < 1024; i++)
+    {
+        // As the address is page aligned, it will always leave 12 bits zeroed.
+        // Those bits are used by the attributes ;)
+        first_page_table[i] = (i * 0x1000) | 3; // attributes: supervisor level, read/write, present.
+    }
+
+    // attributes: supervisor level, read/write, present
+    this->page_directory[0] = ((unsigned int)first_page_table) | 3;
+
+
+    loadPageDirectory(this->page_directory);
+    enablePaging();
+}
+
+/*
+void IdentityPaging(uint32_t *first_pte, vaddr from, int size)
+{
+    from = from & 0xFFFFF000; // Discard the bits we don't want
+    for (; size > 0; from += 4096, first_pte++)
+    {
+        *first_pte = from | 1; // makr page present.
+    }
+}
+*/

src/kernel/memory/PageDirectory.h

@@ -0,0 +1,28 @@
+#pragma once 
+#include <stdint.h>
+
+extern "C" void loadPageDirectory (uint32_t* addr );
+extern "C" void enablePaging();
+typedef uintptr_t address_t;
+
+
+#define KB 1024
+
+static const int MAX_PAGES =  1024 * KB; // 4GB , 4kB/page
+static volatile address_t pmem_stack[MAX_PAGES];
+static volatile address_t pmem_stack_top = MAX_PAGES; // top down allocation
+
+
+struct page_directory_entry {};
+struct page_table_entry{};
+
+
+
+class PageDirectory {
+    public:
+    void enable ();
+    
+    private:
+    uint32_t page_directory[1024] __attribute__((aligned(4096)));
+    uint32_t first_page_table[1024] __attribute__((aligned(4096)));
+};

src/kernel/memory/PageFrameAllocator.cpp

@@ -0,0 +1,38 @@
+#include "PageFrameAllocator.h"
+
+
+MemoryInfo memInfo {};
+void mapMultibootMemoryMap( multiboot_info_t *mbt){
+    printf("mmap_addr = 0x%x, mmap_length = 0x%x\n",
+    (unsigned) mbt->mmap_addr, (unsigned) mbt->mmap_length);
+    multiboot_memory_map_t *mmap = (multiboot_memory_map_t*) mbt->mmap_addr;
+
+    for (;  (unsigned long) mmap < mbt->mmap_addr + mbt->mmap_length;  mmap = (multiboot_memory_map_t *) ((unsigned long) mmap + mmap->size + sizeof(mmap->size))){
+
+            if ( mmap->type == MULTIBOOT_MEMORY_AVAILABLE){
+                memInfo.memorySizeInBytes +=  mmap->len;   
+            } else {
+                memInfo.reservedMemoryInBytes += mmap->len;
+            }
+            
+            print_Multiboot_memory_Map(mmap);
+            
+        }
+    uint32_t memorySizeInGiB = memInfo.memorySizeInBytes / 1073741824; 
+
+    printf("Available Memory: 0x%x bytes, 0x%x GiB\n",  memInfo.memorySizeInBytes, memorySizeInGiB );
+    printf("Reserved Memory: 0x%x bytes\n",  memInfo.reservedMemoryInBytes );
+
+}
+
+void print_Multiboot_memory_Map(multiboot_memory_map_t* mmap){
+    printf(
+        "size = 0x%x, base_addr = 0x%x%08x, length = 0x%x%08x, type = 0x%x\n",
+        (unsigned) mmap->size,
+        (unsigned) (mmap->addr >> 32),
+        (unsigned) (mmap->addr & 0xffffffff),
+        (unsigned) (mmap->len >> 32),
+        (unsigned) (mmap->len & 0xffffffff),
+        (unsigned) mmap->type
+    );
+}

src/kernel/memory/PageFrameAllocator.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "../arch/i386/tty/kterm.h"
+
+#include <stdint.h>
+#include "../bootloader/multiboot.h"
+
+struct MemoryInfo{
+    uint32_t memorySizeInBytes = 0;
+    uint32_t reservedMemoryInBytes = 0;
+};
+
+
+extern void *kernel_begin;
+extern void *kernel_end;
+
+
+
+
+void print_Multiboot_memory_Map(multiboot_memory_map_t*);
+void mapMultibootMemoryMap(multiboot_info_t*);

src/kernel/memory/PhysicalMemoryManager.cpp

@@ -0,0 +1,118 @@
+#include "PhysicalMemoryManager.h"
+
+size_t mem_size = 0;
+int used_blocks = 0;
+size_t max_blocks = 0;
+uint32_t* pmmap = 0;
+size_t pmmap_size = 0; 
+
+
+void PhysicalMemoryManager_initialise(uint32_t physicalmemorymap_address, size_t size )
+{
+    mem_size = size;
+    max_blocks = KB_TO_BLOCKS(mem_size);
+
+    used_blocks = max_blocks;
+
+    pmmap = (uint32_t*) physicalmemorymap_address;
+
+    if(max_blocks % BLOCKS_PER_WORD)
+        pmmap_size++;
+    
+    memset(pmmap, 0xFF, pmmap_size);
+}
+
+void PhysicalMemoryManager_region_initialise(uint32_t base, size_t size)
+{
+    size_t blocks = size /BLOCK_SIZE;
+    uint32_t align = base / BLOCK_SIZE;
+
+    for(size_t i = 0 ; i < blocks; i ++)
+    {
+        bitmap_unset(pmmap, align++);
+        used_blocks--;
+    }
+
+    bitmap_set(pmmap, 0);
+
+}
+
+void PhysicalMemoryManager_region_deinitialise(uint32_t base, size_t size )
+{
+    size_t blocks = size / BLOCK_SIZE;
+    uint32_t align = base / BLOCK_SIZE;
+
+    for(size_t i = 0 ; i < blocks; i++ )
+    {
+        bitmap_set(pmmap, align++);
+        used_blocks++;
+    }
+
+
+}
+
+void PhysicalMemoryManager_initialise_available_regions(uint32_t mmap_, uint32_t mmap_end_)
+{
+    multiboot_memory_map_t *mmap = (multiboot_memory_map_t*)mmap_;
+    multiboot_memory_map_t *mmap_end= (multiboot_memory_map_t*) mmap_end_;
+
+    for(int i = 0; mmap < mmap_end ; mmap++, i++)
+    {   
+        if(mmap->type == MULTIBOOT_MEMORY_AVAILABLE)
+        {
+            PhysicalMemoryManager_region_initialise((uint32_t) mmap->addr, (size_t) mmap->len);
+        }
+    }
+
+}
+
+void PhysicalMemoryManager_deinitialise_kernel()
+{
+    extern uint8_t kernel_begin;
+    extern uint8_t kernel_end;
+
+    size_t kernel_size = (size_t) &kernel_end - (size_t) &kernel_begin;
+
+    uint32_t pmmap_size_aligned = pmmap_size;
+    if(!IS_ALIGNED(pmmap_size_aligned, BLOCK_SIZE))
+    {
+        pmmap_size_aligned = ALIGN(pmmap_size_aligned, BLOCK_SIZE);
+    }
+    
+    PhysicalMemoryManager_region_deinitialise((uint32_t) &kernel_begin, kernel_size);
+    PhysicalMemoryManager_region_deinitialise((uint32_t) &kernel_end, pmmap_size_aligned);
+    
+}
+
+void* PhysicalMemoryManager_allocate_block()
+{
+    if(used_blocks - max_blocks <= 0)
+    {
+        return 0;
+    }
+
+    int p_index = bitmap_first_unset(pmmap, p_index );
+
+    if(p_index == -1){
+        return 0;
+    }
+
+    bitmap_set(pmmap, p_index);
+    used_blocks++;
+
+    return (void*) (BLOCK_SIZE * p_index);
+}
+
+void PhysicalMemoryManager_free_block(void* p){
+    if(p==0){
+        return ;
+    }
+
+    uint32_t p_addr = (uint32_t) p;
+
+    int index  = p_addr / BLOCK_SIZE;
+    bitmap_unset(pmmap, index);
+
+    used_blocks--;
+
+}

src/kernel/memory/PhysicalMemoryManager.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include "../bootloader/multiboot.h"
+#include <stdint.h>
+#include <stddef.h>
+#include "../../libc/include/mem.h"
+#include "../kstructures/bitmap.h"
+
+
+#define BLOCK_SIZE 4092
+#define BLOCKS_PER_WORD 32
+
+#define KB_TO_BLOCKS(x) (((x) * 1024 ) / BLOCK_SIZE)
+#define IS_ALIGNED(addr, align) !((addr) & ~((align) - 1))
+#define ALIGN(addr, align) (((addr) & ~((align) - 1 )) + (align))
+
+
+extern void PhysicalMemoryManager_initialise(uint32_t, size_t);
+
+extern void PhysicalMemoryManager_region_initialise(uint32_t, size_t);
+extern void PhysicalMemoryManager_region_deinitialise(uint32_t,size_t);
+
+extern void PhysicalMemoryManager_initialise_available_regions(uint32_t, uint32_t);
+extern void PhysicalMemoryManager_deinitialise_kernel();
+
+extern void* PhysicalMemoryManager_allocate_block();
+extern void PhysicalMemoryManager_free_block(void* p);
+
+
+extern size_t mem_size;
+extern int used_blocks;
+extern size_t max_blocks;
+extern uint32_t* pmmap;
+extern size_t pmmap_size ; 

src/kernel/memory/SlabAllocator.h

@@ -0,0 +1,33 @@
+#pragma once
+/**
+ *  We'll need something to this effect to allocate memory in the kernel
+ *  this will hopefully someday implement a full slab allocator 
+ **/
+enum SlabState {
+    empty,
+    partial,
+    full 
+};
+
+class CacheSlab {
+    const int SlabSize = 4000;
+    void* start = 0x0;
+};
+
+
+class Allocator {
+
+    public:
+        Allocator();
+        ~Allocator();
+
+        void* kmalloc( int size );
+        void kfree (void* address);
+
+    private:
+        CacheSlab** _cache;
+
+
+
+
+};

src/kernel/paging.s

@@ -0,0 +1,20 @@
+.globl enablePaging
+enablePaging:
+	push %ebp
+	mov %esp, %ebp
+	mov %cr0, %eax
+	or $0x80000000, %eax
+	mov %eax, %cr0
+	mov %ebp, %esp
+	pop %ebp
+	ret
+
+.globl loadPageDirectory
+loadPageDirectory:
+	push %ebp
+	mov %esp, %ebp
+	mov 8(%esp), %eax
+	mov %eax, %cr3
+	mov %ebp, %esp
+	pop %ebp
+	ret

src/kernel/pic/pic.h

@@ -1,5 +1,5 @@
 #pragma once 
-#include "../../io.h"
+#include "../io.h"
 
 #define PIC1		0x20		/* IO base address for master PIC */
 #define PIC2		0xA0		/* IO base address for slave PIC */

src/kernel/serial.h

@@ -1,14 +1,10 @@
 #pragma once
-
+#include "tty/kterm.h"
-#include "Terminal/kterm.h"
 #include "io.h"
-#define PORT 0x3f8 
-static int init_serial() {
 
-#ifdef __VERBOSE__
+#define PORT 0x3f8 
-   printf("Init Serial\n");
+
-#endif
+inline static int init_serial() {
-   
    outb(PORT + 1, 0x00);    // Disable all interrupts
    outb(PORT + 3, 0x80);    // Enable DLAB (set baud rate divisor)
    outb(PORT + 0, 0x03);    // Set divisor to 3 (lo byte) 38400 baud
@@ -30,33 +26,95 @@ static int init_serial() {
    return 0;
 }
 
-int is_transmit_empty() {
+inline int is_transmit_empty() {
    return inb(PORT + 5) & 0x20;
 }
  
-void write_serial(char a) {
+inline void write_serial(char a) {
    while (is_transmit_empty() == 0);
  
    outb(PORT,a);
 }
 
-int serial_received() {
+inline int serial_received() {
    return inb(PORT + 5) & 1;
 }
  
-char read_serial() {
+inline char read_serial() {
    while (serial_received() == 0);
  
    return inb(PORT);
 }
 
-void print_serial(const char* string ){
+inline void print_serial(const char* string ){
     for(size_t i = 0; i < strlen(string); i ++){
         write_serial(string[i]);
     }
 }
 
-void test_serial(){
+
+inline void printf_serial ( const char *format, ...) {
+   
+    char **arg = (char **)&format;
+    int c;
+    char buf[20];
+
+    arg++;
+    
+    while ((c = *format++) != 0){
+        if( c != '%')
+            write_serial(c);
+        else{
+            char *p, *p2;
+            int pad0 = 0, pad = 0;
+
+            c = *format++;
+            if(c =='0'){
+                pad0 = 1;
+                c = *format++;
+            }
+
+            if ( c >= '0' && c <= '9'){
+                pad = c - '0';
+                c = *format++;
+            }
+
+            switch (c)
+            {
+            case 'd':
+             
+            case 'u':
+            case 'x':
+                itoa(buf, c, *((int *) arg++));
+
+                p = buf;
+                goto string;
+                break;
+            
+            case 's':
+                p = *arg++;
+                if(!p)
+                    p = "(null)";
+                
+                string: 
+                    for (p2 = p; *p2; p2++);
+                    for (; p2 < p + pad; p2++)
+                        write_serial(pad0 ? '0': ' ');
+                    while (*p)
+                        write_serial(*p++);
+                    break;
+
+
+            default:
+                write_serial(*((int *)arg++));
+                break;
+            }
+        }
+    }
+}
+
+
+inline void test_serial(){
         /** Serial test **/
         kterm_writestring("Writing to COM1 serial port:");
         init_serial();

src/kernel/time.cpp

@@ -1,111 +0,0 @@
-#include "time.h"
-
-// Set by ACPI table parsing code if possible
-int century_register = 0x00;     
-unsigned char second;
-unsigned char minute;
-unsigned char hour;
-unsigned char day;
-unsigned char month;
-unsigned int year;
- 
-
-int get_update_in_progress_flag() {
-      outb(cmos_address, 0x0A);
-      return (inb(cmos_data) & 0x80);
-}
- 
-unsigned char get_RTC_register(int reg) {
-      outb(cmos_address, reg);
-      return inb(cmos_data);
-}
- 
-void read_rtc() {
-      unsigned char century;
-      unsigned char last_second;
-      unsigned char last_minute;
-      unsigned char last_hour;
-      unsigned char last_day;
-      unsigned char last_month;
-      unsigned char last_year;
-      unsigned char last_century;
-      unsigned char registerB;
- 
-      // Note: This uses the "read registers until you get the same values twice in a row" technique
-      //       to avoid getting dodgy/inconsistent values due to RTC updates
- 
-      while (get_update_in_progress_flag());                // Make sure an update isn't in progress
-      second = get_RTC_register(0x00);
-      minute = get_RTC_register(0x02);
-      hour = get_RTC_register(0x04);
-      day = get_RTC_register(0x07);
-      month = get_RTC_register(0x08);
-      year = get_RTC_register(0x09);
-      if(century_register != 0) {
-            century = get_RTC_register(century_register);
-      } else {
-            century = 21;
-      }
- 
-      do {
-            last_second = second;
-            last_minute = minute;
-            last_hour = hour;
-            last_day = day;
-            last_month = month;
-            last_year = year;
-            last_century = century;
- 
-            while (get_update_in_progress_flag());           // Make sure an update isn't in progress
-            second = get_RTC_register(0x00);
-            minute = get_RTC_register(0x02);
-            hour = get_RTC_register(0x04);
-            day = get_RTC_register(0x07);
-            month = get_RTC_register(0x08);
-            year = get_RTC_register(0x09);
-            if(century_register != 0) {
-                  century = get_RTC_register(century_register);
-            }
-      } while( (last_second != second) || (last_minute != minute) || (last_hour != hour) ||
-               (last_day != day) || (last_month != month) || (last_year != year) ||
-               (last_century != century) );
- 
-      registerB = get_RTC_register(0x0B);
- 
-      // Convert BCD to binary values if necessary
- 
-      if (!(registerB & 0x04)) {
-            second = (second & 0x0F) + ((second / 16) * 10);
-            minute = (minute & 0x0F) + ((minute / 16) * 10);
-            hour = ( (hour & 0x0F) + (((hour & 0x70) / 16) * 10) ) | (hour & 0x80);
-            day = (day & 0x0F) + ((day / 16) * 10);
-            month = (month & 0x0F) + ((month / 16) * 10);
-            year = (year & 0x0F) + ((year / 16) * 10);
-            if(century_register != 0) {
-                  century = (century & 0x0F) + ((century / 16) * 10);
-            }
-      }
- 
-      // Convert 12 hour clock to 24 hour clock if necessary
- 
-      if (!(registerB & 0x02) && (hour & 0x80)) {
-            hour = ((hour & 0x7F) + 12) % 24;
-      }
- 
-      // Calculate the full (4-digit) year
- 
-      if(century_register != 0) {
-            year += century * 100;
-      } else {
-            year += (CURRENT_YEAR / 100) * 100;
-            if(year < CURRENT_YEAR) year += 100;
-      }
-}
-
-
-void delay(int t){
-    volatile int i,j;
-    for(i=0;i<t;i++)
-        for(j=0;j<25000;j++)
-            asm("NOP");
-}

src/kernel/time.h

@@ -1,15 +1,14 @@
-#pragma once 
+#define CURRENT_YEAR        2021                            // Change this each year!
-#include "io.h"
+ 
-#define CURRENT_YEAR        2021
+int century_register = 0x00;                                // Set by ACPI table parsing code if possible
+ 
+unsigned char second;
+unsigned char minute;
+unsigned char hour;
+unsigned char day;
+unsigned char month;
+unsigned int year;
  
-                           
-extern int century_register;     
-extern unsigned char second;
-extern unsigned char minute;
-extern unsigned char hour;
-extern unsigned char day;
-extern unsigned char month;
-extern unsigned int year;
 
  
 enum {
@@ -17,7 +16,138 @@ enum {
       cmos_data    = 0x71
 };
  
-int get_update_in_progress_flag();
+int get_update_in_progress_flag() {
-unsigned char get_RTC_register();
+      outb(cmos_address, 0x0A);
-void read_rtc();
+      return (inb(cmos_data) & 0x80);
-void delay(int t);
+}
+ 
+unsigned char get_RTC_register(int reg) {
+      outb(cmos_address, reg);
+      return inb(cmos_data);
+}
+ 
+void read_rtc() {
+      unsigned char century;
+      unsigned char last_second;
+      unsigned char last_minute;
+      unsigned char last_hour;
+      unsigned char last_day;
+      unsigned char last_month;
+      unsigned char last_year;
+      unsigned char last_century;
+      unsigned char registerB;
+ 
+      // Note: This uses the "read registers until you get the same values twice in a row" technique
+      //       to avoid getting dodgy/inconsistent values due to RTC updates
+ 
+      while (get_update_in_progress_flag());                // Make sure an update isn't in progress
+      second = get_RTC_register(0x00);
+      minute = get_RTC_register(0x02);
+      hour = get_RTC_register(0x04);
+      day = get_RTC_register(0x07);
+      month = get_RTC_register(0x08);
+      year = get_RTC_register(0x09);
+      if(century_register != 0) {
+            century = get_RTC_register(century_register);
+      } else {
+            century = 21;
+      }
+ 
+      do {
+            last_second = second;
+            last_minute = minute;
+            last_hour = hour;
+            last_day = day;
+            last_month = month;
+            last_year = year;
+            last_century = century;
+ 
+            while (get_update_in_progress_flag());           // Make sure an update isn't in progress
+            second = get_RTC_register(0x00);
+            minute = get_RTC_register(0x02);
+            hour = get_RTC_register(0x04);
+            day = get_RTC_register(0x07);
+            month = get_RTC_register(0x08);
+            year = get_RTC_register(0x09);
+            if(century_register != 0) {
+                  century = get_RTC_register(century_register);
+            }
+      } while( (last_second != second) || (last_minute != minute) || (last_hour != hour) ||
+               (last_day != day) || (last_month != month) || (last_year != year) ||
+               (last_century != century) );
+ 
+      registerB = get_RTC_register(0x0B);
+ 
+      // Convert BCD to binary values if necessary
+ 
+      if (!(registerB & 0x04)) {
+            second = (second & 0x0F) + ((second / 16) * 10);
+            minute = (minute & 0x0F) + ((minute / 16) * 10);
+            hour = ( (hour & 0x0F) + (((hour & 0x70) / 16) * 10) ) | (hour & 0x80);
+            day = (day & 0x0F) + ((day / 16) * 10);
+            month = (month & 0x0F) + ((month / 16) * 10);
+            year = (year & 0x0F) + ((year / 16) * 10);
+            if(century_register != 0) {
+                  century = (century & 0x0F) + ((century / 16) * 10);
+            }
+      }
+ 
+      // Convert 12 hour clock to 24 hour clock if necessary
+ 
+      if (!(registerB & 0x02) && (hour & 0x80)) {
+            hour = ((hour & 0x7F) + 12) % 24;
+      }
+ 
+      // Calculate the full (4-digit) year
+ 
+      if(century_register != 0) {
+            year += century * 100;
+      } else {
+            year += (CURRENT_YEAR / 100) * 100;
+            if(year < CURRENT_YEAR) year += 100;
+      }
+}
+
+
+/*
+void ReadFromCMOS(unsigned char array[])
+{
+    unsigned char tvalue, index;
+
+    for (index = 0; index < 128; index++)
+    {
+        asm(
+            "cli\n\t"           // Disable interrupts
+            "mov al, index\n\t" // Move index address
+            // since the 0x80 bit of al is not set, NMI is active 
+            "out 0x70,al\n\t" // Copy address to CMOS register
+            // some kind of real delay here is probably best 
+            "in al,0x71\n\t" // Fetch 1 byte to al
+            "sti\n\t"        // Enable interrupts
+            "mov tvalue,al\n\t");
+
+        array[index] = tvalue;
+    }
+}
+*/
+
+/*
+void WriteTOCMOS(unsigned char array[])
+{
+   unsigned char index;
+ 
+   for(index = 0; index < 128; index++)
+   {
+      unsigned char tvalue = array[index];
+      
+       asm("cli\n\t"       // Clear interrupts
+         "mov al,index\n\t"    // move index address
+         "out 0x70,al\n\t"     // copy address to CMOS register
+         // some kind of real delay here is probably best 
+         "mov al,tvalue\n\t"   // move value to al
+         "out 0x71,al\n\t"   // write 1 byte to CMOS
+         "sti\n\\t"   );        // Enable interrupts
+      
+   }
+}
+*/

src/kernel/tty/kterm.cpp

@@ -21,7 +21,7 @@ void kterm_init () {
     kterm_row = 0;
     kterm_column = 0;
     kterm_color = vga_entry_color ( VGA_COLOR_LIGHT_GREY , VGA_COLOR_BLACK);
-    kterm_buffer = (uint16_t*) 0xC03FF000;
+    kterm_buffer = (uint16_t*) 0xB8000;
     for (size_t y = 0; y < VGA_HEIGHT; y++ ){
         for( size_t x = 0; x < VGA_WIDTH; x++){
             const size_t index = y * VGA_WIDTH + x;
@@ -137,7 +137,7 @@ void kterm_writestring(const char* data ){
 }
 
 
-static void itoa (char *buf, int base, int d) {
+void itoa (char *buf, int base, int d) {
     char *p = buf;
     char *p1, *p2;
     unsigned long ud = d;
@@ -174,7 +174,7 @@ static void itoa (char *buf, int base, int d) {
 }
 
 void printf ( const char *format, ...) {
-    
+    return;
     char **arg = (char **)&format;
     int c;
     char buf[20];

src/kernel/tty/kterm.h

@@ -4,11 +4,11 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "../Drivers/VGA/colors.h"
+#include "../vga/colors.h"
 #include "../io.h"
 
 extern "C"{
-    #include "../Lib/string.h"
+    #include "./../../libc/include/string.h"
 }
 
 void kterm_init();
@@ -33,10 +33,9 @@ uint16_t get_cursor_position();
 int get_cursor_x (uint16_t cursor_pos);
 int get_cursor_y (uint16_t cursor_pos);
 
-
+extern "C"  void itoa (char *buf, int base, int d);
 void printf ( const char *format, ...);
 
-//static void itoa (char *buf, int base, int d);
 
 #define KernelTag "[Kernel]: "
 #define AS_KERNEL() (  kterm_setcolor(VGA_COLOR_LIGHT_BLUE),\

src/libc/include/mem.h

@@ -1,8 +1,8 @@
 inline void* memset (void* ptr, int value, size_t num){
     for( int i = 0; i < num; i++ )
     {
-        unsigned char* data  = (unsigned char*)ptr+ i;
+        int* data  = (int*)ptr+ i;
-        *data = (unsigned char)value;
+        *data = value;
     }
     return ptr;
 }

src/libc/include/string.c

@@ -0,0 +1,9 @@
+#include "string.h"
+
+size_t strlen(const char* str) {
+    size_t len = 0;
+    while(str[len]){
+        len++;
+    }
+    return len;
+}

src/libc/include/string.h

@@ -1,6 +1,3 @@
 #pragma once
 #include <stddef.h>
 size_t strlen(const char* str);
-
-
-int strncmp ( const char* str1, const char* str2, size_t num );

todo.md

@@ -1,21 +0,0 @@
-# TODO list
-
-![Todo image](https://camo.githubusercontent.com/c43d969d9d071c8342e9a69cdd6acb433c541f431127738974ce22290c46f2b8/68747470733a2f2f692e696d6775722e636f6d2f4f764d5a4273392e6a7067)
-
-
-This list keeps me focused and organised so I don't forget what
-needs to be done. It is a expansion on the features markdown file which describes the features. Here I put things I need to remember 
-to do on a more in depth level.
-
-## --
-[ ] Setup paging  \
-[ ] HELP command   
-[ ] Setup a proper HEAP \
-[ ] Setup a proper Stack \
-[ ] Setup KMalloc and KFree \
-[ ] Merge Functioning Feature branches into sandboxKernelDev \
-[ ] Remove merged feature branches \
-[ ] Merge sandboxKernelDev with dev \
-[ ] Remove sandboxKernelDev branch \
-[ ] Implement proper virtual filesystem 
-