-OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o
+OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o loader.o
CC=gcc
CFLAGS=-nostdlib -I../include -I. -fno-builtin -nostdinc
--- /dev/null
+#include "minilib.h"
+#include "../include/elf.h"
+
+static const unsigned char elf_ident[4] = { 0x7F, 'E', 'L', 'F' };
+
+int load_elf (char * buf, int size) {
+
+ Elf32_Ehdr * elf_hdr = (Elf32_Ehdr *) buf;
+ Elf32_Shdr * elf_sec_hdrs = (Elf32_Shdr *) (buf + elf_hdr->e_shoff);
+
+ /* Sanity check on ELF file */
+ if (memcmp(elf_hdr->e_ident, elf_ident, sizeof(elf_ident))) return -1;
+ if (elf_hdr->e_type != ET_EXEC) return -1;
+ if (elf_hdr->e_machine != EM_386) return -1;
+ if (elf_hdr->e_version != EV_CURRENT) return -1;
+ if (size < sizeof(Elf32_Ehdr)) return -1;
+ if (((char *)&elf_sec_hdrs[elf_hdr->e_shnum]) > (buf + size)) return -1;
+
+ char * string_table = buf + elf_sec_hdrs[elf_hdr->e_shstrndx].sh_offset;
+
+ if (string_table > (buf + size)) return -1;
+
+ int i;
+ for (i = 0; i < elf_hdr->e_shnum; i++) {
+
+ if (elf_sec_hdrs[i].sh_name == SHN_UNDEF) {
+ continue;
+ }
+
+ char * section_name = string_table + elf_sec_hdrs[i].sh_name;
+
+ if ((elf_sec_hdrs[i].sh_type != SHT_PROGBITS) || !(elf_sec_hdrs[i].sh_flags & SHF_ALLOC)) {
+ puts("Skipping ");
+ puts(section_name);
+ puts("\n");
+ continue;
+ }
+
+ puts("Loading ");
+ puts(section_name);
+ puts("\n");
+
+ memcpy(elf_sec_hdrs[i].sh_addr,
+ buf + elf_sec_hdrs[i].sh_offset,
+ elf_sec_hdrs[i].sh_size);
+ }
+
+ return 0;
+}
--- /dev/null
+int load_elf (char * buf, int size) ;
+
*(dest++) = *(src++);
}
+int memcmp (unsigned char *a2, unsigned char *a1, int bytes) {
+ while (bytes--)
+ {
+ if (*(a2++) != *(a1++))
+ return 1;
+ }
+ return 0;
+}
+
+int strcmp (unsigned char *a2, unsigned char *a1) {
+ while (1) {
+ if (*a2 != *a1) return 1;
+ if (*a2 == 0) return 0;
+ a1++;
+ a2++;
+ }
+}
+
int strlen(char *c)
{
int l = 0;
--- /dev/null
+#ifndef __MINILIB_H
+#define __MINILIB_H
+
+#define MINILIB 1
+
+#ifndef __int8_t_defined
+# define __int8_t_defined
+typedef signed char int8_t;
+typedef short int int16_t;
+typedef int int32_t;
+# if __WORDSIZE == 64
+typedef long int int64_t;
+# else
+__extension__
+typedef long long int int64_t;
+# endif
+#endif
+
+/* Unsigned. */
+typedef unsigned char uint8_t;
+typedef unsigned short int uint16_t;
+#ifndef __uint32_t_defined
+typedef unsigned int uint32_t;
+# define __uint32_t_defined
+#endif
+#if __WORDSIZE == 64
+typedef unsigned long int uint64_t;
+#else
+__extension__
+typedef unsigned long long int uint64_t;
+#endif
+
+#endif
puts("Grubptr is: ");
puthex(*grubptr);
puts("\n");
-
+
+
for (i = 0; i < wee->mod_cnt; i++)
{
puts("Module:\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");
}
+
+ 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)
;
}
#ifndef _ELF_H
#define _ELF_H 1
+#ifndef MINILIB
#include <stdint.h>
+#endif
/* Standard ELF types. */