view src/unexnt.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 6f2158fa75ed
children 308d34e9f07d
line wrap: on
line source

/* unexec for XEmacs on Windows NT.
   Copyright (C) 1994 Free Software Foundation, Inc.
   Copyright (C) 2002, 2010 Ben Wing.

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.

   Geoff Voelker (voelker@cs.washington.edu) 8-12-94 */

/* Adapted for XEmacs by David Hobley <david@spook-le0.cia.com.au> */

/* This file has been Mule-ized, Ben Wing, 4-13-02. */

/* The linkers that come with MSVC >= 4.0 merge .bss into .data and reorder
 * uninitialised data so that the .data section looks like:
 *
 *	crt0 initialised data
 *	emacs initialised data
 *		<my_edata>
 *	library initialised data
 *		<start of bss part of .data>
 *	emacs static uninitialised data
 *	library static uninitialised data
 *	emacs global uninitialised data
 *		<my_ebss>
 *	library global uninitialised data
 *
 * This means that we can't use the normal my_ebss in lastfile.c trick to
 * differentiate between unitialised data that belongs to emacs and
 * uninitialised data that belongs to system libraries. This is bad because
 * we do want to initialise the emacs data, but we don't want to initialise
 * the system library data.
 *
 * To solve this problem using MSVC >= 5.0 we use a pragma directive to tell
 * the compiler to put emacs's data (both initialised and uninitialised) in
 * a separate section in the executable, and we only dump that section. This
 * means that all files that define initialized data must include config.h
 * to pick up the pragma. We don't try to make any part of that section
 * read-only.
 *
 * This pragma directive isn't supported by the MSVC 4.x compiler. Instead,
 * we dump crt0 initialised data and library static uninitialised data in
 * addition to the emacs data. This is wrong, but we appear to be able to
 * get away with it. A proper fix might involve the introduction of a static
 * version of my_ebss in lastfile.c and a new firstfile.c file.  jhar */

#include <config.h>
#include "lisp.h"

#include "sysfile.h"
#include "syswindows.h"

/* From IMAGEHLP.H which is not installed by default by MSVC < 5 */
/* The IMAGEHLP.DLL library is not distributed by default with Windows95 */
typedef PIMAGE_NT_HEADERS
(__stdcall * pfnCheckSumMappedFile_t) (LPVOID BaseAddress, DWORD FileLength,
				       LPDWORD HeaderSum, LPDWORD CheckSum);


#if 0
extern BOOL ctrl_c_handler (unsigned long type);
#endif

/* Sync with FSF Emacs 19.34.6
   note: struct file_data is now defined in nt.h */

enum {
  HEAP_UNINITIALIZED = 1,
  HEAP_UNLOADED,
  HEAP_LOADED
};

/* Basically, our "initialized" flag.  */
int heap_state = HEAP_UNINITIALIZED;

/* So we can find our heap in the file to recreate it.  */
unsigned long heap_index_in_executable = UNINIT_LONG;

void get_section_info (file_data *p_file);
void copy_executable_and_dump_data_section (file_data *, file_data *);
void dump_bss_and_heap (file_data *p_infile, file_data *p_outfile);

/* Cached info about the .data section in the executable.  */
PUCHAR data_start_va = UNINIT_PTR;
DWORD  data_start_file = UNINIT_LONG;
DWORD  data_size = UNINIT_LONG;

/* Cached info about the .bss section in the executable.  */
PUCHAR bss_start = UNINIT_PTR;
DWORD  bss_size = UNINIT_LONG;

/* Startup code for running on NT.  When we are running as the dumped
   version, we need to bootstrap our heap and .bss section into our
   address space before we can actually hand off control to the startup
   code supplied by NT (primarily because that code relies upon malloc ()).  */

/* **********************
   Hackers please remember, this _start() thingy is *not* called either
   when dumping portably, or when running from temacs! Do not put
   significant XEmacs initialization here!
   ********************** */

EXTERN_C void mainCRTStartup (void);

EXTERN_C int _start (void);

