vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make elfload not use hooks. Opt for flags and iterators instead.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-02 16:45:57 +01:00
parent 7f8c105f61
commit 73bf57e2c8
9 changed files with 298 additions and 629 deletions
Download patch file Download diff file Expand all files Collapse all files

35
include/grub/elfload.h
View file

@ -33,14 +33,10 @@ struct grub_elf_file
Elf32_Ehdr ehdr32;
} ehdr;
void *phdrs;
char *filename;
};
typedef struct grub_elf_file *grub_elf_t;
typedef grub_err_t (*grub_elf32_load_hook_t)
(Elf32_Phdr *phdr, grub_addr_t *addr, int *load);
typedef grub_err_t (*grub_elf64_load_hook_t)
(Elf64_Phdr *phdr, grub_addr_t *addr, int *load);
typedef int (*grub_elf32_phdr_iterate_hook_t)
(grub_elf_t elf, Elf32_Phdr *phdr, void *arg);
typedef int (*grub_elf64_phdr_iterate_hook_t)
@ -52,26 +48,31 @@ grub_err_t grub_elf_close (grub_elf_t);
int grub_elf_is_elf32 (grub_elf_t);
grub_size_t grub_elf32_size (grub_elf_t,
const char *filename,
Elf32_Addr *, grub_uint32_t *);
enum grub_elf_load_flags
{
GRUB_ELF_LOAD_FLAGS_NONE = 0,
GRUB_ELF_LOAD_FLAGS_LOAD_PT_DYNAMIC = 1,
GRUB_ELF_LOAD_FLAGS_28BITS = 2,
};
grub_err_t grub_elf32_load (grub_elf_t, const char *filename,
grub_elf32_load_hook_t, grub_addr_t *,
void *load_offset, enum grub_elf_load_flags flags, grub_addr_t *,
grub_size_t *);
int grub_elf_is_elf64 (grub_elf_t);
grub_size_t grub_elf64_size (grub_elf_t,
const char *filename,
Elf64_Addr *, grub_uint64_t *);
grub_err_t grub_elf64_load (grub_elf_t, const char *filename,
grub_elf64_load_hook_t, grub_addr_t *,
void *load_offset, enum grub_elf_load_flags flags, grub_addr_t *,
grub_size_t *);
grub_err_t
grub_elf32_phdr_iterate (grub_elf_t elf,
const char *filename,
grub_elf32_phdr_iterate_hook_t hook, void *hook_arg);
grub_err_t
grub_elf64_phdr_iterate (grub_elf_t elf,
const char *filename,
grub_elf64_phdr_iterate_hook_t hook, void *hook_arg);
grub_err_t grub_elf32_load_phdrs (grub_elf_t elf);
grub_err_t grub_elf64_load_phdrs (grub_elf_t elf);
#define FOR_ELF32_PHDRS(elf, phdr) \
for (grub_elf32_load_phdrs (elf), phdr = elf->phdrs; \
phdr && phdr < (Elf32_Phdr *) elf->phdrs + elf->ehdr.ehdr32.e_phnum; phdr++)
#define FOR_ELF64_PHDRS(elf, phdr) \
for (grub_elf64_load_phdrs (elf), phdr = elf->phdrs; \
phdr && phdr < (Elf64_Phdr *) elf->phdrs + elf->ehdr.ehdr64.e_phnum; phdr++)
#endif /* ! GRUB_ELFLOAD_HEADER */