[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.

--- a/src/lrecord.h	Thu Nov 04 22:51:31 2004 +0000
+++ b/src/lrecord.h	Thu Nov 04 23:08:28 2004 +0000
@@ -1,6 +1,6 @@
 /* The "lrecord" structure (header of a compound lisp object).
    Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
-   Copyright (C) 1996, 2001, 2002 Ben Wing.
+   Copyright (C) 1996, 2001, 2002, 2004 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -21,6 +21,8 @@
 
 /* Synched up with: Not in FSF. */
 
+/* This file has been Mule-ized, Ben Wing, 10-13-04. */
+
 #ifndef INCLUDED_lrecord_h_
 #define INCLUDED_lrecord_h_
 
@@ -227,7 +229,7 @@
 
 struct lrecord_implementation
 {
-  const char *name;
+  const Ascbyte *name;
 
   /* information for the dumper: is the object dumpable and should it 
      be dumped. */
@@ -394,7 +396,7 @@
    objects, referenced in the DEFINE_*LRECORD_*IMPLEMENTATION*() call; (b)
    descriptions of global objects to be dumped, registered by
    dump_add_root_block(); (c) descriptions of global pointers to
-   non-Lisp_Object heap objects, registered by dump_add_root_struct_ptr().
+   non-Lisp_Object heap objects, registered by dump_add_root_block_ptr().
    The descriptions need to tell pdump which elements of your structure are
    Lisp_Objects or structure pointers, plus the descriptions in turn of the
    non-Lisp_Object structures pointed to.  If these structures are you own
@@ -446,9 +448,9 @@
    does not need to be given here) and global objects, where the size is an
    argument to the call to dump_add_root_block().
    sized_memory_descriptions are used for pointers and arrays in
-   memory_descriptions and for calls to dump_add_root_struct_ptr(). (####
+   memory_descriptions and for calls to dump_add_root_block_ptr(). (####
    It is not obvious why this is so in the latter case.  Probably, calls to
-   dump_add_root_struct_ptr() should use plain memory_descriptions and have
+   dump_add_root_block_ptr() should use plain memory_descriptions and have
    the size be an argument to the call.)
 
    NOTE: Anywhere that a sized_memory_description occurs inside of a plain
@@ -497,12 +499,12 @@
      ...;
    }
 
-   You'd use XD_STRUCT_PTR, something like:
+   You'd use XD_BLOCK_PTR, something like:
 
    static const struct memory_description foo_description[] = {
      ...
      { XD_INT,		offsetof (Lisp_Foo, count) },
-     { XD_STRUCT_PTR,	offsetof (Lisp_Foo, objects),
+     { XD_BLOCK_PTR,	offsetof (Lisp_Foo, objects),
        XD_INDIRECT (0, 0), &lisp_object_description },
      ...
    };
@@ -519,7 +521,7 @@
      lisp_object_description_1
    };
 
-   Another example of XD_STRUCT_PTR:
+   Another example of XD_BLOCK_PTR:
 
    typedef struct htentry
    {
@@ -557,7 +559,7 @@
    
    const struct memory_description hash_table_description[] = {
      { XD_ELEMCOUNT,     offsetof (Lisp_Hash_Table, size) },
-     { XD_STRUCT_PTR, offsetof (Lisp_Hash_Table, hentries), XD_INDIRECT (0, 1),
+     { XD_BLOCK_PTR, offsetof (Lisp_Hash_Table, hentries), XD_INDIRECT (0, 1),
 	 &htentry_description },
      { XD_LO_LINK,    offsetof (Lisp_Hash_Table, next_weak) },
      { XD_END }
@@ -577,7 +579,7 @@
  
    const struct memory_description specifier_description[] = {
      ...
-     { XD_STRUCT_ARRAY, offset (Lisp_Specifier, data), 1,
+     { XD_BLOCK_ARRAY, offset (Lisp_Specifier, data), 1,
        specifier_extra_description_map },
      ...
      { XD_END }
@@ -627,7 +629,7 @@
   An array of Lisp objects or (equivalently) pointers to lrecords.
   The parameter (i.e. third element) is the count.  This would be declared
   as Lisp_Object foo[666].  For something declared as Lisp_Object *foo,
-  use XD_STRUCT_PTR, whose description parameter is a sized_memory_description
+  use XD_BLOCK_PTR, whose description parameter is a sized_memory_description
   consisting of only XD_LISP_OBJECT and XD_END.
 
     XD_LO_LINK
@@ -646,35 +648,39 @@
 
   Pointer to undumpable data.  Must be NULL when dumping.
 
-    XD_STRUCT_PTR
+    XD_BLOCK_PTR
 
   Pointer to block of described memory. (This is misnamed: It is NOT
   necessarily a pointer to a struct foo.) Parameters are number of
   contiguous blocks and sized_memory_description.
 
-    XD_STRUCT_ARRAY
+    XD_BLOCK_ARRAY
 
   Array of blocks of described memory.  Parameters are number of
-  structures and sized_memory_description.  This differs from XD_STRUCT_PTR
+  structures and sized_memory_description.  This differs from XD_BLOCK_PTR
   in that the parameter is declared as struct foo[666] instead of
   struct *foo.  In other words, the block of memory holding the
   structures is within the containing structure, rather than being
   elsewhere, with a pointer in the containing structure.
 
   NOTE NOTE NOTE: Be sure that you understand the difference between
-  XD_STRUCT_PTR and XD_STRUCT_ARRAY:
+  XD_BLOCK_PTR and XD_BLOCK_ARRAY:
     - struct foo bar[666], i.e. 666 inline struct foos
-        --> XD_STRUCT_ARRAY, argument 666, pointing to a description of
+        --> XD_BLOCK_ARRAY, argument 666, pointing to a description of
             struct foo
     - struct foo *bar, i.e. pointer to a block of 666 struct foos
-        --> XD_STRUCT_PTR, argument 666, pointing to a description of
+        --> XD_BLOCK_PTR, argument 666, pointing to a description of
             struct foo
     - struct foo *bar[666], i.e. 666 pointers to separate blocks of struct foos
-        --> XD_STRUCT_ARRAY, argument 666, pointing to a description of
+        --> XD_BLOCK_ARRAY, argument 666, pointing to a description of
 	    a single pointer to struct foo; the description is a single
-	    XD_STRUCT_PTR, argument 1, which in turn points to a description
+	    XD_BLOCK_PTR, argument 1, which in turn points to a description
 	    of struct foo.
 
+  NOTE also that an XD_BLOCK_PTR of 666 foos is equivalent to an
+  XD_BLOCK_PTR of 1 bar, where the description of `bar' is an
+  XD_BLOCK_ARRAY of 666 foos. 
+
     XD_OPAQUE_DATA_PTR
 
   Pointer to dumpable opaque data.  Parameter is the size of the data.
@@ -693,9 +699,9 @@
   parameter of the XD_UNION descriptor to determine if this description
   applies to the union data, and XD_INDIRECT references refer to the
   containing object and description.  Note that the description applies
-  "inline" to the union data, like XD_STRUCT_ARRAY and not XD_STRUCT_PTR.
+  "inline" to the union data, like XD_BLOCK_ARRAY and not XD_BLOCK_PTR.
   If the union data is a pointer to different types of structures, each
-  element in the memory_description should be an XD_STRUCT_PTR.  See
+  element in the memory_description should be an XD_BLOCK_PTR.  See
   unicode.c, redisplay.c and objects.c for examples of XD_UNION.
 
     XD_UNION_DYNAMIC_SIZE
@@ -705,7 +711,7 @@
   of the union constant.  That is, an object with plain XD_UNION typically
   has the union declared as `union foo' or as `void *', where an object
   with XD_UNION_DYNAMIC_SIZE typically has the union as the last element,
-  and declared as something like char foo[1].  With plain XD_UNION, the
+  and declared as something like Rawbyte foo[1].  With plain XD_UNION, the
   object is (usually) of fixed size and always contains enough space for
   the data associated with all possible union constants, and thus the union
   constant can potentially change during the lifetime of the object.  With
@@ -723,13 +729,14 @@
   associated with the currently specified (and unchangeable) union
   constant.
 
-    XD_C_STRING
+    XD_ASCII_STRING
 
-  Pointer to a C string.
+  Pointer to a C string, purely ASCII.
 
     XD_DOC_STRING
 
-  Pointer to a doc string (C string if positive, opaque value if negative)
+  Pointer to a doc string (C string in pure ASCII if positive,
+  opaque value if negative)
 
     XD_INT_RESET
 
@@ -779,12 +786,12 @@
   XD_LISP_OBJECT,
   XD_LO_LINK,
   XD_OPAQUE_PTR,
-  XD_STRUCT_PTR,
-  XD_STRUCT_ARRAY,
+  XD_BLOCK_PTR,
+  XD_BLOCK_ARRAY,
   XD_OPAQUE_DATA_PTR,
   XD_UNION,
   XD_UNION_DYNAMIC_SIZE,
-  XD_C_STRING,
+  XD_ASCII_STRING,
   XD_DOC_STRING,
   XD_INT_RESET,
   XD_BYTECOUNT,
@@ -866,7 +873,7 @@
 #define XD_INDIRECT_DELTA(code) ((-1 - (code)) >> 8)
 
 #define XD_DYNARR_DESC(base_type, sub_desc)				      \
-  { XD_STRUCT_PTR, offsetof (base_type, base), XD_INDIRECT(1, 0), sub_desc }, \
+  { XD_BLOCK_PTR, offsetof (base_type, base), XD_INDIRECT(1, 0), sub_desc }, \
   { XD_INT,        offsetof (base_type, cur) },				      \
   { XD_INT_RESET,  offsetof (base_type, max), XD_INDIRECT(1, 0) }	      \
 
@@ -1154,7 +1161,7 @@
 extern const struct lrecord_implementation lrecord_##c_name;		  \
 DECLARE_INLINE_HEADER (							  \
 structtype *								  \
-error_check_##c_name (Lisp_Object obj, const char *file, int line)	  \
+error_check_##c_name (Lisp_Object obj, const Ascbyte *file, int line)	  \
 )									  \
 {									  \
   assert_at_line (RECORD_TYPEP (obj, lrecord_type_##c_name), file, line); \
@@ -1166,7 +1173,7 @@
 extern MODULE_API const struct lrecord_implementation lrecord_##c_name;	  \
 DECLARE_INLINE_HEADER (							  \
 structtype *								  \
-error_check_##c_name (Lisp_Object obj, const char *file, int line)	  \
+error_check_##c_name (Lisp_Object obj, const Ascbyte *file, int line)	  \
 )									  \
 {									  \
   assert_at_line (RECORD_TYPEP (obj, lrecord_type_##c_name), file, line); \
@@ -1179,7 +1186,7 @@
 extern struct lrecord_implementation lrecord_##c_name;			  \
 DECLARE_INLINE_HEADER (							  \
 structtype *								  \
-error_check_##c_name (Lisp_Object obj, const char *file, int line)	  \
+error_check_##c_name (Lisp_Object obj, const Ascbyte *file, int line)	  \
 )									  \
 {									  \
   assert_at_line (RECORD_TYPEP (obj, lrecord_type_##c_name), file, line); \
@@ -1190,7 +1197,7 @@
 # define DECLARE_NONRECORD(c_name, type_enum, structtype)		\
 DECLARE_INLINE_HEADER (							\
 structtype *								\
-error_check_##c_name (Lisp_Object obj, const char *file, int line)	\
+error_check_##c_name (Lisp_Object obj, const Ascbyte *file, int line)	\
 )									\
 {									\
   assert_at_line (XTYPE (obj) == type_enum, file, line);		\
@@ -1205,7 +1212,7 @@
 
 DECLARE_INLINE_HEADER (
 Lisp_Object
-wrap_record_1 (const void *ptr, enum lrecord_type ty, const char *file,
+wrap_record_1 (const void *ptr, enum lrecord_type ty, const Ascbyte *file,
 	       int line)
 )
 {
@@ -1402,14 +1409,14 @@
    overwrite the header information. */
 
 #define copy_sized_lcrecord(dst, src, size)			\
-  memcpy ((char *) (dst) + sizeof (struct lcrecord_header),	\
-	  (char *) (src) + sizeof (struct lcrecord_header),	\
+  memcpy ((Rawbyte *) (dst) + sizeof (struct lcrecord_header),	\
+	  (Rawbyte *) (src) + sizeof (struct lcrecord_header),	\
 	  (size) - sizeof (struct lcrecord_header))
 
 #define copy_lcrecord(dst, src) copy_sized_lcrecord (dst, src, sizeof (*(dst)))
 
 #define zero_sized_lcrecord(lcr, size)				\
-   memset ((char *) (lcr) + sizeof (struct lcrecord_header), 0,	\
+   memset ((Rawbyte *) (lcr) + sizeof (struct lcrecord_header), 0,	\
 	   (size) - sizeof (struct lcrecord_header))
 
 #define zero_lcrecord(lcr) zero_sized_lcrecord (lcr, sizeof (*(lcr)))
@@ -1439,13 +1446,26 @@
 /*		                 Dumping                		*/
 /************************************************************************/
 
-/* dump_add_root_struct_ptr (&var, &desc) dumps the structure pointed to by
+/* dump_add_root_block_ptr (&var, &desc) dumps the structure pointed to by
    `var'.  This is for a single relocatable pointer located in the data
-   segment (i.e. the block pointed to is in the heap). */
+   segment (i.e. the block pointed to is in the heap).
+
+   If the structure pointed to is not a `struct' but an array, you should
+   set the size field of the sized_memory_description to 0, and use
+   XD_BLOCK_ARRAY in the inner memory_description.
+
+   NOTE that a "root struct pointer" could also be described using
+   dump_add_root_block(), with SIZE == sizeof (void *), and a description
+   containing a single XD_BLOCK_PTR entry, offset 0, size 1, with a
+   structure description the same as the value passed to
+   dump_add_root_block_ptr().  That would require an extra level of
+   description, though, as compared to using dump_add_root_block_ptr(),
+   and thus this function is generally more convenient.
+    */
 #ifdef PDUMP
-void dump_add_root_struct_ptr (void *, const struct sized_memory_description *);
+void dump_add_root_block_ptr (void *, const struct sized_memory_description *);
 #else
-#define dump_add_root_struct_ptr(varaddr,descaddr) DO_NOTHING
+#define dump_add_root_block_ptr(varaddr, descaddr) DO_NOTHING
 #endif
 
 /* dump_add_opaque (&var, size) dumps the opaque static structure `var'.
@@ -1465,7 +1485,7 @@
 void dump_add_root_block (const void *ptraddress, Bytecount size,
 			  const struct memory_description *desc);
 #else
-#define dump_add_root_block(ptraddress,desc) DO_NOTHING
+#define dump_add_root_block(ptraddress, size, desc) DO_NOTHING
 #endif
 
 /* Call dump_add_opaque_int (&int_var) to dump `int_var', of type `int'. */
@@ -1512,8 +1532,8 @@
 
 #ifdef PDUMP
 #include "dumper.h"
-#define DUMPEDP(adr) ((((char *) (adr)) < pdump_end) && \
-                      (((char *) (adr)) >= pdump_start))
+#define DUMPEDP(adr) ((((Rawbyte *) (adr)) < pdump_end) && \
+                      (((Rawbyte *) (adr)) >= pdump_start))
 #else
 #define DUMPEDP(adr) 0
 #endif
@@ -1534,9 +1554,15 @@
 				     const void *idata);
 const struct sized_memory_description *lispdesc_indirect_description_1
  (const void *obj, const struct sized_memory_description *sdesc);
-Bytecount lispdesc_structure_size (const void *obj,
-				   const struct sized_memory_description *
-				   sdesc);
+Bytecount lispdesc_block_size_1 (const void *obj, Bytecount size,
+			         const struct memory_description *desc);
+
+DECLARE_INLINE_HEADER (
+Bytecount lispdesc_block_size (const void *obj,
+			       const struct sized_memory_description *sdesc))
+{
+  return lispdesc_block_size_1 (obj, sdesc->size, sdesc->description);
+}
 
 DECLARE_INLINE_HEADER (
 EMACS_INT