Mercurial > hg > xemacs-beta
annotate src/unexalpha.c @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | 04bc9d2f42c7 |
children | facf3239ba30 |
rev | line source |
---|---|
428 | 1 /* Unexec for DEC alpha. schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf). |
2 | |
3 Copyright (C) 1994 Free Software Foundation, Inc. | |
4 | |
613 | 5 This file is part of XEmacs. |
428 | 6 |
613 | 7 XEmacs is free software; you can redistribute it and/or modify |
428 | 8 it under the terms of the GNU General Public License as published by |
9 the Free Software Foundation; either version 2, or (at your option) | |
10 any later version. | |
11 | |
613 | 12 XEmacs is distributed in the hope that it will be useful, |
428 | 13 but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
613 | 18 along with XEmacs; see the file COPYING. If not, write to |
428 | 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
20 Boston, MA 02111-1307, USA. */ | |
21 | |
22 /* Synched up with: FSF 19.31. */ | |
23 | |
24 | |
25 #include <config.h> | |
26 #include <stdlib.h> | |
27 #include <string.h> | |
28 #include <unistd.h> | |
29 #include <sys/types.h> | |
30 #include <sys/file.h> | |
31 #include <sys/stat.h> | |
32 #include <sys/mman.h> | |
33 #include <stdio.h> | |
438 | 34 #include <errno.h> |
428 | 35 #include <varargs.h> |
36 #include <filehdr.h> | |
37 #include <aouthdr.h> | |
38 #include <scnhdr.h> | |
39 #include <syms.h> | |
2286 | 40 #include "compiler.h" |
428 | 41 |
42 static void fatal_unexec (char *, char *); | |
43 static void mark_x (char *); | |
44 | |
45 #define READ(_fd, _buffer, _size, _error_message, _error_arg) \ | |
46 errno = EEOF; \ | |
47 if (read (_fd, _buffer, _size) != _size) \ | |
48 fatal_unexec (_error_message, _error_arg); | |
49 | |
50 #define WRITE(_fd, _buffer, _size, _error_message, _error_arg) \ | |
51 if (write (_fd, _buffer, _size) != _size) \ | |
52 fatal_unexec (_error_message, _error_arg); | |
53 | |
54 #define SEEK(_fd, _position, _error_message, _error_arg) \ | |
55 errno = EEOF; \ | |
56 if (lseek (_fd, _position, L_SET) != _position) \ | |
57 fatal_unexec (_error_message, _error_arg); | |
58 | |
59 #define EEOF -1 | |
60 | |
61 static struct scnhdr *text_section; | |
62 static struct scnhdr *init_section; | |
63 static struct scnhdr *finit_section; | |
64 static struct scnhdr *rdata_section; | |
65 static struct scnhdr *rconst_section; | |
66 static struct scnhdr *data_section; | |
67 static struct scnhdr *pdata_section; | |
68 static struct scnhdr *xdata_section; | |
69 static struct scnhdr *got_section; | |
70 static struct scnhdr *lit8_section; | |
71 static struct scnhdr *lit4_section; | |
72 static struct scnhdr *sdata_section; | |
73 static struct scnhdr *sbss_section; | |
74 static struct scnhdr *bss_section; | |
75 | |
76 static unsigned long Brk; | |
77 | |
78 struct headers { | |
79 struct filehdr fhdr; | |
80 struct aouthdr aout; | |
81 struct scnhdr section[_MIPS_NSCNS_MAX]; | |
82 }; | |
83 | |
84 | |
85 /* Define name of label for entry point for the dumped executable. */ | |
86 | |
87 #ifndef DEFAULT_ENTRY_ADDRESS | |
88 #define DEFAULT_ENTRY_ADDRESS __start | |
89 #endif | |
442 | 90 EXTERN_C int DEFAULT_ENTRY_ADDRESS (void); |
91 | |
428 | 92 |
93 int | |
94 unexec (char *new_name, char *a_name, | |
95 unsigned long data_start, | |
2286 | 96 unsigned long UNUSED (bss_start), |
428 | 97 unsigned long entry_address) |
98 { | |
99 int new, old; | |
100 char * oldptr; | |
101 struct headers ohdr, nhdr; | |
102 struct stat stat; | |
103 long pagesize, brk; | |
104 long newsyms, symrel; | |
105 int i; | |
106 long vaddr, scnptr; | |
107 #define BUFSIZE 8192 | |
108 char buffer[BUFSIZE]; | |
109 | |
110 if ((old = open (a_name, O_RDONLY)) < 0) | |
111 fatal_unexec ("opening %s", a_name); | |
112 | |
113 new = creat (new_name, 0666); | |
114 if (new < 0) fatal_unexec ("creating %s", new_name); | |
115 | |
116 if ((fstat (old, &stat) == -1)) | |
117 fatal_unexec ("fstat %s", a_name); | |
118 | |
119 oldptr = (char *)mmap (0, stat.st_size, PROT_READ, MAP_FILE|MAP_SHARED, old, 0); | |
120 | |
121 if (oldptr == (char *)-1) | |
122 fatal_unexec ("mmap %s", a_name); | |
123 | |
124 close (old); | |
125 | |
126 /* This is a copy of the a.out header of the original executable */ | |
127 | |
128 ohdr = (*(struct headers *)oldptr); | |
129 | |
130 /* This is where we build the new header from the in-memory copy */ | |
131 | |
132 nhdr = *((struct headers *)TEXT_START); | |
133 | |
134 /* First do some consistency checks */ | |
135 | |
136 if (nhdr.fhdr.f_magic != ALPHAMAGIC | |
137 && nhdr.fhdr.f_magic != ALPHAUMAGIC) | |
138 { | |
139 fprintf (stderr, "unexec: input file magic number is %x, not %x or %x.\n", | |
140 nhdr.fhdr.f_magic, ALPHAMAGIC, ALPHAUMAGIC); | |
141 exit (1); | |
142 } | |
143 | |
144 if (nhdr.fhdr.f_opthdr != sizeof (nhdr.aout)) | |
145 { | |
146 fprintf (stderr, "unexec: input a.out header is %d bytes, not %ld.\n", | |
147 nhdr.fhdr.f_opthdr, (long) (sizeof (nhdr.aout))); | |
148 exit (1); | |
149 } | |
150 if (nhdr.aout.magic != ZMAGIC) | |
151 { | |
152 fprintf (stderr, "unexec: input file a.out magic number is %o, not %o.\n", | |
153 nhdr.aout.magic, ZMAGIC); | |
154 exit (1); | |
155 } | |
156 | |
157 | |
158 /* Now check the existence of certain header section and grab | |
159 their addresses. */ | |
160 | |
161 #define CHECK_SCNHDR(ptr, name, flags) \ | |
162 ptr = NULL; \ | |
163 for (i = 0; i < nhdr.fhdr.f_nscns && !ptr; i++) \ | |
164 if (strcmp (nhdr.section[i].s_name, name) == 0) \ | |
165 { \ | |
166 if (nhdr.section[i].s_flags != flags) \ | |
167 fprintf (stderr, "unexec: %x flags (%x expected) in %s section.\n", \ | |
168 nhdr.section[i].s_flags, flags, name); \ | |
169 ptr = nhdr.section + i; \ | |
170 } \ | |
171 | |
172 CHECK_SCNHDR (text_section, _TEXT, STYP_TEXT); | |
173 CHECK_SCNHDR (init_section, _INIT, STYP_INIT); | |
174 #ifdef _FINI | |
175 CHECK_SCNHDR (finit_section, _FINI, STYP_FINI); | |
176 #endif /* _FINI */ | |
177 CHECK_SCNHDR (rdata_section, _RDATA, STYP_RDATA); | |
178 #ifdef _RCONST | |
179 CHECK_SCNHDR (rconst_section, _RCONST, STYP_RCONST); | |
180 #endif | |
181 #ifdef _PDATA | |
182 CHECK_SCNHDR (pdata_section, _PDATA, STYP_PDATA); | |
183 #endif /* _PDATA */ | |
184 #ifdef _GOT | |
185 CHECK_SCNHDR (got_section, _GOT, STYP_GOT); | |
186 #endif /* _GOT */ | |
187 CHECK_SCNHDR (data_section, _DATA, STYP_DATA); | |
188 #ifdef _XDATA | |
189 CHECK_SCNHDR (xdata_section, _XDATA, STYP_XDATA); | |
190 #endif /* _XDATA */ | |
191 #ifdef _LIT8 | |
192 CHECK_SCNHDR (lit8_section, _LIT8, STYP_LIT8); | |
193 CHECK_SCNHDR (lit4_section, _LIT4, STYP_LIT4); | |
194 #endif /* _LIT8 */ | |
195 CHECK_SCNHDR (sdata_section, _SDATA, STYP_SDATA); | |
196 CHECK_SCNHDR (sbss_section, _SBSS, STYP_SBSS); | |
197 CHECK_SCNHDR (bss_section, _BSS, STYP_BSS); | |
198 | |
199 | |
200 pagesize = getpagesize (); | |
201 brk = (((long) (sbrk (0))) + pagesize - 1) & (-pagesize); | |
202 | |
203 /* Remember the current break */ | |
204 | |
205 Brk = brk; | |
206 | |
207 nhdr.aout.dsize = brk - DATA_START; | |
208 nhdr.aout.bsize = 0; | |
209 if (entry_address == 0) | |
210 { | |
211 nhdr.aout.entry = (unsigned long)DEFAULT_ENTRY_ADDRESS; | |
212 } | |
213 else | |
214 nhdr.aout.entry = entry_address; | |
215 | |
216 nhdr.aout.bss_start = nhdr.aout.data_start + nhdr.aout.dsize; | |
217 | |
218 if (rdata_section != NULL) | |
219 { | |
220 rdata_section->s_size = data_start - DATA_START; | |
221 | |
222 /* Adjust start and virtual addresses of rdata_section, too. */ | |
223 rdata_section->s_vaddr = DATA_START; | |
224 rdata_section->s_paddr = DATA_START; | |
225 rdata_section->s_scnptr = text_section->s_scnptr + nhdr.aout.tsize; | |
226 } | |
227 | |
228 data_section->s_vaddr = data_start; | |
229 data_section->s_paddr = data_start; | |
230 data_section->s_size = brk - data_start; | |
231 | |
232 if (rdata_section != NULL) | |
233 { | |
234 data_section->s_scnptr = rdata_section->s_scnptr + rdata_section->s_size; | |
235 } | |
236 | |
237 vaddr = data_section->s_vaddr + data_section->s_size; | |
238 scnptr = data_section->s_scnptr + data_section->s_size; | |
239 if (lit8_section != NULL) | |
240 { | |
241 lit8_section->s_vaddr = vaddr; | |
242 lit8_section->s_paddr = vaddr; | |
243 lit8_section->s_size = 0; | |
244 lit8_section->s_scnptr = scnptr; | |
245 } | |
246 if (lit4_section != NULL) | |
247 { | |
248 lit4_section->s_vaddr = vaddr; | |
249 lit4_section->s_paddr = vaddr; | |
250 lit4_section->s_size = 0; | |
251 lit4_section->s_scnptr = scnptr; | |
252 } | |
253 if (sdata_section != NULL) | |
254 { | |
255 sdata_section->s_vaddr = vaddr; | |
256 sdata_section->s_paddr = vaddr; | |
257 sdata_section->s_size = 0; | |
258 sdata_section->s_scnptr = scnptr; | |
259 } | |
260 #ifdef _XDATA | |
261 if (xdata_section != NULL) | |
262 { | |
263 xdata_section->s_vaddr = vaddr; | |
264 xdata_section->s_paddr = vaddr; | |
265 xdata_section->s_size = 0; | |
266 xdata_section->s_scnptr = scnptr; | |
267 } | |
268 #endif | |
269 #ifdef _GOT | |
270 if (got_section != NULL) | |
271 { | |
272 got_section->s_vaddr = vaddr; | |
273 got_section->s_paddr = vaddr; | |
274 got_section->s_size = 0; | |
275 got_section->s_scnptr = scnptr; | |
276 } | |
277 #endif /*_GOT */ | |
278 if (sbss_section != NULL) | |
279 { | |
280 sbss_section->s_vaddr = vaddr; | |
281 sbss_section->s_paddr = vaddr; | |
282 sbss_section->s_size = 0; | |
283 sbss_section->s_scnptr = scnptr; | |
284 } | |
285 if (bss_section != NULL) | |
286 { | |
287 bss_section->s_vaddr = vaddr; | |
288 bss_section->s_paddr = vaddr; | |
289 bss_section->s_size = 0; | |
290 bss_section->s_scnptr = scnptr; | |
291 } | |
292 | |
293 WRITE (new, (char *)TEXT_START, nhdr.aout.tsize, | |
294 "writing text section to %s", new_name); | |
295 WRITE (new, (char *)DATA_START, nhdr.aout.dsize, | |
296 "writing data section to %s", new_name); | |
297 | |
298 | |
299 /* | |
300 * Construct new symbol table header | |
301 */ | |
302 | |
303 memcpy (buffer, oldptr + nhdr.fhdr.f_symptr, cbHDRR); | |
304 | |
305 #define symhdr ((pHDRR)buffer) | |
306 newsyms = nhdr.aout.tsize + nhdr.aout.dsize; | |
307 symrel = newsyms - nhdr.fhdr.f_symptr; | |
308 nhdr.fhdr.f_symptr = newsyms; | |
309 symhdr->cbLineOffset += symrel; | |
310 symhdr->cbDnOffset += symrel; | |
311 symhdr->cbPdOffset += symrel; | |
312 symhdr->cbSymOffset += symrel; | |
313 symhdr->cbOptOffset += symrel; | |
314 symhdr->cbAuxOffset += symrel; | |
315 symhdr->cbSsOffset += symrel; | |
316 symhdr->cbSsExtOffset += symrel; | |
317 symhdr->cbFdOffset += symrel; | |
318 symhdr->cbRfdOffset += symrel; | |
319 symhdr->cbExtOffset += symrel; | |
320 | |
321 WRITE (new, buffer, cbHDRR, "writing symbol table header of %s", new_name); | |
322 | |
323 /* | |
324 * Copy the symbol table and line numbers | |
325 */ | |
326 WRITE (new, oldptr + ohdr.fhdr.f_symptr + cbHDRR, | |
327 stat.st_size - ohdr.fhdr.f_symptr - cbHDRR, | |
328 "writing symbol table of %s", new_name); | |
329 | |
330 #if 0 | |
331 | |
332 /* Not needed for now */ | |
333 | |
334 update_dynamic_symbols (oldptr, new_name, new, newsyms, | |
335 ((pHDRR) (oldptr + ohdr.fhdr.f_symptr))->issExtMax, | |
336 ((pHDRR) (oldptr + ohdr.fhdr.f_symptr))->cbExtOffset, | |
337 ((pHDRR) (oldptr + ohdr.fhdr.f_symptr))->cbSsExtOffset); | |
338 | |
339 #endif | |
340 | |
341 #undef symhdr | |
342 | |
343 SEEK (new, 0, "seeking to start of header in %s", new_name); | |
344 WRITE (new, &nhdr, sizeof (nhdr), | |
345 "writing header of %s", new_name); | |
346 | |
347 close (old); | |
348 close (new); | |
349 mark_x (new_name); | |
350 return 0; | |
351 } | |
352 | |
353 | |
354 #if 0 | |
355 | |
356 /* Not needed for now */ | |
357 | |
358 /* The following function updates the values of some symbols | |
359 that are used by the dynamic loader: | |
360 | |
361 _edata | |
362 _end | |
363 | |
364 */ | |
365 | |
366 int | |
367 update_dynamic_symbols ( | |
368 char *old, /* Pointer to old executable */ | |
369 char *new_name, /* Name of new executable */ | |
370 int new, /* File descriptor for new executable */ | |
371 long newsyms, /* Offset of Symbol table in new executable */ | |
372 int nsyms, /* Number of symbol table entries */ | |
373 long symoff, /* Offset of External Symbols in old file */ | |
374 long stroff) /* Offset of string table in old file */ | |
375 { | |
376 long i; | |
377 int found = 0; | |
378 EXTR n_end, n_edata; | |
379 | |
380 /* We go through the symbol table entries until we have found the two | |
381 symbols. */ | |
382 | |
383 /* cbEXTR is the size of an external symbol table entry */ | |
384 | |
385 for (i = 0; i < nsyms && found < 2; i += cbEXTR) | |
386 { | |
387 REGISTER pEXTR x = (pEXTR) (old + symoff + i); | |
388 char *s; | |
389 | |
390 s = old + stroff + x->asym.iss; /* name of the symbol */ | |
391 | |
392 if (!strcmp(s,"_edata")) | |
393 { | |
394 found++; | |
395 memcpy (&n_edata, x, cbEXTR); | |
396 n_edata.asym.value = Brk; | |
397 SEEK (new, newsyms + cbHDRR + i, | |
398 "seeking to symbol _edata in %s", new_name); | |
399 WRITE (new, &n_edata, cbEXTR, | |
400 "writing symbol table entry for _edata into %s", new_name); | |
401 } | |
402 else if (!strcmp(s,"_end")) | |
403 { | |
404 found++; | |
405 memcpy (&n_end, x, cbEXTR); | |
406 n_end.asym.value = Brk; | |
407 SEEK (new, newsyms + cbHDRR + i, | |
408 "seeking to symbol _end in %s", new_name); | |
409 WRITE (new, &n_end, cbEXTR, | |
410 "writing symbol table entry for _end into %s", new_name); | |
411 } | |
412 } | |
413 | |
414 } | |
415 | |
416 #endif | |
417 | |
418 | |
419 /* | |
420 * mark_x | |
421 * | |
422 * After successfully building the new a.out, mark it executable | |
423 */ | |
424 | |
425 static void | |
426 mark_x (char *name) | |
427 { | |
428 struct stat sbuf; | |
429 int um = umask (777); | |
430 umask (um); | |
431 if (stat (name, &sbuf) < 0) | |
432 fatal_unexec ("getting protection on %s", name); | |
433 sbuf.st_mode |= 0111 & ~um; | |
434 if (chmod (name, sbuf.st_mode) < 0) | |
435 fatal_unexec ("setting protection on %s", name); | |
436 } | |
437 | |
438 static void | |
439 fatal_unexec (char *s, char *arg) | |
440 { | |
441 if (errno == EEOF) | |
442 fputs ("unexec: unexpected end of file, ", stderr); | |
443 else | |
444 fprintf (stderr, "unexec: %s, ", strerror (errno)); | |
445 fprintf (stderr, s, arg); | |
446 fputs (".\n", stderr); | |
447 exit (1); | |
448 } |