diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-07-21 16:53:10 +0400 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2015-07-21 16:53:10 +0400 |
| commit | dd6a7fb6fa4e1f81895f09d52797f51ca662e65a (patch) | |
| tree | 4f57e4917aec248c74271358a0f632a6800b38e7 | |
| parent | 9d07b13fcf420ef34b5f409fc0041aba6e060727 (diff) | |
Edit entry point
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | kernel/GDT/Makefile | 2 | ||||
| -rw-r--r-- | kernel/Helpers/Makefile | 2 | ||||
| -rw-r--r-- | kernel/Makefile | 4 | ||||
| -rw-r--r-- | kernel/entry.asm | 4 | ||||
| -rw-r--r-- | kernel/main.cpp | 23 |
6 files changed, 26 insertions, 11 deletions
@@ -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 ----- +//----- 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(); } + |