tasking: continue working on executing ELF files
This commit is contained in:
+4
-1
@@ -12,6 +12,7 @@
|
||||
#include "../include/multiboot.h"
|
||||
#include "../include/liballoc.h"
|
||||
#include "../include/kheap.h"
|
||||
#include "../include/exec_from_file.h"
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@@ -190,7 +191,7 @@ void kmain(unsigned int magic, unsigned int info)
|
||||
//printf("after heap_init\n");
|
||||
kheap_init();
|
||||
__asm__ __volatile__ ("sti");
|
||||
//scheduler_init();
|
||||
scheduler_init();
|
||||
printf("Kernel init sequence completed\n");
|
||||
|
||||
char yooo[256] = "heheh";
|
||||
@@ -217,6 +218,8 @@ void kmain(unsigned int magic, unsigned int info)
|
||||
printf("huy1 points to: 0x%X huy2 points to:0x%X\n", huy, huy2);
|
||||
printf("huy1: %s\nhuy2: %s", huy, huy2);
|
||||
|
||||
exec_from_file("/boot/katauos.bin");
|
||||
|
||||
while(1)
|
||||
{
|
||||
/* if(inportb(0x64) & 0x1)
|
||||
|
||||
Reference in New Issue
Block a user