Mercurial > hg > xemacs-beta
diff src/Makefile.in.in @ 851:e7ee5f8bde58
[xemacs-hg @ 2002-05-23 11:46:08 by ben]
fix for raymond toy's crash, alloca crashes, some recover-session improvements
files.el: Recover-session improvements: Only show session files where some
files can actually be recovered, and show in chronological order.
subr.el, menubar-items.el: As promised to rms, the functionality in
truncate-string-with-continuation-dots has been merged into
truncate-string-to-width. Change callers in menubar-items.el.
select.el: Document some of these funs better. Fix problem where we were
doing own-clipboard twice.
Makefile.in.in: Add alloca.o. Ensure that alloca.s doesn't compile into alloca.o,
but allocax.o (not that it's currently used or anything.)
EmacsFrame.c, abbrev.c, alloc.c, alloca.c, callint.c, callproc.c, config.h.in, device-msw.c, device-x.c, dired.c, doc.c, editfns.c, emacs.c, emodules.c, eval.c, event-Xt.c, event-msw.c, event-stream.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-x.c, input-method-xlib.c, intl-win32.c, lisp.h, lread.c, menubar-gtk.c, menubar-msw.c, menubar.c, mule-wnnfns.c, nt.c, objects-msw.c, process-nt.c, realpath.c, redisplay-gtk.c, redisplay-output.c, redisplay-x.c, redisplay.c, search.c, select-msw.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: Fix Raymond Toy's crash. Repeat to self: 2^21 - 1 is NOT the
same as (2 << 21) - 1.
Fix crashes due to excessive alloca(). replace alloca() with
ALLOCA(), which calls the C alloca() [which uses xmalloc()]
when the size is too big. Insert in various places calls to
try to flush the C alloca() stored info if there is any.
Add MALLOC_OR_ALLOCA(), for places that expect to be alloca()ing
large blocks. This xmalloc()s when too large and records an
unwind-protect to free -- relying on the caller to unbind_to()
elsewhere in the function. Use it in concat().
Use MALLOC instead of ALLOCA in select-msw.c.
xemacs.mak: Add alloca.o.
| author | ben |
|---|---|
| date | Thu, 23 May 2002 11:46:46 +0000 |
| parents | 6728e641994e |
| children | 2b6fa2618f76 |
line wrap: on
line diff
--- a/src/Makefile.in.in Tue May 21 23:47:40 2002 +0000 +++ b/src/Makefile.in.in Thu May 23 11:46:46 2002 +0000 @@ -307,11 +307,13 @@ ## if they all come out null. objs=\ - abbrev.o alloc.o $(balloon_help_objs) blocktype.o buffer.o bytecode.o\ - callint.o callproc.o casefiddle.o casetab.o chartab.o $(clash_detection_objs)\ - cmdloop.o cmds.o $(coding_system_objs) console.o console-stream.o\ + abbrev.o alloc.o alloca.o \ + $(balloon_help_objs) blocktype.o buffer.o bytecode.o \ + callint.o callproc.o casefiddle.o casetab.o chartab.o \ + $(clash_detection_objs) cmdloop.o cmds.o $(coding_system_objs) console.o \ + console-stream.o\ data.o $(database_objs) $(debug_objs) device.o dired.o doc.o doprnt.o\ - dynarr.o\ + dynarr.o \ editfns.o elhash.o emacs.o eval.o events.o\ event-stream.o $(event_unixoid_objs) $(extra_objs) extents.o\ faces.o file-coding.o fileio.o $(LOCK_OBJ) filemode.o floatfns.o fns.o \ @@ -794,18 +796,13 @@ ## be used but generate no code. ## Some have it written in assembler in alloca.s. ## Some use the C version in alloca.c (these define C_ALLOCA in config.h). - +## Nowadays we always compile in the C version and use it to avoid stack +## overflow. #ifdef C_ALLOCA -## We could put something in alloca.c to #define free and malloc -## whenever emacs was #defined, but that's not appropriate for all -## users of alloca in Emacs. Check out ../lib-src/getopt.c. */ - -alloca.o : ${srcdir}/alloca.c - $(CC) -c -Dfree=xfree -Dmalloc=xmalloc $(cflags) ${srcdir}/alloca.c #else #ifndef HAVE_ALLOCA -alloca.o : ${srcdir}/alloca.s config.h +allocax.o : ${srcdir}/alloca.s config.h ## $(CPP) is cc -E, which may get confused by filenames ## that do not end in .c. So copy file to a safe name. */ ## cp ${srcdir}/alloca.s allocatem.c @@ -819,7 +816,6 @@ @$(RM) alloca.o ## Xenix, in particular, needs to run assembler via cc. $(CC) -c allocax.s - mv allocax.o alloca.o $(RM) allocax.s allocatem.c #endif /* HAVE_ALLOCA */ #endif /* ! defined (C_ALLOCA) */