comparison src/dumper.c @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents a5954632b187
children c925bacdda60
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
1 /* Portable data dumper for XEmacs. 1 /* Portable data dumper for XEmacs.
2 Copyright (C) 1999-2000 Olivier Galibert 2 Copyright (C) 1999-2000 Olivier Galibert
3 Copyright (C) 2001 Martin Buchholz 3 Copyright (C) 2001 Martin Buchholz
4 Copyright (C) 2001 Ben Wing. 4 Copyright (C) 2001, 2002 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
150 150
151 #define PDUMP_READ(ptr, type) \ 151 #define PDUMP_READ(ptr, type) \
152 (((type *) (ptr = (char*) (((type *) ptr) + 1)))[-1]) 152 (((type *) (ptr = (char*) (((type *) ptr) + 1)))[-1])
153 153
154 #define PDUMP_READ_ALIGNED(ptr, type) \ 154 #define PDUMP_READ_ALIGNED(ptr, type) \
155 ((ptr = (char *) ALIGN_PTR (ptr, ALIGNOF (type))), PDUMP_READ (ptr, type)) 155 ((ptr = (char *) ALIGN_PTR (ptr, type)), PDUMP_READ (ptr, type))
156 156
157 157
158 158
159 typedef struct 159 typedef struct
160 { 160 {
753 abort (); 753 abort ();
754 } 754 }
755 755
756 /* We have no way of knowing the required alignment for this structure, 756 /* We have no way of knowing the required alignment for this structure,
757 so just max it maximally aligned. */ 757 so just max it maximally aligned. */
758 return ALIGN_SIZE (max_offset + size_at_max, ALIGNOF (max_align_t)); 758 return MAX_ALIGN_SIZE (max_offset + size_at_max);
759 } 759 }
760 760
761 /* Register the referenced objects in the array of COUNT objects of 761 /* Register the referenced objects in the array of COUNT objects of
762 located at DATA; each object is described by SDESC. "Object" here 762 located at DATA; each object is described by SDESC. "Object" here
763 simply means any block of memory; it need not actually be a C 763 simply means any block of memory; it need not actually be a C
1353 header.id = dump_id; 1353 header.id = dump_id;
1354 header.reloc_address = 0; 1354 header.reloc_address = 0;
1355 header.nb_root_struct_ptrs = Dynarr_length (pdump_root_struct_ptrs); 1355 header.nb_root_struct_ptrs = Dynarr_length (pdump_root_struct_ptrs);
1356 header.nb_opaques = Dynarr_length (pdump_opaques); 1356 header.nb_opaques = Dynarr_length (pdump_opaques);
1357 1357
1358 cur_offset = ALIGN_SIZE (sizeof (header), ALIGNOF (max_align_t)); 1358 cur_offset = MAX_ALIGN_SIZE (sizeof (header));
1359 max_size = 0; 1359 max_size = 0;
1360 1360
1361 pdump_scan_by_alignment (pdump_allocate_offset); 1361 pdump_scan_by_alignment (pdump_allocate_offset);
1362 cur_offset = ALIGN_SIZE (cur_offset, ALIGNOF (max_align_t)); 1362 cur_offset = MAX_ALIGN_SIZE (cur_offset);
1363 header.stab_offset = cur_offset; 1363 header.stab_offset = cur_offset;
1364 1364
1365 pdump_buf = xmalloc (max_size); 1365 pdump_buf = xmalloc (max_size);
1366 pdump_fd = open (EMACS_PROGNAME ".dmp", 1366 pdump_fd = open (EMACS_PROGNAME ".dmp",
1367 O_WRONLY | O_CREAT | O_TRUNC | OPEN_BINARY, 0666); 1367 O_WRONLY | O_CREAT | O_TRUNC | OPEN_BINARY, 0666);
1421 1421
1422 delta = ((EMACS_INT)pdump_start) - header->reloc_address; 1422 delta = ((EMACS_INT)pdump_start) - header->reloc_address;
1423 p = pdump_start + header->stab_offset; 1423 p = pdump_start + header->stab_offset;
1424 1424
1425 /* Put back the pdump_root_struct_ptrs */ 1425 /* Put back the pdump_root_struct_ptrs */
1426 p = (char *) ALIGN_PTR (p, ALIGNOF (pdump_static_pointer)); 1426 p = (char *) ALIGN_PTR (p, pdump_static_pointer);
1427 for (i=0; i<header->nb_root_struct_ptrs; i++) 1427 for (i=0; i<header->nb_root_struct_ptrs; i++)
1428 { 1428 {
1429 pdump_static_pointer ptr = PDUMP_READ (p, pdump_static_pointer); 1429 pdump_static_pointer ptr = PDUMP_READ (p, pdump_static_pointer);
1430 (* ptr.address) = ptr.value + delta; 1430 (* ptr.address) = ptr.value + delta;
1431 } 1431 }
1442 pdump_rt_list = p; 1442 pdump_rt_list = p;
1443 count = 2; 1443 count = 2;
1444 for (;;) 1444 for (;;)
1445 { 1445 {
1446 pdump_reloc_table rt = PDUMP_READ_ALIGNED (p, pdump_reloc_table); 1446 pdump_reloc_table rt = PDUMP_READ_ALIGNED (p, pdump_reloc_table);
1447 p = (char *) ALIGN_PTR (p, ALIGNOF (char *)); 1447 p = (char *) ALIGN_PTR (p, char *);
1448 if (rt.desc) 1448 if (rt.desc)
1449 { 1449 {
1450 char **reloc = (char **)p; 1450 char **reloc = (char **)p;
1451 for (i=0; i < rt.count; i++) 1451 for (i=0; i < rt.count; i++)
1452 { 1452 {
1459 break; 1459 break;
1460 } 1460 }
1461 1461
1462 /* Put the pdump_root_objects variables in place */ 1462 /* Put the pdump_root_objects variables in place */
1463 i = PDUMP_READ_ALIGNED (p, Elemcount); 1463 i = PDUMP_READ_ALIGNED (p, Elemcount);
1464 p = (char *) ALIGN_PTR (p, ALIGNOF (pdump_static_Lisp_Object)); 1464 p = (char *) ALIGN_PTR (p, pdump_static_Lisp_Object);
1465 while (i--) 1465 while (i--)
1466 { 1466 {
1467 pdump_static_Lisp_Object obj = PDUMP_READ (p, pdump_static_Lisp_Object); 1467 pdump_static_Lisp_Object obj = PDUMP_READ (p, pdump_static_Lisp_Object);
1468 1468
1469 if (POINTER_TYPE_P (XTYPE (obj.value))) 1469 if (POINTER_TYPE_P (XTYPE (obj.value)))
1476 /* reorganize hash tables */ 1476 /* reorganize hash tables */
1477 p = pdump_rt_list; 1477 p = pdump_rt_list;
1478 for (;;) 1478 for (;;)
1479 { 1479 {
1480 pdump_reloc_table rt = PDUMP_READ_ALIGNED (p, pdump_reloc_table); 1480 pdump_reloc_table rt = PDUMP_READ_ALIGNED (p, pdump_reloc_table);
1481 p = (char *) ALIGN_PTR (p, ALIGNOF (Lisp_Object)); 1481 p = (char *) ALIGN_PTR (p, Lisp_Object);
1482 if (!rt.desc) 1482 if (!rt.desc)
1483 break; 1483 break;
1484 if (rt.desc == hash_table_description) 1484 if (rt.desc == hash_table_description)
1485 { 1485 {
1486 for (i=0; i < rt.count; i++) 1486 for (i=0; i < rt.count; i++)