Mercurial > hg > xemacs-beta
annotate src/unexalpha.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | facf3239ba30 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Unexec for DEC alpha. schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf). |
| 2 | |
| 3 Copyright (C) 1994 Free Software Foundation, Inc. | |
| 4 | |
| 613 | 5 This file is part of XEmacs. |
| 428 | 6 |
| 613 | 7 XEmacs is free software; you can redistribute it and/or modify |
| 428 | 8 it under the terms of the GNU General Public License as published by |
| 9 the Free Software Foundation; either version 2, or (at your option) | |
| 10 any later version. | |
| 11 | |
| 613 | 12 XEmacs is distributed in the hope that it will be useful, |
| 428 | 13 but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 613 | 18 along with XEmacs; see the file COPYING. If not, write to |
| 428 | 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: FSF 19.31. */ | |
| 23 | |
| 24 | |
| 25 #include <config.h> | |
| 26 #include <stdlib.h> | |
| 27 #include <string.h> | |
| 28 #include <unistd.h> | |
| 29 #include <sys/types.h> | |
| 30 #include <sys/file.h> | |
| 31 #include <sys/stat.h> | |
| 32 #include <sys/mman.h> | |
| 33 #include <stdio.h> | |
| 438 | 34 #include <errno.h> |
| 428 | 35 #include <varargs.h> |
| 36 #include <filehdr.h> | |
| 37 #include <aouthdr.h> | |
| 38 #include <scnhdr.h> | |
| 39 #include <syms.h> | |
| 2286 | 40 #include "compiler.h" |
| 428 | 41 |
| 42 static void fatal_unexec (char *, char *); | |
| 43 static void mark_x (char *); | |
| 44 | |
| 45 #define READ(_fd, _buffer, _size, _error_message, _error_arg) \ | |
| 46 errno = EEOF; \ | |
| 47 if (read (_fd, _buffer, _size) != _size) \ | |
| 48 fatal_unexec (_error_message, _error_arg); | |
| 49 | |
| 50 #define WRITE(_fd, _buffer, _size, _error_message, _error_arg) \ | |
| 51 if (write (_fd, _buffer, _size) != _size) \ | |
| 52 fatal_unexec (_error_message, _error_arg); | |
| 53 | |
| 54 #define SEEK(_fd, _position, _error_message, _error_arg) \ | |
| 55 errno = EEOF; \ | |
| 56 if (lseek (_fd, _position, L_SET) != _position) \ | |
| 57 fatal_unexec (_error_message, _error_arg); | |
| 58 | |
| 59 #define EEOF -1 | |
| 60 | |
| 61 static struct scnhdr *text_section; | |
| 62 static struct scnhdr *init_section; | |
| 63 static struct scnhdr *finit_section; | |
| 64 static struct scnhdr *rdata_section; | |
| 65 static struct scnhdr *rconst_section; | |
| 66 static struct scnhdr *data_section; | |
| 67 static struct scnhdr *pdata_section; | |
| 68 static struct scnhdr *xdata_section; | |
| 69 static struct scnhdr *got_section; | |
| 70 static struct scnhdr *lit8_section; | |
| 71 static struct scnhdr *lit4_section; | |
| 72 static struct scnhdr *sdata_section; | |
| 73 static struct scnhdr *sbss_section; | |
| 74 static struct scnhdr *bss_section; | |
| 75 | |
| 76 static unsigned long Brk; | |
| 77 | |
| 78 struct headers { | |
| 79 struct filehdr fhdr; | |
| 80 struct aouthdr aout; | |
| 81 struct scnhdr section[_MIPS_NSCNS_MAX]; | |
| 82 }; | |
| 83 | |
| 84 | |
| 85 /* Define name of label for entry point for the dumped executable. */ | |
| 86 | |
| 87 #ifndef DEFAULT_ENTRY_ADDRESS | |
| 88 #define DEFAULT_ENTRY_ADDRESS __start | |
| 89 #endif | |
| 442 | 90 EXTERN_C int DEFAULT_ENTRY_ADDRESS (void); |
| 91 | |
| 428 | 92 |
| 93 int | |
| 94 unexec (char *new_name, char *a_name, | |
| 95 unsigned long data_start, | |
| 2286 | 96 unsigned long UNUSED (bss_start), |
| 428 | 97 unsigned long entry_address) |
| 98 { | |
| 3025 | 99 int new_, old; |
| 428 | 100 char * oldptr; |
| 101 struct headers ohdr, nhdr; | |
| 102 struct stat stat; | |
| 103 long pagesize, brk; | |
| 104 long newsyms, symrel; | |
| 105 int i; | |
| 106 long vaddr, scnptr; | |
| 107 #define BUFSIZE 8192 | |
| 108 char buffer[BUFSIZE]; | |
| 109 | |
| 110 if ((old = open (a_name, O_RDONLY)) < 0) | |
| 111 fatal_unexec ("opening %s", a_name); | |
| 112 | |
| 3025 | 113 new_ = creat (new_name, 0666); |
| 114 if (new_ < 0) fatal_unexec ("creating %s", new_name); | |
| 428 | 115 |
| 116 if ((fstat (old, &stat) == -1)) | |
| 117 fatal_unexec ("fstat %s", a_name); | |
| 118 | |
| 119 oldptr = (char *)mmap (0, stat.st_size, PROT_READ, MAP_FILE|MAP_SHARED, old, 0); | |
| 120 | |
| 121 if (oldptr == (char *)-1) | |
| 122 fatal_unexec ("mmap %s", a_name); | |
| 123 | |
| 124 close (old); | |
| 125 | |
| 126 /* This is a copy of the a.out header of the original executable */ | |
| 127 | |
| 128 ohdr = (*(struct headers *)oldptr); | |
| 129 | |
| 130 /* This is where we build the new header from the in-memory copy */ | |
| 131 | |
| 132 nhdr = *((struct headers *)TEXT_START); | |
| 133 | |
| 134 /* First do some consistency checks */ | |
| 135 | |
| 136 if (nhdr.fhdr.f_magic != ALPHAMAGIC | |
| 137 && nhdr.fhdr.f_magic != ALPHAUMAGIC) | |
| 138 { | |
| 139 fprintf (stderr, "unexec: input file magic number is %x, not %x or %x.\n", | |
| 140 nhdr.fhdr.f_magic, ALPHAMAGIC, ALPHAUMAGIC); | |
| 141 exit (1); | |
| 142 } | |
| 143 | |
| 144 if (nhdr.fhdr.f_opthdr != sizeof (nhdr.aout)) | |
| 145 { | |
| 146 fprintf (stderr, "unexec: input a.out header is %d bytes, not %ld.\n", | |
| 147 nhdr.fhdr.f_opthdr, (long) (sizeof (nhdr.aout))); | |
| 148 exit (1); | |
| 149 } | |
| 150 if (nhdr.aout.magic != ZMAGIC) | |
| 151 { | |
| 152 fprintf (stderr, "unexec: input file a.out magic number is %o, not %o.\n", | |
| 153 nhdr.aout.magic, ZMAGIC); | |
| 154 exit (1); | |
| 155 } | |
| 156 | |
| 157 | |
| 158 /* Now check the existence of certain header section and grab | |
| 159 their addresses. */ | |
| 160 | |
| 161 #define CHECK_SCNHDR(ptr, name, flags) \ | |
| 162 ptr = NULL; \ | |
| 163 for (i = 0; i < nhdr.fhdr.f_nscns && !ptr; i++) \ | |
| 164 if (strcmp (nhdr.section[i].s_name, name) == 0) \ | |
| 165 { \ | |
| 166 if (nhdr.section[i].s_flags != flags) \ | |
| 167 fprintf (stderr, "unexec: %x flags (%x expected) in %s section.\n", \ | |
| 168 nhdr.section[i].s_flags, flags, name); \ | |
| 169 ptr = nhdr.section + i; \ | |
| 170 } \ | |
| 171 | |
| 172 CHECK_SCNHDR (text_section, _TEXT, STYP_TEXT); | |
| 173 CHECK_SCNHDR (init_section, _INIT, STYP_INIT); | |
| 174 #ifdef _FINI | |
| 175 CHECK_SCNHDR (finit_section, _FINI, STYP_FINI); | |
| 176 #endif /* _FINI */ | |
| 177 CHECK_SCNHDR (rdata_section, _RDATA, STYP_RDATA); | |
| 178 #ifdef _RCONST | |
| 179 CHECK_SCNHDR (rconst_section, _RCONST, STYP_RCONST); | |
| 180 #endif | |
| 181 #ifdef _PDATA | |
| 182 CHECK_SCNHDR (pdata_section, _PDATA, STYP_PDATA); | |
| 183 #endif /* _PDATA */ | |
| 184 #ifdef _GOT | |
| 185 CHECK_SCNHDR (got_section, _GOT, STYP_GOT); | |
| 186 #endif /* _GOT */ | |
| 187 CHECK_SCNHDR (data_section, _DATA, STYP_DATA); | |
| 188 #ifdef _XDATA | |
| 189 CHECK_SCNHDR (xdata_section, _XDATA, STYP_XDATA); | |
| 190 #endif /* _XDATA */ | |
| 191 #ifdef _LIT8 | |
| 192 CHECK_SCNHDR (lit8_section, _LIT8, STYP_LIT8); | |
| 193 CHECK_SCNHDR (lit4_section, _LIT4, STYP_LIT4); | |
| 194 #endif /* _LIT8 */ | |
| 195 CHECK_SCNHDR (sdata_section, _SDATA, STYP_SDATA); | |
| 196 CHECK_SCNHDR (sbss_section, _SBSS, STYP_SBSS); | |
| 197 CHECK_SCNHDR (bss_section, _BSS, STYP_BSS); | |
| 198 | |
| 199 | |
| 200 pagesize = getpagesize (); | |
| 201 brk = (((long) (sbrk (0))) + pagesize - 1) & (-pagesize); | |
| 202 | |
| 203 /* Remember the current break */ | |
| 204 | |
| 205 Brk = brk; | |
| 206 | |
| 207 nhdr.aout.dsize = brk - DATA_START; | |
| 208 nhdr.aout.bsize = 0; | |
| 209 if (entry_address == 0) | |
| 210 { | |
| 211 nhdr.aout.entry = (unsigned long)DEFAULT_ENTRY_ADDRESS; | |
| 212 } | |
| 213 else | |
| 214 nhdr.aout.entry = entry_address; | |
| 215 | |
| 216 nhdr.aout.bss_start = nhdr.aout.data_start + nhdr.aout.dsize; | |
| 217 | |
| 218 if (rdata_section != NULL) | |
| 219 { | |
| 220 rdata_section->s_size = data_start - DATA_START; | |
| 221 | |
| 222 /* Adjust start and virtual addresses of rdata_section, too. */ | |
| 223 rdata_section->s_vaddr = DATA_START; | |
| 224 rdata_section->s_paddr = DATA_START; | |
| 225 rdata_section->s_scnptr = text_section->s_scnptr + nhdr.aout.tsize; | |
| 226 } | |
| 227 | |
| 228 data_section->s_vaddr = data_start; | |
| 229 data_section->s_paddr = data_start; | |
| 230 data_section->s_size = brk - data_start; | |
| 231 | |
| 232 if (rdata_section != NULL) | |
| 233 { | |
| 234 data_section->s_scnptr = rdata_section->s_scnptr + rdata_section->s_size; | |
| 235 } | |
| 236 | |
| 237 vaddr = data_section->s_vaddr + data_section->s_size; | |
| 238 scnptr = data_section->s_scnptr + data_section->s_size; | |
| 239 if (lit8_section != NULL) | |
| 240 { | |
| 241 lit8_section->s_vaddr = vaddr; | |
| 242 lit8_section->s_paddr = vaddr; | |
| 243 lit8_section->s_size = 0; | |
| 244 lit8_section->s_scnptr = scnptr; | |
| 245 } | |
| 246 if (lit4_section != NULL) | |
| 247 { | |
| 248 lit4_section->s_vaddr = vaddr; | |
| 249 lit4_section->s_paddr = vaddr; | |
| 250 lit4_section->s_size = 0; | |
| 251 lit4_section->s_scnptr = scnptr; | |
| 252 } | |
| 253 if (sdata_section != NULL) | |
| 254 { | |
| 255 sdata_section->s_vaddr = vaddr; | |
| 256 sdata_section->s_paddr = vaddr; | |
| 257 sdata_section->s_size = 0; | |
| 258 sdata_section->s_scnptr = scnptr; | |
| 259 } | |
| 260 #ifdef _XDATA | |
| 261 if (xdata_section != NULL) | |
| 262 { | |
| 263 xdata_section->s_vaddr = vaddr; | |
| 264 xdata_section->s_paddr = vaddr; | |
| 265 xdata_section->s_size = 0; | |
| 266 xdata_section->s_scnptr = scnptr; | |
| 267 } | |
| 268 #endif | |
| 269 #ifdef _GOT | |
| 270 if (got_section != NULL) | |
| 271 { | |
| 272 got_section->s_vaddr = vaddr; | |
| 273 got_section->s_paddr = vaddr; | |
| 274 got_section->s_size = 0; | |
| 275 got_section->s_scnptr = scnptr; | |
| 276 } | |
| 277 #endif /*_GOT */ | |
| 278 if (sbss_section != NULL) | |
| 279 { | |
| 280 sbss_section->s_vaddr = vaddr; | |
| 281 sbss_section->s_paddr = vaddr; | |
| 282 sbss_section->s_size = 0; | |
| 283 sbss_section->s_scnptr = scnptr; | |
| 284 } | |
| 285 if (bss_section != NULL) | |
| 286 { | |
| 287 bss_section->s_vaddr = vaddr; | |
| 288 bss_section->s_paddr = vaddr; | |
| 289 bss_section->s_size = 0; | |
| 290 bss_section->s_scnptr = scnptr; | |
| 291 } | |
| 292 | |
| 3025 | 293 WRITE (new_, (char *)TEXT_START, nhdr.aout.tsize, |
| 428 | 294 "writing text section to %s", new_name); |
| 3025 | 295 WRITE (new_, (char *)DATA_START, nhdr.aout.dsize, |
| 428 | 296 "writing data section to %s", new_name); |
| 297 | |
| 298 | |
| 299 /* | |
| 300 * Construct new symbol table header | |
| 301 */ | |
| 302 | |
| 303 memcpy (buffer, oldptr + nhdr.fhdr.f_symptr, cbHDRR); | |
| 304 | |
| 305 #define symhdr ((pHDRR)buffer) | |
| 306 newsyms = nhdr.aout.tsize + nhdr.aout.dsize; | |
| 307 symrel = newsyms - nhdr.fhdr.f_symptr; | |
| 308 nhdr.fhdr.f_symptr = newsyms; | |
| 309 symhdr->cbLineOffset += symrel; | |
| 310 symhdr->cbDnOffset += symrel; | |
| 311 symhdr->cbPdOffset += symrel; | |
| 312 symhdr->cbSymOffset += symrel; | |
| 313 symhdr->cbOptOffset += symrel; | |
| 314 symhdr->cbAuxOffset += symrel; | |
| 315 symhdr->cbSsOffset += symrel; | |
| 316 symhdr->cbSsExtOffset += symrel; | |
| 317 symhdr->cbFdOffset += symrel; | |
| 318 symhdr->cbRfdOffset += symrel; | |
| 319 symhdr->cbExtOffset += symrel; | |
| 320 | |
| 3025 | 321 WRITE (new_, buffer, cbHDRR, "writing symbol table header of %s", new_name); |
| 428 | 322 |
| 323 /* | |
| 324 * Copy the symbol table and line numbers | |
| 325 */ | |
| 3025 | 326 WRITE (new_, oldptr + ohdr.fhdr.f_symptr + cbHDRR, |
| 428 | 327 stat.st_size - ohdr.fhdr.f_symptr - cbHDRR, |
| 328 "writing symbol table of %s", new_name); | |
| 329 | |
| 330 #if 0 | |
| 331 | |
| 332 /* Not needed for now */ | |
| 333 | |
| 3025 | 334 update_dynamic_symbols (oldptr, new_name, new_, newsyms, |
| 428 | 335 ((pHDRR) (oldptr + ohdr.fhdr.f_symptr))->issExtMax, |
| 336 ((pHDRR) (oldptr + ohdr.fhdr.f_symptr))->cbExtOffset, | |
| 337 ((pHDRR) (oldptr + ohdr.fhdr.f_symptr))->cbSsExtOffset); | |
| 338 | |
| 339 #endif | |
| 340 | |
| 341 #undef symhdr | |
| 342 | |
| 3025 | 343 SEEK (new_, 0, "seeking to start of header in %s", new_name); |
| 344 WRITE (new_, &nhdr, sizeof (nhdr), | |
| 428 | 345 "writing header of %s", new_name); |
| 346 | |
| 347 close (old); | |
| 3025 | 348 close (new_); |
| 428 | 349 mark_x (new_name); |
| 350 return 0; | |
| 351 } | |
| 352 | |
| 353 | |
| 354 #if 0 | |
| 355 | |
| 356 /* Not needed for now */ | |
| 357 | |
| 358 /* The following function updates the values of some symbols | |
| 359 that are used by the dynamic loader: | |
| 360 | |
| 361 _edata | |
| 362 _end | |
| 363 | |
| 364 */ | |
| 365 | |
| 366 int | |
| 367 update_dynamic_symbols ( | |
| 368 char *old, /* Pointer to old executable */ | |
| 369 char *new_name, /* Name of new executable */ | |
| 3025 | 370 int new_, /* File descriptor for new executable */ |
| 428 | 371 long newsyms, /* Offset of Symbol table in new executable */ |
| 372 int nsyms, /* Number of symbol table entries */ | |
| 373 long symoff, /* Offset of External Symbols in old file */ | |
| 374 long stroff) /* Offset of string table in old file */ | |
| 375 { | |
| 376 long i; | |
| 377 int found = 0; | |
| 378 EXTR n_end, n_edata; | |
| 379 | |
| 380 /* We go through the symbol table entries until we have found the two | |
| 381 symbols. */ | |
| 382 | |
| 383 /* cbEXTR is the size of an external symbol table entry */ | |
| 384 | |
| 385 for (i = 0; i < nsyms && found < 2; i += cbEXTR) | |
| 386 { | |
| 387 REGISTER pEXTR x = (pEXTR) (old + symoff + i); | |
| 388 char *s; | |
| 389 | |
| 390 s = old + stroff + x->asym.iss; /* name of the symbol */ | |
| 391 | |
| 392 if (!strcmp(s,"_edata")) | |
| 393 { | |
| 394 found++; | |
| 395 memcpy (&n_edata, x, cbEXTR); | |
| 396 n_edata.asym.value = Brk; | |
| 3025 | 397 SEEK (new_, newsyms + cbHDRR + i, |
| 428 | 398 "seeking to symbol _edata in %s", new_name); |
| 3025 | 399 WRITE (new_, &n_edata, cbEXTR, |
| 428 | 400 "writing symbol table entry for _edata into %s", new_name); |
| 401 } | |
| 402 else if (!strcmp(s,"_end")) | |
| 403 { | |
| 404 found++; | |
| 405 memcpy (&n_end, x, cbEXTR); | |
| 406 n_end.asym.value = Brk; | |
| 3025 | 407 SEEK (new_, newsyms + cbHDRR + i, |
| 428 | 408 "seeking to symbol _end in %s", new_name); |
| 3025 | 409 WRITE (new_, &n_end, cbEXTR, |
| 428 | 410 "writing symbol table entry for _end into %s", new_name); |
| 411 } | |
| 412 } | |
| 413 | |
| 414 } | |
| 415 | |
| 416 #endif | |
| 417 | |
| 418 | |
| 419 /* | |
| 420 * mark_x | |
| 421 * | |
| 422 * After successfully building the new a.out, mark it executable | |
| 423 */ | |
| 424 | |
| 425 static void | |
| 426 mark_x (char *name) | |
| 427 { | |
| 428 struct stat sbuf; | |
| 429 int um = umask (777); | |
| 430 umask (um); | |
| 431 if (stat (name, &sbuf) < 0) | |
| 432 fatal_unexec ("getting protection on %s", name); | |
| 433 sbuf.st_mode |= 0111 & ~um; | |
| 434 if (chmod (name, sbuf.st_mode) < 0) | |
| 435 fatal_unexec ("setting protection on %s", name); | |
| 436 } | |
| 437 | |
| 438 static void | |
| 439 fatal_unexec (char *s, char *arg) | |
| 440 { | |
| 441 if (errno == EEOF) | |
| 442 fputs ("unexec: unexpected end of file, ", stderr); | |
| 443 else | |
| 444 fprintf (stderr, "unexec: %s, ", strerror (errno)); | |
| 445 fprintf (stderr, s, arg); | |
| 446 fputs (".\n", stderr); | |
| 447 exit (1); | |
| 448 } |