2002-12-27 08:53:07 +00:00
|
|
|
|
/* dl.c - loadable module support */
|
|
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
|
* GRUB -- GRand Unified Bootloader
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
|
* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
2002-12-27 08:53:07 +00:00
|
|
|
|
*
|
2004-04-04 13:46:03 +00:00
|
|
|
|
* GRUB is free software; you can redistribute it and/or modify
|
2002-12-27 08:53:07 +00:00
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program 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
|
2004-04-04 13:46:03 +00:00
|
|
|
|
* along with GRUB; if not, write to the Free Software
|
2002-12-27 08:53:07 +00:00
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#include <grub/elf.h>
|
|
|
|
|
#include <grub/dl.h>
|
|
|
|
|
#include <grub/misc.h>
|
|
|
|
|
#include <grub/mm.h>
|
|
|
|
|
#include <grub/err.h>
|
|
|
|
|
#include <grub/types.h>
|
|
|
|
|
#include <grub/symbol.h>
|
|
|
|
|
#include <grub/file.h>
|
|
|
|
|
#include <grub/env.h>
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
|
#include <grub/cache.h>
|
2004-04-04 13:46:03 +00:00
|
|
|
|
|
|
|
|
|
#if GRUB_HOST_SIZEOF_VOID_P == 4
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
typedef Elf32_Word Elf_Word;
|
|
|
|
|
typedef Elf32_Addr Elf_Addr;
|
|
|
|
|
typedef Elf32_Ehdr Elf_Ehdr;
|
|
|
|
|
typedef Elf32_Shdr Elf_Shdr;
|
|
|
|
|
typedef Elf32_Sym Elf_Sym;
|
|
|
|
|
|
|
|
|
|
# define ELF_ST_BIND(val) ELF32_ST_BIND (val)
|
|
|
|
|
# define ELF_ST_TYPE(val) ELF32_ST_TYPE (val)
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#elif GRUB_HOST_SIZEOF_VOID_P == 8
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
typedef Elf64_Word Elf_Word;
|
|
|
|
|
typedef Elf64_Addr Elf_Addr;
|
|
|
|
|
typedef Elf64_Ehdr Elf_Ehdr;
|
|
|
|
|
typedef Elf64_Shdr Elf_Shdr;
|
|
|
|
|
typedef Elf64_Sym Elf_Sym;
|
|
|
|
|
|
|
|
|
|
# define ELF_ST_BIND(val) ELF64_ST_BIND (val)
|
|
|
|
|
# define ELF_ST_TYPE(val) ELF64_ST_TYPE (val)
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_dl_list
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_dl_list *next;
|
|
|
|
|
grub_dl_t mod;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
};
|
2004-04-04 13:46:03 +00:00
|
|
|
|
typedef struct grub_dl_list *grub_dl_list_t;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_dl_list_t grub_dl_head;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_dl_add (grub_dl_t mod)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_list_t l;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_dl_get (mod->name))
|
|
|
|
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
2002-12-27 08:53:07 +00:00
|
|
|
|
"`%s' is already loaded", mod->name);
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
l = (grub_dl_list_t) grub_malloc (sizeof (*l));
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! l)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
l->mod = mod;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
l->next = grub_dl_head;
|
|
|
|
|
grub_dl_head = l;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_remove (grub_dl_t mod)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_list_t *p, q;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
for (p = &grub_dl_head, q = *p; q; p = &q->next, q = *p)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (q->mod == mod)
|
|
|
|
|
{
|
|
|
|
|
*p = q->next;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_free (q);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_t
|
|
|
|
|
grub_dl_get (const char *name)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_list_t l;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
for (l = grub_dl_head; l; l = l->next)
|
|
|
|
|
if (grub_strcmp (name, l->mod->name) == 0)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
return l->mod;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2003-01-06 00:01:35 +00:00
|
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_iterate (int (*hook) (grub_dl_t mod))
|
2003-01-06 00:01:35 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_list_t l;
|
2003-01-06 00:01:35 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
for (l = grub_dl_head; l; l = l->next)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
if (hook (l->mod))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_symbol
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
struct grub_symbol *next;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
const char *name;
|
|
|
|
|
void *addr;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_t mod; /* The module to which this symbol belongs. */
|
2002-12-27 08:53:07 +00:00
|
|
|
|
};
|
2004-04-04 13:46:03 +00:00
|
|
|
|
typedef struct grub_symbol *grub_symbol_t;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
/* The size of the symbol table. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
#define GRUB_SYMTAB_SIZE 509
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
/* The symbol table (using an open-hash). */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static struct grub_symbol *grub_symtab[GRUB_SYMTAB_SIZE];
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
/* Simple hash function. */
|
|
|
|
|
static unsigned
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_symbol_hash (const char *s)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned key = 0;
|
|
|
|
|
|
|
|
|
|
while (*s)
|
|
|
|
|
key = key * 65599 + *s++;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return (key + (key >> 5)) % GRUB_SYMTAB_SIZE;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Resolve the symbol name NAME and return the address.
|
|
|
|
|
Return NULL, if not found. */
|
|
|
|
|
void *
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_resolve_symbol (const char *name)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_symbol_t sym;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
for (sym = grub_symtab[grub_symbol_hash (name)]; sym; sym = sym->next)
|
|
|
|
|
if (grub_strcmp (sym->name, name) == 0)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
return sym->addr;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Register a symbol with the name NAME and the address ADDR. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_err_t
|
|
|
|
|
grub_dl_register_symbol (const char *name, void *addr, grub_dl_t mod)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_symbol_t sym;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
unsigned k;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
sym = (grub_symbol_t) grub_malloc (sizeof (*sym));
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! sym)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
if (mod)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
sym->name = grub_strdup (name);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! sym->name)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_free (sym);
|
|
|
|
|
return grub_errno;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
sym->name = name;
|
|
|
|
|
|
|
|
|
|
sym->addr = addr;
|
|
|
|
|
sym->mod = mod;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
k = grub_symbol_hash (name);
|
|
|
|
|
sym->next = grub_symtab[k];
|
|
|
|
|
grub_symtab[k] = sym;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Unregister all the symbols defined in the module MOD. */
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_unregister_symbols (grub_dl_t mod)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
|
|
if (! mod)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_fatal ("core symbols cannot be unregistered");
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
for (i = 0; i < GRUB_SYMTAB_SIZE; i++)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_symbol_t sym, *p, q;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
for (p = &grub_symtab[i], sym = *p; sym; sym = q)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
q = sym->next;
|
|
|
|
|
if (sym->mod == mod)
|
|
|
|
|
{
|
|
|
|
|
*p = q;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_free ((void *) sym->name);
|
|
|
|
|
grub_free (sym);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
p = &sym->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the address of a section whose index is N. */
|
|
|
|
|
static void *
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_get_section_addr (grub_dl_t mod, unsigned n)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_segment_t seg;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
for (seg = mod->segment; seg; seg = seg->next)
|
|
|
|
|
if (seg->section == n)
|
|
|
|
|
return seg->addr;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Load all segments from memory specified by E. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned i;
|
|
|
|
|
Elf_Shdr *s;
|
|
|
|
|
|
|
|
|
|
for (i = 0, s = (Elf_Shdr *)((char *) e + e->e_shoff);
|
|
|
|
|
i < e->e_shnum;
|
|
|
|
|
i++, s = (Elf_Shdr *)((char *) s + e->e_shentsize))
|
|
|
|
|
{
|
|
|
|
|
if (s->sh_flags & SHF_ALLOC)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_segment_t seg;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
seg = (grub_dl_segment_t) grub_malloc (sizeof (*seg));
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! seg)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
if (s->sh_size)
|
|
|
|
|
{
|
|
|
|
|
void *addr;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
addr = grub_memalign (s->sh_addralign, s->sh_size);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! addr)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_free (seg);
|
|
|
|
|
return grub_errno;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (s->sh_type)
|
|
|
|
|
{
|
|
|
|
|
case SHT_PROGBITS:
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_memcpy (addr, (char *) e + s->sh_offset, s->sh_size);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
break;
|
|
|
|
|
case SHT_NOBITS:
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_memset (addr, 0, s->sh_size);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
seg->addr = addr;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
seg->addr = 0;
|
|
|
|
|
|
|
|
|
|
seg->size = s->sh_size;
|
|
|
|
|
seg->section = i;
|
|
|
|
|
seg->next = mod->segment;
|
|
|
|
|
mod->segment = seg;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned i;
|
|
|
|
|
Elf_Shdr *s;
|
|
|
|
|
Elf_Sym *sym;
|
|
|
|
|
const char *str;
|
|
|
|
|
Elf_Word size, entsize;
|
|
|
|
|
|
|
|
|
|
for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
|
|
|
|
|
i < e->e_shnum;
|
|
|
|
|
i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
|
|
|
|
|
if (s->sh_type == SHT_SYMTAB)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
if (i == e->e_shnum)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_error (GRUB_ERR_BAD_MODULE, "no symbol table");
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
sym = (Elf_Sym *) ((char *) e + s->sh_offset);
|
|
|
|
|
size = s->sh_size;
|
|
|
|
|
entsize = s->sh_entsize;
|
|
|
|
|
|
|
|
|
|
s = (Elf_Shdr *) ((char *) e + e->e_shoff + e->e_shentsize * s->sh_link);
|
|
|
|
|
str = (char *) e + s->sh_offset;
|
|
|
|
|
|
|
|
|
|
for (i = 0;
|
|
|
|
|
i < size / entsize;
|
|
|
|
|
i++, sym = (Elf_Sym *) ((char *) sym + entsize))
|
|
|
|
|
{
|
|
|
|
|
unsigned char type = ELF_ST_TYPE (sym->st_info);
|
|
|
|
|
unsigned char bind = ELF_ST_BIND (sym->st_info);
|
|
|
|
|
const char *name = str + sym->st_name;
|
|
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
|
{
|
|
|
|
|
case STT_NOTYPE:
|
|
|
|
|
/* Resolve a global symbol. */
|
|
|
|
|
if (sym->st_name != 0 && sym->st_shndx == 0)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
sym->st_value = (Elf_Addr) grub_dl_resolve_symbol (name);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! sym->st_value)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
2002-12-27 08:53:07 +00:00
|
|
|
|
"the symbol `%s' not found", name);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
sym->st_value = 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case STT_OBJECT:
|
2004-04-04 13:46:03 +00:00
|
|
|
|
sym->st_value += (Elf_Addr) grub_dl_get_section_addr (mod,
|
2002-12-27 08:53:07 +00:00
|
|
|
|
sym->st_shndx);
|
|
|
|
|
if (bind != STB_LOCAL)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_dl_register_symbol (name, (void *) sym->st_value, mod))
|
|
|
|
|
return grub_errno;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case STT_FUNC:
|
2004-04-04 13:46:03 +00:00
|
|
|
|
sym->st_value += (Elf_Addr) grub_dl_get_section_addr (mod,
|
2002-12-27 08:53:07 +00:00
|
|
|
|
sym->st_shndx);
|
|
|
|
|
if (bind != STB_LOCAL)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_dl_register_symbol (name, (void *) sym->st_value, mod))
|
|
|
|
|
return grub_errno;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_strcmp (name, "grub_mod_init") == 0)
|
|
|
|
|
mod->init = (void (*) (grub_dl_t)) sym->st_value;
|
|
|
|
|
else if (grub_strcmp (name, "grub_mod_fini") == 0)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
mod->fini = (void (*) (void)) sym->st_value;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case STT_SECTION:
|
2004-04-04 13:46:03 +00:00
|
|
|
|
sym->st_value = (Elf_Addr) grub_dl_get_section_addr (mod,
|
2002-12-27 08:53:07 +00:00
|
|
|
|
sym->st_shndx);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case STT_FILE:
|
|
|
|
|
sym->st_value = 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
2002-12-27 08:53:07 +00:00
|
|
|
|
"unknown symbol type `%d'", (int) type);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_call_init (grub_dl_t mod)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
if (mod->init)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
(mod->init) (mod);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_dl_resolve_name (grub_dl_t mod, Elf_Ehdr *e)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
Elf_Shdr *s;
|
|
|
|
|
const char *str;
|
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
|
|
s = (Elf_Shdr *) ((char *) e + e->e_shoff + e->e_shstrndx * e->e_shentsize);
|
|
|
|
|
str = (char *) e + s->sh_offset;
|
|
|
|
|
|
|
|
|
|
for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
|
|
|
|
|
i < e->e_shnum;
|
|
|
|
|
i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_strcmp (str + s->sh_name, ".modname") == 0)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
mod->name = grub_strdup ((char *) e + s->sh_offset);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! mod->name)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i == e->e_shnum)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_error (GRUB_ERR_BAD_MODULE, "no module name found");
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
static grub_err_t
|
|
|
|
|
grub_dl_resolve_dependencies (grub_dl_t mod, Elf_Ehdr *e)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
Elf_Shdr *s;
|
|
|
|
|
const char *str;
|
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
|
|
s = (Elf_Shdr *) ((char *) e + e->e_shoff + e->e_shstrndx * e->e_shentsize);
|
|
|
|
|
str = (char *) e + s->sh_offset;
|
|
|
|
|
|
|
|
|
|
for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
|
|
|
|
|
i < e->e_shnum;
|
|
|
|
|
i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_strcmp (str + s->sh_name, ".moddeps") == 0)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
const char *name = (char *) e + s->sh_offset;
|
|
|
|
|
const char *max = name + s->sh_size;
|
|
|
|
|
|
|
|
|
|
while (name < max)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_t m;
|
|
|
|
|
grub_dl_dep_t dep;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
m = grub_dl_load (name);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! m)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2003-01-06 00:01:35 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_ref (m);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
dep = (grub_dl_dep_t) grub_malloc (sizeof (*dep));
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! dep)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return grub_errno;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
dep->mod = m;
|
|
|
|
|
dep->next = mod->dep;
|
|
|
|
|
mod->dep = dep;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
name += grub_strlen (name) + 1;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
return GRUB_ERR_NONE;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-01-06 00:01:35 +00:00
|
|
|
|
int
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_ref (grub_dl_t mod)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_dep_t dep;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
|
|
for (dep = mod->dep; dep; dep = dep->next)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_ref (dep->mod);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
2003-01-06 00:01:35 +00:00
|
|
|
|
return ++mod->ref_count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_unref (grub_dl_t mod)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_dep_t dep;
|
2003-01-06 00:01:35 +00:00
|
|
|
|
|
2003-01-20 04:13:46 +00:00
|
|
|
|
for (dep = mod->dep; dep; dep = dep->next)
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_unref (dep->mod);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
|
|
return --mod->ref_count;
|
2003-01-06 00:01:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
|
static void
|
|
|
|
|
grub_dl_flush_cache (grub_dl_t mod)
|
|
|
|
|
{
|
|
|
|
|
grub_dl_segment_t seg;
|
|
|
|
|
|
|
|
|
|
for (seg = mod->segment; seg; seg = seg->next)
|
|
|
|
|
grub_arch_sync_caches (seg->addr, seg->size);
|
|
|
|
|
}
|
|
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
|
/* Load a module from core memory. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_t
|
|
|
|
|
grub_dl_load_core (void *addr, grub_size_t size)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
Elf_Ehdr *e;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_t mod;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
e = addr;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (! grub_arch_dl_check_header (e, size))
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_error (GRUB_ERR_BAD_MODULE, "invalid ELF header");
|
2002-12-27 08:53:07 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
mod = (grub_dl_t) grub_malloc (sizeof (*mod));
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! mod)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
mod->name = 0;
|
|
|
|
|
mod->ref_count = 1;
|
|
|
|
|
mod->dep = 0;
|
|
|
|
|
mod->segment = 0;
|
|
|
|
|
mod->init = 0;
|
|
|
|
|
mod->fini = 0;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_dl_resolve_name (mod, e)
|
|
|
|
|
|| grub_dl_resolve_dependencies (mod, e)
|
|
|
|
|
|| grub_dl_load_segments (mod, e)
|
|
|
|
|
|| grub_dl_resolve_symbols (mod, e)
|
|
|
|
|
|| grub_arch_dl_relocate_symbols (mod, e))
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
mod->fini = 0;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_unload (mod);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2004-12-27 Marco Gerards <metgerards@student.han.nl>
* genmk.rb: Handle the `Program' class in the main loop. Written
by Johan Rydberg <jrydberg@gnu.org>.
(Program): New class.
(programs): New variable.
* boot/powerpc/ieee1275/cmain.c: Include <grub/machine/ieee1275.h>
instead of "grub/machine/ieee1275.h". Include <grub/kernel.h>
instead of "grub/kernel.h". Include <grub/machine/init.h>.
(help_arch): Function removed.
* conf/powerpc-ieee1275.rmk (grubof_HEADERS): Add
`powerpc/libgcc.h' and `loader.h'.
(pkgdata_PROGRAMS): New variable.
(sbin_UTILITIES): Variable removed.
(grub_emu_SOURCES): Added kern/powerpc/cache.S.
(grubof_SOURCES): Variable re-defined so it only includes the
core functionality.
(grubof_CFLAGS): Remove `-DGRUBOF'.
(pkgdata_MODULES, fshelp_mod_SOURCES, fshelp_mod_CFLAGS,
(fat_mod_SOURCES, fat_mod_CFLAGS, ext2_mod_SOURCES)
(ext2_mod_CFLAGS, ufs_mod_SOURCES, ufs_mod_CFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, hfs_mod_SOURCES)
(hfs_mod_CFLAGS, jfs_mod_SOURCES, jfs_mod_CFLAGS)
(iso9660_mod_SOURCES, iso9660_mod_CFLAGS, _linux_mod_SOURCES)
(_linux_mod_CFLAGS, linux_mod_SOURCES, linux_mod_CFLAGS)
(normal_mod_SOURCES, normal_mod_CFLAGS, normal_mod_ASFLAGS)
(hello_mod_SOURCES, hello_mod_CFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, terminal_mod_SOURCES, terminal_mod_CFLAGS)
(ls_mod_SOURCES, ls_mod_CFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cat_mod_SOURCES, cat_mod_CFLAGS, font_mod_SOURCES)
(font_mod_CFLAGS, amiga_mod_SOURCES, amiga_mod_CFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, pc_mod_SOURCES)
(pc_mod_CFLAGS): New variables.
* disk/powerpc/ieee1275/ofdisk.c: Include <grub/machine/init.h>.
(grub_ofdisk_iterate): Add a prototype for `dev_iterate'.
* include/grub/dl.h (grub_arch_dl_sync_caches): New prototype.
* include/grub/loader.h (grub_os_area_addr, grub_os_area_size):
Moved from here...
* include/grub/i386/pc/init.h (grub_os_area_addr)
(rub_os_area_size): ... to here.
* include/grub/powerpc/ieee1275/ieee1275.h
(grub_ieee1275_entry_fn): Export symbol.
* include/grub/powerpc/ieee1275/init.h: New file.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/cache.h: Likewise.
* kern/powerpc/cache.S: Likewise. Written by Hollis Blanchard
<hollis@penguinppc.org>.
* kern/dl.c: Include <grub/cache.h>.
(grub_dl_flush_cache): New function.
(grub_dl_load_core): Call `grub_dl_flush_cache' to flush the cache
for this module.
* kern/powerpc/ieee1275/init.c (grub_ofdisk_init)
(grub_console_init): Removed prototypes.
(grub_machine_init): Don't initialize the modules anymore.
* kern/powerpc/ieee1275/openfw.c (grub_map): Make the function
static.
* include/grub/powerpc/types.h (GRUB_HOST_WORDS_LITTLEENDIAN):
Macro undef removed.
(GRUB_HOST_WORDS_BIGENDIAN): New macro.
* kern/powerpc/dl.c (grub_arch_dl_relocate_symbols): Add
relocation `R_PPC_REL32'. Return an error when the relocation is
unknown.
* Makefile.in (DATA): Add `$(pkgdata_PROGRAMS)'.
* kern/i386/pc/init.c (grub_arch_sync_caches): New function.
* util/misc.c (grub_arch_sync_caches): Likewise.
2004-12-27 13:46:20 +00:00
|
|
|
|
grub_dl_flush_cache (mod);
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_call_init (mod);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_dl_add (mod))
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_unload (mod);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return mod;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Load a module from the file FILENAME. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_t
|
|
|
|
|
grub_dl_load_file (const char *filename)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_file_t file;
|
|
|
|
|
grub_ssize_t size;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
void *core = 0;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_t mod = 0;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
file = grub_file_open (filename);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! file)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
size = grub_file_size (file);
|
|
|
|
|
core = grub_malloc (size);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! core)
|
|
|
|
|
goto failed;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_file_read (file, core, size) != (int) size)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
goto failed;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
mod = grub_dl_load_core (core, size);
|
2003-01-06 00:01:35 +00:00
|
|
|
|
mod->ref_count = 0;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
failed:
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_file_close (file);
|
|
|
|
|
grub_free (core);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
return mod;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Load a module using a symbolic name. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_t
|
|
|
|
|
grub_dl_load (const char *name)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
|
|
|
|
char *filename;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_t mod;
|
|
|
|
|
char *grub_dl_dir = grub_env_get ("prefix");
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
mod = grub_dl_get (name);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (mod)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
return mod;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (! grub_dl_dir)
|
|
|
|
|
grub_fatal ("module dir is not initialized yet");
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
filename = (char *) grub_malloc (grub_strlen (grub_dl_dir) + 1
|
|
|
|
|
+ grub_strlen (name) + 4 + 1);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
if (! filename)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_sprintf (filename, "%s/%s.mod", grub_dl_dir, name);
|
|
|
|
|
mod = grub_dl_load_file (filename);
|
|
|
|
|
grub_free (filename);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
if (! mod)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_strcmp (mod->name, name) != 0)
|
|
|
|
|
grub_error (GRUB_ERR_BAD_MODULE, "mismatched names");
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
return mod;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Unload the module MOD. */
|
2003-01-06 00:01:35 +00:00
|
|
|
|
int
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_unload (grub_dl_t mod)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_dep_t dep, depn;
|
|
|
|
|
grub_dl_segment_t seg, segn;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
2003-01-06 00:01:35 +00:00
|
|
|
|
if (mod->ref_count > 0)
|
|
|
|
|
return 0;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
if (mod->fini)
|
|
|
|
|
(mod->fini) ();
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_remove (mod);
|
|
|
|
|
grub_dl_unregister_symbols (mod);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
|
for (dep = mod->dep; dep; dep = depn)
|
|
|
|
|
{
|
|
|
|
|
depn = dep->next;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (! grub_dl_unref (dep->mod))
|
|
|
|
|
grub_dl_unload (dep->mod);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_free (dep);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (seg = mod->segment; seg; seg = segn)
|
|
|
|
|
{
|
|
|
|
|
segn = seg->next;
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_free (seg->addr);
|
|
|
|
|
grub_free (seg);
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_free (mod->name);
|
|
|
|
|
grub_free (mod);
|
2003-01-06 00:01:35 +00:00
|
|
|
|
return 1;
|
2002-12-27 08:53:07 +00:00
|
|
|
|
}
|
|
|
|
|
|
2003-01-06 00:01:35 +00:00
|
|
|
|
/* Unload unneeded modules. */
|
2002-12-27 08:53:07 +00:00
|
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_unload_unneeded (void)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
/* Because grub_dl_remove modifies the list of modules, this
|
2003-01-06 00:01:35 +00:00
|
|
|
|
implementation is tricky. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_list_t p = grub_dl_head;
|
2003-01-06 00:01:35 +00:00
|
|
|
|
|
|
|
|
|
while (p)
|
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
if (grub_dl_unload (p->mod))
|
2003-01-06 00:01:35 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
p = grub_dl_head;
|
2003-01-06 00:01:35 +00:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = p->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Unload all modules. */
|
|
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_unload_all (void)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
while (grub_dl_head)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_list_t p;
|
2003-01-06 00:01:35 +00:00
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
|
grub_dl_unload_unneeded ();
|
2003-01-06 00:01:35 +00:00
|
|
|
|
|
|
|
|
|
/* Force to decrement the ref count. This will purge pre-loaded
|
|
|
|
|
modules and manually inserted modules. */
|
2004-04-04 13:46:03 +00:00
|
|
|
|
for (p = grub_dl_head; p; p = p->next)
|
2003-01-06 00:01:35 +00:00
|
|
|
|
p->mod->ref_count--;
|
|
|
|
|
}
|
|
|
|
|
}
|