3 files changed, 114 insertions, 5 deletions

diff --git a/kernel/Helpers/memPrint.cpp b/kernel/Helpers/memPrint.cpp
index bde4702..f6cc397 100644
--- a/kernel/Helpers/memPrint.cpp
+++ b/kernel/Helpers/memPrint.cpp
@@ -3,9 +3,69 @@
 //Constructor
 memPrint::memPrint(){
 
+    //Initialise position
+    this->m_cursorX=0;
+    this->m_cursorY=0;
+
+    //Initialise color
+    this->setBackground(BLACK);
+    this->setForeground(WHITE);
+
 }
 
 //Destructor
 memPrint::~memPrint(){
 
 }
+
+
+//Move cursor
+void memPrint::updateCursor(){
+    this->m_cursorX++;
+
+    if(this->m_cursorX > MAXCURSORX){
+        this->m_cursorX=0;
+        this->m_cursorY++;
+
+        if(this->m_cursorY > MAXCURSORY){
+            //Scroll screen
+        }
+
+
+    }
+
+
+}
+
+void memPrint::setBackground(colorBios color){
+    u8 newColor= (color << 4);
+    this->m_colors= newColor | ((this->m_colors << 4) >> 4);
+}
+
+void memPrint::setForeground(colorBios color){
+    u8 newColor= color;
+    this->m_colors= newColor | ((this->m_colors >> 4) << 4);
+}
+
+//Print a char
+
+void memPrint::putChar(u8 character){
+
+    char *adress= ((char *) MEMPRINTSTARTADR) + (this->m_cursorX * 2) + (this->m_cursorY * 80 * 2);
+
+    *adress=character;
+
+    adress++;
+
+    *adress=this->m_colors;
+
+    this->updateCursor();
+
+}
+
+void memPrint::print(char *str){
+    while(*str!=0x0){
+        this->putChar(*str);
+        str++;
+    }
+}
diff --git a/kernel/Helpers/memPrint.hpp b/kernel/Helpers/memPrint.hpp
index 841be86..437d6cb 100644
--- a/kernel/Helpers/memPrint.hpp
+++ b/kernel/Helpers/memPrint.hpp
@@ -1,6 +1,13 @@
 #ifndef __memPrint__
 #define __memPrint__
 
+#include "./types.hpp"
+
+
+#define MEMPRINTSTARTADR 0xB8000
+#define MAXCURSORX 80
+#define MAXCURSORY 25
+
 //Define the bios color
 enum colorBios{
 
@@ -32,6 +39,15 @@ class memPrint{
 
     private:
 
+        //Cursor position
+        u8 m_cursorX;
+        u8 m_cursorY;
+
+        //Current colors (background and foreground):
+        u8 m_colors;
+
+        //Methods
+        void updateCursor();
 
     public:
 
@@ -40,6 +56,17 @@ class memPrint{
 
 		//Destructor
 		~memPrint();
+
+		//Set color
+		void setBackground(colorBios color);
+		void setForeground(colorBios color);
+
+		//Putchar
+		void putChar(u8 character);
+
+		//Print
+        void print(char *str);
+
 };
 
 #endif
diff --git a/kernel/main.cpp b/kernel/main.cpp
index c958ac0..9cd9875 100644
--- a/kernel/main.cpp
+++ b/kernel/main.cpp
@@ -7,10 +7,20 @@
 int  main(){
 
     //Test print a char
-	char* letter=(char*)0xB8A00;
+	/*char* letter=(char*)0xB8A00;
 	*letter='H';
 	letter++;
-	*letter=(GREEN << 4) | BLUE;
+	*letter=(GREEN << 4) | BLUE;*/
+
+    memPrint VideoRam;
+
+
+    VideoRam.print("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    VideoRam.print("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    VideoRam.print("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    VideoRam.print("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    VideoRam.print("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    VideoRam.print("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 
     //Infinite loop
 	while(1);
@@ -29,9 +39,21 @@ extern "C" void _boot(){
     Gdt gdt;
 
     //Load Gdt into memory
-    //gdt.loadGdt();
-
-    //Call main function
+    gdt.loadGdt();
+
+    //Init all segments and stack
+    __asm__("\
+        movw $0x10, %ax; \n \
+        movw %ax, %ds; \n \
+        movw %ax, %es \n \
+        ljmp $0x08, $updateDS;\
+        updateDS: \n\
+        movw $0x18, %ax \n \
+        movw %ax, %ss \n \
+        movl $0x00B00000, %esp \n\
+    ");
+
+    //Call main function after stack pointer changing (due to C++ optimisation)
     main();
 }