Mercurial > hg > xemacs-beta
view src/unexhp9k3.c @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +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; }