int
_start (void)
{
  /* Cache system info, e.g., the NT page size.  */
  cache_system_info ();
  /* Set OS type, so that tchar stuff below works */
  init_win32_very_early ();

  /* If we're a dumped version of emacs then we need to recreate
     our heap and play tricks with our .bss section.  Do this before
     start up.  (WARNING:  Do not put any code before this section
     that relies upon malloc () and runs in the dumped version.  It
     won't work.)  */
  if (heap_state == HEAP_UNLOADED) 
    {
      Extbyte executable_path[PATH_MAX_TCHAR];

      /* Don't use mswindows_get_module_file_name() because it uses
	 xmalloc() */
      if (qxeGetModuleFileName (NULL, executable_path, _MAX_PATH) == 0)
	{
	  exit (1);
	}

      /* #### This is super-bogus. When I rename xemacs.exe,
	 the renamed file still loads its heap from xemacs.exe --kkm */
#if 0
      {
	Extbyte *p;
	
	/* To allow profiling, make sure executable_path names the .exe
	   file, not the file created by the profiler */
	p = qxetcsrchr (executable_path, '\\');
	qxetcscpy (p + 1, XETEXT (PATH_PROGNAME ".exe"));
      }
#endif

      recreate_heap (executable_path);
      heap_state = HEAP_LOADED;
    }

  /* #### This is bogus, too. _fmode is set to different values
     when we run `xemacs' and `temacs run-emacs'. The sooner we
     hit and fix all the weirdities this causes us, the better --kkm */
#if 0
  /* The default behavior is to treat files as binary and patch up
     text files appropriately.  */
  _fmode = O_BINARY;
#endif

#if 0
  /* This prevents ctrl-c's in shells running while we're suspended from
     having us exit.  */
  SetConsoleCtrlHandler ((PHANDLER_ROUTINE) ctrl_c_handler, TRUE);
#endif

  mainCRTStartup ();
  return 0; /* not reached? */
}

/* Dump out .data and .bss sections into a new executable.  */
int
unexec (Ibyte *new_name, Ibyte *old_name, unsigned int UNUSED (start_data),
	unsigned int UNUSED (start_bss), unsigned int UNUSED (entry_address))
{
  file_data in_file, out_file;
  Ibyte *out_filename = alloca_ibytes (qxestrlen (new_name) + 10);
  Ibyte *in_filename = alloca_ibytes (qxestrlen (old_name) + 10);
  unsigned long size;
  Ibyte *ptr;
  HINSTANCE hImagehelp;
  
  /* Make sure that the input and output filenames have the
     ".exe" extension...patch them up if they don't.  */
  qxestrcpy (in_filename, old_name);
  ptr = in_filename + qxestrlen (in_filename) - 4;
  if (qxestrcmp_ascii (ptr, ".exe"))
    qxestrcat_ascii (in_filename, ".exe");

  qxestrcpy (out_filename, new_name);
  ptr = out_filename + qxestrlen (out_filename) - 4;
  if (qxestrcmp_ascii (ptr, ".exe"))
    qxestrcat_ascii (out_filename, ".exe");

  stdout_out ("Dumping from %s\n", in_filename);
  stdout_out ("          to %s\n", out_filename);

  /* We need to round off our heap to NT's allocation unit (64KB).  */
  round_heap (get_allocation_unit ());

  /* Open the undumped executable file.  */
  if (!open_input_file (&in_file, in_filename))
    {
      stdout_out ("Failed to open %s (%d)...bailing.\n", 
		  in_filename, GetLastError ());
      exit (1);
    }

  /* Get the interesting section info, like start and size of .bss...  */
  get_section_info (&in_file);

  /* The size of the dumped executable is the size of the original
     executable plus the size of the heap and the size of the .bss section.  */
  heap_index_in_executable = (unsigned long)
    round_to_next ((Rawbyte *) in_file.size, get_allocation_unit ());
  size = heap_index_in_executable + get_committed_heap_size () + bss_size;
  if (!open_output_file (&out_file, out_filename, size))
    {
      stdout_out ("Failed to open %s (%d)...bailing.\n", 
		  out_filename, GetLastError ());
      exit (1);
    }

  /* Set the flag (before dumping).  */
  heap_state = HEAP_UNLOADED;

  copy_executable_and_dump_data_section (&in_file, &out_file);
  dump_bss_and_heap (&in_file, &out_file);

  /* Patch up header fields; profiler is picky about this. */
  hImagehelp = LoadLibraryA ("imagehlp.dll");
  if (hImagehelp)
  {
    PIMAGE_DOS_HEADER dos_header;
    PIMAGE_NT_HEADERS nt_header;

    DWORD  headersum;
    DWORD  checksum;
    pfnCheckSumMappedFile_t pfnCheckSumMappedFile;

    dos_header = (PIMAGE_DOS_HEADER) out_file.file_base;
    nt_header = (PIMAGE_NT_HEADERS) ((Rawbyte *) dos_header +
				     dos_header->e_lfanew);

    nt_header->OptionalHeader.CheckSum = 0;
#if 0
    nt_header->FileHeader.TimeDateStamp = time (NULL);
    dos_header->e_cp = size / 512;
    nt_header->OptionalHeader.SizeOfImage = size;
#endif

    pfnCheckSumMappedFile =
      (pfnCheckSumMappedFile_t) GetProcAddress (hImagehelp,
						"CheckSumMappedFile");
    if (pfnCheckSumMappedFile)
      {
#if 0
	nt_header->FileHeader.TimeDateStamp = time (NULL);
#endif
	pfnCheckSumMappedFile (out_file.file_base,
			       out_file.size,
			       &headersum,
			       &checksum);
	nt_header->OptionalHeader.CheckSum = checksum;
      }
    FreeLibrary (hImagehelp);
  }

  close_file_data (&in_file);
  close_file_data (&out_file);

  return 0;
}

