8231fb77c6
2009-06-27 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/dl.h: Include grub/elf.h.
(struct grub_dl): Add symtab field.
* kern/dl.c [GRUB_MACHINE_QEMU]: Define
GRUB_MODULES_MACHINE_READONLY.
(grub_dl_resolve_symbols): Populate mod->symtab, making a copy
of the header for read-only modules.
(grub_dl_unload): Free mod->symtab for read-only modules.
* kern/i386/dl.c: Use mod->symtab.
* kern/powerpc/dl.c: Likewise.
* kern/sparc64/dl.c: Likewise.
* kern/x86_64/dl.c: Likewise.
* conf/i386-qemu.rmk: New file.
* kern/i386/qemu/startup.S: Likewise.
* kern/i386/qemu/mmap.c: Likewise.
* boot/i386/qemu/boot.S: Likewise.
* include/grub/i386/qemu/time.h: Likewise.
* include/grub/i386/qemu/serial.h: Likewise.
* include/grub/i386/qemu/kernel.h: Likewise.
* include/grub/i386/qemu/console.h: Likewise.
* include/grub/i386/qemu/boot.h: Likewise.
* include/grub/i386/qemu/init.h: Likewise.
* include/grub/i386/qemu/machine.h: Likewise.
* include/grub/i386/qemu/loader.h: Likewise.
* include/grub/i386/qemu/memory.h: Likewise.
* conf/i386-coreboot.rmk (GRUB_BOOT_MACHINE_LINK_ADDR)
(GRUB_KERNEL_MACHINE_LINK_ADDR): New variables.
[qemu] (pkglib_IMAGES): Add `boot.img'.
[qemu] (boot_img_SOURCES, boot_img_ASFLAGS, boot_img_LDFLAGS)
[qemu] (boot_img_FORMAT): New variables.
[qemu] (bin_UTILITIES): Add `grub-mkimage'.
[qemu] (grub_mkimage_SOURCES, grub_mkimage_CFLAGS): New variables.
[qemu] (kernel_img_SOURCES, kernel_img_HEADERS, kernel_img_CFLAGS)
[qemu] (kernel_img_ASFLAGS, kernel_img_LDFLAGS)
[qemu] (kernel_img_FORMAT): New variables.
* configure.ac: Recognise `i386-qemu'.
* util/i386/pc/grub-mkimage.c (compress_kernel): Add dummy variant
(for no compression).
[GRUB_MACHINE_QEMU] (generate_image): Misc adjustments to produce
a valid i386 ROM image. Make `GRUB_KERNEL_MACHINE_COMPRESSED_SIZE',
`GRUB_KERNEL_MACHINE_INSTALL_DOS_PART' and
`GRUB_KERNEL_MACHINE_INSTALL_BSD_PART' optional features (with
ifdefs).
109 lines
2.8 KiB
C
109 lines
2.8 KiB
C
/* dl-386.c - arch-dependent part of loadable module support */
|
|
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2002,2005,2007 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <grub/dl.h>
|
|
#include <grub/elf.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/err.h>
|
|
|
|
/* Check if EHDR is a valid ELF header. */
|
|
grub_err_t
|
|
grub_arch_dl_check_header (void *ehdr)
|
|
{
|
|
Elf32_Ehdr *e = ehdr;
|
|
|
|
/* Check the magic numbers. */
|
|
if (e->e_ident[EI_CLASS] != ELFCLASS32
|
|
|| e->e_ident[EI_DATA] != ELFDATA2LSB
|
|
|| e->e_machine != EM_386)
|
|
return grub_error (GRUB_ERR_BAD_OS, "invalid arch specific ELF magic");
|
|
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
/* Relocate symbols. */
|
|
grub_err_t
|
|
grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
|
|
{
|
|
Elf32_Ehdr *e = ehdr;
|
|
Elf32_Shdr *s;
|
|
Elf32_Word entsize;
|
|
unsigned i;
|
|
|
|
/* Find a symbol table. */
|
|
for (i = 0, s = (Elf32_Shdr *) ((char *) e + e->e_shoff);
|
|
i < e->e_shnum;
|
|
i++, s = (Elf32_Shdr *) ((char *) s + e->e_shentsize))
|
|
if (s->sh_type == SHT_SYMTAB)
|
|
break;
|
|
|
|
if (i == e->e_shnum)
|
|
return grub_error (GRUB_ERR_BAD_MODULE, "no symtab found");
|
|
|
|
entsize = s->sh_entsize;
|
|
|
|
for (i = 0, s = (Elf32_Shdr *) ((char *) e + e->e_shoff);
|
|
i < e->e_shnum;
|
|
i++, s = (Elf32_Shdr *) ((char *) s + e->e_shentsize))
|
|
if (s->sh_type == SHT_REL)
|
|
{
|
|
grub_dl_segment_t seg;
|
|
|
|
/* Find the target segment. */
|
|
for (seg = mod->segment; seg; seg = seg->next)
|
|
if (seg->section == s->sh_info)
|
|
break;
|
|
|
|
if (seg)
|
|
{
|
|
Elf32_Rel *rel, *max;
|
|
|
|
for (rel = (Elf32_Rel *) ((char *) e + s->sh_offset),
|
|
max = rel + s->sh_size / s->sh_entsize;
|
|
rel < max;
|
|
rel++)
|
|
{
|
|
Elf32_Word *addr;
|
|
Elf32_Sym *sym;
|
|
|
|
if (seg->size < rel->r_offset)
|
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
|
"reloc offset is out of the segment");
|
|
|
|
addr = (Elf32_Word *) ((char *) seg->addr + rel->r_offset);
|
|
sym = (Elf32_Sym *) ((char *) mod->symtab
|
|
+ entsize * ELF32_R_SYM (rel->r_info));
|
|
|
|
switch (ELF32_R_TYPE (rel->r_info))
|
|
{
|
|
case R_386_32:
|
|
*addr += sym->st_value;
|
|
break;
|
|
|
|
case R_386_PC32:
|
|
*addr += (sym->st_value - (Elf32_Word) seg->addr
|
|
- rel->r_offset);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return GRUB_ERR_NONE;
|
|
}
|