Module Name: src Committed By: matt Date: Mon Dec 14 00:41:19 UTC 2009
Modified Files: src/libexec/ld.elf_so/arch/mips: Makefile.inc mips_reloc.c rtld_start.S Log Message: Merge from matt-nb5-mips64: Add N32/N64 support for mips dynamic loader. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/libexec/ld.elf_so/arch/mips/Makefile.inc cvs rdiff -u -r1.55 -r1.56 src/libexec/ld.elf_so/arch/mips/mips_reloc.c cvs rdiff -u -r1.9 -r1.10 src/libexec/ld.elf_so/arch/mips/rtld_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/libexec/ld.elf_so/arch/mips/Makefile.inc diff -u src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.16 src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.17 --- src/libexec/ld.elf_so/arch/mips/Makefile.inc:1.16 Wed Nov 4 17:02:43 2009 +++ src/libexec/ld.elf_so/arch/mips/Makefile.inc Mon Dec 14 00:41:18 2009 @@ -1,11 +1,17 @@ -# $NetBSD: Makefile.inc,v 1.16 2009/11/04 17:02:43 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.17 2009/12/14 00:41:18 matt Exp $ SRCS+= rtld_start.S mips_reloc.c # XXX Should not be in CPPFLAGS! -CPPFLAGS+= -mabicalls -G0 -fPIC +CPUFLAGS+= -G0 +ABI64?= ${CPUFLAGS:M-mabi=64:M-mabi=o64} +.if !empty(ABI64) +CPPFLAGS+= -DELFSIZE=64 +.else CPPFLAGS+= -DELFSIZE=32 +.endif CPPFLAGS+= -DRTLD_INHIBIT_COPY_RELOCS +AFLAGS+= -Wa,--fatal-warnings LDFLAGS+= -Wl,-e,rtld_start Index: src/libexec/ld.elf_so/arch/mips/mips_reloc.c diff -u src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.55 src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.56 --- src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.55 Sat Aug 29 13:46:55 2009 +++ src/libexec/ld.elf_so/arch/mips/mips_reloc.c Mon Dec 14 00:41:18 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mips_reloc.c,v 1.55 2009/08/29 13:46:55 jmmv Exp $ */ +/* $NetBSD: mips_reloc.c,v 1.56 2009/12/14 00:41:18 matt Exp $ */ /* * Copyright 1997 Michael L. Hitch <mhi...@montana.edu> @@ -30,11 +30,12 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: mips_reloc.c,v 1.55 2009/08/29 13:46:55 jmmv Exp $"); +__RCSID("$NetBSD: mips_reloc.c,v 1.56 2009/12/14 00:41:18 matt Exp $"); #endif /* not lint */ #include <sys/types.h> #include <sys/stat.h> +#include <sys/endian.h> #include <stdlib.h> #include <string.h> @@ -42,7 +43,9 @@ #include "debug.h" #include "rtld.h" +#ifdef __mips_o32 #define SUPPORT_OLD_BROKEN_LD +#endif void _rtld_bind_start(void); void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr); @@ -52,29 +55,69 @@ * It is possible for the compiler to emit relocations for unaligned data. * We handle this situation with these inlines. */ -#define RELOC_ALIGNED_P(x) \ - (((uintptr_t)(x) & (sizeof(void *) - 1)) == 0) -static inline Elf_Addr -load_ptr(void *where) +#if ELFSIZE == 64 +/* + * ELF64 MIPS encodes the relocs uniquely. The first 32-bits of info contain + * the symbol index. The top 32-bits contain three relocation types encoded + * in big-endian integer with first relocation in LSB. This means for little + * endian we have to byte swap that interger (r_type). + */ +#define Elf_Sxword Elf64_Sxword +#define ELF_R_NXTTYPE_64_P(r_type) ((((r_type) >> 8) & 0xff) == R_TYPE(64)) +#if BYTE_ORDER == LITTLE_ENDIAN +#undef ELF_R_SYM +#undef ELF_R_TYPE +#define ELF_R_SYM(r_info) ((r_info) & 0xffffffff) +#define ELF_R_TYPE(r_info) bswap32((r_info) >> 32) +#endif +#else +#define ELF_R_NXTTYPE_64_P(r_type) (0) +#define Elf_Sxword Elf32_Sword +#endif + +static inline Elf_Sxword +load_ptr(void *where, size_t len) { - if (__predict_true(RELOC_ALIGNED_P(where))) - return *(Elf_Addr *)where; - else { - Elf_Addr res; + Elf_Sxword val; - (void)memcpy(&res, where, sizeof(res)); - return res; + if (__predict_true(((uintptr_t)where & (len - 1)) == 0)) { +#if ELFSIZE == 64 + if (len == sizeof(Elf_Sxword)) + return *(Elf_Sxword *)where; +#endif + return *(Elf_Sword *)where; } + + val = 0; +#if BYTE_ORDER == LITTLE_ENDIAN + (void)memcpy(&val, where, len); +#endif +#if BYTE_ORDER == BIG_ENDIAN + (void)memcpy((uint8_t *)((&val)+1) - len, where, len); +#endif + return (len == sizeof(Elf_Sxword)) ? val : (Elf_Sword)val; } static inline void -store_ptr(void *where, Elf_Addr val) +store_ptr(void *where, Elf_Sxword val, size_t len) { - if (__predict_true(RELOC_ALIGNED_P(where))) - *(Elf_Addr *)where = val; - else - (void)memcpy(where, &val, sizeof(val)); + if (__predict_true(((uintptr_t)where & (len - 1)) == 0)) { +#if ELFSIZE == 64 + if (len == sizeof(Elf_Sxword)) { + *(Elf_Sxword *)where = val; + return; + } +#endif + *(Elf_Sword *)where = val; + return; + } +#if BYTE_ORDER == LITTLE_ENDIAN + (void)memcpy(where, &val, len); +#endif +#if BYTE_ORDER == BIG_ENDIAN + (void)memcpy(where, (const uint8_t *)((&val)+1) - len, len); +#endif } @@ -94,7 +137,8 @@ void *where; const Elf_Sym *symtab = NULL, *sym; Elf_Addr *got = NULL; - Elf_Word local_gotno = 0, symtabno = 0, gotsym = 0, i; + Elf_Word local_gotno = 0, symtabno = 0, gotsym = 0; + size_t i; for (; dynp->d_tag != DT_NULL; dynp++) { switch (dynp->d_tag) { @@ -135,20 +179,42 @@ ++got; } - rellim = (const Elf_Rel *)((const char *)rel + relsz); + rellim = (const Elf_Rel *)((uintptr_t)rel + relsz); for (; rel < rellim; rel++) { + Elf_Word r_symndx, r_type; + where = (void *)(relocbase + rel->r_offset); - switch (ELF_R_TYPE(rel->r_info)) { - case R_TYPE(NONE): - break; + r_symndx = ELF_R_SYM(rel->r_info); + r_type = ELF_R_TYPE(rel->r_info); - case R_TYPE(REL32): - assert(ELF_R_SYM(rel->r_info) < gotsym); - sym = symtab + ELF_R_SYM(rel->r_info); + switch (r_type & 0xff) { + case R_TYPE(REL32): { + const size_t rlen = + ELF_R_NXTTYPE_64_P(r_type) + ? sizeof(Elf_Sxword) + : sizeof(Elf_Sword); + Elf_Sxword old = load_ptr(where, rlen); + Elf_Sxword val = old; +#if ELFSIZE == 64 + assert(r_type == R_TYPE(REL32) + || r_type == (R_TYPE(REL32)|(R_TYPE(64) << 8))); +#endif + assert(r_symndx < gotsym); + sym = symtab + r_symndx; assert(ELF_ST_BIND(sym->st_info) == STB_LOCAL); - store_ptr(where, load_ptr(where) + relocbase); + val += relocbase; + store_ptr(where, val, sizeof(Elf_Sword)); + rdbg(("REL32/L(%p) %p -> %p in <self>", + where, (void *)old, (void *)val)); + store_ptr(where, val, rlen); break; + } + + case R_TYPE(GPREL32): + case R_TYPE(NONE): + break; + default: abort(); @@ -185,8 +251,8 @@ sym = obj->symtab + obj->gotsym; /* Now do the global GOT entries */ for (i = obj->gotsym; i < obj->symtabno; i++) { - rdbg((" doing got %d sym %p (%s, %x)", i - obj->gotsym, sym, - sym->st_name + obj->strtab, *got)); + rdbg((" doing got %d sym %p (%s, %lx)", i - obj->gotsym, sym, + sym->st_name + obj->strtab, (u_long) *got)); #ifdef SUPPORT_OLD_BROKEN_LD if (ELF_ST_TYPE(sym->st_info) == STT_FUNC && @@ -239,37 +305,41 @@ *got = def->st_value + (Elf_Addr)defobj->relocbase; } - rdbg((" --> now %x", *got)); + rdbg((" --> now %lx", (u_long) *got)); ++sym; ++got; } got = obj->pltgot; for (rel = obj->rel; rel < obj->rellim; rel++) { + Elf_Word r_symndx, r_type; void *where; - Elf_Addr tmp; - unsigned long symnum; where = obj->relocbase + rel->r_offset; - symnum = ELF_R_SYM(rel->r_info); + r_symndx = ELF_R_SYM(rel->r_info); + r_type = ELF_R_TYPE(rel->r_info); - switch (ELF_R_TYPE(rel->r_info)) { + switch (r_type & 0xff) { case R_TYPE(NONE): break; - case R_TYPE(REL32): + case R_TYPE(REL32): { /* 32-bit PC-relative reference */ - def = obj->symtab + symnum; - - if (symnum >= obj->gotsym) { - tmp = load_ptr(where); - tmp += got[obj->local_gotno + symnum - obj->gotsym]; - store_ptr(where, tmp); - - rdbg(("REL32/G %s in %s --> %p in %s", - obj->strtab + def->st_name, obj->path, - (void *)tmp, obj->path)); - break; + const size_t rlen = + ELF_R_NXTTYPE_64_P(r_type) + ? sizeof(Elf_Sxword) + : sizeof(Elf_Sword); + Elf_Sxword old = load_ptr(where, rlen); + Elf_Sxword val = old; + + def = obj->symtab + r_symndx; + + if (r_symndx >= obj->gotsym) { + val += got[obj->local_gotno + r_symndx - obj->gotsym]; + rdbg(("REL32/G(%p) %p --> %p (%s) in %s", + where, (void *)old, (void *)val, + obj->strtab + def->st_name, + obj->path)); } else { /* * XXX: ABI DIFFERENCE! @@ -286,7 +356,6 @@ * * --rkb, Oct 6, 2001 */ - tmp = load_ptr(where); if (def->st_info == ELF_ST_INFO(STB_LOCAL, STT_SECTION) @@ -294,23 +363,25 @@ && !broken #endif ) - tmp += (Elf_Addr)def->st_value; + val += (Elf_Addr)def->st_value; - tmp += (Elf_Addr)obj->relocbase; - store_ptr(where, tmp); + val += (Elf_Addr)obj->relocbase; - rdbg(("REL32/L %s in %s --> %p in %s", - obj->strtab + def->st_name, obj->path, - (void *)tmp, obj->path)); + rdbg(("REL32/L(%p) %p -> %p (%s) in %s", + where, (void *)old, (void *)val, + obj->strtab + def->st_name, obj->path)); } + store_ptr(where, val, rlen); break; + } default: rdbg(("sym = %lu, type = %lu, offset = %p, " "contents = %p, symbol = %s", - symnum, (u_long)ELF_R_TYPE(rel->r_info), - (void *)rel->r_offset, (void *)load_ptr(where), - obj->strtab + obj->symtab[symnum].st_name)); + (u_long)r_symndx, (u_long)ELF_R_TYPE(rel->r_info), + (void *)rel->r_offset, + (void *)load_ptr(where, sizeof(Elf_Sword)), + obj->strtab + obj->symtab[r_symndx].st_name)); _rtld_error("%s: Unsupported relocation type %ld " "in non-PLT relocations", obj->path, (u_long) ELF_R_TYPE(rel->r_info)); Index: src/libexec/ld.elf_so/arch/mips/rtld_start.S diff -u src/libexec/ld.elf_so/arch/mips/rtld_start.S:1.9 src/libexec/ld.elf_so/arch/mips/rtld_start.S:1.10 --- src/libexec/ld.elf_so/arch/mips/rtld_start.S:1.9 Sat Oct 5 11:59:05 2002 +++ src/libexec/ld.elf_so/arch/mips/rtld_start.S Mon Dec 14 00:41:19 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld_start.S,v 1.9 2002/10/05 11:59:05 mycroft Exp $ */ +/* $NetBSD: rtld_start.S,v 1.10 2009/12/14 00:41:19 matt Exp $ */ /* * Copyright 1997 Michael L. Hitch <mhi...@montana.edu> @@ -33,73 +33,108 @@ .globl _C_LABEL(_rtld_relocate_nonplt_self) .globl _C_LABEL(_rtld) +#define PTR_SIZE (1<<PTR_SCALESHIFT) + LEAF(rtld_start) + .frame sp, 4*PTR_SIZE, ra + .mask 0x10090000,-PTR_SIZE .set noreorder + SETUP_GP + PTR_SUBU sp, 4*PTR_SIZE # adjust stack pointer + SETUP_GP64(s4, rtld_start) + SAVE_GP(0) + # -> 1*PTR_SIZE(sp) for atexit + # -> 2*PTR_SIZE(sp) for obj_main + move s0, a0 # save stack pointer from a0 + move s3, a3 # save ps_strings pointer - .cpload t9 - addu sp, sp, -12 # adjust stack pointer - .cprestore 0 # -> 0(sp) for gp - # -> 4(sp) for atexit - # -> 8(sp) for obj_main - move s0,a0 # save stack pointer from a0 - move s1,a3 # save ps_strings pointer - - la a1, 1f + PTR_LA a1, 1f bal 1f - la t9,_C_LABEL(_rtld_relocate_nonplt_self) -1: subu a1, ra, a1 # relocbase - move s2,a1 - la a0,_DYNAMIC - addu t9, a1, t9 - jalr t9 - addu a0, a1, a0 # &_DYNAMIC + PTR_LA t0, _C_LABEL(_rtld_relocate_nonplt_self) +1: PTR_SUBU a1, ra, a1 # relocbase + move s2, a1 # save for _rtld + PTR_LA a0, _DYNAMIC + PTR_ADDU t9, a1, t0 + jalr t9 # _rtld_relocate_nonplt_self(dynp, relocabase) + PTR_ADDU a0, a1, a0 # &_DYNAMIC - move a1,s2 # relocbase - addu a0, sp, 4 # sp + move a1, s2 # relocbase + PTR_ADDU a0, sp, 2*PTR_SIZE # sp jal _C_LABEL(_rtld) # v0 = _rtld(sp, relocbase) nop - lw a1, 4(sp) # our atexit function - lw a2, 8(sp) # obj_main entry - addu sp, sp,12 # readjust stack - move a0,s0 # stack pointer - move t9,v0 + PTR_L a1, 2*PTR_SIZE(sp) # our atexit function + PTR_L a2, 3*PTR_SIZE(sp) # obj_main entry + PTR_ADDU sp, 4*PTR_SIZE # readjust stack + move a0, s0 # stack pointer + move t9, v0 jr t9 # _start(sp, cleanup, obj); - move a3,s1 # restore ps_strings + move a3, s3 # restore ps_strings END(rtld_start) +#define XCALLFRAME_SIZ (12*SZREG) +#define XCALLFRAME_RA (10*SZREG) +#define XCALLFRAME_GP (9*SZREG) +#define XCALLFRAME_S0 (8*SZREG) +#define XCALLFRAME_A3 (7*SZREG) +#define XCALLFRAME_A2 (6*SZREG) +#define XCALLFRAME_A1 (5*SZREG) +#define XCALLFRAME_A0 (4*SZREG) +#if defined(__mips_n32) || defined(__mips_n64) +#define XCALLFRAME_A7 (3*SZREG) +#define XCALLFRAME_A6 (2*SZREG) +#define XCALLFRAME_A5 (1*SZREG) +#define XCALLFRAME_A4 (0*SZREG) +#endif + .globl _rtld_bind_start .ent _rtld_bind_start _rtld_bind_start: - - move v1,gp # save old GP - add t9,8 # modify T9 to point at .cpload - .cpload t9 - subu sp,44 # save arguments and sp value in stack - .cprestore 36 - sw t7,40(sp) - sw a0,16(sp) - sw a1,20(sp) - sw a2,24(sp) - sw a3,28(sp) - sw s0,32(sp) - move s0,sp - move a0,t8 # symbol index - move a1,t7 # old RA - move a2,v1 # old GP - move a3,ra # current RA + .frame sp, XCALLFRAME_SIZ, $15 + move v1, gp # save old GP +#if defined(__mips_o32) || defined(__mips_o64) + PTR_ADDU t9, 8 # modify T9 to point at .cpload +#endif + SETUP_GP + PTR_SUBU sp, XCALLFRAME_SIZ # save arguments and sp value in stack + SETUP_GP64(XCALLFRAME_GP, _rtld_bind_start) + SAVE_GP(XCALLFRAME_GP) +#if defined(__mips_n32) || defined(__mips_n64) + REG_S a4, XCALLFRAME_A4(sp) + REG_S a5, XCALLFRAME_A5(sp) + REG_S a6, XCALLFRAME_A6(sp) + REG_S a7, XCALLFRAME_A7(sp) +#endif + REG_S a0, XCALLFRAME_A0(sp) + REG_S a1, XCALLFRAME_A1(sp) + REG_S a2, XCALLFRAME_A2(sp) + REG_S a3, XCALLFRAME_A3(sp) + REG_S $15, XCALLFRAME_RA(sp) # ra is in t7/t3 + REG_S s0, XCALLFRAME_S0(sp) + move s0, sp + move a0, t8 # symbol index + move a1, $15 # old RA + move a2, v1 # old GP + move a3, ra # current RA jal _C_LABEL(_rtld_bind) - nop - move sp,s0 - lw ra,40(sp) - lw a0,16(sp) - lw a1,20(sp) - lw a2,24(sp) - lw a3,28(sp) - lw s0,32(sp) - addu sp,44 - move t9,v0 + nop + move sp, s0 + REG_L ra, XCALLFRAME_RA(sp) + REG_L s0, XCALLFRAME_S0(sp) + REG_L a0, XCALLFRAME_A0(sp) + REG_L a1, XCALLFRAME_A1(sp) + REG_L a2, XCALLFRAME_A2(sp) + REG_L a3, XCALLFRAME_A3(sp) +#if defined(__mips_n32) || defined(__mips_n64) + REG_L a4, XCALLFRAME_A4(sp) + REG_L a5, XCALLFRAME_A5(sp) + REG_L a6, XCALLFRAME_A6(sp) + REG_L a7, XCALLFRAME_A7(sp) +#endif + RESTORE_GP64 + PTR_ADDU sp, XCALLFRAME_SIZ + move t9, v0 jr t9 - nop - .end _rtld_bind_start + nop +END(_rtld_bind_start)