Mercurial > hg > xemacs-beta
view src/unexcw.c @ 665:fdefd0186b75
[xemacs-hg @ 2001-09-20 06:28:42 by ben]
The great integral types renaming.
The purpose of this is to rationalize the names used for various
integral types, so that they match their intended uses and follow
consist conventions, and eliminate types that were not semantically
different from each other.
The conventions are:
-- All integral types that measure quantities of anything are
signed. Some people disagree vociferously with this, but their
arguments are mostly theoretical, and are vastly outweighed by
the practical headaches of mixing signed and unsigned values,
and more importantly by the far increased likelihood of
inadvertent bugs: Because of the broken "viral" nature of
unsigned quantities in C (operations involving mixed
signed/unsigned are done unsigned, when exactly the opposite is
nearly always wanted), even a single error in declaring a
quantity unsigned that should be signed, or even the even more
subtle error of comparing signed and unsigned values and
forgetting the necessary cast, can be catastrophic, as
comparisons will yield wrong results. -Wsign-compare is turned
on specifically to catch this, but this tends to result in a
great number of warnings when mixing signed and unsigned, and
the casts are annoying. More has been written on this
elsewhere.
-- All such quantity types just mentioned boil down to EMACS_INT,
which is 32 bits on 32-bit machines and 64 bits on 64-bit
machines. This is guaranteed to be the same size as Lisp
objects of type `int', and (as far as I can tell) of size_t
(unsigned!) and ssize_t. The only type below that is not an
EMACS_INT is Hashcode, which is an unsigned value of the same
size as EMACS_INT.
-- Type names should be relatively short (no more than 10
characters or so), with the first letter capitalized and no
underscores if they can at all be avoided.
-- "count" == a zero-based measurement of some quantity. Includes
sizes, offsets, and indexes.
-- "bpos" == a one-based measurement of a position in a buffer.
"Charbpos" and "Bytebpos" count text in the buffer, rather than
bytes in memory; thus Bytebpos does not directly correspond to
the memory representation. Use "Membpos" for this.
-- "Char" refers to internal-format characters, not to the C type
"char", which is really a byte.
-- For the actual name changes, see the script below.
I ran the following script to do the conversion. (NOTE: This script
is idempotent. You can safely run it multiple times and it will
not screw up previous results -- in fact, it will do nothing if
nothing has changed. Thus, it can be run repeatedly as necessary
to handle patches coming in from old workspaces, or old branches.)
There are two tags, just before and just after the change:
`pre-integral-type-rename' and `post-integral-type-rename'. When
merging code from the main trunk into a branch, the best thing to
do is first merge up to `pre-integral-type-rename', then apply the
script and associated changes, then merge from
`post-integral-type-change' to the present. (Alternatively, just do
the merging in one operation; but you may then have a lot of
conflicts needing to be resolved by hand.)
Script `fixtypes.sh' follows:
----------------------------------- cut ------------------------------------
files="*.[ch] s/*.h m/*.h config.h.in ../configure.in Makefile.in.in ../lib-src/*.[ch] ../lwlib/*.[ch]"
gr Memory_Count Bytecount $files
gr Lstream_Data_Count Bytecount $files
gr Element_Count Elemcount $files
gr Hash_Code Hashcode $files
gr extcount bytecount $files
gr bufpos charbpos $files
gr bytind bytebpos $files
gr memind membpos $files
gr bufbyte intbyte $files
gr Extcount Bytecount $files
gr Bufpos Charbpos $files
gr Bytind Bytebpos $files
gr Memind Membpos $files
gr Bufbyte Intbyte $files
gr EXTCOUNT BYTECOUNT $files
gr BUFPOS CHARBPOS $files
gr BYTIND BYTEBPOS $files
gr MEMIND MEMBPOS $files
gr BUFBYTE INTBYTE $files
gr MEMORY_COUNT BYTECOUNT $files
gr LSTREAM_DATA_COUNT BYTECOUNT $files
gr ELEMENT_COUNT ELEMCOUNT $files
gr HASH_CODE HASHCODE $files
----------------------------------- cut ------------------------------------
`fixtypes.sh' is a Bourne-shell script; it uses 'gr':
----------------------------------- cut ------------------------------------
#!/bin/sh
# Usage is like this:
# gr FROM TO FILES ...
# globally replace FROM with TO in FILES. FROM and TO are regular expressions.
# backup files are stored in the `backup' directory.
from="$1"
to="$2"
shift 2
echo ${1+"$@"} | xargs global-replace "s/$from/$to/g"
----------------------------------- cut ------------------------------------
`gr' in turn uses a Perl script to do its real work,
`global-replace', which follows:
----------------------------------- cut ------------------------------------
: #-*- Perl -*-
### global-modify --- modify the contents of a file by a Perl expression
## Copyright (C) 1999 Martin Buchholz.
## Copyright (C) 2001 Ben Wing.
## Authors: Martin Buchholz <martin@xemacs.org>, Ben Wing <ben@xemacs.org>
## Maintainer: Ben Wing <ben@xemacs.org>
## Current Version: 1.0, May 5, 2001
# This program 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.
#
# This program 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 XEmacs; see the file COPYING. If not, write to the Free
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
use strict;
use FileHandle;
use Carp;
use Getopt::Long;
use File::Basename;
(my $myName = $0) =~ s@.*/@@; my $usage="
Usage: $myName [--help] [--backup-dir=DIR] [--line-mode] [--hunk-mode]
PERLEXPR FILE ...
Globally modify a file, either line by line or in one big hunk.
Typical usage is like this:
[with GNU print, GNU xargs: guaranteed to handle spaces, quotes, etc.
in file names]
find . -name '*.[ch]' -print0 | xargs -0 $0 's/\bCONST\b/const/g'\n
[with non-GNU print, xargs]
find . -name '*.[ch]' -print | xargs $0 's/\bCONST\b/const/g'\n
The file is read in, either line by line (with --line-mode specified)
or in one big hunk (with --hunk-mode specified; it's the default), and
the Perl expression is then evalled with \$_ set to the line or hunk of
text, including the terminating newline if there is one. It should
destructively modify the value there, storing the changed result in \$_.
Files in which any modifications are made are backed up to the directory
specified using --backup-dir, or to `backup' by default. To disable this,
use --backup-dir= with no argument.
Hunk mode is the default because it is MUCH MUCH faster than line-by-line.
Use line-by-line only when it matters, e.g. you want to do a replacement
only once per line (the default without the `g' argument). Conversely,
when using hunk mode, *ALWAYS* use `g'; otherwise, you will only make one
replacement in the entire file!
";
my %options = ();
$Getopt::Long::ignorecase = 0;
&GetOptions (
\%options,
'help', 'backup-dir=s', 'line-mode', 'hunk-mode',
);
die $usage if $options{"help"} or @ARGV <= 1;
my $code = shift;
die $usage if grep (-d || ! -w, @ARGV);
sub SafeOpen {
open ((my $fh = new FileHandle), $_[0]);
confess "Can't open $_[0]: $!" if ! defined $fh;
return $fh;
}
sub SafeClose {
close $_[0] or confess "Can't close $_[0]: $!";
}
sub FileContents {
my $fh = SafeOpen ("< $_[0]");
my $olddollarslash = $/;
local $/ = undef;
my $contents = <$fh>;
$/ = $olddollarslash;
return $contents;
}
sub WriteStringToFile {
my $fh = SafeOpen ("> $_[0]");
binmode $fh;
print $fh $_[1] or confess "$_[0]: $!\n";
SafeClose $fh;
}
foreach my $file (@ARGV) {
my $changed_p = 0;
my $new_contents = "";
if ($options{"line-mode"}) {
my $fh = SafeOpen $file;
while (<$fh>) {
my $save_line = $_;
eval $code;
$changed_p = 1 if $save_line ne $_;
$new_contents .= $_;
}
} else {
my $orig_contents = $_ = FileContents $file;
eval $code;
if ($_ ne $orig_contents) {
$changed_p = 1;
$new_contents = $_;
}
}
if ($changed_p) {
my $backdir = $options{"backup-dir"};
$backdir = "backup" if !defined ($backdir);
if ($backdir) {
my ($name, $path, $suffix) = fileparse ($file, "");
my $backfulldir = $path . $backdir;
my $backfile = "$backfulldir/$name";
mkdir $backfulldir, 0755 unless -d $backfulldir;
print "modifying $file (original saved in $backfile)\n";
rename $file, $backfile;
}
WriteStringToFile ($file, $new_contents);
}
}
----------------------------------- cut ------------------------------------
In addition to those programs, I needed to fix up a few other
things, particularly relating to the duplicate definitions of
types, now that some types merged with others. Specifically:
1. in lisp.h, removed duplicate declarations of Bytecount. The
changed code should now look like this: (In each code snippet
below, the first and last lines are the same as the original, as
are all lines outside of those lines. That allows you to locate
the section to be replaced, and replace the stuff in that
section, verifying that there isn't anything new added that
would need to be kept.)
--------------------------------- snip -------------------------------------
/* Counts of bytes or chars */
typedef EMACS_INT Bytecount;
typedef EMACS_INT Charcount;
/* Counts of elements */
typedef EMACS_INT Elemcount;
/* Hash codes */
typedef unsigned long Hashcode;
/* ------------------------ dynamic arrays ------------------- */
--------------------------------- snip -------------------------------------
2. in lstream.h, removed duplicate declaration of Bytecount.
Rewrote the comment about this type. The changed code should
now look like this:
--------------------------------- snip -------------------------------------
#endif
/* The have been some arguments over the what the type should be that
specifies a count of bytes in a data block to be written out or read in,
using Lstream_read(), Lstream_write(), and related functions.
Originally it was long, which worked fine; Martin "corrected" these to
size_t and ssize_t on the grounds that this is theoretically cleaner and
is in keeping with the C standards. Unfortunately, this practice is
horribly error-prone due to design flaws in the way that mixed
signed/unsigned arithmetic happens. In fact, by doing this change,
Martin introduced a subtle but fatal error that caused the operation of
sending large mail messages to the SMTP server under Windows to fail.
By putting all values back to be signed, avoiding any signed/unsigned
mixing, the bug immediately went away. The type then in use was
Lstream_Data_Count, so that it be reverted cleanly if a vote came to
that. Now it is Bytecount.
Some earlier comments about why the type must be signed: This MUST BE
SIGNED, since it also is used in functions that return the number of
bytes actually read to or written from in an operation, and these
functions can return -1 to signal error.
Note that the standard Unix read() and write() functions define the
count going in as a size_t, which is UNSIGNED, and the count going
out as an ssize_t, which is SIGNED. This is a horrible design
flaw. Not only is it highly likely to lead to logic errors when a
-1 gets interpreted as a large positive number, but operations are
bound to fail in all sorts of horrible ways when a number in the
upper-half of the size_t range is passed in -- this number is
unrepresentable as an ssize_t, so code that checks to see how many
bytes are actually written (which is mandatory if you are dealing
with certain types of devices) will get completely screwed up.
--ben
*/
typedef enum lstream_buffering
--------------------------------- snip -------------------------------------
3. in dumper.c, there are four places, all inside of switch()
statements, where XD_BYTECOUNT appears twice as a case tag. In
each case, the two case blocks contain identical code, and you
should *REMOVE THE SECOND* and leave the first.
author | ben |
---|---|
date | Thu, 20 Sep 2001 06:31:11 +0000 |
parents | b39c14581166 |
children | 943eaba38521 |
line wrap: on
line source
/* unexec for XEmacs on Cygwin32. Copyright (C) 1994, 1998 Free Software Foundation, Inc. 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 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 XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This is a complete rewrite, some code snarfed from unexnt.c and unexec.c, Andy Piper (andy@xemacs.org) 13-1-98 */ #include <config.h> #include "lisp.h" #define DONT_ENCAPSULATE /* filenames are external in unex*.c */ #include "sysfile.h" #define PERROR(arg) \ do { \ perror (arg); \ exit (-1); \ } while (0) #if !defined (HAVE_A_OUT_H) && !defined (WIN32_NATIVE) unexec (char *, char *, void *, void *, void *) { PERROR ("cannot unexec() a.out.h not installed"); } #else #ifdef MINGW #include <../../include/a.out.h> #else #include <a.out.h> #endif #define ALLOC_UNIT 0xFFFF #define ALLOC_MASK ~((unsigned long) (ALLOC_UNIT)) #define ALIGN_ALLOC(addr) \ ((((unsigned long) addr) + ALLOC_UNIT) & ALLOC_MASK) /* Note that all sections must be aligned on a 0x1000 boundary so this is the minimum size that our dummy bss can be. */ #ifndef NO_DEBUG #define BSS_PAD_SIZE 0x1000 #else #define BSS_PAD_SIZE 0 #endif /* To prevent zero-initialized variables from being placed into the bss section, use non-zero values to represent an uninitialized state. */ #define UNINIT_PTR ((void *) 0xF0A0F0A0) #define UNINIT_LONG (0xF0A0F0A0L) static void get_section_info (int a_out, char* a_name); static void copy_executable_and_dump_data_section (int a_out, int a_new); static void dup_file_area (int a_out, int a_new, long size); #if 0 static void write_int_to_bss (int a_out, int a_new, void* va, void* newval); #endif /* Cached info about the .data section in the executable. */ void *data_start_va = UNINIT_PTR; long data_size = UNINIT_LONG; /* Cached info about the .bss section in the executable. */ void *bss_start = UNINIT_PTR; long bss_size = UNINIT_LONG; int sections_reversed = 0; FILHDR f_hdr; PEAOUTHDR f_ohdr; SCNHDR f_data, f_bss, f_text, f_nextdata; #define CHECK_AOUT_POS(a) \ do { \ if (lseek (a_out, 0, SEEK_CUR) != a) \ { \ printf ("we are at %lx, should be at %lx\n", \ lseek (a_out, 0, SEEK_CUR), a); \ exit (-1); \ } \ } while (0) /* Dump out .data and .bss sections into a new executable. */ int unexec (char *out_name, char *in_name, uintptr_t start_data, uintptr_t d1, uintptr_t d2) { /* ugly nt hack - should be in lisp */ int a_new, a_out = -1; char new_name[PATH_MAX], a_name[PATH_MAX]; char *ptr; /* Make sure that the input and output filenames have the ".exe" extension...patch them up if they don't. */ strcpy (a_name, in_name); ptr = a_name + strlen (a_name) - 4; if (strcmp (ptr, ".exe")) strcat (a_name, ".exe"); strcpy (new_name, out_name); ptr = new_name + strlen (new_name) - 4; if (strcmp (ptr, ".exe")) strcat (new_name, ".exe"); /* We need to round off our heap to NT's allocation unit (64KB). */ /* round_heap (get_allocation_unit ()); */ if (a_name && (a_out = open (a_name, O_RDONLY | OPEN_BINARY)) < 0) PERROR (a_name); if ((a_new = open (new_name, O_WRONLY | O_TRUNC | O_CREAT | OPEN_BINARY, 0755)) < 0) PERROR (new_name); /* Get the interesting section info, like start and size of .bss... */ get_section_info (a_out, a_name); copy_executable_and_dump_data_section (a_out, a_new); close (a_out); close (a_new); return 0; } /* Flip through the executable and cache the info necessary for dumping. */ static void get_section_info (int a_out, char* a_name) { extern char my_ebss[]; /* From lastfile.c */ extern char my_edata[]; if (read (a_out, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) PERROR (a_name); if (f_hdr.e_magic != DOSMAGIC) PERROR ("unknown exe header"); /* Check the NT header signature ... */ if (f_hdr.nt_signature != NT_SIGNATURE) PERROR ("invalid nt header"); /* Flip through the sections for .data and .bss ... */ if (f_hdr.f_opthdr > 0) { if (read (a_out, &f_ohdr, AOUTSZ) != AOUTSZ) PERROR (a_name); } /* Loop through .data & .bss section headers, copying them in. With newer lds these are reversed so we have to cope with both */ lseek (a_out, sizeof (f_hdr) + f_hdr.f_opthdr, 0); if (read (a_out, &f_text, sizeof (f_text)) != sizeof (f_text) || strcmp (f_text.s_name, ".text")) PERROR ("no .text section"); /* The .bss section. */ if (read (a_out, &f_bss, sizeof (f_bss)) != sizeof (f_bss) || (strcmp (f_bss.s_name, ".bss") && strcmp (f_bss.s_name, ".data"))) PERROR ("no .bss / .data section"); /* check for reversed .bss and .data */ if (!strcmp (f_bss.s_name, ".data")) { printf (".data and .bss reversed\n"); sections_reversed = 1; memcpy (&f_data, &f_bss, sizeof (f_bss)); } /* The .data section. */ if (!sections_reversed) { if (read (a_out, &f_data, sizeof (f_data)) != sizeof (f_data) || strcmp (f_data.s_name, ".data")) PERROR ("no .data section"); } else { if (read (a_out, &f_bss, sizeof (f_bss)) != sizeof (f_bss) || strcmp (f_bss.s_name, ".bss")) PERROR ("no .bss section"); } bss_start = (void *) ((char*)f_ohdr.ImageBase + f_bss.s_vaddr); bss_size = (unsigned long)((char*)&my_ebss-(char*)bss_start); /* must keep bss data that we want to be blank as blank */ printf ("found bss - keeping %lx of %lx bytes\n", bss_size, f_ohdr.bsize); /* The .data section. */ data_start_va = (void *) ((char*)f_ohdr.ImageBase + f_data.s_vaddr); /* We want to only write Emacs data back to the executable, not any of the library data (if library data is included, then a dumped Emacs won't run on system versions other than the one Emacs was dumped on). */ data_size = (unsigned long)my_edata - (unsigned long)data_start_va; printf ("found data - keeping %lx of %lx bytes\n", data_size, f_ohdr.dsize); /* The following data section - often .idata */ if (read (a_out, &f_nextdata, sizeof (f_nextdata)) != sizeof (f_nextdata) && strcmp (&f_nextdata.s_name[2], "data")) PERROR ("no other data section"); } /* The dump routines. */ static void copy_executable_and_dump_data_section (int a_out, int a_new) { long size = 0; /* NOTE: Some of these were previously declared as unsigned long, but the ones changed to long represent file sizes or pointers, which can't reasonably get above 2G. (A 2G executable???) Furthermore, some were even being compared as in if (x < 0) ... */ long new_data_size, new_bss_size, bss_padding, file_sz_change; long data_padding = 0; long f_data_s_scnptr = f_data.s_scnptr; long f_nextdata_s_scnptr = f_nextdata.s_scnptr; unsigned long f_data_s_vaddr = f_data.s_vaddr; unsigned long f_bss_s_vaddr = f_bss.s_vaddr; int i; void* empty_space; extern int static_heap_dumped; SCNHDR section; /* calculate new sizes: f_ohdr.dsize is the total initialized data size on disk which is f_data.s_size + f_idata.s_size. f_ohdr.data_start is the base addres of all data and so should not be changed. *.s_vaddr is the virtual address of the start of the section *normalized from f_ohdr.ImageBase. *.s_paddr appears to be the number of bytes in the section *actually used (whereas *.s_size is aligned). bsize is now 0 since subsumed into .data dsize is dsize + (f_data.s_vaddr - f_bss.s_vaddr) f_data.s_vaddr is f_bss.s_vaddr f_data.s_size is new dsize maybe. what about s_paddr & s_scnptr? */ /* this is the amount the file increases in size */ if (!sections_reversed) { new_bss_size = f_data.s_vaddr - f_bss.s_vaddr; data_padding = 0; } else { new_bss_size = f_nextdata.s_vaddr - f_bss.s_vaddr; data_padding = (f_bss.s_vaddr - f_data.s_vaddr) - f_data.s_size; } if ((new_bss_size - bss_size) < BSS_PAD_SIZE) PERROR (".bss free space too small"); file_sz_change = (new_bss_size + data_padding) - BSS_PAD_SIZE; new_data_size = f_ohdr.dsize + file_sz_change; if (!sections_reversed) f_data.s_vaddr = f_bss.s_vaddr; f_data.s_paddr += file_sz_change; #if 0 if (f_data.s_size + f_nextdata.s_size != f_ohdr.dsize) printf ("section size doesn't tally with dsize %lx != %lx\n", f_data.s_size + f_nextdata.s_size, f_ohdr.dsize); #endif f_data.s_size += file_sz_change; lseek (a_new, 0, SEEK_SET); /* write file header */ f_hdr.f_symptr += file_sz_change; #ifdef NO_DEBUG f_hdr.f_nscns--; #endif printf ("writing file header\n"); if (write (a_new, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr)) PERROR ("failed to write file header"); /* write optional header fixing dsize & bsize*/ printf ("writing optional header\n"); printf ("new data size is %lx, >= %lx\n", new_data_size, f_ohdr.dsize + f_ohdr.bsize); if (new_data_size < (long) (f_ohdr.dsize + f_ohdr.bsize)) printf ("warning: new data size is < approx\n"); f_ohdr.dsize=new_data_size; f_ohdr.bsize=BSS_PAD_SIZE; if (write (a_new, &f_ohdr, sizeof (f_ohdr)) != sizeof (f_ohdr)) PERROR ("failed to write optional header"); /* write text as is */ printf ("writing text header (unchanged)\n"); if (write (a_new, &f_text, sizeof (f_text)) != sizeof (f_text)) PERROR ("failed to write text header"); #ifndef NO_DEBUG /* Write small bss section. */ if (!sections_reversed) { f_bss.s_size = BSS_PAD_SIZE; f_bss.s_paddr = BSS_PAD_SIZE; f_bss.s_vaddr = f_data.s_vaddr - BSS_PAD_SIZE; if (write (a_new, &f_bss, sizeof (f_bss)) != sizeof (f_bss)) PERROR ("failed to write bss header"); } #endif /* write new data header */ printf ("writing .data header\n"); if (write (a_new, &f_data, sizeof (f_data)) != sizeof (f_data)) PERROR ("failed to write data header"); #ifndef NO_DEBUG /* Write small bss section. */ if (sections_reversed) { f_bss.s_size = BSS_PAD_SIZE; f_bss.s_paddr = BSS_PAD_SIZE; f_bss.s_vaddr = f_nextdata.s_vaddr - BSS_PAD_SIZE; if (write (a_new, &f_bss, sizeof (f_bss)) != sizeof (f_bss)) PERROR ("failed to write bss header"); } #endif printf ("writing following data header\n"); f_nextdata.s_scnptr += file_sz_change; if (f_nextdata.s_lnnoptr != 0) f_nextdata.s_lnnoptr += file_sz_change; if (f_nextdata.s_relptr != 0) f_nextdata.s_relptr += file_sz_change; if (write (a_new, &f_nextdata, sizeof (f_nextdata)) != sizeof (f_nextdata)) PERROR ("failed to write nextdata header"); /* copy other section headers adjusting the file offset */ for (i=0; i<(f_hdr.f_nscns-3); i++) { if (read (a_out, §ion, sizeof (section)) != sizeof (section)) PERROR ("no .data section"); section.s_scnptr += file_sz_change; if (section.s_lnnoptr != 0) section.s_lnnoptr += file_sz_change; if (section.s_relptr != 0) section.s_relptr += file_sz_change; if (write (a_new, §ion, sizeof (section)) != sizeof (section)) PERROR ("failed to write data header"); } #ifdef NO_DEBUG /* dump bss to maintain offsets */ memset (&f_bss, 0, sizeof (f_bss)); if (write (a_new, &f_bss, sizeof (f_bss)) != sizeof (f_bss)) PERROR ("failed to write bss header"); #endif size = lseek (a_new, 0, SEEK_CUR); CHECK_AOUT_POS (size); /* copy eveything else until start of data */ size = f_data_s_scnptr - lseek (a_out, 0, SEEK_CUR); printf ("copying executable up to data section ... %lx bytes\n", size); dup_file_area (a_out, a_new, size); CHECK_AOUT_POS (f_data_s_scnptr); if (!sections_reversed) { /* dump bss + padding between sections, sans small bss pad */ printf ("dumping .bss into executable... %lx bytes\n", bss_size); if (write (a_new, bss_start, bss_size) != bss_size) { PERROR ("failed to write bss section"); } /* pad, needs to be zero */ bss_padding = (new_bss_size - bss_size) - BSS_PAD_SIZE; if (bss_padding < 0) PERROR ("padded .bss too small"); printf ("padding .bss ... %lx bytes\n", bss_padding); empty_space = malloc (bss_padding); memset (empty_space, 0, bss_padding); if (write (a_new, empty_space, bss_padding) != bss_padding) PERROR ("failed to write bss section"); free (empty_space); } /* tell dumped version not to free pure heap */ static_heap_dumped = 1; /* Get a pointer to the raw data in our address space. */ printf ("dumping .data section... %lx bytes\n", data_size); if (write (a_new, data_start_va, data_size) != data_size) PERROR ("failed to write data section"); /* were going to use free again ... */ static_heap_dumped = 0; size = lseek (a_out, f_data_s_scnptr + data_size, SEEK_SET); if (!sections_reversed) { size = f_nextdata_s_scnptr - size; dup_file_area (a_out, a_new, size); } else { /* need to pad to bss with data in file */ printf ("padding .data ... %lx bytes\n", data_padding); size = (f_bss_s_vaddr - f_data_s_vaddr) - data_size; dup_file_area (a_out, a_new, size); /* dump bss + padding between sections */ printf ("dumping .bss into executable... %lx bytes\n", bss_size); if (write (a_new, bss_start, bss_size) != bss_size) PERROR ("failed to write bss section"); /* pad, needs to be zero */ bss_padding = (new_bss_size - bss_size) - BSS_PAD_SIZE; if (bss_padding < 0) PERROR ("padded .bss too small"); printf ("padding .bss ... %lx bytes\n", bss_padding); empty_space = malloc (bss_padding); memset (empty_space, 0, bss_padding); if (write (a_new, empty_space, bss_padding) != bss_padding) PERROR ("failed to write bss section"); free (empty_space); if (lseek (a_new, 0, SEEK_CUR) != (long) f_nextdata.s_scnptr) { printf ("at %lx should be at %lx\n", lseek (a_new, 0, SEEK_CUR), f_nextdata.s_scnptr); PERROR ("file positioning error\n"); } lseek (a_out, f_nextdata_s_scnptr, SEEK_SET); } CHECK_AOUT_POS (f_nextdata_s_scnptr); /* now dump - nextdata don't need to do this cygwin ds is in .data! */ printf ("dumping following data section... %lx bytes\n", f_nextdata.s_size); dup_file_area (a_out,a_new,f_nextdata.s_size); /* write rest of file */ printf ("writing rest of file\n"); size = lseek (a_out, 0, SEEK_END); size = size - (f_nextdata_s_scnptr + f_nextdata.s_size); /* length remaining in a_out */ lseek (a_out, f_nextdata_s_scnptr + f_nextdata.s_size, SEEK_SET); dup_file_area (a_out, a_new, size); } /* * copy from aout to anew */ static void dup_file_area (int a_out, int a_new, long size) { char page[BUFSIZ]; long n; for (; size > 0; size -= sizeof (page)) { n = size > (long) sizeof (page) ? sizeof (page) : size; if (read (a_out, page, n) != n || write (a_new, page, n) != n) PERROR ("dump_out()"); } } #if 0 static void write_int_to_bss (int a_out, int a_new, void* va, void* newval) { int cpos; cpos = lseek (a_new, 0, SEEK_CUR); if (va < bss_start || va > bss_start + f_data.s_size) PERROR ("address not in data space\n"); lseek (a_new, f_data.s_scnptr + ((unsigned long)va - (unsigned long)bss_start), SEEK_SET); if (write (a_new, newval, sizeof (int)) != (int) sizeof (int)) PERROR ("failed to write int value"); lseek (a_new, cpos, SEEK_SET); } #endif #endif /* HAVE_A_OUT_H */