xemacs-beta: src/unexaix.c comparison

comparison src/unexaix.c @ 219:262b8bb4a523 r20-4b8

Import from CVS: tag r20-4b8

author	cvs
date	Mon, 13 Aug 2007 10:09:35 +0200
parents	e45d5e7c476e
children	c42ec1d1cded

comparison

equal deleted inserted replaced

-:c9f226976f56
+:262b8bb4a523
 #endif
 #include <stdio.h>
 #include <sys/stat.h>
 #include <errno.h>
-extern char *start_of_text ();		/* Start of text */
+extern char *start_of_text (void);		/* Start of text */
-extern char *start_of_data ();		/* Start of initialized data */
+extern char *start_of_data (void);		/* Start of initialized data */
 extern int _data;
 extern int _edata;
 extern int _text;
 extern int _etext;
 #ifdef XCOFF
 #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 unrelocate_symbols (int, int, char *, char *);
 #endif
 static ulong data_st;                   /* start of data area written out */
 #ifndef MAX_SECTIONS
 #define MAX_SECTIONS	10
 #endif
+static adjust_lnnoptrs (int, int, char *);
 #endif /* COFF */
 static int pagemask;
 /* Correct an int which is the bit pattern of a pointer to a byte
 #ifdef emacs
 #include "lisp.h"
 static
-report_error (file, fd)
+report_error (char *file, int fd)
-char *file;
-int fd;
 {
 if (fd)
 close (fd);
 report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil));
 }
 #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
 static
-report_error_1 (fd, msg, a1, a2)
+report_error_1 (int fd, char *msg, int a1, int a2)
-int fd;
-char *msg;
-int a1, a2;
 {
 close (fd);
 #ifdef emacs
 error (msg, a1, a2);
 #else
 fprintf (stderr, msg, a1, a2);
 fprintf (stderr, "\n");
 #endif
 }
-static int make_hdr ();
+static int make_hdr (int, int, unsigned, unsigned, unsigned, char *, char *);
-static void mark_x ();
+static void mark_x (char *);
-static int copy_text_and_data ();
+static int copy_text_and_data (int);
-static int copy_sym ();
+static int copy_sym (int, int, char *, char *);
+static write_segment (int, char *, char *);
 /* ****************************************************************
 * unexec
 *
 * driving logic.
 */
-unexec (new_name, a_name, data_start, bss_start, entry_address)
+int unexec (char *new_name, char *a_name,
-char *new_name, *a_name;
+	uintptr_t data_start,
-unsigned data_start, bss_start, entry_address;
+	uintptr_t bss_start,
+	uintptr_t entry_address)
 {
 int new, a_out = -1;
 if (a_name && (a_out = open (a_name, 0)) < 0)
 {
 *
 * Make the header in the new a.out from the header in core.
 * Modify the text and data sizes.
 */
 static int
-make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
+make_hdr (int new, int a_out, unsigned data_start, unsigned bss_start, unsigned entry_address, char *a_name, char *new_name)
-int new, a_out;
-unsigned data_start, bss_start, entry_address;
-char *a_name;
-char *new_name;
 {
 int scns;
 unsigned int bss_end;
 struct scnhdr section[MAX_SECTIONS];
 	CHECK_SCNHDR(f_xhdr, _EXCEPT,  STYP_EXCEPT);
 }
 if (f_thdr == 0)
 	{
-	  ERROR1 ("unexec: couldn't find \"%s\" section", _TEXT);
+	  ERROR1 ("unexec: couldn't find \"%s\" section", (int) _TEXT);
 	}
 if (f_dhdr == 0)
 	{
-	  ERROR1 ("unexec: couldn't find \"%s\" section", _DATA);
+	  ERROR1 ("unexec: couldn't find \"%s\" section", (int) _DATA);
 	}
 if (f_bhdr == 0)
 	{
-	  ERROR1 ("unexec: couldn't find \"%s\" section", _BSS);
+	  ERROR1 ("unexec: couldn't find \"%s\" section", (int) _BSS);
 	}
 }
 else
 {
 ERROR0 ("can't build a COFF file from scratch yet");
 *
 * Copy the text and data segments from memory to the new a.out
 */
 static int
-copy_text_and_data (new)
+copy_text_and_data (int new)
-int new;
 {
 char *end;
 char *ptr;
 lseek (new, (long) text_scnptr, 0);
 return 0;
 }
 #define UnexBlockSz (1<<12)			/* read/write block size */
-write_segment (new, ptr, end)
+write_segment (int new, char *ptr, char *end)
-int new;
-char *ptr, *end;
 {
 int i, nwrite, ret;
 char buf[80];
 extern int errno;
 char zeros[UnexBlockSz];
 * copy_sym
 *
 * Copy the relocation information and symbol table from the a.out to the new
 */
 static int
-copy_sym (new, a_out, a_name, new_name)
+copy_sym (int new, int a_out, char *a_name, char *new_name)
-int new, a_out;
-char *a_name, *new_name;
 {
 char page[UnexBlockSz];
 int n;
 if (a_out < 0)
 * mark_x
 *
 * After successfully building the new a.out, mark it executable
 */
 static void
-mark_x (name)
+mark_x (char *name)
-char *name;
 {
 struct stat sbuf;
 int um;
 int new = 0;  /* for PERROR */
 using the two descriptors already open (WRITEDESC and READDESC).
 Instead of reading one small structure at a time it should use
 a reasonable size buffer.  But I don't have time to work on such
 things, so I am installing it as submitted to me.  -- RMS.  */
-adjust_lnnoptrs (writedesc, readdesc, new_name)
+adjust_lnnoptrs (int writedesc, int readdesc, char *new_name)
-int writedesc;
-int readdesc;
-char *new_name;
 {
 int nsyms;
 int naux;
 int new;
 #ifdef amdahl_uts
 /* It is probably a false economy to optimise this routine (it used to
 read one LDREL and do do two lseeks per iteration) but the wrath of
 RMS (see above :-) would be too much to bear */
-unrelocate_symbols (new, a_out, a_name, new_name)
+unrelocate_symbols (int new, int a_out, char *a_name, char *new_name)
-int new, a_out;
-char *a_name, *new_name;
 {
 int i;
 int l;
 LDREL *ldrel;
 LDHDR ldhdr;

Mercurial > hg > xemacs-beta

comparison src/unexaix.c @ 219:262b8bb4a523 r20-4b8