Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Symbol resolution functions in the kernel: Removed the unused parameter 

allowing optional prepending of a string to the symbol names.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30750 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-05-13 15:25:27 +00:00
parent 0bd0e0af2a
commit 6a1e04b121
6 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
headers/private/kernel/arch/elf.h
View File

@ -13,9 +13,9 @@ struct elf_image_info;
extern "C" { extern "C" {
#endif #endif
extern int arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend, extern int arch_elf_relocate_rel(struct elf_image_info *image,
struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len); struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len);
extern int arch_elf_relocate_rela(struct elf_image_info *image, const char *sym_prepend, extern int arch_elf_relocate_rela(struct elf_image_info *image,
struct elf_image_info *resolve_image, struct Elf32_Rela *rel, int rel_len); struct elf_image_info *resolve_image, struct Elf32_Rela *rel, int rel_len);
#ifdef __cplusplus #ifdef __cplusplus

2
headers/private/kernel/elf_priv.h
View File

@ -64,6 +64,6 @@ extern
"C" "C"
#endif #endif
status_t elf_resolve_symbol(struct elf_image_info *image, struct Elf32_Sym *sym, status_t elf_resolve_symbol(struct elf_image_info *image, struct Elf32_Sym *sym,
struct elf_image_info *shared_image, const char *sym_prepend, addr_t *sym_addr); struct elf_image_info *shared_image, addr_t *sym_addr);
#endif /* _KERNEL_ELF_PRIV_H */ #endif /* _KERNEL_ELF_PRIV_H */

15
src/system/kernel/arch/m68k/arch_elf.cpp
View File

@ -56,8 +56,8 @@ static const char *kRelocations[] = {
"R_68K_JMP_SLOT", /* Create PLT entry */ "R_68K_JMP_SLOT", /* Create PLT entry */
"R_68K_RELATIVE", /* Adjust by program base */ "R_68K_RELATIVE", /* Adjust by program base */
/* These are GNU extensions to enable C++ vtable garbage collection. */ /* These are GNU extensions to enable C++ vtable garbage collection. */
"R_68K_GNU_VTINHERIT", "R_68K_GNU_VTINHERIT",
"R_68K_GNU_VTENTRY", "R_68K_GNU_VTENTRY",
#if 0 #if 0
"R_386_NONE", "R_386_NONE",
"R_386_32", /* add symbol value */ "R_386_32", /* add symbol value */
@ -79,8 +79,8 @@ status_t
boot_arch_elf_relocate_rel(struct preloaded_image *image, boot_arch_elf_relocate_rel(struct preloaded_image *image,
struct Elf32_Rel *rel, int rel_len) struct Elf32_Rel *rel, int rel_len)
#else #else
int int
arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend, arch_elf_relocate_rel(struct elf_image_info *image,
struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len) struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len)
#endif #endif
{ {
@ -140,8 +140,8 @@ status_t
boot_arch_elf_relocate_rela(struct preloaded_image *image, boot_arch_elf_relocate_rela(struct preloaded_image *image,
struct Elf32_Rela *rel, int rel_len) struct Elf32_Rela *rel, int rel_len)
#else #else
int int
arch_elf_relocate_rela(struct elf_image_info *image, const char *sym_prepend, arch_elf_relocate_rela(struct elf_image_info *image,
struct elf_image_info *resolve_image, struct Elf32_Rela *rel, int rel_len) struct elf_image_info *resolve_image, struct Elf32_Rela *rel, int rel_len)
#endif #endif
{ {
@ -191,8 +191,7 @@ arch_elf_relocate_rela(struct elf_image_info *image, const char *sym_prepend,
#ifdef _BOOT_MODE #ifdef _BOOT_MODE
vlErr = boot_elf_resolve_symbol(image, sym, &S); vlErr = boot_elf_resolve_symbol(image, sym, &S);
#else #else
vlErr = elf_resolve_symbol(image, sym, resolve_image, vlErr = elf_resolve_symbol(image, sym, resolve_image, &S);
sym_prepend, &S);
#endif #endif
if (vlErr < 0) { if (vlErr < 0) {
dprintf("%s(): Failed to relocate " dprintf("%s(): Failed to relocate "

13
src/system/kernel/arch/ppc/arch_elf.cpp
View File

@ -24,8 +24,8 @@ status_t
boot_arch_elf_relocate_rel(struct preloaded_image *image, boot_arch_elf_relocate_rel(struct preloaded_image *image,
struct Elf32_Rel *rel, int rel_len) struct Elf32_Rel *rel, int rel_len)
#else #else
int int
arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend, arch_elf_relocate_rel(struct elf_image_info *image,
struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len) struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len)
#endif #endif
{ {
@ -118,8 +118,8 @@ status_t
boot_arch_elf_relocate_rela(struct preloaded_image *image, boot_arch_elf_relocate_rela(struct preloaded_image *image,
struct Elf32_Rela *rel, int rel_len) struct Elf32_Rela *rel, int rel_len)
#else #else
int int
arch_elf_relocate_rela(struct elf_image_info *image, const char *sym_prepend, arch_elf_relocate_rela(struct elf_image_info *image,
struct elf_image_info *resolve_image, struct Elf32_Rela *rel, int rel_len) struct elf_image_info *resolve_image, struct Elf32_Rela *rel, int rel_len)
#endif #endif
{ {
@ -142,7 +142,7 @@ arch_elf_relocate_rela(struct elf_image_info *image, const char *sym_prepend,
dprintf("arch_elf_relocate_rela(): Failed to get GOT address!\n"); \ dprintf("arch_elf_relocate_rela(): Failed to get GOT address!\n"); \
return B_ERROR; \ return B_ERROR; \
} }
// TODO: Get the PLT address! // TODO: Get the PLT address!
#define REQUIRE_PLT \ #define REQUIRE_PLT \
if (L == 0) { \ if (L == 0) { \
@ -189,8 +189,7 @@ arch_elf_relocate_rela(struct elf_image_info *image, const char *sym_prepend,
#ifdef _BOOT_MODE #ifdef _BOOT_MODE
vlErr = boot_elf_resolve_symbol(image, sym, &S); vlErr = boot_elf_resolve_symbol(image, sym, &S);
#else #else
vlErr = elf_resolve_symbol(image, sym, resolve_image, vlErr = elf_resolve_symbol(image, sym, resolve_image, &S);
sym_prepend, &S);
#endif #endif
if (vlErr < 0) { if (vlErr < 0) {
dprintf("%s(): Failed to relocate " dprintf("%s(): Failed to relocate "

7
src/system/kernel/arch/x86/arch_elf.c
View File

@ -60,7 +60,7 @@ boot_arch_elf_relocate_rel(struct preloaded_image *image,
struct Elf32_Rel *rel, int relLength) struct Elf32_Rel *rel, int relLength)
#else #else
int int
arch_elf_relocate_rel(struct elf_image_info *image, const char *prepend, arch_elf_relocate_rel(struct elf_image_info *image,
struct elf_image_info *resolveImage, struct Elf32_Rel *rel, int relLength) struct elf_image_info *resolveImage, struct Elf32_Rel *rel, int relLength)
#endif #endif
{ {
@ -93,8 +93,7 @@ arch_elf_relocate_rel(struct elf_image_info *image, const char *prepend,
#ifdef _BOOT_MODE #ifdef _BOOT_MODE
status = boot_elf_resolve_symbol(image, symbol, &S); status = boot_elf_resolve_symbol(image, symbol, &S);
#else #else
status = elf_resolve_symbol(image, symbol, resolveImage, status = elf_resolve_symbol(image, symbol, resolveImage, &S);
prepend, &S);
#endif #endif
if (status < B_OK) if (status < B_OK)
return status; return status;
@ -172,7 +171,7 @@ boot_arch_elf_relocate_rela(struct preloaded_image *image,
struct Elf32_Rela *rel, int relLength) struct Elf32_Rela *rel, int relLength)
#else #else
int int
arch_elf_relocate_rela(struct elf_image_info *image, const char *prepend, arch_elf_relocate_rela(struct elf_image_info *image,
struct elf_image_info *resolveImage, struct Elf32_Rela *rel, int relLength) struct elf_image_info *resolveImage, struct Elf32_Rela *rel, int relLength)
#endif #endif
{ {

43
src/system/kernel/elf.cpp
View File

@ -660,33 +660,22 @@ elf_parse_dynamic_section(struct elf_image_info *image)
/*! Resolves the \a symbol by linking against \a sharedImage if necessary. /*! Resolves the \a symbol by linking against \a sharedImage if necessary.
Returns the resolved symbol's address in \a _symbolAddress. Returns the resolved symbol's address in \a _symbolAddress.
TODO: eventually get rid of "symbolPrepend"
*/ */
status_t status_t
elf_resolve_symbol(struct elf_image_info *image, struct Elf32_Sym *symbol, elf_resolve_symbol(struct elf_image_info *image, struct Elf32_Sym *symbol,
struct elf_image_info *sharedImage, const char *symbolPrepend, struct elf_image_info *sharedImage, addr_t *_symbolAddress)
addr_t *_symbolAddress)
{ {
switch (symbol->st_shndx) { switch (symbol->st_shndx) {
case SHN_UNDEF: case SHN_UNDEF:
{ {
struct Elf32_Sym *newSymbol; struct Elf32_Sym *newSymbol;
char newNameBuffer[368]; const char *symbolName = SYMNAME(image, symbol);
char *newName;
// patch the symbol name
if (symbolPrepend) {
newName = newNameBuffer;
strlcpy(newName, symbolPrepend, sizeof(newName));
strlcat(newName, SYMNAME(image, symbol), sizeof(newName));
} else
newName = SYMNAME(image, symbol);
// it's undefined, must be outside this image, try the other image // it's undefined, must be outside this image, try the other image
newSymbol = elf_find_symbol(sharedImage, newName); newSymbol = elf_find_symbol(sharedImage, symbolName);
if (newSymbol == NULL) { if (newSymbol == NULL) {
dprintf("\"%s\": could not resolve symbol '%s'\n", dprintf("\"%s\": could not resolve symbol '%s'\n",
image->name, newName); image->name, symbolName);
return B_MISSING_SYMBOL; return B_MISSING_SYMBOL;
} }
@ -694,14 +683,14 @@ elf_resolve_symbol(struct elf_image_info *image, struct Elf32_Sym *symbol,
if (ELF32_ST_TYPE(symbol->st_info) if (ELF32_ST_TYPE(symbol->st_info)
!= ELF32_ST_TYPE(newSymbol->st_info)) { != ELF32_ST_TYPE(newSymbol->st_info)) {
dprintf("elf_resolve_symbol: found symbol '%s' in shared image " dprintf("elf_resolve_symbol: found symbol '%s' in shared image "
"but wrong type\n", newName); "but wrong type\n", symbolName);
return B_MISSING_SYMBOL; return B_MISSING_SYMBOL;
} }
if (ELF32_ST_BIND(newSymbol->st_info) != STB_GLOBAL if (ELF32_ST_BIND(newSymbol->st_info) != STB_GLOBAL
&& ELF32_ST_BIND(newSymbol->st_info) != STB_WEAK) { && ELF32_ST_BIND(newSymbol->st_info) != STB_WEAK) {
TRACE(("elf_resolve_symbol: found symbol '%s' but not " TRACE(("elf_resolve_symbol: found symbol '%s' but not "
"exported\n", newName)); "exported\n", symbolName));
return B_MISSING_SYMBOL; return B_MISSING_SYMBOL;
} }
@ -727,7 +716,7 @@ elf_resolve_symbol(struct elf_image_info *image, struct Elf32_Sym *symbol,
/*! Until we have shared library support, just this links against the kernel */ /*! Until we have shared library support, just this links against the kernel */
static int static int
elf_relocate(struct elf_image_info *image, const char *symbolPrepend) elf_relocate(struct elf_image_info *image)
{ {
int status = B_NO_ERROR; int status = B_NO_ERROR;
@ -738,8 +727,8 @@ elf_relocate(struct elf_image_info *image, const char *symbolPrepend)
TRACE(("total %i relocs\n", TRACE(("total %i relocs\n",
image->rel_len / (int)sizeof(struct Elf32_Rel))); image->rel_len / (int)sizeof(struct Elf32_Rel)));
status = arch_elf_relocate_rel(image, symbolPrepend, sKernelImage, status = arch_elf_relocate_rel(image, sKernelImage, image->rel,
image->rel, image->rel_len); image->rel_len);
if (status < B_OK) if (status < B_OK)
return status; return status;
} }
@ -749,10 +738,10 @@ elf_relocate(struct elf_image_info *image, const char *symbolPrepend)
image->pltrel_len / (int)sizeof(struct Elf32_Rel))); image->pltrel_len / (int)sizeof(struct Elf32_Rel)));
if (image->pltrel_type == DT_REL) { if (image->pltrel_type == DT_REL) {
status = arch_elf_relocate_rel(image, symbolPrepend, sKernelImage, status = arch_elf_relocate_rel(image, sKernelImage, image->pltrel,
image->pltrel, image->pltrel_len); image->pltrel_len);
} else { } else {
status = arch_elf_relocate_rela(image, symbolPrepend, sKernelImage, status = arch_elf_relocate_rela(image, sKernelImage,
(struct Elf32_Rela *)image->pltrel, image->pltrel_len); (struct Elf32_Rela *)image->pltrel, image->pltrel_len);
} }
if (status < B_OK) if (status < B_OK)
@ -760,8 +749,8 @@ elf_relocate(struct elf_image_info *image, const char *symbolPrepend)
} }
if (image->rela) { if (image->rela) {
status = arch_elf_relocate_rela(image, symbolPrepend, sKernelImage, status = arch_elf_relocate_rela(image, sKernelImage, image->rela,
image->rela, image->rela_len); image->rela_len);
if (status < B_OK) if (status < B_OK)
return status; return status;
} }
@ -943,7 +932,7 @@ insert_preloaded_image(struct preloaded_image *preloadedImage, bool kernel)
goto error1; goto error1;
if (!kernel) { if (!kernel) {
status = elf_relocate(image, NULL); status = elf_relocate(image);
if (status < B_OK) if (status < B_OK)
goto error1; goto error1;
} else } else
@ -1823,7 +1812,7 @@ load_kernel_add_on(const char *path)
if (status < B_OK) if (status < B_OK)
goto error5; goto error5;
status = elf_relocate(image, NULL); status = elf_relocate(image);
if (status < B_OK) if (status < B_OK)
goto error5; goto error5;