From dd6a7fb6fa4e1f81895f09d52797f51ca662e65a Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Tue, 21 Jul 2015 16:53:10 +0400
Subject: [PATCH] Edit entry point

---
 Makefile                |  2 +-
 kernel/GDT/Makefile     |  2 +-
 kernel/Helpers/Makefile |  2 +-
 kernel/Makefile         |  4 ++--
 kernel/entry.asm        |  4 ++--
 kernel/main.cpp         | 23 +++++++++++++++++++----
 6 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index a2d377f..50d9525 100644
--- a/Makefile
+++ b/Makefile
@@ -19,5 +19,5 @@ kernel/kernel.bin:
 
 clean:
 	cd kernel && make clean
-	rm $(EXEC)
+	-rm $(EXEC)
 #-----------------
diff --git a/kernel/GDT/Makefile b/kernel/GDT/Makefile
index e6083dd..4f5192b 100644
--- a/kernel/GDT/Makefile
+++ b/kernel/GDT/Makefile
@@ -13,5 +13,5 @@ $(EXEC): gdt.cpp
 .PHONY:clean
 
 clean:
-	rm *.o
+	-rm *.o
 #----------------
diff --git a/kernel/Helpers/Makefile b/kernel/Helpers/Makefile
index e619021..de11d62 100644
--- a/kernel/Helpers/Makefile
+++ b/kernel/Helpers/Makefile
@@ -13,5 +13,5 @@ $(EXEC): memory.cpp
 .PHONY:clean
 
 clean:
-	rm *.o
+	-rm *.o
 #----------------
diff --git a/kernel/Makefile b/kernel/Makefile
index bc32d48..0ad6f60 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -34,6 +34,6 @@ Helpers/helpers.o:
 
 clean:
 	cd ./GDT/ && make clean
-	rm ./*.o
-	rm ./$(EXEC)
+	-rm ./*.o
+	-rm ./$(EXEC)
 #-----------------
diff --git a/kernel/entry.asm b/kernel/entry.asm
index 04f580a..f1ab9b8 100644
--- a/kernel/entry.asm
+++ b/kernel/entry.asm
@@ -1,7 +1,7 @@
 [BITS 32]
 
 ;Define extern symbol
-extern main
+extern _boot
 
 ;Define entry point as global for linking
 global _kernelEntry
@@ -20,5 +20,5 @@ dd 0x1BADB002
 
 
 begin:
-	call main ;Start kernel
+	call _boot ;Start kernel
 
diff --git a/kernel/main.cpp b/kernel/main.cpp
index 634a147..15eb154 100644
--- a/kernel/main.cpp
+++ b/kernel/main.cpp
@@ -1,16 +1,31 @@
 #include "GDT/gdt.hpp"
+#include "Drivers/memPrint/memPrint.hpp"
+
 
 //----- PiegOS kernel main -----
-
 int  main(){
 
+    //Infinite loop
+	while(1);
+
+    //Exit code
+	return 0;
+}
+
+
+
+//----- PiegOS kernel boot -----
+
+//Mangling the _boot function
+extern "C" void _boot(){
+
     //Create Gdt instance
     Gdt gdt;
 
     //Load Gdt into memory
     gdt.loadGdt();
 
-	while(1);
-
-	return 0;
+    //Call main function
+    main();
 }
+