May 2000 - XEmacs-Beta - XEmacs Mailing List Archives

Re: set-window-configuration vs error-checking sub windows 24 years, 6 months

Jan Vroonhof

Jan Vroonhof <vroonhof(a)math.ethz.ch> writes: > +void > +check_subwindow_instance_caches (void) > +{ With this test in place, the following is enough to crash XEmacs by hitting the sledgehammer check abort. xemacs -vanilla (with-displaying-help-buffer (garbage-collect)) I think the essential ingredient here is that w-d-h-b creates a new window with a buffer in help mode and thus a new buffer tab widget. The garbage-collection then creates the problem with the inconsistency between the two weak caches. Either the weak-lists are not working correctly or there is something which keeps holding references to the instances[1] .. Jan Footnotes: [1] Isn't that a general problem? Can lisp get at the instances?

1 participants
0 comments

CVS problems... 24 years, 6 months

Jan Vroonhof

Is anybody else seeing this cvs server: Updating nt/installer cvs server: Updating nt/installer/Wise cvs [update aborted]: end of file from server (consult above messages if any) korteweg:/scratch/xemacs/xemacs-20> cd nt/installer/ korteweg:/scratch/xemacs/xemacs-20/nt/installer> cvs update ? Wise/.new.xemacs-be cvs server: Updating . cvs server: Updating Wise cvs [update aborted]: reading from server: Connection reset by peer korteweg:/scratch/xemacs/xemacs-20/nt/installer> cvs --version Concurrent Versions System (CVS) 1.10.7 (client/server) Copyright (c) 1989-1998 Brian Berliner, david d `zoo' zuhn, Jeff Polk, and other authors CVS may be copied only under the terms of the GNU General Public License, a copy of which can be found with the CVS distribution kit. Specify the --help option for further information about CVS korteweg:/scratch/xemacs/xemacs-20/nt/installer>

4 participants
5 comments

Re: Package Status 24 years, 6 months

Karl M. Hegbloom

>>>>> "Andreas" == Andreas Jaeger <aj(a)suse.de> writes: Andreas> I'm looking forward to your patches. I especially look forward to: Andreas> - Karl's overhaul of the XEmacs build structure (patch pending) Andreas> - ilisp integration (Karl Hegbloom) I have to go work today - daily-pay temp labor -- I'm flat out broke right now and have not paid my phone bill yet -- but when I get home this afternoon, I'll get back to work on this stuff. I can send Scheme forms to Guile now. I've only read a small part of `ilisp' so far though. I need a few days to become more familiar with how it functions. Classes start the 19th. I'm signed up for 2 this summer... I'll try and take time for some XEmacs studies as well. If I'd been doing nothing but reading XEmacs code for the last two years I'd be a lot farther along in my understanding of it than I am... but in reality out of all that time have only spent a total of a month or so on it. I feel like I'm way behind.

2 participants
1 comments

untabify works no more 24 years, 6 months

Michael Sperber

Has anyone noticed? -- Cheers =8-} Mike Friede, Völkerverständigung und überhaupt blabla

2 participants
1 comments

Re: set-window-configuration vs error-checking sub windows 24 years, 6 months

Jan Vroonhof

