From: Joshua Wise Date: Wed, 10 Sep 2008 22:24:10 +0000 (-0400) Subject: Merge ELF loader. X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/86c89e89a88d25e85956b258005b52e0f2686b89?ds=inline;hp=--cc Merge ELF loader. --- 86c89e89a88d25e85956b258005b52e0f2686b89 diff --cc grubload/Makefile index c850bb3,041f09c..f0f9742 --- a/grubload/Makefile +++ b/grubload/Makefile @@@ -1,4 -1,4 +1,4 @@@ - OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o realmode.o -OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o loader.o ++OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o realmode.o loader.o CC=gcc CFLAGS=-nostdlib -I../include -I. -fno-builtin -nostdinc diff --cc grubload/multiboot_c.c index 25522e2,f871687..03e2143 --- a/grubload/multiboot_c.c +++ b/grubload/multiboot_c.c @@@ -47,7 -43,15 +48,15 @@@ void c_start(unsigned int magic, struc puts(" Name: "); puts(wee->mods[i].mod_string); puts("\n"); } + 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); + - - while (1) - ; + puts("Now returning to real mode.\n"); + memcpy(0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size); - realmode(); ++ realmode(); // goodbye! }