/* Routines to manipulate NT executable file sections.  */

#ifndef DUMP_SEPARATE_SECTION
static void
get_bss_info_from_map_file (file_data *p_infile, PUCHAR *p_bss_start, 
			    DWORD *p_bss_size)
{
  int n, start, len;
  Ibyte *map_filename = alloca_ibytes (qxestrlen (p_infile->name) + 10);
  Extbyte buffer[256];
  FILE *map;

  /* Overwrite the .exe extension on the executable file name with
     the .map extension.  */
  qxestrcpy (map_filename, p_infile->name);
  n = qxestrlen (map_filename) - 3;
  qxestrcpy (&map_filename[n], "map");

  map = qxe_fopen (map_filename, "r");
  if (!map)
    {
      stdout_out ("Failed to open map file %s, error %d...bailing out.\n",
		  map_filename, GetLastError ());
      exit (-1);
    }

  while (fgets (buffer, sizeof (buffer), map))
    {
      if (!(strstr (buffer, ".bss") && strstr (buffer, "DATA")))
	continue;
      n = sscanf (buffer, " %*d:%x %x", &start, &len);
      if (n != 2)
	{
	  /* printf with external data, stdout_out with internal */
	  printf ("Failed to scan the .bss section line:\n%s", buffer);
	  exit (-1);
	}
      break;
    }
  *p_bss_start = (PUCHAR) start;
  *p_bss_size = (DWORD) len;
}
#endif