Andy Piper <andy(a)xemacs.org> writes: > I suppose it might be worth rewriting your sledgehammer check to validate > that for every instance in the frame cache its domain is (a) a window and > (b) in that window's cache. I just did this (code at end) I stuck it in Feval, Ffuncall, Fset_window_configuration and before/after garbage_collect[1]. It hits in Feval all the time while starting up Gnus. I can sometimes get it too when I make buffers with C-x b and play a lot with windows. Still no clue what could cause it. Could you review my check? Footnotes: [1] In case it was some problem with the weak hash tables. Jan korteweg:/scratch/xemacs/xemacs-20/src> cvs diff glyphs.c lisp.h eval.c alloc.c Index: glyphs.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/glyphs.c,v retrieving revision 1.23.2.72 diff -u -r1.23.2.72 glyphs.c --- glyphs.c 2000/05/23 10:53:41 1.23.2.72 +++ glyphs.c 2000/05/26 08:40:39 ＠＠ -592,6 +592,71 ＠＠ check_window_subwindow_cache (XWINDOW (XIMAGE_INSTANCE_DOMAIN (instance))); } + +int inhibit_sledge_hammer_check = 0; + +static int found_in_cache = 0; + +static int +find_instance_mapper (Lisp_Object key, Lisp_Object value, + void *flag_closure) +{ + /* This function can GC */ + /* value can be nil; we cache failures as well as successes */ + if (!NILP (value)) + { + Lisp_Object instance; + + VOID_TO_LISP (instance, flag_closure); + if (EQ (value, instance)) + { + found_in_cache = 1; + return 1; + } + } + + return 0; +} + +static void +check_image_instance_in_window_cache (Lisp_Object instance) +{ + struct window *w; + + if (WINDOWP (XIMAGE_INSTANCE_DOMAIN (instance))) + { + w = XWINDOW (XIMAGE_INSTANCE_DOMAIN (instance)); + + assert (!NILP (w->subwindow_instance_cache)); + + found_in_cache = 0; + + elisp_maphash (find_instance_mapper, + w->subwindow_instance_cache, + LISP_TO_VOID (instance)); + + assert (found_in_cache); + } +} + +void +check_subwindow_instance_caches (void) +{ + Lisp_Object frmcons, devcons, concons; + + if (inhibit_sledge_hammer_check) + return; + + FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) + { + Lisp_Object rest; + + LIST_LOOP (rest, XWEAK_LIST_LIST + (FRAME_SUBWINDOW_CACHE (XFRAME (XCAR (frmcons))))) + check_image_instance_in_window_cache (XCAR (rest)); + } +} + #endif /* Determine what kind of domain governs the image instance. ＠＠ -3144,6 +3209,7 ＠＠ & (IMAGE_SUBWINDOW_MASK | IMAGE_WIDGET_MASK)) assert (EQ (XIMAGE_INSTANCE_FRAME (instance), DOMAIN_FRAME (domain))); + check_subwindow_instance_caches(); #endif ERROR_CHECK_IMAGE_INSTANCE (instance); return instance; Index: lisp.h =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/lisp.h,v retrieving revision 1.38.2.64 diff -u -r1.38.2.64 lisp.h --- lisp.h 2000/05/21 01:40:39 1.38.2.64 +++ lisp.h 2000/05/26 08:40:54 ＠＠ -2351,6 +2351,9 ＠＠ /* Defined in glyphs.c */ Error_behavior decode_error_behavior_flag (Lisp_Object); Lisp_Object encode_error_behavior_flag (Error_behavior); +#ifdef ERROR_CHECK_GLYPHS +void check_subwindow_instance_caches (void); +#endif /* Defined in indent.c */ int bi_spaces_at_point (struct buffer *, Bytind); Index: eval.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/eval.c,v retrieving revision 1.27.2.24 diff -u -r1.27.2.24 eval.c --- eval.c 2000/05/17 07:35:45 1.27.2.24 +++ eval.c 2000/05/26 08:41:17 ＠＠ -2939,6 +2939,10 ＠＠ UNGCPRO; } +#ifdef ERROR_CHECK_GLYPHS + check_subwindow_instance_caches (); +#endif + if (++lisp_eval_depth > max_lisp_eval_depth) { if (max_lisp_eval_depth < 100) ＠＠ -3162,6 +3166,8 ＠＠ /* Callers should gcpro lexpr args */ garbage_collect_1 (); + check_subwindow_instance_caches(); + if (++lisp_eval_depth > max_lisp_eval_depth) { if (max_lisp_eval_depth < 100) Index: alloc.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/alloc.c,v retrieving revision 1.42.2.61 diff -u -r1.42.2.61 alloc.c --- alloc.c 2000/05/01 11:00:02 1.42.2.61 +++ alloc.c 2000/05/26 08:41:37 ＠＠ -3353,6 +3353,8 ＠＠ f = XFRAME (frame); } + check_subwindow_instance_caches(); + pre_gc_cursor = Qnil; cursor_changed = 0; ＠＠ -3561,6 +3563,8 ＠＠ /* now stop inhibiting GC */ unbind_to (speccount, Qnil); + + check_subwindow_instance_caches(); if (!breathing_space) { korteweg:/scratch/xemacs/xemacs-20/src> cvs diff window.c Index: window.c =================================================================== RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/window.c,v retrieving revision 1.41.2.52 diff -u -r1.41.2.52 window.c --- window.c 2000/05/11 10:29:37 1.41.2.52 +++ window.c 2000/05/26 08:57:44 ＠＠ -1603,9 +1603,10 ＠＠ (window)) { struct window *w = decode_window (window); + struct frame *f = XFRAME (w->frame); - int left = w->pixel_left; - int top = w->pixel_top; + int left = w->pixel_left - FRAME_LEFT_BORDER_END (f) - FRAME_LEFT_GUTTER_BOUNDS(f); + int top = w->pixel_top - FRAME_TOP_BORDER_END (f) - FRAME_TOP_GUTTER_BOUNDS(f);; return list4 (make_int (left), make_int (top), ＠＠ -1941,6 +1942,8 ＠＠ they don't sit around consuming excess space. They will be reinitialized by the window-configuration code as necessary. */ finalize_window ((void *) w, 0); + + check_subwindow_instance_caches(); } DEFUN ("delete-window", Fdelete_window, 0, 2, "", /* ＠＠ -5218,7 +5221,16 ＠＠ /* Force subwindows to be reinstantiated. They are all going anyway and if we don't do this GC may not happen between now - and the next time we check their integrity. */ + and the next time we check their integrity. + + #### JV: I don't understand this comment. Trying to be smart like + this and trying to do redisplay's work can cause problems + (See also comment in unmap_subwindow). In fact I don't follow + "all are going anyway" at all. Most calls of + Fset_windows_configuration + happen as part of save-window-excursion and have no redisplay + during the existance of the new state. + */ reset_frame_subwindow_instance_cache (f); #if 0 ＠＠ -5601,6 +5613,8 ＠＠ UNGCPRO; + check_subwindow_instance_caches(); + return Qnil; } korteweg:/scratch/xemacs/xemacs-20/src>

2 participants
1 comments

Is anyone interested in old dump code? 24 years, 6 months

Yoshiki Hayashi

These are diff between FSF Emacs 20.6.90 and current XEmacs 21.2. --- /src/xemacs/src/m/iris4d.h Mon Feb 21 10:00:40 2000 +++ /home/penny/sources/emacs-20.6.90/src/m/iris4d.h Mon May 15 22:06:31 2000 ＠＠ -14,11 +14,25 ＠＠ 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 +along with GNU Emacs; 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: FSF 19.31. */ + +/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word + is the most significant byte. */ + +#define WORDS_BIG_ENDIAN + +/* Define NO_ARG_ARRAY if you cannot take the address of the first of a + * group of arguments and treat it as an array of the arguments. */ + +#define NO_ARG_ARRAY + +/* Define WORD_MACHINE if addresses and such have + * to be corrected before they can be used as byte counts. */ + +#undef WORD_MACHINE /* Now define a symbol for the cpu type, if your compiler does not define it automatically: ＠＠ -33,6 +47,19 ＠＠ #define IRIS_4D #endif +/* Use type int rather than a union, to represent Lisp_Object */ +/* This is desirable for most machines. */ + +#define NO_UNION_TYPE + +/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend + the bit field into an int. In other words, if bit fields + are always unsigned. + + If you use NO_UNION_TYPE, this flag does not matter. */ + +#define EXPLICIT_SIGN_EXTEND + /* jg(a)genmagic.genmagic.com (John Giannandrea) says this is unnecessary. */ #if 0 /* Data type of load average, as read out of kmem. */ ＠＠ -86,16 +113,33 ＠＠ #ifdef USG5_4 #undef UNEXEC -#define UNEXEC "unexelf.o" +#define UNEXEC unexelf.o #else -#define UNEXEC "unexmips.o" +#define UNEXEC unexmips.o #endif #define TEXT_START 0x400000 + +/* + * DATA_SEG_BITS forces extra bits to be or'd in with any pointers which + * were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for + * the value field of a LISP_OBJECT). + */ + #define DATA_START 0x10000000 +#define DATA_SEG_BITS 0x10000000 #undef LIBS_MACHINE /* -lsun in case using Yellow Pages for passwords. */ +#if defined(__GNUC__) && defined(_ABIN32) +#define LIBS_MACHINE +#else +#ifndef IRIX6_5 +#define LIBS_MACHINE -lmld +#else +#define LIBS_MACHINE +#endif +#endif #define LIBS_DEBUG /* Define this if you have a fairly recent system, ＠＠ -105,13 +149,13 ＠＠ #ifndef USG5_4 #ifdef HAVE_CRTN /* Must define START-FILES so that the linker can find /usr/lib/crt0.o. */ -#define START_FILES "pre-crt0.o /usr/lib/crt1.o" -#define LIB_STANDARD "-lc /usr/lib/crtn.o" +#define START_FILES pre-crt0.o /usr/lib/crt1.o +#define LIB_STANDARD -lc /usr/lib/crtn.o #else -#define START_FILES "pre-crt0.o /usr/lib/crt0.o" +#define START_FILES pre-crt0.o /usr/lib/crt0.o /* The entry-point label (start of text segment) is `start', not `__start'. */ #define DEFAULT_ENTRY_ADDRESS start -#define LIB_STANDARD "-lc" +#define LIB_STANDARD -lc #endif #endif ＠＠ -129,3 +173,30 ＠＠ #undef STACK_DIRECTION #define STACK_DIRECTION -1 + +/* The standard definitions of these macros would work ok, + but these are faster because the constants are short. */ + +#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) + +#define XSET(var, type, ptr) \ + ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)) + +#define XMARKBIT(a) ((a) < 0) +#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0)) +#define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS)) + +#ifndef __GNUC__ +/* Turn off some "helpful" error checks for type mismatches + that we can't fix without breaking other machines. */ +#ifdef IRIX_FORCE_32_BITS +#ifdef THIS_IS_MAKEFILE +#ifndef IRIX6_5 +#define C_SWITCH_MACHINE -32 +#else +#define C_SWITCH_MACHINE -n32 +#endif +#endif +#endif + +#endif /* not __GNUC__ */ --- /src/xemacs/src/m/iris5d.h Mon Feb 21 10:00:40 2000 +++ /home/penny/sources/emacs-20.6.90/src/m/iris5d.h Mon May 15 22:06:35 2000 ＠＠ -1,4 +1,4 ＠＠ -/* machine description file for Iris-4D machines. Use with s-iris3-6.h +/* machine description file for Iris-5D machines. Use with s-iris3-6.h Copyright (C) 1987 Free Software Foundation, Inc. This file is part of GNU Emacs. ＠＠ -14,16 +14,30 ＠＠ 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 +along with GNU Emacs; 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: FSF 19.31. */ /* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="irix3-3" */ +/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word + is the most significant byte. */ + +#define WORDS_BIG_ENDIAN + +/* Define NO_ARG_ARRAY if you cannot take the address of the first of a + * group of arguments and treat it as an array of the arguments. */ + +#define NO_ARG_ARRAY + +/* Define WORD_MACHINE if addresses and such have + * to be corrected before they can be used as byte counts. */ + +#undef WORD_MACHINE + /* Now define a symbol for the cpu type, if your compiler does not define it automatically: Ones defined so far include vax, m68000, ns16000, pyramid, ＠＠ -37,6 +51,19 ＠＠ #define IRIS_4D #endif +/* Use type int rather than a union, to represent Lisp_Object */ +/* This is desirable for most machines. */ + +#define NO_UNION_TYPE + +/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend + the bit field into an int. In other words, if bit fields + are always unsigned. + + If you use NO_UNION_TYPE, this flag does not matter. */ + +#define EXPLICIT_SIGN_EXTEND + /* Data type of load average, as read out of kmem. */ #define LOAD_AVE_TYPE long /* This doesn't quite work on the 4D */ ＠＠ -88,14 +115,27 ＠＠ #ifdef UNEXEC #undef UNEXEC #endif -#define UNEXEC "unexelf.o" +#define UNEXEC unexelf.o #define TEXT_START 0x400000 +/* + * DATA_SEG_BITS forces extra bits to be or'd in with any pointers which + * were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for + * the value field of a LISP_OBJECT). + */ + #define DATA_START 0x10000000 +#define DATA_SEG_BITS 0x10000000 #undef LIBS_MACHINE /* -lsun in case using Yellow Pages for passwords. */ +#if defined(__GNUC__) && defined(_ABIN32) +#define LIBS_MACHINE -lsun +#else +#define LIBS_MACHINE -lsun -lmld +#endif + #define LIBS_DEBUG /* Define this if you have a fairly recent system, ＠＠ -104,13 +144,13 ＠＠ #ifdef HAVE_CRTN /* Must define START-FILES so that the linker can find /usr/lib/crt0.o. */ -#define START_FILES "pre-crt0.o /usr/lib/crt1.o" -#define LIB_STANDARD "-lbsd -lc /usr/lib/crtn.o" +#define START_FILES pre-crt0.o /usr/lib/crt1.o +#define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o #else -#define START_FILES "pre-crt0.o /usr/lib/crt0.o" +#define START_FILES pre-crt0.o /usr/lib/crt0.o /* The entry-point label (start of text segment) is `start', not `__start'. */ #define DEFAULT_ENTRY_ADDRESS start -#define LIB_STANDARD "-lbsd -lc" +#define LIB_STANDARD -lbsd -lc #endif /* Use terminfo instead of termcap. */ ＠＠ -131,8 +171,20 ＠＠ #define STACK_DIRECTION -1 +/* The standard definitions of these macros would work ok, + but these are faster because the constants are short. */ + +#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS) + +#define XSET(var, type, ptr) \ + ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)) + +#define XMARKBIT(a) ((a) < 0) +#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0)) +#define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS)) + #ifndef __GNUC__ /* Turn off some "helpful" error checks for type mismatches that we can't fix without breaking other machines. */ -#define C_SWITCH_MACHINE "-cckr" +#define C_SWITCH_MACHINE -cckr #endif --- /src/xemacs/src/unexelf.c Thu May 25 14:28:08 2000 +++ /home/penny/sources/emacs-20.6.90/src/unexelf.c Mon May 15 17:14:02 2000 ＠＠ -1,24 +1,27 ＠＠ -/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993 +/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000 Free Software Foundation, Inc. -This file is part of XEmacs. +This file is part of GNU Emacs. -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. +GNU Emacs 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. + +GNU Emacs 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 +along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +Boston, MA 02111-1307, USA. + +In other words, you are welcome to use, share and improve this program. +You are forbidden to forbid anyone else to use, share and improve +what you give them. Help stamp out software-hoarding! */ -/* Synched up with: FSF 20.4. */ /* * unexec.c - Convert a running program into an a.out file. ＠＠ -30,14 +33,14 ＠＠ * Modified heavily since then. * * Synopsis: - * unexec (new_name, a_name, data_start, bss_start, entry_address) - * char *new_name, *a_name; + * unexec (new_name, old_name, data_start, bss_start, entry_address) + * char *new_name, *old_name; * unsigned data_start, bss_start, entry_address; * * Takes a snapshot of the program and makes an a.out format file in the * file named by the string argument new_name. - * If a_name is non-NULL, the symbol table will be taken from the given file. - * On some machines, an existing a_name file is required. + * If old_name is non-NULL, the symbol table will be taken from the given file. + * On some machines, an existing old_name file is required. * * The boundaries within the a.out file may be adjusted with the data_start * and bss_start arguments. Either or both may be given as 0 for defaults. ＠＠ -49,11 +52,6 ＠＠ * The value you specify may be rounded down to a suitable boundary * as required by the machine you are using. * - * Specifying zero for data_start means the boundary between text and data - * should not be the same as when the program was loaded. - * If NO_REMAP is defined, the argument data_start is ignored and the - * segment boundaries are never changed. - * * Bss_start indicates how much of the data segment is to be saved in the * a.out file and restored when the program is executed. It gives the lowest * unsaved address, and is rounded up to a page boundary. The default when 0 ＠＠ -63,9 +61,6 ＠＠ * * The new file is set up to start at entry_address. * - * If you make improvements I'd like to get them too. - * harpo!utah-cs!thomas, thomas＠Utah-20 - * */ /* Even more heavily modified by james(a)bigtex.cactus.org of Dell Computer Co. ＠＠ -413,7 +408,7 ＠＠ #define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1) #else #include <config.h> -extern void fatal (const char *, ...); +extern void fatal (char *, ...); #endif #include <sys/types.h> ＠＠ -432,8 +427,8 ＠＠ #include <sys/elf_mips.h> #include <sym.h> #endif /* __sony_news && _SYSTYPE_SYSV */ -#ifdef __sgi -#include <sym.h> /* for HDRR declaration */ +#if __sgi +#include <syms.h> /* for HDRR declaration */ #endif /* __sgi */ #if defined (__alpha__) && !defined (__NetBSD__) && !defined (__OpenBSD__) ＠＠ -482,17 +477,19 ＠＠ # endif # include <sys/exec_elf.h> -# define PT_LOAD Elf_pt_load -# define SHT_SYMTAB Elf_sht_symtab -# define SHT_DYNSYM Elf_sht_dynsym -# define SHT_NULL Elf_sht_null -# define SHT_NOBITS Elf_sht_nobits -# define SHT_REL Elf_sht_rel -# define SHT_RELA Elf_sht_rela - -# define SHN_UNDEF Elf_eshn_undefined -# define SHN_ABS Elf_eshn_absolute -# define SHN_COMMON Elf_eshn_common +# ifndef PT_LOAD +# define PT_LOAD Elf_pt_load +# define SHT_SYMTAB Elf_sht_symtab +# define SHT_DYNSYM Elf_sht_dynsym +# define SHT_NULL Elf_sht_null +# define SHT_NOBITS Elf_sht_nobits +# define SHT_REL Elf_sht_rel +# define SHT_RELA Elf_sht_rela + +# define SHN_UNDEF Elf_eshn_undefined +# define SHN_ABS Elf_eshn_absolute +# define SHN_COMMON Elf_eshn_common +# endif # ifdef __alpha__ # include <sys/exec_ecoff.h> ＠＠ -511,10 +508,18 ＠＠ #ifndef ElfW # ifdef __STDC__ -# define ElfW(type) Elf32_##type +# define ElfBitsW(bits, type) Elf##bits##_##type +# else +# define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type +# endif +# ifdef _LP64 +# define ELFSIZE 64 # else -# define ElfW(type) Elf32_/**/type +# define ELFSIZE 32 # endif + /* This macro expands `bits' before invoking ElfBitsW. */ +# define ElfExpandBitsW(bits, type) ElfBitsW (bits, type) +# define ElfW(type) ElfExpandBitsW (ELFSIZE, type) #endif #ifndef ELF_BSS_SECTION_NAME ＠＠ -566,7 +571,8 ＠＠ /* Round X up to a multiple of Y. */ static ElfW(Addr) -round_up (ElfW(Addr) x, ElfW(Addr) y) +round_up (x, y) + ElfW(Addr) x, y; { int rem = x % y; if (rem == 0) ＠＠ -574,6 +580,45 ＠＠ return x - rem + y; } +/* Return the index of the section named NAME. + SECTION_NAMES, FILE_NAME and FILE_H give information + about the file we are looking in. + + If we don't find the section NAME, that is a fatal error + if NOERROR is 0; we return -1 if NOERROR is nonzero. */ + +static int +find_section (name, section_names, file_name, old_file_h, old_section_h, noerror) + char *name; + char *section_names; + char *file_name; + ElfW(Ehdr) *old_file_h; + ElfW(Shdr) *old_section_h; + int noerror; +{ + int idx; + + for (idx = 1; idx < old_file_h->e_shnum; idx++) + { +#ifdef DEBUG + fprintf (stderr, "Looking for %s - found %s\n", name, + section_names + OLD_SECTION_H (idx).sh_name); +#endif + if (!strcmp (section_names + OLD_SECTION_H (idx).sh_name, + name)) + break; + } + if (idx == old_file_h->e_shnum) + { + if (noerror) + return -1; + else + fatal ("Can't find %s in %s.\n", name, file_name, 0); + } + + return idx; +} + /* **************************************************************** * unexec * ＠＠ -583,11 +628,10 ＠＠ * .data section, and inserting an empty .bss immediately afterwards. * */ -void unexec (char *new_name, char *old_name, unsigned int data_start, - unsigned int bss_start, unsigned int entry_address); void -unexec (char *new_name, char *old_name, unsigned int data_start, - unsigned int bss_start, unsigned int entry_address) +unexec (new_name, old_name, data_start, bss_start, entry_address) + char *new_name, *old_name; + unsigned data_start, bss_start, entry_address; { int new_file, old_file, new_file_size; ＠＠ -609,8 +653,10 ＠＠ ElfW(Off) new_data2_offset; ElfW(Addr) new_data2_addr; - int n, nn, old_bss_index, old_data_index, new_data2_index; - int old_sbss_index, old_mdebug_index; + int n, nn; + int old_bss_index, old_sbss_index; + int old_data_index, new_data2_index; + int old_mdebug_index; struct stat stat_buf; /* Open the old file & map it into the address space. */ ＠＠ -623,7 +669,8 ＠＠ if (fstat (old_file, &stat_buf) == -1) fatal ("Can't fstat (%s): errno %d\n", old_name, errno); - old_base = (caddr_t) mmap (0, stat_buf.st_size, PROT_READ, MAP_SHARED, old_file, 0); + old_base = mmap ((caddr_t) 0, stat_buf.st_size, PROT_READ, MAP_SHARED, + old_file, 0); if (old_base == (caddr_t) -1) fatal ("Can't mmap (%s): errno %d\n", old_name, errno); ＠＠ -641,77 +688,43 ＠＠ old_section_names = (char *) old_base + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset; + /* Find the mdebug section, if any. */ + + old_mdebug_index = find_section (".mdebug", old_section_names, + old_name, old_file_h, old_section_h, 1); + /* Find the old .bss section. Figure out parameters of the new * data2 and bss sections. */ - for (old_bss_index = 1; old_bss_index < (int) old_file_h->e_shnum; - old_bss_index++) - { -#ifdef DEBUG - fprintf (stderr, "Looking for .bss - found %s\n", - old_section_names + OLD_SECTION_H (old_bss_index).sh_name); -#endif - if (!strcmp (old_section_names + OLD_SECTION_H (old_bss_index).sh_name, - ELF_BSS_SECTION_NAME)) - break; - } - if (old_bss_index == old_file_h->e_shnum) - fatal ("Can't find .bss in %s.\n", old_name, 0); + old_bss_index = find_section (".bss", old_section_names, + old_name, old_file_h, old_section_h, 0); - for (old_sbss_index = 1; old_sbss_index < (int) old_file_h->e_shnum; - old_sbss_index++) - { -#ifdef DEBUG - fprintf (stderr, "Looking for .sbss - found %s\n", - old_section_names + OLD_SECTION_H (old_sbss_index).sh_name); -#endif - if (!strcmp (old_section_names + OLD_SECTION_H (old_sbss_index).sh_name, - ".sbss")) - break; - } - if (old_sbss_index == old_file_h->e_shnum) - { + old_sbss_index = find_section (".sbss", old_section_names, + old_name, old_file_h, old_section_h, 1); + if (old_sbss_index != -1) + if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS) old_sbss_index = -1; - old_bss_addr = OLD_SECTION_H(old_bss_index).sh_addr; - old_bss_size = OLD_SECTION_H(old_bss_index).sh_size; + + if (old_sbss_index == -1) + { + old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr; + old_bss_size = OLD_SECTION_H (old_bss_index).sh_size; new_data2_index = old_bss_index; } else { - old_bss_addr = OLD_SECTION_H(old_sbss_index).sh_addr; - old_bss_size = OLD_SECTION_H(old_bss_index).sh_size - + OLD_SECTION_H(old_sbss_index).sh_size; + old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr; + old_bss_size = OLD_SECTION_H (old_bss_index).sh_size + + OLD_SECTION_H (old_sbss_index).sh_size; new_data2_index = old_sbss_index; } - for (old_mdebug_index = 1; old_mdebug_index < (int) old_file_h->e_shnum; - old_mdebug_index++) - { -#ifdef DEBUG - fprintf (stderr, "Looking for .mdebug - found %s\n", - old_section_names + OLD_SECTION_H (old_mdebug_index).sh_name); -#endif - if (!strcmp (old_section_names + OLD_SECTION_H (old_mdebug_index).sh_name, - ".mdebug")) - break; - } - if (old_mdebug_index == old_file_h->e_shnum) - old_mdebug_index = 0; + /* Find the old .data section. Figure out parameters of + the new data2 and bss sections. */ - for (old_data_index = 1; old_data_index < (int) old_file_h->e_shnum; - old_data_index++) - { -#ifdef DEBUG - fprintf (stderr, "Looking for .data - found %s\n", - old_section_names + OLD_SECTION_H (old_data_index).sh_name); -#endif - if (!strcmp (old_section_names + OLD_SECTION_H (old_data_index).sh_name, - ".data")) - break; - } - if (old_data_index == old_file_h->e_shnum) - old_data_index = 0; + old_data_index = find_section (".data", old_section_names, + old_name, old_file_h, old_section_h, 0); #if defined (emacs) || !defined (DEBUG) new_bss_addr = (ElfW(Addr)) sbrk (0); ＠＠ -750,13 +763,13 ＠＠ if (ftruncate (new_file, new_file_size)) fatal ("Can't ftruncate (%s): errno %d\n", new_name, errno); - new_base = (caddr_t) mmap (0, new_file_size, PROT_READ | PROT_WRITE, #ifdef UNEXEC_USE_MAP_PRIVATE - MAP_PRIVATE, + new_base = mmap ((caddr_t) 0, new_file_size, PROT_READ | PROT_WRITE, + MAP_PRIVATE, new_file, 0); #else - MAP_SHARED, + new_base = mmap ((caddr_t) 0, new_file_size, PROT_READ | PROT_WRITE, + MAP_SHARED, new_file, 0); #endif - new_file, 0); if (new_base == (caddr_t) -1) fatal ("Can't mmap (%s): errno %d\n", new_name, errno); ＠＠ -806,13 +819,13 ＠＠ if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment) alignment = OLD_SECTION_H (old_bss_index).sh_addralign; -#ifdef __mips +#ifdef __sgi /* According to r02kar(a)x4u2.desy.de (Karsten Kuenne) and oliva(a)gnu.org (Alexandre Oliva), on IRIX 5.2, we always get "Program segment above .bss" when dumping when the executable doesn't have an sbss section. */ if (old_sbss_index != -1) -#endif /* __mips */ +#endif /* __sgi */ if (NEW_PROGRAM_H (n).p_vaddr + NEW_PROGRAM_H (n).p_filesz > (old_sbss_index == -1 ? old_bss_addr ＠＠ -948,6 +961,15 ＠＠ if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB && NEW_SECTION_H (nn).sh_type != SHT_DYNSYM) PATCH_INDEX (NEW_SECTION_H (nn).sh_info); + + if (old_sbss_index != -1) + if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss")) + { + NEW_SECTION_H (nn).sh_offset = + round_up (NEW_SECTION_H (nn).sh_offset, + NEW_SECTION_H (nn).sh_addralign); + NEW_SECTION_H (nn).sh_type = SHT_PROGBITS; + } /* Now, start to copy the content of sections. */ if (NEW_SECTION_H (nn).sh_type == SHT_NULL ＠＠ -960,21 +982,16 ＠＠ if (!strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".data") || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), ".sdata") - /* Taking these sections from the current process, breaks - Linux in a subtle way. Binaries only run on the - architecture (e.g. i586 vs i686) of the dumping machine */ -#ifdef __sgi || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), ".lit4") || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), ".lit8") || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), - ".got") -#endif - || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), ".sdata1") || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), - ".data1")) + ".data1") + || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, + ".sbss")) src = (caddr_t) OLD_SECTION_H (n).sh_addr; else src = old_base + OLD_SECTION_H (n).sh_offset; ＠＠ -1004,7 +1021,8 ＠＠ #endif /* __alpha__ */ #if defined (__sony_news) && defined (_SYSTYPE_SYSV) - if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG && old_mdebug_index) + if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG + && old_mdebug_index != -1) { int diff = NEW_SECTION_H(nn).sh_offset - OLD_SECTION_H(old_mdebug_index).sh_offset; ＠＠ -1027,7 +1045,7 ＠＠ } #endif /* __sony_news && _SYSTYPE_SYSV */ -#ifdef __sgi +#if __sgi /* Adjust the HDRR offsets in .mdebug and copy the line data if it's in its usual 'hole' in the object. Makes the new file debuggable with dbx. ＠＠ -1142,14 +1160,10 ＠＠ if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data") || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), ".sdata") -#ifdef __sgi || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), ".lit4") || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), ".lit8") - || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), - ".got") -#endif || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), ".sdata1") || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), -- Yoshiki Hayashi

1 participants
0 comments

Re: pcl-cvs refers to vc-resolve-conflicts 24 years, 6 months

Jan Vroonhof

Charles G Waldman <cgw(a)fnal.gov> writes: > vc-resolve-conflicts is defined in FSF emacs 20.6's version of vc.el > but not the version of vc.el in the XEmacs packages. Does this do something useful? > Should we modify pcl-cvs to not refer to this function, or sync up our > vc.el with the FSF? I have "officially" stopped syncing because vc.el is supposed to be completely rewritten. It is annoying that the FSF still keeps extending the old version too. I would say that if vc-resolve-conflicts is reasonably isolated it would be nice to have. Just don't spent too much effort on it. Jan

1 participants
0 comments

Re: set-window-configuration vs error-checking sub windows 24 years, 6 months

Jan Vroonhof

Andy Piper <andy(a)xemacs.org> writes: > Please explain to me how this happens (I genuinely want to know), I thought > the only way that a window could become dead is through > mark_window_as_deleted - and this explicitly removes the subwindows from > the frame cache. I don't want to paper over this if there is something else > I'm missing. Well I now put the hard core check I wrote about in my previous messages in mark_window_as_deleted and sure the check hits there. (The Fdelete_window is call is part of delete_other window). The image_instance is involved is an IMAGE_WIDGET with xpos = ypos = 0 and which is very wide and not so high. To me that seems like the tab widget. I had a look at image_instantiate if (UNBOUNDP (instance)) { Lisp_Object locative = noseeum_cons (Qnil, noseeum_cons (pointerp ? ls3 : instantiator, DEVICEP (governing_domain) ? subtable : XWINDOW (governing_domain) ->subwindow_instance_cache)); int speccount = specpdl_depth (); record_unwind_protect (image_instantiate_cache_result, locative); instance = instantiate_image_instantiator (governing_domain,domain,...) cache_subwindow_instance_in_frame_maybe (instance); Fsetcar (locative, instance); unbind_to (speccount, Qnil); } Two remarks 1. Shouldn't locative and/or governingdomain be GCRPO'ed?, instantiate_image_instantiator gcpro's its variables. 2. Isn't it possible that DEVICEP(governing_domain) is true, but domain is a window?. In that case cache_subwindow_instance_in_frame_maybe might add it to the frame cache but it won't be in the window cache, so mark_window_as_deleted does not see it? Jan

2 participants
2 comments

XEmacs 21.2.33 GC bug? 24 years, 6 months

Yoshiki Hayashi

No lisp backtrace is generated. As always, I cannot reproduce this. (gdb) bt #0 0x40415931 in kill () from /lib/libc.so.6 #1 0x80be0a5 in fatal_error_signal (sig=11) at emacs.c:514 #2 0x40415868 in sigaction () from /lib/libc.so.6 #3 0x814db5b in mark_image_instance (obj=142899072) at glyphs.c:786 #4 0x8087ae0 in mark_object (obj=142899072) at alloc.c:2500 #5 0x808bebc in mark_cons (obj=147179168) at alloc.c:877 #6 0x8087ae0 in mark_object (obj=147179168) at alloc.c:2500 #7 0x80eb11a in mark_widget_value_mapper (val=0x85cda48, closure=0x0) at gui-x.c:70 #8 0x8215887 in lw_map_widget_values (id=65561, mapfunc=0x80eb100 <mark_widget_value_mapper>, closure=0x0) at lwlib.c:446 #9 0x80eb0e7 in mark_popup_data (obj=142900184) at gui-x.c:90 #10 0x8087ae0 in mark_object (obj=147179180) at alloc.c:2500 #11 0x808bebc in mark_cons (obj=147179216) at alloc.c:877 #12 0x8087ae0 in mark_object (obj=147179216) at alloc.c:2500 #13 0x8089213 in garbage_collect_1 () at alloc.c:3449 #14 0x80c57f6 in Ffuncall (nargs=5, args=0xbffff634) at eval.c:3163 #15 0x80c8f8b in call4 (fn=137320860, arg0=137185788, arg1=139970440, arg2=137185788, arg3=137185788) at eval.c:3915 #16 0x818ec2b in clear_echo_area (f=0x857c788, label=137185788, no_restore=0) at minibuf.c:679 #17 0x8110796 in echo_key_event (command_builder=0x85f5fb0, event=149754680) at event-stream.c:632 #18 0x8112b36 in Fnext_event (event=149754680, prompt=137185788) at event-stream.c:2228 #19 0x80a4d4d in Fcommand_loop_1 () at cmdloop.c:570 #20 0x80c2d41 in condition_case_1 (handlers=137185884, bfun=0x80a4fa0 <command_loop_1>, barg=137185788, hfun=0x80a5050 <cmd_error>, harg=137185788) at eval.c:1640 #21 0x80a5164 in command_loop_2 (dummy=137185788) at cmdloop.c:256 #22 0x80c2c0c in internal_catch (tag=137259860, func=0x80a5120 <command_loop_2>, arg=137185788, threw=0x0) at eval.c:1306 #23 0x80a4617 in initial_command_loop (load_me=137185788) at cmdloop.c:305 #24 0x80bf081 in xemacs_21_2_b33_i686_pc_linux () at emacs.c:2147 #25 0x80bf8cf in main () at emacs.c:2576 #26 0x4040fa42 in __libc_start_main () from /lib/libc.so.6 (gdb) bt full #0 0x40415931 in kill () from /lib/libc.so.6 No symbol table info available. #1 0x80be0a5 in fatal_error_signal (sig=11) at emacs.c:514 sig = 11 #2 0x40415868 in sigaction () from /lib/libc.so.6 No symbol table info available. #3 0x814db5b in mark_image_instance (obj=142899072) at glyphs.c:786 obj = 0 #4 0x8087ae0 in mark_object (obj=142899072) at alloc.c:2500 obj = -1073745460 #5 0x808bebc in mark_cons (obj=147179168) at alloc.c:877 obj = 147179168 #6 0x8087ae0 in mark_object (obj=147179168) at alloc.c:2500 obj = -1073745460 #7 0x80eb11a in mark_widget_value_mapper (val=0x85cda48, closure=0x0) at gui-x.c:70 val = (widget_value *) 0x85cda48 #8 0x8215887 in lw_map_widget_values (id=65561, mapfunc=0x80eb100 <mark_widget_value_mapper>, closure=0x0) at lwlib.c:446 id = 3221221836 mapfunc = (int (*)()) 0 closure = (void *) 0x0 info = (widget_info *) 0x0 #9 0x80eb0e7 in mark_popup_data (obj=142900184) at gui-x.c:90 obj = 140302920 #10 0x8087ae0 in mark_object (obj=147179180) at alloc.c:2500 obj = -1073745460 #11 0x808bebc in mark_cons (obj=147179216) at alloc.c:877 obj = 147179216 #12 0x8087ae0 in mark_object (obj=147179216) at alloc.c:2500 obj = -1073745460 #13 0x8089213 in garbage_collect_1 () at alloc.c:3449 speccount = 1 cursor_changed = 1 pre_gc_cursor = 142885208 gcpro1 = {next = 0xbffff654, var = 0xbffff4e0, nvars = 1} frame = 139970440 device = 0 args = {1076133068, 0} args = {138053416, 0} -- Yoshiki Hayashi

1 participants
0 comments

ilisp 5.10.1 - Work begun for XEmacs 24 years, 6 months

Karl M. Hegbloom

I want to be able to use `ilisp' to work with Guile, and have imported `ilisp-5.10.1' into my CVS repository. I've only done a little bit of work on it so far, and it's not totally functional yet. If anyone would like to help, I'd appreciate it. We can either move it over to the main cvs.xemacs.org repository, or work from mine - I'll give writes to anyone who's qualified. (Hey, if I'm qualified, then just about anyone is.) export CVSROOT=:pserver:anoncvs＠bittersweet.inetarena.com:/var/cvs/emacsen cvs login [ empty password ] cvs checkout ilisp Hmmm... deja-vu. Didn't I post this once already? -- Those who do not study Lisp are doomed to reimplement it - Poorly. A few months in the laboratory often saves several hours at the library. mailto:karlheg＠debian.org (Karl M. Hegbloom)

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

2000

1999

1998

XEmacs-Beta May 2000