Mercurial > hg > xemacs-beta
view src/unexhp9k3.c @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | abe6d1db359e |
children | 13e47461d509 |
line wrap: on
line source
/* * Code to do an unexec for HPUX 8.0 on an HP9000/[34]00 for a * dynamically linked temacs. Copyright (C) 1992-1993 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. */ /* Synched up with: Not in FSF. */ /* Created 29-Oct-92 by Harlan Sexton for SunOS Modified Jan 93 by Hamish Macdonald for HPUX */ /********************** Included .h Files **************************/ #include <config.h> #include <stdarg.h> #include <sys/param.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/types.h> #include <string.h> #include <stdio.h> #include <errno.h> #include <signal.h> #ifdef __hp9000s300 # include </usr/include/debug.h> #endif #include <a.out.h> #include <unistd.h> #include <ctype.h> #include <sys/dir.h> #include "sysdep.h" /* XEmacs: Richard Cognot <cognot@ensg.u-nancy.fr> says we need these */ extern void perror(const char*); extern int sys_nerr; extern char *sys_errlist[]; extern char *strerror (int); /********************** Macros *************************************/ #define SYS_ERR \ ((errno > 0)?((errno < sys_nerr)?(sys_errlist[errno]):\ "unknown system error"): "unknown error") #define MASK_UP(x,p_of_two) \ ((((unsigned long) (x)) + ((p_of_two) - 1)) & (~((p_of_two) - 1))) #define MASK_DOWN(x,p_of_two) (((unsigned long) (x)) & (~((p_of_two) - 1))) /********************** Function Prototypes/Declarations ***********/ static void unexec_error (const char *fmt, int use_errno, ...); static int unexec_open (char *filename, int flag, int mode); static long unexec_seek (int fd, long position); static void unexec_read (int fd, long position, char *buf, int bytes); static void unexec_write (int fd, long position, char *buf, int bytes); static void unexec_copy (int new_fd, int old_fd, long old_pos, long new_pos, int bytes); static void unexec_pad (int fd, int bytes); static void unexec_fstat (int fd, struct stat *statptr); static void unexec_fchmod (int fd, int mode); int run_time_remap (char *dummy); /********************** Variables **********************************/ /* for reporting error messages from system calls */ extern int sys_nerr; extern int _DYNAMIC; extern char **environ; static unsigned long sbrk_of_0_at_unexec; /*******************************************************************/ static void unexec_error (const char *fmt, int use_errno, ...) { const char *err_msg = SYS_ERR; va_list args; fprintf (stderr, "unexec - "); va_start (args, use_errno); vfprintf (stderr, fmt, args); va_end (args); if (use_errno) fprintf (stderr, ": %s", err_msg); fprintf (stderr, "\n"); exit (1); return; } static int unexec_open (char *filename, int flag, int mode) { int fd; errno = 0; fd = open (filename, flag, mode); if (fd < 0) { unexec_error ("Failure opening file %s", 1, (void *) filename, 0, 0); return -1; } else return fd; } static long unexec_seek (int fd, long position) { long seek_value; if (fd <= 0) unexec_error ("No file open in which to seek", 0, 0, 0, 0); errno = 0; if (position < 0) seek_value = (long) lseek (fd, 0, L_INCR); else seek_value = (long) lseek (fd, position, L_SET); if (seek_value < 0) unexec_error ("Failed to do a seek to 0x%x in %s", 1, (char *) position, "unexec() output file", 0); return seek_value; } static void unexec_read (int fd, long position, char *buf, int bytes) { int n_read; int remains = bytes; position = unexec_seek (fd, position); if (bytes < 0) unexec_error ("Attempted read of %d bytes", 0, (char *) bytes, 0, 0); errno = 0; while (remains > 0) { n_read = read (fd, buf, remains); if (n_read <= 0) unexec_error ("Read failed for 0x%x bytes at offset 0x%x in %s", 1, (char *) bytes, (char *) position, "unexec() output file"); buf += n_read; remains -= n_read; } return; } static void unexec_write (int fd, long position, char *buf, int bytes) { int n_written; int remains = bytes; position = unexec_seek (fd, position); if (bytes < 0) unexec_error ("Attempted write of %d bytes in %s", 0, (char *) bytes, "unexec() output file", 0); errno = 0; while (remains > 0) { n_written = write (fd, buf, remains); if (n_written <= 0) unexec_error ("Write failed for 0x%x bytes at offset 0x%x in %s", 1, (char *) bytes, (char *) position, "unexec() output file"); buf += n_written; remains -= n_written; } return; } static void unexec_copy (int new_fd, int old_fd, long old_pos, long new_pos, int bytes) { int remains = bytes; char buf[128]; while (remains > 0) { int n_to_copy = remains > sizeof(buf) ? sizeof(buf) : remains; unexec_read (old_fd, old_pos, buf, n_to_copy); unexec_write (new_fd, new_pos, buf, n_to_copy); old_pos += n_to_copy; new_pos += n_to_copy; remains -= n_to_copy; } return; } static void unexec_pad (int fd, int bytes) { if (bytes > 0) { char buf[1024]; int remaining = bytes; memset (buf, 0, sizeof(buf)); while (remaining > 0) { int this_write = (remaining > sizeof(buf))?sizeof(buf):remaining; unexec_write (fd, -1, buf, this_write); remaining -= this_write; } } } static void unexec_fstat (int fd, struct stat *statptr) { errno = 0; if (-1 == fstat (fd, statptr)) unexec_error ("fstat() failed for descriptor %d", 1, (char *) fd, 0, 0); return; } static void unexec_fchmod (int fd, int mode) { errno = 0; if (-1 == fchmod (fd, mode)) unexec_error ("fchmod() failed for descriptor %d", 1, (char *) fd, 0, 0); return; } /* * EXPORTED FUNCTIONS */ /* this has to be a global variable to prevent the optimizers from * assuming that it can not be 0. */ static void *dynamic_addr = (void *) &_DYNAMIC; int unexec (char *new_name, char *old_name, unsigned int emacs_edata, unsigned int dummy1, unsigned int dummy2) { /* /dld.sl data */ struct dynamic *ld = 0; /* old and new state */ int old_fd; int new_fd; struct exec old_hdr; struct exec new_hdr; struct stat old_buf; /* some process specific "constants" */ unsigned long n_pagsiz; caddr_t dynamic_beg; caddr_t current_break = (caddr_t) sbrk (0); /* dynamically linked image? -- if so, find dld.sl structures */ if (dynamic_addr) { ld = (struct dynamic *) dynamic_addr; #ifdef DEBUG printf ("dl_text = %#x\n", ld->text); printf ("dl_data = %#x\n", ld->data); printf ("dl_bss = %#x\n", ld->bss); printf ("dl_end = %#x\n", ld->end); printf ("dl_dmodule = %#x\n", ld->dmodule); printf ("dl_dlt = %#x\n", ld->dlt); printf ("dl_plt = %#x\n", ld->plt); #endif } /* open the old and new files, figuring out how big the old one is so that we can map it in */ old_fd = unexec_open (old_name, O_RDONLY, 0); new_fd = unexec_open (new_name, O_RDWR | O_CREAT | O_TRUNC, 0666); /* setup the header and the statbuf for old_fd */ unexec_read (old_fd, 0, (char *) &old_hdr, sizeof (old_hdr)); unexec_fstat (old_fd, &old_buf); /* set up some important constants */ n_pagsiz = EXEC_PAGESIZE; /* setup beginning of data to copy from executable */ if (ld) dynamic_beg = ld->dmodule; else dynamic_beg = (caddr_t)EXEC_ALIGN (old_hdr.a_text) + old_hdr.a_data; /* set up the new exec */ new_hdr = old_hdr; new_hdr.a_text = MASK_DOWN (emacs_edata, n_pagsiz); new_hdr.a_data = MASK_UP (current_break, n_pagsiz) - EXEC_ALIGN(new_hdr.a_text); new_hdr.a_bss = 0; #ifdef DEBUG printf ("old text %#x\n", old_hdr.a_text); printf ("new text %#x\n", new_hdr.a_text); printf ("old data %#x\n", old_hdr.a_data); printf ("new data %#x\n", new_hdr.a_data); printf ("old bss %#x\n", old_hdr.a_bss); printf ("new bss %#x\n", new_hdr.a_bss); #endif /* set up this variable, in case we want to reset "the break" when restarting */ sbrk_of_0_at_unexec = ((unsigned long) MASK_UP (current_break, n_pagsiz)); /* Write out the first approximation to the new file. The sizes of each section will be correct, but there will be a number of corrections that will need to be made. */ { long old_datoff = DATA_OFFSET (old_hdr); long new_datoff = DATA_OFFSET (new_hdr); long old_dataddr = EXEC_ALIGN (old_hdr.a_text); long new_dataddr = EXEC_ALIGN (new_hdr.a_text); long new_mcaloff = MODCAL_OFFSET (new_hdr); long old_mcaloff = MODCAL_OFFSET (old_hdr); long newtext_size = new_hdr.a_text - old_dataddr; long newdata1_size = (unsigned long)dynamic_beg - new_dataddr; long dyn_size = (EXEC_ALIGN (old_hdr.a_text) + old_hdr.a_data) - (unsigned long)dynamic_beg; long newdata2_size = (unsigned long)current_break - ((unsigned long)dynamic_beg + dyn_size); long pad_size = MASK_UP (current_break, n_pagsiz) - ((unsigned long) current_break); #ifdef DEBUG printf ("current break is %#lx\n", current_break); printf ("old_dataddr = %#lx, dynamic_beg = %#lx\n", old_dataddr, dynamic_beg); #endif /* * First, write the text segment with new header -- copy * everything until the start of the data segment from the old * file */ #ifdef DEBUG printf ("copying %#lx bytes of text from 0\n", old_datoff); #endif unexec_copy (new_fd, old_fd, 0, 0, old_datoff); /* pad out the text segment */ #ifdef DEBUG printf ( "text pad size is %#x\n", old_dataddr - old_hdr.a_text); #endif unexec_pad (new_fd, old_dataddr - old_hdr.a_text); /* * Update debug header spoo */ if (new_hdr.a_extension > 0) { new_hdr.a_extension += LESYM_OFFSET(new_hdr) - LESYM_OFFSET(old_hdr); } /* * go back and write the new header. */ unexec_write (new_fd, 0, (char *) &new_hdr, sizeof (new_hdr)); /* * Copy the part of the data segment which becomes text from the * running image. */ #ifdef DEBUG printf ("copying %#lx bytes of new text from %#lx to position %#lx\n", newtext_size, old_dataddr, TEXT_OFFSET(new_hdr) + old_dataddr); #endif unexec_write (new_fd, TEXT_OFFSET(new_hdr) + old_dataddr, (caddr_t)old_dataddr, newtext_size); #ifdef DEBUG printf ("new DATA_OFFSET is %#lx\n", new_datoff); #endif /* * Copy the part of the old data segment which will be data * in the new executable (before the dynamic stuff) * from the running image. */ #ifdef DEBUG printf ("copying %#lx bytes of data from %#lx to position %#lx\n", newdata1_size, new_dataddr, new_datoff); #endif unexec_write (new_fd, new_datoff, (caddr_t)new_dataddr, newdata1_size); /* copy the dynamic part of the data segment from the old executable */ if (dyn_size) { #ifdef DEBUG printf ("copying %#lx bytes of dyn data from executable" " at address %#lx to position %#lx\n", dyn_size, dynamic_beg, new_datoff + newdata1_size); #endif unexec_copy (new_fd, old_fd, old_datoff + newtext_size + newdata1_size, new_datoff + newdata1_size, dyn_size); } /* copy remaining data (old bss) from the running image */ #ifdef DEBUG printf ("copying %#lx bytes of data from %#lx to position %#lx\n", newdata2_size, new_dataddr + newdata1_size + dyn_size, new_datoff + newdata1_size + dyn_size); #endif unexec_write (new_fd, new_datoff + newdata1_size + dyn_size, (caddr_t)(new_dataddr + newdata1_size + dyn_size), newdata2_size); /* pad out the data segment */ #ifdef DEBUG printf ( "pad size is %#x\n", pad_size); #endif unexec_pad (new_fd, pad_size); /* Finally, copy the rest of the junk from the old file. */ #ifdef DEBUG printf ("Copying %#lx bytes of junk from %#lx (old) to %#lx (new)\n", old_buf.st_size - old_mcaloff, old_mcaloff, new_mcaloff); #endif unexec_copy (new_fd, old_fd, old_mcaloff, new_mcaloff, old_buf.st_size - old_mcaloff); { long curpos, offset; struct _debug_header dhdr; int new_header_delta; new_header_delta = LESYM_OFFSET(new_hdr) - LESYM_OFFSET(old_hdr); if ((new_header_delta > 0) && ((offset = EXT_OFFSET(old_hdr)) > 0)) { curpos = lseek(new_fd, 0, SEEK_CUR); lseek(old_fd, offset, 0); if (read(old_fd, &dhdr, sizeof(dhdr)) == sizeof(dhdr)) { dhdr.header_offset += new_header_delta; dhdr.gntt_offset += new_header_delta; dhdr.lntt_offset += new_header_delta; dhdr.slt_offset += new_header_delta; dhdr.vt_offset += new_header_delta; dhdr.xt_offset += new_header_delta; lseek(new_fd, EXT_OFFSET(new_hdr), SEEK_SET); if (write(new_fd, &dhdr, sizeof(dhdr)) != sizeof(dhdr)) { unexec_error("Unable to write debug information to \"%s\"\n", 1, new_name); } lseek(new_fd, curpos, SEEK_SET); } else { unexec_error("Unable to read debug information from \"%s\"\n", 1, old_name); } } } } /* make the output file executable -- then quit */ unexec_fchmod (new_fd, 0755); close (old_fd); close (new_fd); return 0; } int run_time_remap (char *dummy) { unsigned long current_sbrk = (unsigned long) sbrk (0); if (sbrk_of_0_at_unexec < current_sbrk) fprintf (stderr, "Absurd new brk addr = 0x%x (current = 0x%x)\n", sbrk_of_0_at_unexec, current_sbrk); else { errno = 0; if (brk ((caddr_t) sbrk_of_0_at_unexec)) fprintf (stderr, "failed to change brk addr to 0x%x: %s\n", sbrk_of_0_at_unexec, SYS_ERR); } return 0; }