/* Flip through the executable and cache the info necessary for dumping.  */
static void
get_section_info (file_data *p_infile)
{
  PIMAGE_DOS_HEADER dos_header;
  PIMAGE_NT_HEADERS nt_header;
  PIMAGE_SECTION_HEADER section, data_section;
  Rawbyte *ptr;
  int i;
  
  dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base;
  if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) 
    {
      stdout_out ("Unknown EXE header in %s...bailing.\n", p_infile->name);
      exit (1);
    }
  nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + 
				   dos_header->e_lfanew);
  if (nt_header == NULL) 
    {
      stdout_out ("Failed to find IMAGE_NT_HEADER in %s...bailing.\n", 
		  p_infile->name);
      exit (1);
    }

  /* Check the NT header signature ...  */
  if (nt_header->Signature != IMAGE_NT_SIGNATURE) 
    {
      stdout_out ("Invalid IMAGE_NT_SIGNATURE 0x%x in %s...bailing.\n",
		  nt_header->Signature, p_infile->name);
    }

  /* Flip through the sections for .data and .bss ...  */
  section = (PIMAGE_SECTION_HEADER) IMAGE_FIRST_SECTION (nt_header);
  for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) 
    {
#ifndef DUMP_SEPARATE_SECTION
      if (!qxestrcmp_ascii (section->Name, ".bss")) 
	{
	  extern int my_ebss;		/* From lastfile.c  */

	  ptr = (Rawbyte *) nt_header->OptionalHeader.ImageBase +
	    section->VirtualAddress;
	  bss_start = ptr;
	  bss_size = (Rawbyte*) &my_ebss - (Rawbyte*) bss_start;
	}

      if (!qxestrcmp_ascii (section->Name, ".data")) 
#else
      if (!qxestrcmp_ascii (section->Name, "xdata"))
#endif
	{
	  extern Rawbyte my_edata[];	/* From lastfile.c  */

	  /* The .data section.  */
	  data_section = section;
	  ptr = (Rawbyte *) nt_header->OptionalHeader.ImageBase +
	    section->VirtualAddress;
	  data_start_va = ptr;
	  data_start_file = section->PointerToRawData;

#ifndef DUMP_SEPARATE_SECTION
	  /* Write only the part of the section that contains emacs data. */
	  data_size = my_edata - data_start_va;
#else
	  /* Write back the full section.  */
	  data_size = section->SizeOfRawData;

	  /* This code doesn't know how to grow the raw size of a section. */
	  if (section->SizeOfRawData < section->Misc.VirtualSize)
	    {
	      stdout_out ("The emacs data section is smaller than expected"
			  "...bailing.\n");
	      exit (1);
	    }
#endif
	}
      section++;
    }

#ifndef DUMP_SEPARATE_SECTION
  if (bss_start == UNINIT_PTR)
    {
      /* Starting with MSVC 4.0, the .bss section has been eliminated
	 and appended virtually to the end of the .data section.  Our
	 only hint about where the .bss section starts in the address
	 comes from the SizeOfRawData field in the .data section
	 header.  Unfortunately, this field is only approximate, as it
	 is a rounded number and is typically rounded just beyond the
	 start of the .bss section.  To find the start and size of the
	 .bss section exactly, we have to peek into the map file.  */
      extern int my_ebss;

      get_bss_info_from_map_file (p_infile, &ptr, &bss_size);
      bss_start = ptr + nt_header->OptionalHeader.ImageBase
	+ data_section->VirtualAddress;
      bss_size = (Rawbyte *) &my_ebss - (Rawbyte *) bss_start;
    }
#else
  bss_size = 0;
#endif
}


/* The dump routines.  */

#ifdef DEBUG_XEMACS
/* printf with external data, stdout_out with internal */
#define DUMP_MSG(x) printf x
#else
#define DUMP_MSG(x)
#endif

static void
copy_executable_and_dump_data_section (file_data *p_infile,
				       file_data *p_outfile)
{
  Rawbyte *data_file, *data_va;
  unsigned long size, index;

  /* Get a pointer to where the raw data should go in the executable file.  */
  data_file = (Rawbyte *) p_outfile->file_base + data_start_file;

  /* Get a pointer to the raw data in our address space.  */
  data_va = data_start_va;

  size = (DWORD) data_file - (DWORD) p_outfile->file_base;
  DUMP_MSG (("Copying executable up to data section...\n"));
  DUMP_MSG (("\t0x%08x Offset in input file.\n", 0));
  DUMP_MSG (("\t0x%08x Offset in output file.\n", 0));
  DUMP_MSG (("\t0x%08x Size in bytes.\n", size));
  memcpy (p_outfile->file_base, p_infile->file_base, size);

  size = data_size;
  DUMP_MSG (("Dumping data section...\n"));
  DUMP_MSG (("\t0x%08x Address in process.\n", data_va));
  DUMP_MSG (("\t0x%08x Offset in output file.\n", 
	     (Rawbyte *) data_file -
	     (Rawbyte *) p_outfile->file_base));
  DUMP_MSG (("\t0x%08x Size in bytes.\n", size));
  memcpy (data_file, data_va, size);

  index = (DWORD) data_file + size - (DWORD) p_outfile->file_base;
  size = p_infile->size - index;
  DUMP_MSG (("Copying rest of executable...\n"));
  DUMP_MSG (("\t0x%08x Offset in input file.\n", index));
  DUMP_MSG (("\t0x%08x Offset in output file.\n", index));
  DUMP_MSG (("\t0x%08x Size in bytes.\n", size));
  memcpy ((Rawbyte *) p_outfile->file_base + index, 
	  (Rawbyte *) p_infile->file_base + index, size);
}

