mirror of
https://git.proxmox.com/git/grub2
synced 2025-05-29 12:55:25 +00:00
a5ffe96617
* util/i386/pc/pupa-setup.c: Include pupa/machine/kernel.h. (setup): Configure the installed partition information and the dl prefix. * loader/i386/pc/chainloader.c (my_mod): New variable. (pupa_chainloader_unload): New function. (pupa_rescue_cmd_chainloader): Refer itself. (PUPA_MOD_INIT): Save its own module in MY_MOD. * kern/i386/pc/startup.S (install_partition): Removed. (version_string): Likewise. (config_file): Likewise. (pupa_install_dos_part): New variable. (pupa_install_bsd_part): Likewise. (pupa_prefix): Likewise. (pupa_chainloader_real_boot): Call pupa_dl_unload_all. * kern/i386/pc/init.c: Include pupa/machine/kernel.h, pupa/dl.h and pupa/misc.h. (make_install_device): New function. (pupa_machine_init): Set the dl prefix. * kern/rescue.c: Include pupa/rescue.h and pupa/dl.h. (buf): Renamed to ... (linebuf): ... this. (pupa_rescue_cmd_prefix): New function. (pupa_rescue_cmd_insmod): Likewise. (pupa_rescue_cmd_rmmod): Likewise. (pupa_rescue_cmd_lsmod): Likewise. (pupa_enter_rescue_mode): Register new commands: prefix, insmod, rmmod and lsmod. * kern/mm.c (pupa_memalign): If failed even after invalidating disk caches, unload unneeded modules and retry. * kern/misc.c (pupa_memmove): New function. (pupa_memcpy): Removed. (pupa_strcpy): New function. (pupa_itoa): Made static. * kern/dl.c (pupa_dl_iterate): New function. (pupa_dl_ref): Likewise. (pupa_dl_unref): Likewise. (pupa_dl_unload): Return if succeeded or not. (pupa_dl_unload_unneeded): New function. (pupa_dl_unload_all): Likewise. (pupa_dl_init): Renamed to ... (pupa_dl_set_prefix): ... this. (pupa_dl_get_prefix): New function. * include/pupa/i386/pc/kernel.h: Include pupa/types.h. (PUPA_KERNEL_MACHINE_INSTALL_DOS_PART): New macro. (PUPA_KERNEL_MACHINE_INSTALL_BSD_PART): Likewise. (PUPA_KERNEL_MACHINE_PREFIX): Likewise. (pupa_install_dos_part): Declared. (pupa_install_bsd_part): Likewise. (pupa_prefix): Likewise. (pupa_boot_drive): Likewise. * include/pupa/types.h: Fix a typo. * include/pupa/misc.h (pupa_memcpy): New macro. Just an alias to pupa_memmove. (pupa_memmove): Declared. (pupa_strcpy): Likewise. * include/pupa/dl.h (PUPA_MOD_INIT): Change the prototype. Now pupa_mod_init takes one argument, its own module. (pupa_dl_unload_unneeded): Declared. (pupa_dl_unload_all): Likewise. (pupa_dl_ref): Likewise. (pupa_dl_unref): Likewise. (pupa_dl_iterate): Likewise. (pupa_dl_init): Renamed to ... (pupa_dl_set_prefix): ... this. (pupa_dl_get_prefix): Declared. * fs/fat.c [!PUPA_UTIL] (my_mod): New variable. (pupa_fat_dir) [!PUPA_UTIL]: Prevent the fat module from being unloaded. (pupa_fat_open) [!PUPA_UTIL]: Refer itself if succeeded. (pupa_fat_close) [!PUPA_UTIL]: Unrefer itself. * configure.ac (tmp_CFLAGS): Added -Wshadow, -Wpointer-arith, -Wmissing-prototypes, -Wundef and -Wstrict-prototypes.
93 lines
2.8 KiB
C
93 lines
2.8 KiB
C
/* dl.h - types and prototypes for loadable module support */
|
|
/*
|
|
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
|
* Copyright (C) 2002 Yoshinori K. Okuji <okuji@enbug.org>
|
|
*
|
|
* PUPA 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 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
|
|
* along with PUPA; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#ifndef PUPA_DL_H
|
|
#define PUPA_DL_H 1
|
|
|
|
#include <pupa/symbol.h>
|
|
#include <pupa/err.h>
|
|
#include <pupa/types.h>
|
|
|
|
#define PUPA_MOD_INIT \
|
|
static void pupa_mod_init (pupa_dl_t mod) __attribute__ ((unused)); \
|
|
static void \
|
|
pupa_mod_init (pupa_dl_t mod)
|
|
|
|
#define PUPA_MOD_FINI \
|
|
static void pupa_mod_fini (void) __attribute__ ((unused)); \
|
|
static void \
|
|
pupa_mod_fini (void)
|
|
|
|
#define PUPA_MOD_NAME(name) \
|
|
__asm__ (".section .modname,\"S\"\n.string \"" #name "\"\n.previous")
|
|
|
|
#define PUPA_MOD_DEP(name) \
|
|
__asm__ (".section .moddeps,\"S\"\n.string \"" #name "\"\n.previous")
|
|
|
|
struct pupa_dl_segment
|
|
{
|
|
struct pupa_dl_segment *next;
|
|
void *addr;
|
|
pupa_size_t size;
|
|
unsigned section;
|
|
};
|
|
typedef struct pupa_dl_segment *pupa_dl_segment_t;
|
|
|
|
struct pupa_dl;
|
|
|
|
struct pupa_dl_dep
|
|
{
|
|
struct pupa_dl_dep *next;
|
|
struct pupa_dl *mod;
|
|
};
|
|
typedef struct pupa_dl_dep *pupa_dl_dep_t;
|
|
|
|
struct pupa_dl
|
|
{
|
|
char *name;
|
|
int ref_count;
|
|
pupa_dl_dep_t dep;
|
|
pupa_dl_segment_t segment;
|
|
void (*init) (struct pupa_dl *mod);
|
|
void (*fini) (void);
|
|
};
|
|
typedef struct pupa_dl *pupa_dl_t;
|
|
|
|
pupa_dl_t EXPORT_FUNC(pupa_dl_load_file) (const char *filename);
|
|
pupa_dl_t EXPORT_FUNC(pupa_dl_load) (const char *name);
|
|
pupa_dl_t pupa_dl_load_core (void *addr, pupa_size_t size);
|
|
int EXPORT_FUNC(pupa_dl_unload) (pupa_dl_t mod);
|
|
void pupa_dl_unload_unneeded (void);
|
|
void pupa_dl_unload_all (void);
|
|
int EXPORT_FUNC(pupa_dl_ref) (pupa_dl_t mod);
|
|
int EXPORT_FUNC(pupa_dl_unref) (pupa_dl_t mod);
|
|
void EXPORT_FUNC(pupa_dl_iterate) (int (*hook) (pupa_dl_t mod));
|
|
pupa_dl_t EXPORT_FUNC(pupa_dl_get) (const char *name);
|
|
pupa_err_t EXPORT_FUNC(pupa_dl_register_symbol) (const char *name, void *addr,
|
|
pupa_dl_t mod);
|
|
void *EXPORT_FUNC(pupa_dl_resolve_symbol) (const char *name);
|
|
void pupa_dl_set_prefix (const char *dir);
|
|
const char *pupa_dl_get_prefix (void);
|
|
|
|
int pupa_arch_dl_check_header (void *ehdr, pupa_size_t size);
|
|
pupa_err_t pupa_arch_dl_relocate_symbols (pupa_dl_t mod, void *ehdr);
|
|
|
|
#endif /* ! PUPA_DL_H */
|