Merge ELF loader.

[netwatch.git] / grubload / multiboot_c.c

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index c87b6755634dfab2c8b7b10c669f83ff33f6397d..03e2143ba7d6970a8ab967f9ee33fd0f4024ac0b 100644 (file)
--- a/grubload/multiboot_c.c
+++ b/grubload/multiboot_c.c
@@ -1,5 +1,8 @@
 #include "console.h"
 
 #include "console.h"
 

+extern char _binary_realmode_bin_start[];
+extern int _binary_realmode_bin_size;
+

 struct mb_info
 {
        unsigned long flags;
 struct mb_info
 {
        unsigned long flags;


@@ -23,6 +26,8 @@ void c_start(unsigned int magic, struct mb_info *wee)
        unsigned short *grubptr = 0x7CFE;
        int i;
        
        unsigned short *grubptr = 0x7CFE;
        int i;
        

+       void (*realmode)() = 0x4000;
+       

        puts("Magic is: ");
        puthex(magic);
        puts("\nMultiboot header is: ");
        puts("Magic is: ");
        puthex(magic);
        puts("\nMultiboot header is: ");


@@ -33,7 +38,8 @@ void c_start(unsigned int magic, struct mb_info *wee)
        puts("Grubptr is: ");
        puthex(*grubptr);
        puts("\n");
        puts("Grubptr is: ");
        puthex(*grubptr);
        puts("\n");

-       
+
+

        for (i = 0; i < wee->mod_cnt; i++)
        {
                puts("Module:\n");
        for (i = 0; i < wee->mod_cnt; i++)
        {
                puts("Module:\n");


@@ -41,6 +47,16 @@ void c_start(unsigned int magic, struct mb_info *wee)
                puts("  Size: "); puthex(wee->mods[i].mod_end - wee->mods[i].mod_start); puts("\n");
                puts("  Name: "); puts(wee->mods[i].mod_string); puts("\n");
        }
                puts("  Size: "); puthex(wee->mods[i].mod_end - wee->mods[i].mod_start); puts("\n");
                puts("  Name: "); puts(wee->mods[i].mod_string); puts("\n");
        }

-       while (1)
-               ;
+
+       if ((wee->mod_cnt != 1) || (strcmp(wee->mods[0].mod_string, "aseg.elf")))
+       {
+               puts("Expected 1 module called aseg.elf.\n");
+               while(1) asm("hlt");
+       }
+
+       load_elf(wee->mods[0].mod_start, wee->mods[0].mod_end - wee->mods[0].mod_start);
+
+       puts("Now returning to real mode.\n");  
+       memcpy(0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size);
+       realmode();     // goodbye!

 }
 }