Mercurial > hg > xemacs-beta
annotate dynodump/i386/_relocate.c @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:46:22 +0200 |
| parents | 25f70ba0133c |
| children |
| rev | line source |
|---|---|
| 153 | 1 /* |
| 2 * Copyright (c) 1995 by Sun Microsystems, Inc. | |
| 3 * All rights reserved. | |
| 4 * | |
| 5 * This source code is a product of Sun Microsystems, Inc. and is provided | |
| 6 * for unrestricted use provided that this legend is included on all tape | |
| 7 * media and as a part of the software program in whole or part. Users | |
| 8 * may copy or modify this source code without charge, but are not authorized | |
| 9 * to license or distribute it to anyone else except as part of a product or | |
| 10 * program developed by the user. | |
| 11 * | |
| 12 * THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC. | |
| 13 * SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY | |
| 14 * OF SUCH SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT | |
| 15 * EXPRESS OR IMPLIED WARRANTY OF ANY KIND. SUN MICROSYSTEMS, INC. DISCLAIMS | |
| 16 * ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED | |
| 17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN | |
| 18 * NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT, | |
| 19 * INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING | |
| 20 * FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY. | |
| 21 * | |
| 22 * This source code is provided with no support and without any obligation on | |
| 23 * the part of Sun Microsystems, Inc. to assist in its use, correction, | |
| 24 * modification or enhancement. | |
| 25 * | |
| 26 * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE | |
| 27 * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS | |
| 28 * SOURCE CODE OR ANY PART THEREOF. | |
| 29 * | |
| 30 * Sun Microsystems, Inc. | |
| 31 * 2550 Garcia Avenue | |
| 32 * Mountain View, California 94043 | |
| 33 */ | |
| 34 | |
| 35 #pragma ident "@(#) $Id: _relocate.c,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI" | |
| 36 | |
| 37 /* LINTLIBRARY */ | |
| 38 | |
| 39 #include <libelf.h> | |
| 40 #include <string.h> | |
| 41 #include <machdep.h> | |
| 42 #include "_dynodump.h" | |
| 43 | |
| 44 void | |
| 45 update_reloc(Cache *ocache, Cache *_ocache, | |
| 46 Cache *icache, Cache *_icache, | |
| 47 Half shnum) | |
| 48 { | |
| 49 Shdr *shdr; | |
| 50 Rel *rels; | |
| 51 int reln, cnt; | |
| 52 Cache *orcache, *ircache; | |
| 53 | |
| 54 /* | |
| 55 * Set up to readh the output relocation table. | |
| 56 */ | |
| 57 shdr = _ocache->c_shdr; | |
| 58 rels = (Rel *) _ocache->c_data->d_buf; | |
| 59 reln = shdr->sh_size / shdr->sh_entsize; | |
| 60 | |
| 61 /* | |
| 62 * Determine the section that is being relocated. | |
| 63 */ | |
| 64 orcache = &ocache[shdr->sh_info]; | |
| 65 shdr = _icache->c_shdr; | |
| 66 ircache = &icache[shdr->sh_info]; | |
| 67 | |
| 68 /* | |
| 69 * Determine the section that is being relocated. Note that for this | |
| 70 * stupid architecture the .rel.plt actually contains offsets into the | |
| 71 * .got. | |
| 72 */ | |
| 73 if (strcmp(_ocache->c_name, ".rel.plt")) { | |
| 74 orcache = &ocache[shdr->sh_info]; | |
| 75 shdr = _icache->c_shdr; | |
| 76 ircache = &icache[shdr->sh_info]; | |
| 77 } else { | |
| 78 Half ndx; | |
| 79 Cache * __ocache = ocache; | |
| 80 | |
| 81 for (__ocache++, ndx = 1; ndx != shnum; ndx++, __ocache++) { | |
| 82 if (strcmp(__ocache->c_name, ".got") == 0) { | |
| 83 orcache = __ocache; | |
| 84 ircache = &icache[ndx]; | |
| 85 break; | |
| 86 } | |
| 87 } | |
| 88 } | |
| 89 | |
| 90 /* | |
| 91 * Loop through the relocation table. | |
| 92 */ | |
| 93 for (cnt = 0; cnt < reln; cnt++, rels++) { | |
| 94 unsigned char *iaddr, *oaddr; | |
| 95 Addr off; | |
| 96 unsigned char type = ELF_R_TYPE(rels->r_info); | |
| 97 | |
| 98 /* | |
| 99 * Ignore some relocations as these can be safely carried out | |
| 100 * twice (they simply override any existing data). In fact, | |
| 101 * some relocations like __iob's copy relocation must be carried | |
| 102 * out each time the process restarts, otherwise stdio blows up. | |
| 103 */ | |
| 104 if ((type == R_386_COPY) || (type == R_386_NONE)) | |
| 105 continue; | |
| 106 | |
| 107 /* | |
| 108 * If we are required to restore the relocation location | |
| 109 * to its value prior to relocation, then read the | |
| 110 * location's original contents from the input image and | |
| 111 * copy it to the output image. | |
| 112 */ | |
| 113 off = rels->r_offset - ircache->c_shdr->sh_addr; | |
| 114 iaddr = (unsigned char *) ircache->c_data->d_buf + off; | |
| 115 oaddr = (unsigned char *) orcache->c_data->d_buf + off; | |
| 116 *(unsigned long *) oaddr = *(unsigned long *) iaddr; | |
| 117 } | |
| 118 } |