static void
dump_bss_and_heap (file_data *UNUSED (p_infile), file_data *p_outfile)
{
  Rawbyte *heap_data;
  unsigned long size, index;

  DUMP_MSG (("Dumping heap onto end of executable...\n"));

  index = heap_index_in_executable;
  size = get_committed_heap_size ();
  heap_data = get_heap_start ();

  DUMP_MSG (("\t0x%08x Heap start in process.\n", heap_data));
  DUMP_MSG (("\t0x%08x Heap offset in executable.\n", index));
  DUMP_MSG (("\t0x%08x Heap size in bytes.\n", size));

  memcpy ((PUCHAR) p_outfile->file_base + index, heap_data, size);

#ifndef DUMP_SEPARATE_SECTION
  DUMP_MSG (("Dumping bss onto end of executable...\n"));
    
  index += size;
  size = bss_size;

  DUMP_MSG (("\t0x%08x BSS start in process.\n", bss_start));
  DUMP_MSG (("\t0x%08x BSS offset in executable.\n", index));
  DUMP_MSG (("\t0x%08x BSS size in bytes.\n", size));
  memcpy ((Rawbyte *) p_outfile->file_base + index, bss_start, size);
#endif
}

#undef DUMP_MSG

/* Reload and remap routines.  */


/* Load the dumped .bss section into the .bss area of our address space.  */
/* Already done if the .bss  was part of a separate emacs data section */
void
read_in_bss (Extbyte *filename)
{
#ifndef DUMP_SEPARATE_SECTION
  HANDLE file;
  unsigned long index, n_read;

  file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
			OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
  assert (file != INVALID_HANDLE_VALUE);
  
  /* Seek to where the .bss section is tucked away after the heap...  */
  index = heap_index_in_executable + get_committed_heap_size ();
  if (SetFilePointer (file, index, NULL, FILE_BEGIN) == 0xFFFFFFFF)
    ABORT ();

  /* Ok, read in the saved .bss section and initialize all 
     uninitialized variables.  */
  if (!ReadFile (file, bss_start, bss_size, &n_read, NULL))
    ABORT ();

  CloseHandle (file);
#endif
}

/* Map the heap dumped into the executable file into our address space.  */
void 
map_in_heap (Extbyte *filename)
{
  HANDLE file;
  HANDLE file_mapping;
  void  *file_base;
  unsigned long size, upper_size, n_read;

  file = qxeCreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL,
			OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
  assert (file != INVALID_HANDLE_VALUE);

  size = GetFileSize (file, &upper_size);
  file_mapping = qxeCreateFileMapping (file, NULL, PAGE_WRITECOPY, 
				       0, size, NULL);
  assert (file_mapping);

  size = get_committed_heap_size ();
  file_base = MapViewOfFileEx (file_mapping, FILE_MAP_COPY, 0, 
			       heap_index_in_executable, size,
			       get_heap_start ());
  if (file_base != 0) 
    {
      return;
    }

  /* If we don't succeed with the mapping, then copy from the 
     data into the heap.  */

  CloseHandle (file_mapping);

  if (VirtualAlloc (get_heap_start (), get_committed_heap_size (),
		    MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE) == NULL)
    ABORT ();

  /* Seek to the location of the heap data in the executable.  */
  if (SetFilePointer (file, heap_index_in_executable,
		      NULL, FILE_BEGIN) == 0xFFFFFFFF)
    ABORT ();

  /* Read in the data.  */
  if (!ReadFile (file, get_heap_start (), 
		 get_committed_heap_size (), &n_read, NULL))
    ABORT ();

  CloseHandle (file);
}