Date: Wed, 14 Apr 2004 16:41:27 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 51079 for review Message-ID: <200404142341.i3ENfRAO083866@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=51079 Change 51079 by peter@peter_daintree on 2004/04/14 16:40:41 I think I'll get yelled at for using 'lu' here Affected files ... .. //depot/projects/hammer/sys/alpha/alpha/elf_machdep.c#11 edit .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#22 edit .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#11 edit .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#13 edit .. //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#10 edit .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#11 edit Differences ... ==== //depot/projects/hammer/sys/alpha/alpha/elf_machdep.c#11 (text+ko) ==== @@ -109,7 +109,7 @@ /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, int local, elf_lookup_fn lu) + int type, int local, elf_lookup_fn lookup) { Elf_Addr *where; Elf_Addr addr; @@ -152,7 +152,7 @@ break; case R_ALPHA_REFQUAD: - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; addr += addend; @@ -161,7 +161,7 @@ break; case R_ALPHA_GLOB_DAT: - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; addr += addend; @@ -171,7 +171,7 @@ case R_ALPHA_JMP_SLOT: /* No point in lazy binding for kernel modules. */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; if (*where != addr) @@ -199,18 +199,18 @@ int elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type, - elf_lookup_fn lu) + elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 0, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup)); } int elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, elf_lookup_fn lu) + int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 1, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup)); } int ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#22 (text+ko) ==== @@ -105,7 +105,7 @@ /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, int local, elf_lookup_fn lu) + int type, int local, elf_lookup_fn lookup) { Elf64_Addr *where, val; Elf32_Addr *where32, val32; @@ -141,7 +141,7 @@ break; case R_X86_64_64: /* S + A */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); val = addr + addend; if (addr == 0) return -1; @@ -150,7 +150,7 @@ break; case R_X86_64_PC32: /* S + A - P */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); where32 = (Elf32_Addr *)where; val32 = (Elf32_Addr)(addr + addend - (Elf_Addr)where); if (addr == 0) @@ -160,7 +160,7 @@ break; case R_X86_64_32S: /* S + A sign extend */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); val32 = (Elf32_Addr)(addr + addend); where32 = (Elf32_Addr *)where; if (addr == 0) @@ -179,7 +179,7 @@ break; case R_X86_64_GLOB_DAT: /* S */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; if (*where != addr) @@ -203,18 +203,18 @@ int elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type, - elf_lookup_fn lu) + elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 0, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup)); } int elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, elf_lookup_fn lu) + int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 1, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup)); } int ==== //depot/projects/hammer/sys/i386/i386/elf_machdep.c#11 (text+ko) ==== @@ -105,7 +105,7 @@ /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, int local, elf_lookup_fn lu) + int type, int local, elf_lookup_fn lookup) { Elf_Addr *where; Elf_Addr addr; @@ -148,7 +148,7 @@ break; case R_386_32: /* S + A */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; addr += addend; @@ -157,7 +157,7 @@ break; case R_386_PC32: /* S + A - P */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; addr += addend - (Elf_Addr)where; @@ -175,7 +175,7 @@ break; case R_386_GLOB_DAT: /* S */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; if (*where != addr) @@ -195,18 +195,18 @@ int elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type, - elf_lookup_fn lu) + elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 0, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup)); } int elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, elf_lookup_fn lu) + int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 1, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup)); } int ==== //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#13 (text+ko) ==== @@ -143,7 +143,7 @@ } static Elf_Addr -lookup_fdesc(linker_file_t lf, Elf_Word symidx, elf_lookup_fn lu) +lookup_fdesc(linker_file_t lf, Elf_Word symidx, elf_lookup_fn lookup) { linker_file_t top; Elf_Addr addr; @@ -151,7 +151,7 @@ int i; static int eot = 0; - addr = lu(lf, symidx, 0); + addr = lookup(lf, symidx, 0); if (addr == 0) { top = lf; symname = elf_get_symname(top, symidx); @@ -192,7 +192,7 @@ /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, int local, elf_lookup_fn lu) + int type, int local, elf_lookup_fn lookup) { Elf_Addr relocbase = (Elf_Addr)lf->address; Elf_Addr *where; @@ -239,7 +239,7 @@ case R_IA64_NONE: break; case R_IA64_DIR64LSB: /* word64 LSB S + A */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return (-1); *where = addr + addend; @@ -249,7 +249,7 @@ printf("%s: addend ignored for OPD relocation\n", __func__); } - addr = lookup_fdesc(lf, symidx, lu); + addr = lookup_fdesc(lf, symidx, lookup); if (addr == 0) return (-1); *where = addr; @@ -257,7 +257,7 @@ case R_IA64_REL64LSB: /* word64 LSB BD + A */ break; case R_IA64_IPLTLSB: - addr = lookup_fdesc(lf, symidx, lu); + addr = lookup_fdesc(lf, symidx, lookup); if (addr == 0) return (-1); where[0] = *((Elf_Addr*)addr) + addend; @@ -274,18 +274,18 @@ int elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type, - elf_lookup_fn lu) + elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 0, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup)); } int elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, elf_lookup_fn lu) + int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 1, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup)); } int ==== //depot/projects/hammer/sys/powerpc/powerpc/elf_machdep.c#10 (text+ko) ==== @@ -107,7 +107,7 @@ /* Process one elf relocation with addend. */ static int elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, int local, elf_lookup_fn lu) + int type, int local, elf_lookup_fn lookup) { Elf_Addr *where; Elf_Addr addr; @@ -141,7 +141,7 @@ break; case R_PPC_GLOB_DAT: - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; addr += addend; @@ -151,7 +151,7 @@ case R_PPC_JMP_SLOT: /* No point in lazy binding for kernel modules. */ - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; if (*where != addr) @@ -182,18 +182,18 @@ int elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type, - elf_lookup_fn lu) + elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 0, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup)); } int elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, elf_lookup_fn lu) + int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, relocbase, data, type, 1, lu)); + return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup)); } int ==== //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#11 (text+ko) ==== @@ -253,7 +253,7 @@ int elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, const void *data, - int type, elf_lookup_fn lu) + int type, elf_lookup_fn lookup) { const Elf_Rela *rela; Elf_Addr value; @@ -277,7 +277,7 @@ /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type, - elf_lookup_fn lu) + elf_lookup_fn lookup) { const Elf_Rela *rela; Elf_Addr relocbase; @@ -310,7 +310,7 @@ value = rela->r_addend; if (RELOC_RESOLVE_SYMBOL(rtype)) { - addr = lu(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return (-1); value += addr;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404142341.i3ENfRAO083866>