Also add realmode warm booter

diff --git a/grubload/Makefile b/grubload/Makefile
index 971fb5ce2eb312e7b3f6d065c3119841751f32f8..c850bb33434cc4512e48560bff4ce102e3432dd4 100644 (file)
--- a/grubload/Makefile
+++ b/grubload/Makefile
@@ -1,4 +1,4 @@
-OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o
+OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o realmode.o

 CC=gcc
 CFLAGS=-nostdlib -I../include -I. -fno-builtin -nostdinc
 
 CC=gcc
 CFLAGS=-nostdlib -I../include -I. -fno-builtin -nostdinc
 


@@ -6,3 +6,9 @@ all: multiboot
 
 multiboot: $(OBJS)
        ld -o multiboot $(OBJS) -Ttext=0x100000
 
 multiboot: $(OBJS)
        ld -o multiboot $(OBJS) -Ttext=0x100000

+
+realmode.bin: realmode.asm
+       nasm -o realmode.bin realmode.asm
+
+realmode.o: realmode.bin
+       objcopy -I binary -B i386 -O elf32-i386 realmode.bin realmode.o

diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c
index c87b6755634dfab2c8b7b10c669f83ff33f6397d..25522e26c7cdffe8a14945a0066ad247f9454554 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: ");


@@ -41,6 +46,8 @@ 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)
-               ;
+
+       puts("Now returning to real mode.\n");  
+       memcpy(0x4000, _binary_realmode_bin_start, (int)&_binary_realmode_bin_size);
+       realmode();

 }
 }