Mercurial > hg > xemacs-beta
diff src/unexelfsgi.c @ 371:cc15677e0335 r21-2b1
Import from CVS: tag r21-2b1
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:03:08 +0200 |
| parents | a4f53d9b3154 |
| children | 7d59cb494b73 |
line wrap: on
line diff
--- a/src/unexelfsgi.c Mon Aug 13 11:01:58 2007 +0200 +++ b/src/unexelfsgi.c Mon Aug 13 11:03:08 2007 +0200 @@ -1,26 +1,24 @@ -/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000 +/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992 Free Software Foundation, Inc. - This file is part of XEmacs. +This file is part of XEmacs. - XEmacs 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, or (at your option) - any later version. +XEmacs 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, or (at your option) any +later version. - GNU Emacs 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. +XEmacs 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 GNU Emacs; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. +You should have received a copy of the GNU General Public License +along with XEmacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ - In other words, you are welcome to use, share and improve this - program. You are forbidden to forbid anyone else to use, share and - improve what you give them. Help stamp out software-hoarding! */ +/* Synched up with: FSF 19.31. */ /* @@ -33,114 +31,519 @@ * Modified heavily since then. * * Synopsis: - * void - * unexec (char *new_name, - * char *old_name, - * uintptr_t data_start, - * uintptr_t bss_start, - * uintptr_t entry_address) + * unexec (new_name, a_name, data_start, bss_start, entry_address) + * char *new_name, *a_name; + * unsigned data_start, bss_start, entry_address; + * + * Takes a snapshot of the program and makes an a.out format file in the + * file named by the string argument new_name. + * If a_name is non-NULL, the symbol table will be taken from the given file. + * On some machines, an existing a_name file is required. + * + * The boundaries within the a.out file may be adjusted with the data_start + * and bss_start arguments. Either or both may be given as 0 for defaults. + * + * Data_start gives the boundary between the text segment and the data + * segment of the program. The text segment can contain shared, read-only + * program code and literal data, while the data segment is always unshared + * and unprotected. Data_start gives the lowest unprotected address. + * The value you specify may be rounded down to a suitable boundary + * as required by the machine you are using. + * + * Specifying zero for data_start means the boundary between text and data + * should not be the same as when the program was loaded. + * If NO_REMAP is defined, the argument data_start is ignored and the + * segment boundaries are never changed. * - * The basic idea is that we start with an ELF file which contains - * .bss (uninitialized global data) section which is normally not in - * the file. As we load lisp the variables, which were first set to 0, - * will change their values. We want to save those changed values into - * another ELF file, which will become a new xemacs image. To do this, - * we need to change several structures in the ELF file. + * Bss_start indicates how much of the data segment is to be saved in the + * a.out file and restored when the program is executed. It gives the lowest + * unsaved address, and is rounded up to a page boundary. The default when 0 + * is given assumes that the entire data segment is to be stored, including + * the previous data and bss as well as any additional storage allocated with + * break (2). + * + * The new file is set up to start at entry_address. + * + * If you make improvements I'd like to get them too. + * harpo!utah-cs!thomas, thomas@Utah-20 + * + */ + +/* Even more heavily modified by james@bigtex.cactus.org of Dell Computer Co. + * ELF support added. + * + * Basic theory: the data space of the running process needs to be + * dumped to the output file. Normally we would just enlarge the size + * of .data, scooting everything down. But we can't do that in ELF, + * because there is often something between the .data space and the + * .bss space. + * + * In the temacs dump below, notice that the Global Offset Table + * (.got) and the Dynamic link data (.dynamic) come between .data1 and + * .bss. It does not work to overlap .data with these fields. * - * First of all, we need to change the programm header which tells - * the linker how to load stuff into memory so that data will come - * from the file and not from the /dev/zero. To do this, we find the - * segment, which is marked as loadable (type PT_LOAD) and which - * covers the old .bss section. We will next change the filesz and - * memsz for that segment to extend over the new data section. + * The solution is to create a new .data segment. This segment is + * filled with data from the current process. Since the contents of + * various sections refer to sections by index, the new .data segment + * is made the last in the table to avoid changing any existing index. + + * This is an example of how the section headers are changed. "Addr" + * is a process virtual address. "Offset" is a file offset. + +raid:/nfs/raid/src/dist-18.56/src> dump -h temacs + +temacs: + + **** SECTION HEADER TABLE **** +[No] Type Flags Addr Offset Size Name + Link Info Adralgn Entsize + +[1] 1 2 0x80480d4 0xd4 0x13 .interp + 0 0 0x1 0 + +[2] 5 2 0x80480e8 0xe8 0x388 .hash + 3 0 0x4 0x4 + +[3] 11 2 0x8048470 0x470 0x7f0 .dynsym + 4 1 0x4 0x10 + +[4] 3 2 0x8048c60 0xc60 0x3ad .dynstr + 0 0 0x1 0 + +[5] 9 2 0x8049010 0x1010 0x338 .rel.plt + 3 7 0x4 0x8 + +[6] 1 6 0x8049348 0x1348 0x3 .init + 0 0 0x4 0 + +[7] 1 6 0x804934c 0x134c 0x680 .plt + 0 0 0x4 0x4 + +[8] 1 6 0x80499cc 0x19cc 0x3c56f .text + 0 0 0x4 0 + +[9] 1 6 0x8085f3c 0x3df3c 0x3 .fini + 0 0 0x4 0 + +[10] 1 2 0x8085f40 0x3df40 0x69c .rodata + 0 0 0x4 0 + +[11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1 + 0 0 0x4 0 + +[12] 1 3 0x8088330 0x3f330 0x20afc .data + 0 0 0x4 0 + +[13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1 + 0 0 0x4 0 + +[14] 1 3 0x80a96cc 0x606cc 0x1a8 .got + 0 0 0x4 0x4 + +[15] 6 3 0x80a9874 0x60874 0x80 .dynamic + 4 0 0x4 0x8 + +[16] 8 3 0x80a98f4 0x608f4 0x449c .bss + 0 0 0x4 0 + +[17] 2 0 0 0x608f4 0x9b90 .symtab + 18 371 0x4 0x10 + +[18] 3 0 0 0x6a484 0x8526 .strtab + 0 0 0x1 0 + +[19] 3 0 0 0x729aa 0x93 .shstrtab + 0 0 0x1 0 + +[20] 1 0 0 0x72a3d 0x68b7 .comment + 0 0 0x1 0 + +raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs + +xemacs: + + **** SECTION HEADER TABLE **** +[No] Type Flags Addr Offset Size Name + Link Info Adralgn Entsize + +[1] 1 2 0x80480d4 0xd4 0x13 .interp + 0 0 0x1 0 + +[2] 5 2 0x80480e8 0xe8 0x388 .hash + 3 0 0x4 0x4 + +[3] 11 2 0x8048470 0x470 0x7f0 .dynsym + 4 1 0x4 0x10 + +[4] 3 2 0x8048c60 0xc60 0x3ad .dynstr + 0 0 0x1 0 + +[5] 9 2 0x8049010 0x1010 0x338 .rel.plt + 3 7 0x4 0x8 + +[6] 1 6 0x8049348 0x1348 0x3 .init + 0 0 0x4 0 + +[7] 1 6 0x804934c 0x134c 0x680 .plt + 0 0 0x4 0x4 + +[8] 1 6 0x80499cc 0x19cc 0x3c56f .text + 0 0 0x4 0 + +[9] 1 6 0x8085f3c 0x3df3c 0x3 .fini + 0 0 0x4 0 + +[10] 1 2 0x8085f40 0x3df40 0x69c .rodata + 0 0 0x4 0 + +[11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1 + 0 0 0x4 0 + +[12] 1 3 0x8088330 0x3f330 0x20afc .data + 0 0 0x4 0 + +[13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1 + 0 0 0x4 0 + +[14] 1 3 0x80a96cc 0x606cc 0x1a8 .got + 0 0 0x4 0x4 + +[15] 6 3 0x80a9874 0x60874 0x80 .dynamic + 4 0 0x4 0x8 + +[16] 8 3 0x80c6800 0x7d800 0 .bss + 0 0 0x4 0 + +[17] 2 0 0 0x7d800 0x9b90 .symtab + 18 371 0x4 0x10 + +[18] 3 0 0 0x87390 0x8526 .strtab + 0 0 0x1 0 + +[19] 3 0 0 0x8f8b6 0x93 .shstrtab + 0 0 0x1 0 + +[20] 1 0 0 0x8f949 0x68b7 .comment + 0 0 0x1 0 + +[21] 1 3 0x80a98f4 0x608f4 0x1cf0c .data + 0 0 0x4 0 + + * This is an example of how the file header is changed. "Shoff" is + * the section header offset within the file. Since that table is + * after the new .data section, it is moved. "Shnum" is the number of + * sections, which we increment. * - * Next we have to make sure that section header for the stuff which - * used to be uninitialized is changed to be initialized and to come - * from the file. To do this, we change the size and the type of the old - * .bss section (and all other section of the type SHT_NOBITS) to cover the - * new section and to be of type SHT_PROCBITS. - * - * We also insert a new SHT_NOBITS section to keep some tools, which expect - * .bss happy. - * - * Finally we need to patch up some references to the section - * indexes since we change the order and undo the relocation info to - * be the same as it was "before" because we actually used the data - * from the memory which were changed by the run-time linker. + * "Phoff" is the file offset to the program header. "Phentsize" and + * "Shentsz" are the program and section header entries sizes respectively. + * These can be larger than the apparent struct sizes. + +raid:/nfs/raid/src/dist-18.56/src> dump -f temacs + +temacs: + + **** ELF HEADER **** +Class Data Type Machine Version +Entry Phoff Shoff Flags Ehsize +Phentsize Phnum Shentsz Shnum Shstrndx + +1 1 2 3 1 +0x80499cc 0x34 0x792f4 0 0x34 +0x20 5 0x28 21 19 + +raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs + +xemacs: + + **** ELF HEADER **** +Class Data Type Machine Version +Entry Phoff Shoff Flags Ehsize +Phentsize Phnum Shentsz Shnum Shstrndx + +1 1 2 3 1 +0x80499cc 0x34 0x96200 0 0x34 +0x20 5 0x28 22 19 + + * These are the program headers. "Offset" is the file offset to the + * segment. "Vaddr" is the memory load address. "Filesz" is the + * segment size as it appears in the file, and "Memsz" is the size in + * memory. Below, the third segment is the code and the fourth is the + * data: the difference between Filesz and Memsz is .bss + +raid:/nfs/raid/src/dist-18.56/src> dump -o temacs + +temacs: + ***** PROGRAM EXECUTION HEADER ***** +Type Offset Vaddr Paddr +Filesz Memsz Flags Align + +6 0x34 0x8048034 0 +0xa0 0xa0 5 0 + +3 0xd4 0 0 +0x13 0 4 0 + +1 0x34 0x8048034 0 +0x3f2f9 0x3f2f9 5 0x1000 + +1 0x3f330 0x8088330 0 +0x215c4 0x25a60 7 0x1000 + +2 0x60874 0x80a9874 0 +0x80 0 7 0 + +raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs + +xemacs: + ***** PROGRAM EXECUTION HEADER ***** +Type Offset Vaddr Paddr +Filesz Memsz Flags Align + +6 0x34 0x8048034 0 +0xa0 0xa0 5 0 + +3 0xd4 0 0 +0x13 0 4 0 + +1 0x34 0x8048034 0 +0x3f2f9 0x3f2f9 5 0x1000 + +1 0x3f330 0x8088330 0 +0x3e4d0 0x3e4d0 7 0x1000 + +2 0x60874 0x80a9874 0 +0x80 0 7 0 + + */ -#ifndef emacs -#define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1) -#include <string.h> -#else -#include <config.h> -extern void fatal (const char *, ...); -#endif +/* Modified by wtien@urbana.mcd.mot.com of Motorola Inc. + * + * The above mechanism does not work if the unexeced ELF file is being + * re-layout by other applications (such as `strip'). All the applications + * that re-layout the internal of ELF will layout all sections in ascending + * order of their file offsets. After the re-layout, the data2 section will + * still be the LAST section in the section header vector, but its file offset + * is now being pushed far away down, and causes part of it not to be mapped + * in (ie. not covered by the load segment entry in PHDR vector), therefore + * causes the new binary to fail. + * + * The solution is to modify the unexec algorithm to insert the new data2 + * section header right before the new bss section header, so their file + * offsets will be in the ascending order. Since some of the section's (all + * sections AFTER the bss section) indexes are now changed, we also need to + * modify some fields to make them point to the right sections. This is done + * by macro PATCH_INDEX. All the fields that need to be patched are: + * + * 1. ELF header e_shstrndx field. + * 2. section header sh_link and sh_info field. + * 3. symbol table entry st_shndx field. + * + * The above example now should look like: + + **** SECTION HEADER TABLE **** +[No] Type Flags Addr Offset Size Name + Link Info Adralgn Entsize + +[1] 1 2 0x80480d4 0xd4 0x13 .interp + 0 0 0x1 0 + +[2] 5 2 0x80480e8 0xe8 0x388 .hash + 3 0 0x4 0x4 + +[3] 11 2 0x8048470 0x470 0x7f0 .dynsym + 4 1 0x4 0x10 + +[4] 3 2 0x8048c60 0xc60 0x3ad .dynstr + 0 0 0x1 0 + +[5] 9 2 0x8049010 0x1010 0x338 .rel.plt + 3 7 0x4 0x8 + +[6] 1 6 0x8049348 0x1348 0x3 .init + 0 0 0x4 0 + +[7] 1 6 0x804934c 0x134c 0x680 .plt + 0 0 0x4 0x4 + +[8] 1 6 0x80499cc 0x19cc 0x3c56f .text + 0 0 0x4 0 + +[9] 1 6 0x8085f3c 0x3df3c 0x3 .fini + 0 0 0x4 0 + +[10] 1 2 0x8085f40 0x3df40 0x69c .rodata + 0 0 0x4 0 + +[11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1 + 0 0 0x4 0 + +[12] 1 3 0x8088330 0x3f330 0x20afc .data + 0 0 0x4 0 + +[13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1 + 0 0 0x4 0 + +[14] 1 3 0x80a96cc 0x606cc 0x1a8 .got + 0 0 0x4 0x4 + +[15] 6 3 0x80a9874 0x60874 0x80 .dynamic + 4 0 0x4 0x8 + +[16] 1 3 0x80a98f4 0x608f4 0x1cf0c .data + 0 0 0x4 0 + +[17] 8 3 0x80c6800 0x7d800 0 .bss + 0 0 0x4 0 + +[18] 2 0 0 0x7d800 0x9b90 .symtab + 19 371 0x4 0x10 + +[19] 3 0 0 0x87390 0x8526 .strtab + 0 0 0x1 0 +[20] 3 0 0 0x8f8b6 0x93 .shstrtab + 0 0 0x1 0 + +[21] 1 0 0 0x8f949 0x68b7 .comment + 0 0 0x1 0 + + */ + + /* More mods, by Jack Repenning <jackr@sgi.com>, Fri Aug 11 15:45:52 1995 + + Same algorithm as immediately above. However, the detailed + calculations of the various locations needed significant + overhaul. + + At the point of the old .bss, the file offsets and the memory + addresses do distinct, slightly snaky things: + + offset of .bss is meaningless and unpredictable + addr of .bss is meaningful + alignment of .bss is important to addr, so there may be a small + gap in address range before start of bss + offset of next section is rounded up modulo 0x1000 + the hole so-introduced is zero-filled, so it can be mapped in as + the first partial-page of bss (the rest of the bss is mapped from + /dev/zero) + I suppose you could view this not as a hole, but as the beginning + of the bss, actually present in the file. But you should not + push that worldview too far, as the linker still knows that the + "offset" claimed for the bss is unused, and seems not always + careful about setting it. + + We are doing all our tricks at this same rather complicated + location (isn't life fun?): + + insert a new data section to contain now-initialized old bss and + heap + define a zero-length bss just so there is one + + The offset of the new data section is dictated by its current + address (which, of course, we want also to be its addr): the + loader maps in the whole file region containing old data, rodata, + got, and new data as a single mapped segment, starting at the + address of the first chunk; the rest have to be laid out in the + file such that the map into the right spots. That is: + + offset(newdata) == + addrInRunningMemory(newdata)-aIRM(olddata) + + offset(oldData) + + This would not necessarily match the oldbss offset, even if it + were carefully calculated! We must compute this. + + The linker that built temacs has also already arranged that + olddata is properly page-aligned (not necessarily beginning on a + page, but rather that a page's worth of the low bits of addr and + offset match). We preserve this. + + addr(bss) is alignment-constrained from the end of the new data. + Since we base endof(newdata) on sbrk(), we have a page boundary + (in both offset and addr) and meet any alignment constraint, + needing no alignment adjustment of this location and no + mini-hole. Or, if you like, we've allowed sbrk() to "compute" + the mini-hole size for us. + + That puts newbss beginning on a page boundary, both in offset and + addr. (offset(bss) is still meaningless, but what the heck, + we'll fix it up.) + + Since newbss has zero length, and its offset (however + meaningless) is page aligned, we place the next section exactly + there, with no hole needed to restore page alignment. + + So, the shift for all sections beyond the playing field is: + + new_bss_addr - roundup(old_bss_addr,0x1000) + + */ + /* Still more mods... Olivier Galibert 19971705 + - support for .sbss section (automagically changed to data without + name change) + - support for 64bits ABI (will need a bunch of fixes in the rest + of the code before it works + */ + #include <sys/types.h> #include <stdio.h> #include <sys/stat.h> #include <memory.h> +#include <string.h> #include <errno.h> #include <unistd.h> #include <fcntl.h> #include <elf.h> +#include <sym.h> /* for HDRR declaration */ #include <sys/mman.h> -#if defined (__sony_news) && defined (_SYSTYPE_SYSV) -#include <sys/elf_mips.h> -#include <sym.h> -#endif /* __sony_news && _SYSTYPE_SYSV */ -#if __sgi -#include <syms.h> /* for HDRR declaration */ -#endif /* __sgi */ +#include <config.h> +#include "lisp.h" -#if __GNU_LIBRARY__ - 0 >= 6 -# include <link.h> /* get ElfW etc */ +/* in 64bits mode, use 64bits elf */ +#ifdef _ABI64 +typedef Elf64_Shdr l_Elf_Shdr; +typedef Elf64_Phdr l_Elf_Phdr; +typedef Elf64_Ehdr l_Elf_Ehdr; +typedef Elf64_Addr l_Elf_Addr; +typedef Elf64_Word l_Elf_Word; +typedef Elf64_Off l_Elf_Off; +typedef Elf64_Sym l_Elf_Sym; +#else +typedef Elf32_Shdr l_Elf_Shdr; +typedef Elf32_Phdr l_Elf_Phdr; +typedef Elf32_Ehdr l_Elf_Ehdr; +typedef Elf32_Addr l_Elf_Addr; +typedef Elf32_Word l_Elf_Word; +typedef Elf32_Off l_Elf_Off; +typedef Elf32_Sym l_Elf_Sym; #endif -#ifndef ElfW -# ifdef __STDC__ -# define ElfBitsW(bits, type) Elf##bits##_##type -# else -# define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type -# endif -# ifdef _LP64 -# define ELFSIZE 64 -# else -# define ELFSIZE 32 -# endif - /* This macro expands `bits' before invoking ElfBitsW. */ -# define ElfExpandBitsW(bits, type) ElfBitsW (bits, type) -# define ElfW(type) ElfExpandBitsW (ELFSIZE, type) -#endif - -#ifndef ELF_BSS_SECTION_NAME -#define ELF_BSS_SECTION_NAME ".bss" -#endif /* Get the address of a particular section or program header entry, - * accounting for the size of the entries. */ + * accounting for the size of the entries. + */ #define OLD_SECTION_H(n) \ - (*(ElfW(Shdr) *) ((byte *) old_section_h + old_file_h->e_shentsize * (n))) + (*(l_Elf_Shdr *) ((byte *) old_section_h + old_file_h->e_shentsize * (n))) #define NEW_SECTION_H(n) \ - (*(ElfW(Shdr) *) ((byte *) new_section_h + new_file_h->e_shentsize * (n))) + (*(l_Elf_Shdr *) ((byte *) new_section_h + new_file_h->e_shentsize * (n))) #define OLD_PROGRAM_H(n) \ - (*(ElfW(Phdr) *) ((byte *) old_program_h + old_file_h->e_phentsize * (n))) + (*(l_Elf_Phdr *) ((byte *) old_program_h + old_file_h->e_phentsize * (n))) #define NEW_PROGRAM_H(n) \ - (*(ElfW(Phdr) *) ((byte *) new_program_h + new_file_h->e_phentsize * (n))) + (*(l_Elf_Phdr *) ((byte *) new_program_h + new_file_h->e_phentsize * (n))) #define PATCH_INDEX(n) \ do { \ - if ((int) (n) >= growme_index) \ + if ((n) >= old_bss_index) \ (n)++; } while (0) - typedef unsigned char byte; /* Round X up to a multiple of Y. */ -static ElfW(Addr) -round_up (ElfW(Addr) x, ElfW(Addr) y) +int +round_up (x, y) + int x, y; { int rem = x % y; if (rem == 0) @@ -156,12 +559,13 @@ if NOERROR is 0; we return -1 if NOERROR is nonzero. */ static int -find_section (char *name, - const char *section_names, - char *file_name, - ElfW(Ehdr) *old_file_h, - ElfW(Shdr) *old_section_h, - int noerror) +find_section (name, section_names, file_name, old_file_h, old_section_h, noerror) + char *name; + char *section_names; + char *file_name; + l_Elf_Ehdr *old_file_h; + l_Elf_Shdr *old_section_h; + int noerror; { int idx; @@ -173,14 +577,17 @@ #endif if (!strcmp (section_names + OLD_SECTION_H (idx).sh_name, name)) - return idx; + break; + } + if (idx == old_file_h->e_shnum) + { + if (noerror) + return -1; + else + fatal ("Can't find .bss in %s.\n", file_name); } - /* If we're here, we found nothing or return did not work */ - if ( ! noerror) - fatal ("Can't find %s in %s.\n", name, file_name); - - return -1; + return idx; } /* **************************************************************** @@ -192,105 +599,152 @@ * .data section, and inserting an empty .bss immediately afterwards. * */ -void -unexec (char *new_name, - char *old_name, - uintptr_t data_start, - uintptr_t bss_start, - uintptr_t entry_address) +int +unexec (new_name, old_name, data_start, bss_start, entry_address) + char *new_name, *old_name; + uintptr_t data_start, bss_start, entry_address; { - int old_file; + extern uintptr_t bss_end; + int new_file, old_file, new_file_size; - struct stat stat_buf; + /* Pointers to the base of the image of the two files. */ caddr_t old_base, new_base; - ElfW(Ehdr) *old_file_h, * new_file_h; - ElfW(Phdr) *old_program_h, * new_program_h; - ElfW(Shdr) *old_section_h, * new_section_h; - ElfW(Shdr) * growme = NULL, * grown = NULL; - ElfW(Addr) old_bss_addr = 0, new_data2_addr = 0; + /* Pointers to the file, program and section headers for the old and new + files. */ + l_Elf_Ehdr *old_file_h, *new_file_h; + l_Elf_Phdr *old_program_h, *new_program_h; + l_Elf_Shdr *old_section_h, *new_section_h; + + /* Point to the section name table in the old file. */ + char *old_section_names; - int growme_index = -1; - int n, nn; - const char *old_section_names; - int old_mdebug_index, old_data_index; - int new_bss_addr, new_data2_size, new_data2_offset, new_file, new_file_size; + l_Elf_Addr old_bss_addr, new_bss_addr; + l_Elf_Addr old_base_addr; + l_Elf_Word old_bss_size, new_data2_size; + l_Elf_Off new_data2_offset, new_base_offset; + l_Elf_Addr new_data2_addr; + l_Elf_Addr new_offsets_shift; - /* Open the old file */ - if ( (old_file = open (old_name, O_RDONLY)) < 0 ) - fatal ("Can't open %s for reading: errno %d\n", old_name, errno); + int n, nn, old_bss_index, old_data_index; + int old_mdebug_index, old_sbss_index; + struct stat stat_buf; + + /* Open the old file & map it into the address space. */ + + old_file = open (old_name, O_RDONLY); + + if (old_file < 0) + fatal ("Can't open %s for reading: errno %d\n", old_name, errno); if (fstat (old_file, &stat_buf) == -1) - fatal ("Can't fstat (%s): errno %d\n", old_name, errno); + fatal ("Can't fstat(%s): errno %d\n", old_name, errno); + + old_base = mmap (0, stat_buf.st_size, PROT_READ, MAP_SHARED, old_file, 0); + + if (old_base == (caddr_t) -1) + fatal ("Can't mmap(%s): errno %d\n", old_name, errno); - /* map old file into the address space. */ - old_base = (caddr_t) mmap ((caddr_t) 0, stat_buf.st_size, - PROT_READ, MAP_SHARED, old_file, 0); - if (old_base == (caddr_t) MAP_FAILED) - fatal ("Can't mmap (%s): errno %d\n", old_name, errno); +#ifdef DEBUG + fprintf (stderr, "mmap(%s, %x) -> %x\n", old_name, stat_buf.st_size, + old_base); +#endif - old_file_h = (ElfW(Ehdr) *) old_base; - old_program_h = (ElfW(Phdr) *) ((byte *) old_base + old_file_h->e_phoff); - old_section_h = (ElfW(Shdr) *) ((byte *) old_base + old_file_h->e_shoff); - old_section_names = (const char *) old_base - + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset; + /* Get pointers to headers & section names. */ + + old_file_h = (l_Elf_Ehdr *) old_base; + old_program_h = (l_Elf_Phdr *) ((byte *) old_base + old_file_h->e_phoff); + old_section_h = (l_Elf_Shdr *) ((byte *) old_base + old_file_h->e_shoff); + old_section_names + = (char *) old_base + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset; - /* Find a section which we will grow by looking for the SHT_NOBITS - * section with ALLOCATE flag and with the biggest address. */ - for (n = 1; n < old_file_h->e_shnum; n++) { - ElfW(Shdr) * sh = & OLD_SECTION_H(n); + /* Find the mdebug section, if any. */ + + old_mdebug_index = find_section (".mdebug", old_section_names, + old_name, old_file_h, old_section_h, 1); + + /* Find the .sbss section, if any. */ + + old_sbss_index = find_section (".sbss", old_section_names, + old_name, old_file_h, old_section_h, 1); - if ((sh->sh_type == SHT_NOBITS) && (sh->sh_flags & SHF_ALLOC)) { - if ( old_bss_addr < sh->sh_addr ) { - growme = sh; - growme_index = n; - new_data2_addr = old_bss_addr = sh->sh_addr; - } - } - } + if (old_sbss_index != -1 && (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)) + old_sbss_index = -1; + + /* Find the old .bss section. */ - if (growme == NULL ) - fatal ("Can't find a section to grow\n", 0, 0); + old_bss_index = find_section (".bss", old_section_names, + old_name, old_file_h, old_section_h, 0); + + /* Find the old .data section. Figure out parameters of + the new data2 and bss sections. */ old_data_index = find_section (".data", old_section_names, old_name, old_file_h, old_section_h, 0); - new_bss_addr = (ElfW(Addr)) sbrk (0); - new_data2_size = new_bss_addr - old_bss_addr; + old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr; + old_bss_size = OLD_SECTION_H (old_bss_index).sh_size; + old_base_addr = old_sbss_index == -1 ? old_bss_addr : OLD_SECTION_H (old_sbss_index).sh_addr; +#if defined(emacs) || !defined(DEBUG) + bss_end = (uintptr_t) sbrk (0); + new_bss_addr = (l_Elf_Addr) bss_end; +#else + new_bss_addr = old_bss_addr + old_bss_size + 0x1234; +#endif + new_data2_addr = old_bss_addr; + new_data2_size = new_bss_addr - old_bss_addr; new_data2_offset = OLD_SECTION_H (old_data_index).sh_offset + - (new_data2_addr - OLD_SECTION_H (old_data_index).sh_addr); + (new_data2_addr - OLD_SECTION_H (old_data_index).sh_addr); + new_base_offset = OLD_SECTION_H (old_data_index).sh_offset + + (old_base_addr - OLD_SECTION_H (old_data_index).sh_addr); + new_offsets_shift = new_bss_addr - + ((old_base_addr & ~0xfff) + ((old_base_addr & 0xfff) ? 0x1000 : 0)); - if ( new_bss_addr < old_bss_addr + growme->sh_size ) - fatal (".bss shrank when undumping???\n", 0, 0); +#ifdef DEBUG + fprintf (stderr, "old_bss_index %d\n", old_bss_index); + fprintf (stderr, "old_bss_addr %x\n", old_bss_addr); + fprintf (stderr, "old_bss_size %x\n", old_bss_size); + fprintf (stderr, "old_base_addr %x\n", old_base_addr); + fprintf (stderr, "new_bss_addr %x\n", new_bss_addr); + fprintf (stderr, "new_data2_addr %x\n", new_data2_addr); + fprintf (stderr, "new_data2_size %x\n", new_data2_size); + fprintf (stderr, "new_data2_offset %x\n", new_data2_offset); + fprintf (stderr, "new_offsets_shift %x\n", new_offsets_shift); +#endif - /* Set the output file to the right size and mmap it. */ - if ( (new_file = open (new_name, O_RDWR | O_CREAT, 0666)) < 0 ) - fatal ("Can't create (%s): errno %d\n", new_name, errno); + if ((unsigned) new_bss_addr < (unsigned) old_bss_addr + old_bss_size) + fatal (".bss shrank when undumping???\n"); + + /* Set the output file to the right size and mmap it. Set + pointers to various interesting objects. stat_buf still has + old_file data. */ - new_file_size = stat_buf.st_size + old_file_h->e_shentsize + new_data2_size; + new_file = open (new_name, O_RDWR | O_CREAT, 0666); + if (new_file < 0) + fatal ("Can't creat (%s): errno %d\n", new_name, errno); + + new_file_size = stat_buf.st_size /* old file size */ + + old_file_h->e_shentsize /* one new section header */ + + new_offsets_shift; /* trailing section shift */ if (ftruncate (new_file, new_file_size)) - fatal ("Can't ftruncate (%s): errno %d\n", new_name, errno); + fatal ("Can't ftruncate (%s): errno %d\n", new_name, errno); - new_base = (caddr_t) mmap ((caddr_t) 0, new_file_size, - PROT_READ | PROT_WRITE, -#ifdef UNEXEC_USE_MAP_PRIVATE - MAP_PRIVATE, -#else - MAP_SHARED, -#endif - new_file, 0); + new_base = mmap (0, new_file_size, PROT_READ | PROT_WRITE, MAP_SHARED, + new_file, 0); if (new_base == (caddr_t) -1) - fatal ("Can't mmap (%s): errno %d\n", new_name, errno); + fatal ("Can't mmap (%s): errno %d\n", new_name, errno); - new_file_h = (ElfW(Ehdr) *) new_base; - new_program_h = (ElfW(Phdr) *) ((byte *) new_base + old_file_h->e_phoff); - new_section_h = (ElfW(Shdr) *) ((byte *) new_base + old_file_h->e_shoff + - new_data2_size); + new_file_h = (l_Elf_Ehdr *) new_base; + new_program_h = (l_Elf_Phdr *) ((byte *) new_base + old_file_h->e_phoff); + new_section_h + = (l_Elf_Shdr *) ((byte *) new_base + old_file_h->e_shoff + + new_offsets_shift); /* Make our new file, program and section headers as copies of the - * originals. */ + originals. */ + memcpy (new_file_h, old_file_h, old_file_h->e_ehsize); memcpy (new_program_h, old_program_h, old_file_h->e_phnum * old_file_h->e_phentsize); @@ -299,183 +753,192 @@ PATCH_INDEX (new_file_h->e_shstrndx); /* Fix up file header. We'll add one section. Section header is - * further away now. */ - new_file_h->e_shoff += new_data2_size; + further away now. */ + + new_file_h->e_shoff += new_offsets_shift; new_file_h->e_shnum += 1; - /* Fix up a new program header by extending the writable data - * segment so that the bss area is covered too. Find that segment by - * looking for one that starts before and ends after the .bss and is - * PT_LOADable. */ - for (n = new_file_h->e_phnum - 1; n >= 0; n--) { - ElfW(Phdr) * ph = & NEW_PROGRAM_H(n); + #ifdef DEBUG - printf ("%d @ %0x + %0x against %0x + %0x", - n, ph->p_vaddr, ph->p_memsz,growme->sh_addr, growme->sh_size); + fprintf (stderr, "Old section offset %x\n", old_file_h->e_shoff); + fprintf (stderr, "Old section count %d\n", old_file_h->e_shnum); + fprintf (stderr, "New section offset %x\n", new_file_h->e_shoff); + fprintf (stderr, "New section count %d\n", new_file_h->e_shnum); #endif - if ((ph->p_type == PT_LOAD) && - (ph->p_vaddr <= growme->sh_addr) && - ((ph->p_vaddr+ph->p_memsz) >= (growme->sh_addr + growme->sh_size))) { - /* Make sure that the size includes any padding before the - * old .bss section. */ - ph->p_memsz = ph->p_filesz = new_bss_addr - ph->p_vaddr; -#ifdef DEBUG - puts (" That's the one!"); + + /* Fix up a new program header. Extend the writable data segment so + that the bss area is covered too. Find that segment by looking + for a segment that ends just before the .bss area. Make sure + that no segments are above the new .data2. Put a loop at the end + to adjust the offset and address of any segment that is above + data2, just in case we decide to allow this later. */ + + for (n = new_file_h->e_phnum - 1; n >= 0; n--) + { + /* Compute maximum of all requirements for alignment of section. */ + int alignment = (NEW_PROGRAM_H (n)).p_align; + if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment) + alignment = OLD_SECTION_H (old_bss_index).sh_addralign; + + /* Supposedly this condition is okay for the SGI. */ +#if 0 + if (NEW_PROGRAM_H (n).p_vaddr + NEW_PROGRAM_H (n).p_filesz > old_base_addr) + fatal ("Program segment above .bss in %s\n", old_name); #endif - break; - } -#ifdef DEBUG - putchar ('\n'); -#endif - } + if (NEW_PROGRAM_H (n).p_type == PT_LOAD + && (round_up ((NEW_PROGRAM_H (n)).p_vaddr + + (NEW_PROGRAM_H (n)).p_filesz, + alignment) + == round_up (old_base_addr, alignment))) + break; + } if (n < 0) - fatal ("Couldn't find segment which covers %s", - old_section_names + growme->sh_name); + fatal ("Couldn't find segment next to %s in %s\n", + old_sbss_index == -1 ? ".sbss" : ".bss", old_name); + + NEW_PROGRAM_H (n).p_filesz += new_offsets_shift; + NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz; + +#if 1 /* Maybe allow section after data2 - does this ever happen? */ + for (n = new_file_h->e_phnum - 1; n >= 0; n--) + { + if (NEW_PROGRAM_H (n).p_vaddr + && NEW_PROGRAM_H (n).p_vaddr >= new_data2_addr) + NEW_PROGRAM_H (n).p_vaddr += new_offsets_shift - old_bss_size; - /* Walk through all section headers, insert the new data2 section - * right before the new bss section. */ - for (n = 1, nn = 1; n < (int) old_file_h->e_shnum; n++, nn++) { - ElfW(Shdr) * nsec = & NEW_SECTION_H(nn); - ElfW(Shdr) * osec = & OLD_SECTION_H(n); + if (NEW_PROGRAM_H (n).p_offset >= new_data2_offset) + NEW_PROGRAM_H (n).p_offset += new_offsets_shift; + } +#endif + + /* Fix up section headers based on new .data2 section. Any section + whose offset or virtual address is after the new .data2 section + gets its value adjusted. .bss size becomes zero and new address + is set. data2 section header gets added by copying the existing + .data header and modifying the offset, address and size. */ + for (old_data_index = 1; old_data_index < old_file_h->e_shnum; + old_data_index++) + if (!strcmp (old_section_names + OLD_SECTION_H (old_data_index).sh_name, + ".data")) + break; + if (old_data_index == old_file_h->e_shnum) + fatal ("Can't find .data in %s.\n", old_name); - /* If this is the section we want to grow, insert the new data - * section before it. */ - if ( osec == growme ) { - /* Steal the data section header for this data2 section but - * use the * 'grow' section's alignment. This * will assure - * that the new section * always be placed in the same spot - * * as the old section by any other * application. */ - ElfW(Shdr) * od = &OLD_SECTION_H(old_data_index); + /* Walk through all section headers, insert the new data2 section right + before the new bss section. */ + for (n = 1, nn = 1; n < old_file_h->e_shnum; n++, nn++) + { + caddr_t src; - memcpy (nsec, od, new_file_h->e_shentsize); + /* XEmacs change: */ + if (n < old_bss_index) + { + memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n), + old_file_h->e_shentsize); + + } + else if (n == old_bss_index) + { + + /* If it is bss section, insert the new data2 section before it. */ + /* Steal the data section header for this data2 section. */ + memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (old_data_index), + new_file_h->e_shentsize); + + NEW_SECTION_H (nn).sh_addr = new_data2_addr; + NEW_SECTION_H (nn).sh_offset = new_data2_offset; + NEW_SECTION_H (nn).sh_size = new_data2_size; + /* Use the bss section's alignment. This will assure that the + new data2 section always be placed in the same spot as the old + bss section by any other application. */ + NEW_SECTION_H (nn).sh_addralign = OLD_SECTION_H (n).sh_addralign; - nsec->sh_addr = new_data2_addr; - nsec->sh_offset = new_data2_offset; - nsec->sh_size = new_data2_size; - nsec->sh_addralign = osec->sh_addralign; - - /* Copy over what we have in memory now. */ - memcpy (nsec->sh_offset + new_base, (caddr_t) osec->sh_addr, + /* Now copy over what we have in the memory now. */ + memcpy (NEW_SECTION_H (nn).sh_offset + new_base, + (caddr_t) OLD_SECTION_H (n).sh_addr, new_data2_size); nn++; - grown = nsec++; - } - - memcpy (nsec, osec, old_file_h->e_shentsize); - - if ( osec == growme ) { - /* The new bss section's size is zero, and its file offset - * and virtual address should be off by NEW_DATA2_SIZE. */ - nsec->sh_offset = grown->sh_offset + new_data2_size; - nsec->sh_addr = grown->sh_addr + new_data2_size; - - /* Let the new bss section address alignment be the same as - * the section address alignment followed the old bss - * section, so this section will be placed in exactly the - * same place. */ - nsec->sh_addralign = osec->sh_addralign; - nsec->sh_size = 0; - } else { - /* Any section that was originally placed AFTER the bss - * section should now be off by NEW_DATA2_SIZE. */ - if ( round_up (nsec->sh_offset, growme->sh_addralign) >= - new_data2_offset) - nsec->sh_offset += new_data2_size; - } - - /* Any section that was originally placed after the section * - * header table should now be off by the size of one section - * header table entry. */ - if (nsec->sh_offset > new_file_h->e_shoff) - nsec->sh_offset += new_file_h->e_shentsize; - - - /* If any section hdr refers to the section after the new .data - * section, make it refer to next one because we have inserted a - * new section in between. */ - PATCH_INDEX (nsec->sh_link); - - /* For symbol tables, info is a symbol table index, so don't - * change it. */ - if (nsec->sh_type != SHT_SYMTAB && nsec->sh_type != SHT_DYNSYM) - PATCH_INDEX (nsec->sh_info); - - /* Any section which used to be NOBITS will now becomes PROGBITS - * if it's ALLOC-atable, unless, of cause, it's not the one we - * decided to grow */ - if ( (osec->sh_type == SHT_NOBITS) && (osec->sh_flags & SHF_ALLOC) && - (osec != growme ) ) { - nsec->sh_type = SHT_PROGBITS; - } - - /* Now, start to copy the content of sections */ - if ( nsec->sh_type != SHT_NULL || nsec->sh_type != SHT_NOBITS ) { + memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n), + old_file_h->e_shentsize); + + /* The new bss section's size is zero, and its file offset and virtual + address should be off by NEW_OFFSETS_SHIFT. */ + NEW_SECTION_H (nn).sh_offset += new_offsets_shift; + NEW_SECTION_H (nn).sh_addr = new_bss_addr; + /* Let the new bss section address alignment be the same as the + section address alignment followed the old bss section, so + this section will be placed in exactly the same place. */ + NEW_SECTION_H (nn).sh_addralign = OLD_SECTION_H (n).sh_addralign; + NEW_SECTION_H (nn).sh_size = 0; + } + else /* n > old_bss_index */ + memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n), + old_file_h->e_shentsize); + + /* Any section that was original placed AFTER the bss + section must now be adjusted by NEW_OFFSETS_SHIFT. */ - /* Write out the sections. .data and .data1 (and data2, - * called ".data" in the strings table) get copied from the - * current process instead of the old file. */ - caddr_t src = old_base + osec->sh_offset; - const char * secname = old_section_names + nsec->sh_name; - const char * names[] = { - ".data",".sdata", ".lit4", ".lit8", ".sdata1", ".data1", - ".sbss", NULL}; - int i; - - for ( i=0; names[i] != NULL; i++ ) { - if ( ! strcmp (secname, names[i]) ) { - src = (caddr_t) osec->sh_addr; - break; - } - } - - memcpy (nsec->sh_offset + new_base, src, nsec->sh_size); - } - - old_mdebug_index = find_section (".mdebug", old_section_names, - old_name, old_file_h, old_section_h, 1); + if (NEW_SECTION_H (nn).sh_offset >= new_base_offset) + NEW_SECTION_H (nn).sh_offset += new_offsets_shift; + + /* If any section hdr refers to the section after the new .data + section, make it refer to next one because we have inserted + a new section in between. */ + + PATCH_INDEX (NEW_SECTION_H (nn).sh_link); + /* For symbol tables, info is a symbol table index, + so don't change it. */ + if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB + && NEW_SECTION_H (nn).sh_type != SHT_DYNSYM) + PATCH_INDEX (NEW_SECTION_H (nn).sh_info); + + /* Fix the type and alignment for the .sbss section */ + if ((old_sbss_index != -1) && !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss")) + { + NEW_SECTION_H (nn).sh_type = SHT_PROGBITS; + NEW_SECTION_H (nn).sh_offset = round_up (NEW_SECTION_H (nn).sh_offset, + NEW_SECTION_H (nn).sh_addralign); + } -#if defined (__sony_news) && defined (_SYSTYPE_SYSV) - if (nsec->sh_type == SHT_MIPS_DEBUG && old_mdebug_index != -1) { - int diff = nsec->sh_offset-OLD_SECTION_H(old_mdebug_index).sh_offset; - HDRR *phdr = (HDRR *)(nsec->sh_offset + new_base); + /* Now, start to copy the content of sections. */ + if (NEW_SECTION_H (nn).sh_type == SHT_NULL + || NEW_SECTION_H (nn).sh_type == SHT_NOBITS) + continue; + + /* Write out the sections. .data, .data1 and .sbss (and data2, called + ".data" in the strings table) get copied from the current process + instead of the old file. */ + if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data") + || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data1") + || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".got") + || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss")) + src = (caddr_t) OLD_SECTION_H (n).sh_addr; + else + src = old_base + OLD_SECTION_H (n).sh_offset; + + memcpy (NEW_SECTION_H (nn).sh_offset + new_base, src, + NEW_SECTION_H (nn).sh_size); - if (diff) { - phdr->cbLineOffset += diff; - phdr->cbDnOffset += diff; - phdr->cbPdOffset += diff; - phdr->cbSymOffset += diff; - phdr->cbOptOffset += diff; - phdr->cbAuxOffset += diff; - phdr->cbSsOffset += diff; - phdr->cbSsExtOffset += diff; - phdr->cbFdOffset += diff; - phdr->cbRfdOffset += diff; - phdr->cbExtOffset += diff; - } - } -#endif /* __sony_news && _SYSTYPE_SYSV */ - -#if __sgi - /* Adjust the HDRR offsets in .mdebug and copy the line data if - * it's in its usual 'hole' in the object. Makes the new file - * debuggable with dbx. patches up two problems: the absolute - * file offsets in the HDRR record of .mdebug (see - * /usr/include/syms.h), and the ld bug that gets the line table - * in a hole in the elf file rather than in the .mdebug section - * proper. - * - * David Anderson. davea@sgi.com Jan 16,1994 */ + /* Adjust the HDRR offsets in .mdebug and copy the + line data if it's in its usual 'hole' in the object. + Makes the new file debuggable with dbx. + patches up two problems: the absolute file offsets + in the HDRR record of .mdebug (see /usr/include/syms.h), and + the ld bug that gets the line table in a hole in the + elf file rather than in the .mdebug section proper. + David Anderson. davea@sgi.com Jan 16,1994. */ + if (n == old_mdebug_index) + { #define MDEBUGADJUST(__ct,__fileaddr) \ if (n_phdrr->__ct > 0) \ { \ n_phdrr->__fileaddr += movement; \ } - if (n == old_mdebug_index) { - HDRR * o_phdrr = (HDRR *)((byte *)old_base + osec->sh_offset); - HDRR * n_phdrr = (HDRR *)((byte *)new_base + nsec->sh_offset); - unsigned movement = new_data2_size; + HDRR * o_phdrr = (HDRR *)((byte *)old_base + OLD_SECTION_H (n).sh_offset); + HDRR * n_phdrr = (HDRR *)((byte *)new_base + NEW_SECTION_H (nn).sh_offset); + unsigned movement = new_offsets_shift; MDEBUGADJUST (idnMax, cbDnOffset); MDEBUGADJUST (ipdMax, cbPdOffset); @@ -487,112 +950,65 @@ MDEBUGADJUST (ifdMax, cbFdOffset); MDEBUGADJUST (crfd, cbRfdOffset); MDEBUGADJUST (iextMax, cbExtOffset); - - /* The Line Section, being possible off in a hole of the - * object, requires special handling. */ - if (n_phdrr->cbLine > 0) { - if (o_phdrr->cbLineOffset > - osec->sh_offset+ osec->sh_size){ - /* line data is in a hole in elf. do special copy - * and adjust for this ld mistake. */ + /* The Line Section, being possible off in a hole of the object, + requires special handling. */ + if (n_phdrr->cbLine > 0) + { + if (o_phdrr->cbLineOffset > (OLD_SECTION_H (n).sh_offset + + OLD_SECTION_H (n).sh_size)) + { + /* line data is in a hole in elf. do special copy and adjust + for this ld mistake. + */ n_phdrr->cbLineOffset += movement; memcpy (n_phdrr->cbLineOffset + new_base, o_phdrr->cbLineOffset + old_base, n_phdrr->cbLine); - } else { - /* somehow line data is in .mdebug as it is supposed - * to be. */ + } + else + { + /* somehow line data is in .mdebug as it is supposed to be. */ MDEBUGADJUST (cbLine, cbLineOffset); - } - } - } -#endif /* __sgi */ - /* If it is the symbol table, its st_shndx field needs to be - * patched. */ - if (nsec->sh_type == SHT_SYMTAB || nsec->sh_type == SHT_DYNSYM) { - unsigned int num = nsec->sh_size / nsec->sh_entsize; - ElfW(Sym) * sym = (ElfW(Sym) *)(nsec->sh_offset + new_base); - byte *symnames = ((byte *) new_base + - NEW_SECTION_H (nsec->sh_link).sh_offset); - - for (; num--; sym++) { - const char * symnam = (char *) (symnames + sym->st_name); - - /* Update the symbol values of _edata and _end. */ - if (strcmp (symnam, "_end") == 0 - || strcmp (symnam, "end") == 0 - || strcmp (symnam, "_edata") == 0 - || strcmp (symnam, "edata") == 0) - memcpy (&sym->st_value, &new_bss_addr,sizeof (new_bss_addr)); - - - if ((sym->st_shndx == SHN_UNDEF) || (sym->st_shndx == SHN_ABS) - || (sym->st_shndx == SHN_COMMON) - || (sym->st_shndx >= SHN_LOPROC && - sym->st_shndx <= SHN_HIPROC)) - continue; - - PATCH_INDEX (sym->st_shndx); - } - } - } + } + } + } - /* This loop seeks out relocation sections for the data section, so - * that it can undo relocations performed by the runtime linker. */ - for (n = new_file_h->e_shnum - 1; n; n--) { - ElfW(Shdr) section = NEW_SECTION_H (n); - - if ( section.sh_type == SHT_REL || section.sh_type == SHT_RELA ) { - /* This code handles two different size structs, but there - * should be no harm in that provided that r_offset is - * always the first member. */ - ElfW(Shdr) * info = & NEW_SECTION_H(section.sh_info); - const char * nm = old_section_names + info->sh_name; - - if (!strcmp (nm, ".data") || !strcmp (nm, ".sdata") - || !strcmp (nm, ".lit4") || !strcmp (nm, ".lit8") - || !strcmp (nm, ".sdata1") || !strcmp (nm, ".data1")) { - ElfW(Addr) offset = info->sh_addr - info->sh_offset; - caddr_t end, reloc = old_base + section.sh_offset; - - for (end = reloc + section.sh_size; reloc < end; - reloc += section.sh_entsize) { - ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset; -#ifdef __alpha__ - /* The Alpha ELF binutils currently have a bug that - * sometimes results in relocs that contain all - * zeroes. Work around this for now... */ - if (((ElfW(Rel) *) reloc)->r_offset == 0) - continue; -#endif - memcpy (new_base + addr, old_base + addr, - sizeof(ElfW(Addr))); - } - } - } - } - -#ifdef UNEXEC_USE_MAP_PRIVATE - if (lseek (new_file, 0, SEEK_SET) == -1) - fatal ("Can't rewind (%s): errno %d\n", new_name, errno); - - if (write (new_file, new_base, new_file_size) != new_file_size) - fatal ("Can't write (%s): errno %d\n", new_name, errno); -#endif + /* If it is the symbol table, its st_shndx field needs to be patched. */ + if (NEW_SECTION_H (nn).sh_type == SHT_SYMTAB + || NEW_SECTION_H (nn).sh_type == SHT_DYNSYM) + { + l_Elf_Shdr *spt = &NEW_SECTION_H (nn); + unsigned int num = spt->sh_size / spt->sh_entsize; + l_Elf_Sym * sym = (l_Elf_Sym *) (NEW_SECTION_H (nn).sh_offset + + new_base); + for (; num--; sym++) + { + if (sym->st_shndx == SHN_UNDEF + || sym->st_shndx == SHN_ABS + || sym->st_shndx == SHN_COMMON) + continue; + + PATCH_INDEX (sym->st_shndx); + } + } + } /* Close the files and make the new file executable. */ + if (close (old_file)) - fatal ("Can't close (%s): errno %d\n", old_name, errno); + fatal ("Can't close (%s): errno %d\n", old_name, errno); if (close (new_file)) - fatal ("Can't close (%s): errno %d\n", new_name, errno); + fatal ("Can't close (%s): errno %d\n", new_name, errno); if (stat (new_name, &stat_buf) == -1) - fatal ("Can't stat (%s): errno %d\n", new_name, errno); + fatal ("Can't stat (%s): errno %d\n", new_name, errno); n = umask (777); umask (n); stat_buf.st_mode |= 0111 & ~n; if (chmod (new_name, stat_buf.st_mode) == -1) - fatal ("Can't chmod (%s): errno %d\n", new_name, errno); + fatal ("Can't chmod (%s): errno %d\n", new_name, errno); + + return 0; }