/* Dump an executable image.
- Copyright (C) 1985, 1986, 1987, 1988, 1999, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 1985-1988, 1999, 2001-2014 Free Software Foundation,
+ Inc.
This file is part of GNU Emacs.
* Mike Sperber <sperber@informatik.uni-tuebingen.de>
*
* Synopsis:
- * unexec (new_name, a_name, data_start, bss_start, entry_address)
- * char *new_name, *a_name;
- * unsigned data_start, bss_start, entry_address;
+ * unexec (const char *new_name, const *old_name);
*
* 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.
*
- * data_start and entry_address are ignored.
- *
- * 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
- * sbrk(2).
- *
*/
-#ifndef emacs
-#define PERROR(arg) perror (arg); return -1
-#else
#include <config.h>
-#define PERROR(file) report_error (file, new)
-#endif
+#include "unexec.h"
+#include "lisp.h"
+#define PERROR(file) report_error (file, new)
#include <a.out.h>
/* Define getpagesize () if the system does not.
Note that this may depend on symbols defined in a.out.h
#include "getpagesize.h"
#include <sys/types.h>
+#include <inttypes.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/stat.h>
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
-extern char *start_of_text (void); /* Start of text */
-extern char *start_of_data (void); /* Start of initialized data */
-
-extern int _data;
-extern int _text;
+extern char _data[];
+extern char _text[];
#include <filehdr.h>
#include <aouthdr.h>
static struct filehdr f_hdr; /* File header */
static struct aouthdr f_ohdr; /* Optional file header (a.out) */
-static long bias; /* Bias to add for growth */
-static long lnnoptr; /* Pointer to line-number info within file */
+static off_t bias; /* Bias to add for growth */
+static off_t lnnoptr; /* Pointer to line-number info within file */
-static long text_scnptr;
-static long data_scnptr;
+static off_t text_scnptr;
+static off_t data_scnptr;
#define ALIGN(val, pwr) (((val) + ((1L<<(pwr))-1)) & ~((1L<<(pwr))-1))
-static long load_scnptr;
-static long orig_load_scnptr;
-static long orig_data_scnptr;
-static int unrelocate_symbols (int, int, char *, char *);
+static off_t load_scnptr;
+static off_t orig_load_scnptr;
+static off_t orig_data_scnptr;
+static int unrelocate_symbols (int, int, const char *, const char *);
#ifndef MAX_SECTIONS
#define MAX_SECTIONS 10
#endif
-static int adjust_lnnoptrs (int, int, char *);
+static int adjust_lnnoptrs (int, int, const char *);
static int pagemask;
-#ifdef emacs
-#include <setjmp.h>
#include "lisp.h"
-static void
-report_error (char *file, int fd)
+static _Noreturn void
+report_error (const char *file, int fd)
{
+ int err = errno;
if (fd)
- close (fd);
- report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil));
+ emacs_close (fd);
+ report_file_errno ("Cannot unexec", build_string (file), err);
}
-#endif /* emacs */
-#define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1
-#define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1
-#define ERROR2(msg,x,y) report_error_1 (new, msg, x, y); return -1
+#define ERROR0(msg) report_error_1 (new, msg)
+#define ERROR1(msg,x) report_error_1 (new, msg, x)
+#define ERROR2(msg,x,y) report_error_1 (new, msg, x, y)
-static void
-report_error_1 (int fd, char *msg, int a1, int a2)
+static _Noreturn void ATTRIBUTE_FORMAT_PRINTF (2, 3)
+report_error_1 (int fd, const char *msg, ...)
{
- close (fd);
-#ifdef emacs
- error (msg, a1, a2);
-#else
- fprintf (stderr, msg, a1, a2);
- fprintf (stderr, "\n");
-#endif
+ va_list ap;
+ emacs_close (fd);
+ va_start (ap, msg);
+ verror (msg, ap);
+ va_end (ap);
}
-static int make_hdr (int, int, unsigned, unsigned, unsigned, char *, char *);
-static void mark_x (char *);
+static int make_hdr (int, int, const char *, const char *);
+static void mark_x (const char *);
static int copy_text_and_data (int);
-static int copy_sym (int, int, char *, char *);
+static int copy_sym (int, int, const char *, const char *);
static void write_segment (int, char *, char *);
\f
/* ****************************************************************
*
* driving logic.
*/
-int unexec (char *new_name, char *a_name,
- unsigned data_start,
- unsigned bss_start,
- unsigned entry_address)
+void
+unexec (const char *new_name, const char *a_name)
{
int new = -1, a_out = -1;
- if (a_name && (a_out = open (a_name, O_RDONLY)) < 0)
+ if (a_name && (a_out = emacs_open (a_name, O_RDONLY, 0)) < 0)
{
PERROR (a_name);
}
- if ((new = creat (new_name, 0666)) < 0)
+ if ((new = emacs_open (new_name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0)
{
PERROR (new_name);
}
if (make_hdr (new, a_out,
- data_start, bss_start,
- entry_address,
a_name, new_name) < 0
|| copy_text_and_data (new) < 0
|| copy_sym (new, a_out, a_name, new_name) < 0
|| adjust_lnnoptrs (new, a_out, new_name) < 0
|| unrelocate_symbols (new, a_out, a_name, new_name) < 0)
{
- close (new);
- return -1;
+ emacs_close (new);
+ return;
}
- close (new);
+ emacs_close (new);
if (a_out >= 0)
- close (a_out);
+ emacs_close (a_out);
mark_x (new_name);
- return 0;
}
/* ****************************************************************
*/
static int
make_hdr (int new, int a_out,
- unsigned data_start, unsigned bss_start,
- unsigned entry_address,
- char *a_name, char *new_name)
+ const char *a_name, const char *new_name)
{
int scns;
- unsigned int bss_end;
+ uintptr_t bss_start;
+ uintptr_t data_start;
struct scnhdr section[MAX_SECTIONS];
struct scnhdr * f_thdr; /* Text section header */
pagemask = getpagesize () - 1;
/* Adjust text/data boundary. */
- data_start = (long) start_of_data ();
- data_start = ADDR_CORRECT (data_start);
+ data_start = (uintptr_t) _data;
data_start = data_start & ~pagemask; /* (Down) to page boundary. */
- bss_end = ADDR_CORRECT (sbrk (0)) + pagemask;
- bss_end &= ~ pagemask;
- /* Adjust data/bss boundary. */
- if (bss_start != 0)
- {
- bss_start = (ADDR_CORRECT (bss_start) + pagemask);
- /* (Up) to page bdry. */
- bss_start &= ~ pagemask;
- if (bss_start > bss_end)
- {
- ERROR1 ("unexec: Specified bss_start (%u) is past end of program",
- bss_start);
- }
- }
- else
- bss_start = bss_end;
+ bss_start = (uintptr_t) sbrk (0) + pagemask;
+ bss_start &= ~ pagemask;
if (data_start > bss_start) /* Can't have negative data size. */
{
- ERROR2 ("unexec: data_start (%u) can't be greater than bss_start (%u)",
+ ERROR2 (("unexec: data_start (0x%"PRIxPTR
+ ") can't be greater than bss_start (0x%"PRIxPTR")"),
data_start, bss_start);
}
}
#define CHECK_SCNHDR(ptr, name, flags) \
- if (strcmp(s->s_name, name) == 0) { \
+ if (strcmp (s->s_name, name) == 0) { \
if (s->s_flags != flags) { \
- fprintf(stderr, "unexec: %lx flags where %x expected in %s section.\n", \
- (unsigned long)s->s_flags, flags, name); \
+ fprintf (stderr, "unexec: %lx flags where %x expected in %s section.\n", \
+ (unsigned long)s->s_flags, flags, name); \
} \
if (ptr) { \
- fprintf(stderr, "unexec: duplicate section header for section %s.\n", \
- name); \
+ fprintf (stderr, "unexec: duplicate section header for section %s.\n", \
+ name); \
} \
ptr = s; \
}
- CHECK_SCNHDR(f_thdr, _TEXT, STYP_TEXT);
- CHECK_SCNHDR(f_dhdr, _DATA, STYP_DATA);
- CHECK_SCNHDR(f_bhdr, _BSS, STYP_BSS);
- CHECK_SCNHDR(f_lhdr, _LOADER, STYP_LOADER);
- CHECK_SCNHDR(f_dbhdr, _DEBUG, STYP_DEBUG);
- CHECK_SCNHDR(f_tchdr, _TYPCHK, STYP_TYPCHK);
- CHECK_SCNHDR(f_xhdr, _EXCEPT, STYP_EXCEPT);
+ CHECK_SCNHDR (f_thdr, _TEXT, STYP_TEXT);
+ CHECK_SCNHDR (f_dhdr, _DATA, STYP_DATA);
+ CHECK_SCNHDR (f_bhdr, _BSS, STYP_BSS);
+ CHECK_SCNHDR (f_lhdr, _LOADER, STYP_LOADER);
+ CHECK_SCNHDR (f_dbhdr, _DEBUG, STYP_DEBUG);
+ CHECK_SCNHDR (f_tchdr, _TYPCHK, STYP_TYPCHK);
+ CHECK_SCNHDR (f_xhdr, _EXCEPT, STYP_EXCEPT);
}
if (f_thdr == 0)
f_hdr.f_flags |= (F_RELFLG | F_EXEC);
f_ohdr.dsize = bss_start - f_ohdr.data_start;
- f_ohdr.bsize = bss_end - bss_start;
+ f_ohdr.bsize = 0;
f_dhdr->s_size = f_ohdr.dsize;
f_bhdr->s_size = f_ohdr.bsize;
/* fix scnptr's */
{
- ulong ptr = section[0].s_scnptr;
+ off_t ptr = section[0].s_scnptr;
bias = -1;
for (scns = 0; scns < f_hdr.f_nscns; scns++)
char *end;
char *ptr;
- lseek (new, (long) text_scnptr, SEEK_SET);
- ptr = start_of_text () + text_scnptr;
+ lseek (new, text_scnptr, SEEK_SET);
+ ptr = _text;
end = ptr + f_ohdr.tsize;
write_segment (new, ptr, end);
- lseek (new, (long) data_scnptr, SEEK_SET);
+ lseek (new, data_scnptr, SEEK_SET);
ptr = (char *) f_ohdr.data_start;
end = ptr + f_ohdr.dsize;
write_segment (new, ptr, end);
write_segment (int new, char *ptr, char *end)
{
int i, nwrite, ret;
- char buf[80];
- extern int errno;
char zeros[UnexBlockSz];
for (i = 0; ptr < end;)
}
else if (nwrite != ret)
{
+ int write_errno = errno;
+ char buf[1000];
+ void *addr = ptr;
sprintf (buf,
- "unexec write failure: addr 0x%lx, fileno %d, size 0x%x, wrote 0x%x, errno %d",
- (unsigned long)ptr, new, nwrite, ret, errno);
+ "unexec write failure: addr %p, fileno %d, size 0x%x, wrote 0x%x, errno %d",
+ addr, new, nwrite, ret, errno);
+ errno = write_errno;
PERROR (buf);
}
i += nwrite;
* Copy the relocation information and symbol table from the a.out to the new
*/
static int
-copy_sym (int new, int a_out, char *a_name, char *new_name)
+copy_sym (int new, int a_out, const char *a_name, const char *new_name)
{
char page[UnexBlockSz];
int n;
* After successfully building the new a.out, mark it executable
*/
static void
-mark_x (char *name)
+mark_x (const char *name)
{
struct stat sbuf;
int um;
}
\f
static int
-adjust_lnnoptrs (int writedesc, int readdesc, char *new_name)
+adjust_lnnoptrs (int writedesc, int readdesc, const char *new_name)
{
int nsyms;
int naux;
if (!lnnoptr || !f_hdr.f_symptr)
return 0;
- if ((new = open (new_name, O_RDWR)) < 0)
+ if ((new = emacs_open (new_name, O_RDWR, 0)) < 0)
{
PERROR (new_name);
return -1;
}
}
}
- close (new);
+ emacs_close (new);
return 0;
}
static int
-unrelocate_symbols (int new, int a_out, char *a_name, char *new_name)
+unrelocate_symbols (int new, int a_out,
+ const char *a_name, const char *new_name)
{
int i;
LDHDR ldhdr;
LDREL ldrel;
- ulong t_reloc = (ulong) &_text - f_ohdr.text_start;
+ off_t t_reloc = (intptr_t) _text - f_ohdr.text_start;
#ifndef ALIGN_DATA_RELOC
- ulong d_reloc = (ulong) &_data - f_ohdr.data_start;
+ off_t d_reloc = (intptr_t) _data - f_ohdr.data_start;
#else
/* This worked (and was needed) before AIX 4.2.
I have no idea why. -- Mike */
- ulong d_reloc = (ulong) &_data - ALIGN(f_ohdr.data_start, 2);
+ off_t d_reloc = (intptr_t) _data - ALIGN (f_ohdr.data_start, 2);
#endif
int * p;
PERROR (a_name);
}
- p = (int *) (ldrel.l_vaddr + d_reloc);
+ p = (int *) (intptr_t) (ldrel.l_vaddr + d_reloc);
switch (ldrel.l_symndx) {
case SYMNDX_TEXT:
}
return 0;
}
-
-/* arch-tag: 0783857a-7c2d-456f-a426-58b722d69fd0
- (do not change this comment) */
HCoop / bpt / emacs.git / blobdiff