xemacs-beta: src/alloc.c comparison

comparison src/alloc.c @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14

author	cvs
date	Mon, 13 Aug 2007 11:20:41 +0200
parents	b8cc9ab3f761
children	da8ed4261e83

comparison

equal deleted inserted replaced

-:12e008d41344
+:697ef44129c6
 and various changes for Mule, for 19.12.
 Added bit vectors for 19.13.
 	Added lcrecord lists for 19.14.
 slb: Lots of work on the purification and dump time code.
 Synched Doug Lea malloc support from Emacs 20.2.
-og:  Killed the purespace.  Portable dumper (moved to dumper.c)
+og:  Killed the purespace.
 */
 #include <config.h>
 #include "lisp.h"
-#include "alloc.h"
 #include "backtrace.h"
 #include "buffer.h"
 #include "bytecode.h"
 #include "chartab.h"
 #include "device.h"
 #include "glyphs.h"
 #include "opaque.h"
 #include "redisplay.h"
 #include "specifier.h"
 #include "sysfile.h"
-#include "sysdep.h"
 #include "window.h"
-#include "console-stream.h"
+#include <stddef.h>
 #ifdef DOUG_LEA_MALLOC
 #include <malloc.h>
 #endif
-#ifdef PDUMP
-#include "dumper.h"
-#endif
 EXFUN (Fgarbage_collect, 0);
+/* Return the true size of a struct with a variable-length array field.  */
+#define STRETCHY_STRUCT_SIZEOF(stretchy_struct_type,		\
+			       stretchy_array_field,		\
+			       stretchy_array_length)		\
+(offsetof (stretchy_struct_type, stretchy_array_field) +	\
+(offsetof (stretchy_struct_type, stretchy_array_field[1]) -	\
+offsetof (stretchy_struct_type, stretchy_array_field[0])) *	\
+(stretchy_array_length))
 #if 0 /* this is _way_ too slow to be part of the standard debug options */
 #if defined(DEBUG_XEMACS) && defined(MULE)
 #define VERIFY_STRING_CHARS_INTEGRITY
 #endif
 Lisp_Object Vpost_gc_hook, Qpost_gc_hook;
 /* "Garbage collecting" */
 Lisp_Object Vgc_message;
 Lisp_Object Vgc_pointer_glyph;
-static const char gc_default_message[] = "Garbage collecting";
+static CONST char gc_default_message[] = "Garbage collecting";
 Lisp_Object Qgarbage_collecting;
 #ifndef VIRT_ADDR_VARIES
 extern
 #endif /* VIRT_ADDR_VARIES */
 EMACS_INT malloc_sbrk_unused;
 /* Non-zero means we're in the process of doing the dump */
 int purify_flag;
+#ifdef HEAP_IN_DATA
+extern void sheap_adjust_h();
+#endif
 #ifdef ERROR_CHECK_TYPECHECK
 Error_behavior ERROR_ME, ERROR_ME_NOT, ERROR_ME_WARN;
 #endif
 int
 c_readonly (Lisp_Object obj)
 {
-return POINTER_TYPE_P (XTYPE (obj)) && C_READONLY (obj);
+return POINTER_TYPE_P (XGCTYPE (obj)) && C_READONLY (obj);
 }
 int
 lisp_readonly (Lisp_Object obj)
 {
-return POINTER_TYPE_P (XTYPE (obj)) && LISP_READONLY (obj);
+return POINTER_TYPE_P (XGCTYPE (obj)) && LISP_READONLY (obj);
 }
 /* Maximum amount of C stack to save when a GC happens.  */
 }
 }
 /* malloc calls this if it finds we are near exhausting storage */
 void
-malloc_warning (const char *str)
+malloc_warning (CONST char *str)
 {
 if (ignore_malloc_warnings)
 return;
 warn_when_safe
 error ("Memory exhausted");
 }
 /* like malloc and realloc but check for no memory left, and block input. */
+#ifdef xmalloc
 #undef xmalloc
+#endif
 void *
 xmalloc (size_t size)
 {
 void *val = malloc (size);
 if (!val && (size != 0)) memory_full ();
 return val;
 }
+#ifdef xcalloc
 #undef xcalloc
+#endif
 static void *
 xcalloc (size_t nelem, size_t elsize)
 {
 void *val = calloc (nelem, elsize);
 xmalloc_and_zero (size_t size)
 {
 return xcalloc (size, sizeof (char));
 }
+#ifdef xrealloc
 #undef xrealloc
+#endif
 void *
 xrealloc (void *block, size_t size)
 {
 /* We must call malloc explicitly when BLOCK is 0, since some
 reallocs don't do this.  */
 #define deadbeef_memory(ptr, size)
 #endif /* !ERROR_CHECK_GC */
+#ifdef xstrdup
 #undef xstrdup
+#endif
 char *
-xstrdup (const char *str)
+xstrdup (CONST char *str)
 {
 int len = strlen (str) + 1;   /* for stupid terminating 0 */
 void *val = xmalloc (len);
 if (val == 0) return 0;
-return (char *) memcpy (val, str, len);
+memcpy (val, str, len);
+return (char *) val;
 }
 #ifdef NEED_STRDUP
 char *
-strdup (const char *s)
+strdup (CONST char *s)
 {
 return xstrdup (s);
 }
 #endif /* NEED_STRDUP */
 static void *
 allocate_lisp_storage (size_t size)
 {
-return xmalloc (size);
+void *p = xmalloc (size);
-}
+return p;
+}
-/* lcrecords are chained together through their "next" field.
-After doing the mark phase, GC will walk this linked list
+/* lrecords are chained together through their "next.v" field.
-and free any lcrecord which hasn't been marked. */
+* After doing the mark phase, the GC will walk this linked
+*  list and free any record which hasn't been marked.
+*/
 static struct lcrecord_header *all_lcrecords;
 void *
-alloc_lcrecord (size_t size, const struct lrecord_implementation *implementation)
+alloc_lcrecord (size_t size, CONST struct lrecord_implementation *implementation)
 {
 struct lcrecord_header *lcheader;
-type_checking_assert
+#ifdef ERROR_CHECK_GC
-((implementation->static_size == 0 ?
+if (implementation->static_size == 0)
-implementation->size_in_bytes_method != NULL :
+assert (implementation->size_in_bytes_method);
-implementation->static_size == size)
+else
-&&
+assert (implementation->static_size == size);
-(! implementation->basic_p)
+#endif
-&&
-(! (implementation->hash == NULL && implementation->equal != NULL)));
 lcheader = (struct lcrecord_header *) allocate_lisp_storage (size);
-set_lheader_implementation (&lcheader->lheader, implementation);
+set_lheader_implementation (&(lcheader->lheader), implementation);
 lcheader->next = all_lcrecords;
 #if 1                           /* mly prefers to see small ID numbers */
 lcheader->uid = lrecord_uid_counter++;
 #else				/* jwz prefers to see real addrs */
 lcheader->uid = (int) &lcheader;
 {
 struct lcrecord_header *header;
 for (header = all_lcrecords; header; header = header->next)
 {
-if (LHEADER_IMPLEMENTATION (&header->lheader)->finalizer &&
+if (LHEADER_IMPLEMENTATION(&header->lheader)->finalizer &&
 	  !header->free)
-	LHEADER_IMPLEMENTATION (&header->lheader)->finalizer (header, 1);
+	((LHEADER_IMPLEMENTATION(&header->lheader)->finalizer)
-}
+	 (header, 1));
+}
+}
+/* This must not be called -- it just serves as for EQ test
+*  If lheader->implementation->finalizer is this_marks_a_marked_record,
+*  then lrecord has been marked by the GC sweeper
+* header->implementation is put back to its correct value by
+*  sweep_records */
+void
+this_marks_a_marked_record (void *dummy0, int dummy1)
+{
+abort ();
+}
+/* Semi-kludge -- lrecord_symbol_value_forward objects get stuck
+in CONST space and you get SEGV's if you attempt to mark them.
+This sits in lheader->implementation->marker. */
+Lisp_Object
+this_one_is_unmarkable (Lisp_Object obj, void (*markobj) (Lisp_Object))
+{
+abort ();
+return Qnil;
+}
+/* XGCTYPE for records */
+int
+gc_record_type_p (Lisp_Object frob, CONST struct lrecord_implementation *type)
+{
+CONST struct lrecord_implementation *imp;
+if (XGCTYPE (frob) != Lisp_Type_Record)
+return 0;
+imp = XRECORD_LHEADER_IMPLEMENTATION (frob);
+return imp == type;
 }
 /************************************************************************/
 /*			  Debugger support				*/
 /************************************************************************/
 /* Give gdb/dbx enough information to decode Lisp Objects.  We make
 sure certain symbols are always defined, so gdb doesn't complain
-about expressions in src/.gdbinit.  See src/.gdbinit or src/.dbxrc
+about expressions in src/gdbinit.  See src/gdbinit or src/dbxrc to
-to see how this is used.  */
+see how this is used.  */
 EMACS_UINT dbg_valmask = ((1UL << VALBITS) - 1) << GCBITS;
 EMACS_UINT dbg_typemask = (1UL << GCTYPEBITS) - 1;
 #ifdef USE_UNION_TYPE
 unsigned char dbg_USE_UNION_TYPE = 1;
 #else
 unsigned char dbg_USE_UNION_TYPE = 0;
+#endif
+unsigned char Lisp_Type_Int = 100;
+unsigned char Lisp_Type_Cons = 101;
+unsigned char Lisp_Type_String = 102;
+unsigned char Lisp_Type_Vector = 103;
+unsigned char Lisp_Type_Symbol = 104;
+#ifndef MULE
+unsigned char lrecord_char_table_entry;
+unsigned char lrecord_charset;
+#ifndef FILE_CODING
+unsigned char lrecord_coding_system;
+#endif
+#endif
+#ifndef HAVE_TOOLBARS
+unsigned char lrecord_toolbar_button;
+#endif
+#ifndef TOOLTALK
+unsigned char lrecord_tooltalk_message;
+unsigned char lrecord_tooltalk_pattern;
+#endif
+#ifndef HAVE_DATABASE
+unsigned char lrecord_database;
 #endif
 unsigned char dbg_valbits = VALBITS;
 unsigned char dbg_gctypebits = GCTYPEBITS;
 (a struct Lisp_String) is a fixed-size structure and is managed the
 same way as all the other such types.  This structure contains a
 pointer to the actual string data, which is stored in structures of
 type struct string_chars_block.  Each string_chars_block consists
 of a pointer to a struct Lisp_String, followed by the data for that
-string, followed by another pointer to a Lisp_String, followed by
+string, followed by another pointer to a struct Lisp_String,
-the data for that string, etc.  At GC time, the data in these
+followed by the data for that string, etc.  At GC time, the data in
-blocks is compacted by searching sequentially through all the
+these blocks is compacted by searching sequentially through all the
 blocks and compressing out any holes created by unmarked strings.
 Strings that are more than a certain size (bigger than the size of
 a string_chars_block, although something like half as big might
 make more sense) are malloc()ed separately and not stored in
 string_chars_blocks.  Furthermore, no one string stretches across
 Furthermore, we never take objects off the free list
 unless there's a large number (usually 1000, but
 varies depending on type) of them already on the list.
 This way, we ensure that an object that gets freed will
 remain free for the next 1000 (or whatever) times that
-an object of that type is allocated.  */
+an object of that type is allocated.
+*/
 #ifndef MALLOC_OVERHEAD
 #ifdef GNU_MALLOC
 #define MALLOC_OVERHEAD 0
 #elif defined (rcheck)
 try to set aside another reserve in case we run out once more.
 This is called when a relocatable block is freed in ralloc.c.  */
 void refill_memory_reserve (void);
 void
-refill_memory_reserve (void)
+refill_memory_reserve ()
 {
 if (breathing_space == 0)
 breathing_space = (char *) malloc (4096 - MALLOC_OVERHEAD);
 }
 #endif
 # define INVALID_POINTER_VALUE 0xFFFFFFFFFFFFFFFF
 #else
 You have some weird system and need to supply a reasonable value here.
 #endif
-/* The construct (* (void **) (ptr)) would cause aliasing problems
-with modern optimizing compilers like `gcc -O3 -fstrict-aliasing'.
-But `char *' can legally alias any pointer.  Hence this union trick. */
-typedef union { char c; void *p; } *aliasing_voidpp;
-#define ALIASING_VOIDPP_DEREFERENCE(ptr) \
-(((aliasing_voidpp) (ptr))->p)
 #define FREE_STRUCT_P(ptr) \
-(ALIASING_VOIDPP_DEREFERENCE (ptr) == (void *) INVALID_POINTER_VALUE)
+(* (void **) ptr == (void *) INVALID_POINTER_VALUE)
 #define MARK_STRUCT_AS_FREE(ptr) \
-(ALIASING_VOIDPP_DEREFERENCE (ptr) = (void *) INVALID_POINTER_VALUE)
+(* (void **) ptr = (void *) INVALID_POINTER_VALUE)
 #define MARK_STRUCT_AS_NOT_FREE(ptr) \
-(ALIASING_VOIDPP_DEREFERENCE (ptr) = 0)
+(* (void **) ptr = 0)
 #ifdef ERROR_CHECK_GC
 #define PUT_FIXED_TYPE_ON_FREE_LIST(type, structtype, ptr)		\
 do { if (type##_free_list_tail)						\
 /************************************************************************/
 /*			   Cons allocation				*/
 /************************************************************************/
-DECLARE_FIXED_TYPE_ALLOC (cons, Lisp_Cons);
+DECLARE_FIXED_TYPE_ALLOC (cons, struct Lisp_Cons);
 /* conses are used and freed so often that we set this really high */
 /* #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_cons 20000 */
 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_cons 2000
 static Lisp_Object
-mark_cons (Lisp_Object obj)
+mark_cons (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
-if (NILP (XCDR (obj)))
+if (GC_NILP (XCDR (obj)))
 return XCAR (obj);
-mark_object (XCAR (obj));
+markobj (XCAR (obj));
 return XCDR (obj);
 }
 static int
 cons_equal (Lisp_Object ob1, Lisp_Object ob2, int depth)
 {
-depth++;
+while (internal_equal (XCAR (ob1), XCAR (ob2), depth + 1))
-while (internal_equal (XCAR (ob1), XCAR (ob2), depth))
 {
 ob1 = XCDR (ob1);
 ob2 = XCDR (ob2);
 if (! CONSP (ob1) || ! CONSP (ob2))
-	return internal_equal (ob1, ob2, depth);
+	return internal_equal (ob1, ob2, depth + 1);
 }
 return 0;
 }
-static const struct lrecord_description cons_description[] = {
-{ XD_LISP_OBJECT, offsetof (Lisp_Cons, car) },
-{ XD_LISP_OBJECT, offsetof (Lisp_Cons, cdr) },
-{ XD_END }
-};
 DEFINE_BASIC_LRECORD_IMPLEMENTATION ("cons", cons,
 				     mark_cons, print_cons, 0,
 				     cons_equal,
 				     /*
 				      * No `hash' method needed.
 				      * internal_hash knows how to
 				      * handle conses.
 				      */
 				     0,
-				     cons_description,
+				     struct Lisp_Cons);
-				     Lisp_Cons);
 DEFUN ("cons", Fcons, 2, 2, 0, /*
 Create a new cons, give it CAR and CDR as components, and return it.
 */
 (car, cdr))
 {
 /* This cannot GC. */
 Lisp_Object val;
-Lisp_Cons *c;
+struct Lisp_Cons *c;
-ALLOCATE_FIXED_TYPE (cons, Lisp_Cons, c);
+ALLOCATE_FIXED_TYPE (cons, struct Lisp_Cons, c);
-set_lheader_implementation (&c->lheader, &lrecord_cons);
+set_lheader_implementation (&(c->lheader), &lrecord_cons);
 XSETCONS (val, c);
 c->car = car;
 c->cdr = cdr;
 return val;
 }
 "real" consing. */
 Lisp_Object
 noseeum_cons (Lisp_Object car, Lisp_Object cdr)
 {
 Lisp_Object val;
-Lisp_Cons *c;
+struct Lisp_Cons *c;
-NOSEEUM_ALLOCATE_FIXED_TYPE (cons, Lisp_Cons, c);
+NOSEEUM_ALLOCATE_FIXED_TYPE (cons, struct Lisp_Cons, c);
-set_lheader_implementation (&c->lheader, &lrecord_cons);
+set_lheader_implementation (&(c->lheader), &lrecord_cons);
 XSETCONS (val, c);
 XCAR (val) = car;
 XCDR (val) = cdr;
 return val;
 }
 {
 CHECK_NATNUM (length);
 {
 Lisp_Object val = Qnil;
-size_t size = XINT (length);
+int size = XINT (length);
-while (size--)
+while (size-- > 0)
 val = Fcons (init, val);
 return val;
 }
 }
 /*			  Float allocation				*/
 /************************************************************************/
 #ifdef LISP_FLOAT_TYPE
-DECLARE_FIXED_TYPE_ALLOC (float, Lisp_Float);
+DECLARE_FIXED_TYPE_ALLOC (float, struct Lisp_Float);
 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_float 1000
 Lisp_Object
 make_float (double float_value)
 {
 Lisp_Object val;
-Lisp_Float *f;
+struct Lisp_Float *f;
-ALLOCATE_FIXED_TYPE (float, Lisp_Float, f);
+ALLOCATE_FIXED_TYPE (float, struct Lisp_Float, f);
+set_lheader_implementation (&(f->lheader), &lrecord_float);
-/* Avoid dump-time `uninitialized memory read' purify warnings. */
-if (sizeof (struct lrecord_header) + sizeof (double) != sizeof (*f))
-xzero (*f);
-set_lheader_implementation (&f->lheader, &lrecord_float);
 float_data (f) = float_value;
 XSETFLOAT (val, f);
 return val;
 }
 /************************************************************************/
 /*			   Vector allocation				*/
 /************************************************************************/
 static Lisp_Object
-mark_vector (Lisp_Object obj)
+mark_vector (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
 Lisp_Vector *ptr = XVECTOR (obj);
 int len = vector_length (ptr);
 int i;
 for (i = 0; i < len - 1; i++)
-mark_object (ptr->contents[i]);
+markobj (ptr->contents[i]);
 return (len > 0) ? ptr->contents[len - 1] : Qnil;
 }
 static size_t
-size_vector (const void *lheader)
+size_vector (CONST void *lheader)
 {
-return FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Vector, contents,
+return STRETCHY_STRUCT_SIZEOF (Lisp_Vector, contents,
-				       ((Lisp_Vector *) lheader)->size);
+				 ((Lisp_Vector *) lheader)->size);
 }
 static int
 vector_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
 {
 	return 0;
 }
 return 1;
 }
-static hashcode_t
-vector_hash (Lisp_Object obj, int depth)
-{
-return HASH2 (XVECTOR_LENGTH (obj),
-		internal_array_hash (XVECTOR_DATA (obj),
-				     XVECTOR_LENGTH (obj),
-				     depth + 1));
-}
-static const struct lrecord_description vector_description[] = {
-{ XD_LONG,              offsetof (Lisp_Vector, size) },
-{ XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Vector, contents), XD_INDIRECT(0, 0) },
-{ XD_END }
-};
 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION("vector", vector,
 				       mark_vector, print_vector, 0,
 				       vector_equal,
-				       vector_hash,
+				       /*
-				       vector_description,
+				        * No `hash' method needed for
+				        * vectors.  internal_hash
+				        * knows how to handle vectors.
+				        */
+				       0,
 				       size_vector, Lisp_Vector);
 /* #### should allocate `small' vectors from a frob-block */
 static Lisp_Vector *
 make_vector_internal (size_t sizei)
 {
 /* no vector_next */
-size_t sizem = FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Vector, contents, sizei);
+size_t sizem = STRETCHY_STRUCT_SIZEOF (Lisp_Vector, contents, sizei);
 Lisp_Vector *p = (Lisp_Vector *) alloc_lcrecord (sizem, &lrecord_vector);
 p->size = sizei;
 return p;
 }
 /************************************************************************/
 static Lisp_Object all_bit_vectors;
 /* #### should allocate `small' bit vectors from a frob-block */
-static Lisp_Bit_Vector *
+static struct Lisp_Bit_Vector *
 make_bit_vector_internal (size_t sizei)
 {
 size_t num_longs = BIT_VECTOR_LONG_STORAGE (sizei);
-size_t sizem = FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Bit_Vector, bits, num_longs);
+size_t sizem = STRETCHY_STRUCT_SIZEOF (Lisp_Bit_Vector, bits, num_longs);
 Lisp_Bit_Vector *p = (Lisp_Bit_Vector *) allocate_lisp_storage (sizem);
-set_lheader_implementation (&p->lheader, &lrecord_bit_vector);
+set_lheader_implementation (&(p->lheader), &lrecord_bit_vector);
 INCREMENT_CONS_COUNTER (sizem, "bit-vector");
 bit_vector_length (p) = sizei;
 bit_vector_next   (p) = all_bit_vectors;
 }
 Lisp_Object
 make_bit_vector (size_t length, Lisp_Object init)
 {
-Lisp_Bit_Vector *p = make_bit_vector_internal (length);
+struct Lisp_Bit_Vector *p = make_bit_vector_internal (length);
 size_t num_longs = BIT_VECTOR_LONG_STORAGE (length);
 CHECK_BIT (init);
 if (ZEROP (init))
 {
 Lisp_Compiled_Function *f;
 Lisp_Object fun;
 ALLOCATE_FIXED_TYPE (compiled_function, Lisp_Compiled_Function, f);
-set_lheader_implementation (&f->lheader, &lrecord_compiled_function);
+set_lheader_implementation (&(f->lheader), &lrecord_compiled_function);
 f->stack_depth = 0;
 f->specpdl_depth = 0;
 f->flags.documentationp = 0;
 f->flags.interactivep = 0;
 if (!NILP (constants))
 CHECK_VECTOR (constants);
 f->constants = constants;
 CHECK_NATNUM (stack_depth);
-f->stack_depth = (unsigned short) XINT (stack_depth);
+f->stack_depth  = XINT (stack_depth);
 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
 if (!NILP (Vcurrent_compiled_function_annotation))
 f->annotated = Fcopy (Vcurrent_compiled_function_annotation);
 else if (!NILP (Vload_file_name_internal_the_purecopy))
 else if (!NILP (Vload_file_name_internal))
 {
 struct gcpro gcpro1;
 GCPRO1 (fun);		/* don't let fun get reaped */
 Vload_file_name_internal_the_purecopy =
-	Ffile_name_nondirectory (Vload_file_name_internal);
+	Fpurecopy (Ffile_name_nondirectory (Vload_file_name_internal));
 f->annotated = Vload_file_name_internal_the_purecopy;
 UNGCPRO;
 }
 #endif /* COMPILED_FUNCTION_ANNOTATION_HACK */
 /************************************************************************/
 /*			    Symbol allocation				*/
 /************************************************************************/
-DECLARE_FIXED_TYPE_ALLOC (symbol, Lisp_Symbol);
+DECLARE_FIXED_TYPE_ALLOC (symbol, struct Lisp_Symbol);
 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_symbol 1000
 DEFUN ("make-symbol", Fmake_symbol, 1, 1, 0, /*
 Return a newly allocated uninterned symbol whose name is NAME.
 Its value and function definition are void, and its property list is nil.
 */
 (name))
 {
 Lisp_Object val;
-Lisp_Symbol *p;
+struct Lisp_Symbol *p;
 CHECK_STRING (name);
-ALLOCATE_FIXED_TYPE (symbol, Lisp_Symbol, p);
+ALLOCATE_FIXED_TYPE (symbol, struct Lisp_Symbol, p);
-set_lheader_implementation (&p->lheader, &lrecord_symbol);
+set_lheader_implementation (&(p->lheader), &lrecord_symbol);
 p->name     = XSTRING (name);
 p->plist    = Qnil;
 p->value    = Qunbound;
 p->function = Qunbound;
 symbol_next (p) = 0;
 allocate_extent (void)
 {
 struct extent *e;
 ALLOCATE_FIXED_TYPE (extent, struct extent, e);
-set_lheader_implementation (&e->lheader, &lrecord_extent);
+set_lheader_implementation (&(e->lheader), &lrecord_extent);
 extent_object (e) = Qnil;
 set_extent_start (e, -1);
 set_extent_end (e, -1);
 e->plist = Qnil;
 /************************************************************************/
 /*			   Event allocation				*/
 /************************************************************************/
-DECLARE_FIXED_TYPE_ALLOC (event, Lisp_Event);
+DECLARE_FIXED_TYPE_ALLOC (event, struct Lisp_Event);
 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_event 1000
 Lisp_Object
 allocate_event (void)
 {
 Lisp_Object val;
-Lisp_Event *e;
+struct Lisp_Event *e;
-ALLOCATE_FIXED_TYPE (event, Lisp_Event, e);
+ALLOCATE_FIXED_TYPE (event, struct Lisp_Event, e);
-set_lheader_implementation (&e->lheader, &lrecord_event);
+set_lheader_implementation (&(e->lheader), &lrecord_event);
 XSETEVENT (val, e);
 return val;
 }
 /************************************************************************/
 /*			 Marker allocation				*/
 /************************************************************************/
-DECLARE_FIXED_TYPE_ALLOC (marker, Lisp_Marker);
+DECLARE_FIXED_TYPE_ALLOC (marker, struct Lisp_Marker);
 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_marker 1000
 DEFUN ("make-marker", Fmake_marker, 0, 0, 0, /*
 Return a new marker which does not point at any place.
 */
 ())
 {
 Lisp_Object val;
-Lisp_Marker *p;
+struct Lisp_Marker *p;
-ALLOCATE_FIXED_TYPE (marker, Lisp_Marker, p);
+ALLOCATE_FIXED_TYPE (marker, struct Lisp_Marker, p);
-set_lheader_implementation (&p->lheader, &lrecord_marker);
+set_lheader_implementation (&(p->lheader), &lrecord_marker);
 p->buffer = 0;
 p->memind = 0;
 marker_next (p) = 0;
 marker_prev (p) = 0;
 p->insertion_type = 0;
 Lisp_Object
 noseeum_make_marker (void)
 {
 Lisp_Object val;
-Lisp_Marker *p;
+struct Lisp_Marker *p;
-NOSEEUM_ALLOCATE_FIXED_TYPE (marker, Lisp_Marker, p);
+NOSEEUM_ALLOCATE_FIXED_TYPE (marker, struct Lisp_Marker, p);
-set_lheader_implementation (&p->lheader, &lrecord_marker);
+set_lheader_implementation (&(p->lheader), &lrecord_marker);
 p->buffer = 0;
 p->memind = 0;
 marker_next (p) = 0;
 marker_prev (p) = 0;
 p->insertion_type = 0;
 strings (since EVERY REFERENCE to a short string needed to be GCPRO'd so
 that the reference would get relocated).
 This new method makes things somewhat bigger, but it is MUCH safer.  */
-DECLARE_FIXED_TYPE_ALLOC (string, Lisp_String);
+DECLARE_FIXED_TYPE_ALLOC (string, struct Lisp_String);
 /* strings are used and freed quite often */
 /* #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_string 10000 */
 #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_string 1000
 static Lisp_Object
-mark_string (Lisp_Object obj)
+mark_string (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
-Lisp_String *ptr = XSTRING (obj);
+struct Lisp_String *ptr = XSTRING (obj);
-if (CONSP (ptr->plist) && EXTENT_INFOP (XCAR (ptr->plist)))
+if (GC_CONSP (ptr->plist) && GC_EXTENT_INFOP (XCAR (ptr->plist)))
 flush_cached_extent_info (XCAR (ptr->plist));
 return ptr->plist;
 }
 static int
 Bytecount len;
 return (((len = XSTRING_LENGTH (obj1)) == XSTRING_LENGTH (obj2)) &&
 	  !memcmp (XSTRING_DATA (obj1), XSTRING_DATA (obj2), len));
 }
-static const struct lrecord_description string_description[] = {
+DEFINE_BASIC_LRECORD_IMPLEMENTATION ("string", string,
-{ XD_BYTECOUNT,       offsetof (Lisp_String, size) },
+				     mark_string, print_string,
-{ XD_OPAQUE_DATA_PTR, offsetof (Lisp_String, data), XD_INDIRECT(0, 1) },
+				     /*
-{ XD_LISP_OBJECT,     offsetof (Lisp_String, plist) },
+				      * No `finalize', or `hash' methods.
-{ XD_END }
+				      * internal_hash already knows how
-};
+				      * to hash strings and finalization
+				      * is done with the
-/* We store the string's extent info as the first element of the string's
+				      * ADDITIONAL_FREE_string macro,
-property list; and the string's MODIFF as the first or second element
+				      * which is the standard way to do
-of the string's property list (depending on whether the extent info
+				      * finalization when using
-is present), but only if the string has been modified.  This is ugly
+				      * SWEEP_FIXED_TYPE_BLOCK().
-but it reduces the memory allocated for the string in the vast
+				      */
-majority of cases, where the string is never modified and has no
+				     0, string_equal, 0,
-extent info.
+				     struct Lisp_String);
-#### This means you can't use an int as a key in a string's plist. */
-static Lisp_Object *
-string_plist_ptr (Lisp_Object string)
-{
-Lisp_Object *ptr = &XSTRING (string)->plist;
-if (CONSP (*ptr) && EXTENT_INFOP (XCAR (*ptr)))
-ptr = &XCDR (*ptr);
-if (CONSP (*ptr) && INTP (XCAR (*ptr)))
-ptr = &XCDR (*ptr);
-return ptr;
-}
-static Lisp_Object
-string_getprop (Lisp_Object string, Lisp_Object property)
-{
-return external_plist_get (string_plist_ptr (string), property, 0, ERROR_ME);
-}
-static int
-string_putprop (Lisp_Object string, Lisp_Object property, Lisp_Object value)
-{
-external_plist_put (string_plist_ptr (string), property, value, 0, ERROR_ME);
-return 1;
-}
-static int
-string_remprop (Lisp_Object string, Lisp_Object property)
-{
-return external_remprop (string_plist_ptr (string), property, 0, ERROR_ME);
-}
-static Lisp_Object
-string_plist (Lisp_Object string)
-{
-return *string_plist_ptr (string);
-}
-/* No `finalize', or `hash' methods.
-internal_hash() already knows how to hash strings and finalization
-is done with the ADDITIONAL_FREE_string macro, which is the
-standard way to do finalization when using
-SWEEP_FIXED_TYPE_BLOCK(). */
-DEFINE_BASIC_LRECORD_IMPLEMENTATION_WITH_PROPS ("string", string,
-						mark_string, print_string,
-						0, string_equal, 0,
-						string_description,
-						string_getprop,
-						string_putprop,
-						string_remprop,
-						string_plist,
-						Lisp_String);
 /* String blocks contain this many useful bytes. */
 #define STRING_CHARS_BLOCK_SIZE					\
 ((Bytecount) (8192 - MALLOC_OVERHEAD -				\
 	      ((2 * sizeof (struct string_chars_block *))	\
 /* Contents of string_chars_block->string_chars are interleaved
 string_chars structures (see below) and the actual string data */
 unsigned char string_chars[STRING_CHARS_BLOCK_SIZE];
 };
-static struct string_chars_block *first_string_chars_block;
+struct string_chars_block *first_string_chars_block;
-static struct string_chars_block *current_string_chars_block;
+struct string_chars_block *current_string_chars_block;
 /* If SIZE is the length of a string, this returns how many bytes
 *  the string occupies in string_chars_block->string_chars
 *  (including alignment padding).
 */
-#define STRING_FULLSIZE(size) \
+#define STRING_FULLSIZE(s) \
-ALIGN_SIZE (((size) + 1 + sizeof (Lisp_String *)),\
+ALIGN_SIZE (((s) + 1 + sizeof (struct Lisp_String *)),\
-ALIGNOF (Lisp_String *))
+ALIGNOF (struct Lisp_String *))
 #define BIG_STRING_FULLSIZE_P(fullsize) ((fullsize) >= STRING_CHARS_BLOCK_SIZE)
 #define BIG_STRING_SIZE_P(size) (BIG_STRING_FULLSIZE_P (STRING_FULLSIZE(size)))
+#define CHARS_TO_STRING_CHAR(x) \
+((struct string_chars *) \
+(((char *) (x)) - (slot_offset (struct string_chars, chars[0]))))
 struct string_chars
 {
-Lisp_String *string;
+struct Lisp_String *string;
 unsigned char chars[1];
 };
 struct unused_string_chars
 {
-Lisp_String *string;
+struct Lisp_String *string;
 EMACS_INT fullsize;
 };
 static void
 init_string_chars_alloc (void)
 first_string_chars_block->pos = 0;
 current_string_chars_block = first_string_chars_block;
 }
 static struct string_chars *
-allocate_string_chars_struct (Lisp_String *string_it_goes_with,
+allocate_string_chars_struct (struct Lisp_String *string_it_goes_with,
 			      EMACS_INT fullsize)
 {
 struct string_chars *s_chars;
-if (fullsize <=
+/* Allocate the string's actual data */
-(countof (current_string_chars_block->string_chars)
+if (BIG_STRING_FULLSIZE_P (fullsize))
-- current_string_chars_block->pos))
+{
+s_chars = (struct string_chars *) xmalloc (fullsize);
+}
+else if (fullsize <=
+(countof (current_string_chars_block->string_chars)
+- current_string_chars_block->pos))
 {
 /* This string can fit in the current string chars block */
 s_chars = (struct string_chars *)
 	(current_string_chars_block->string_chars
 	 + current_string_chars_block->pos);
 }
 Lisp_Object
 make_uninit_string (Bytecount length)
 {
-Lisp_String *s;
+struct Lisp_String *s;
+struct string_chars *s_chars;
 EMACS_INT fullsize = STRING_FULLSIZE (length);
 Lisp_Object val;
-assert (length >= 0 && fullsize > 0);
+if ((length < 0) || (fullsize <= 0))
+abort ();
 /* Allocate the string header */
-ALLOCATE_FIXED_TYPE (string, Lisp_String, s);
+ALLOCATE_FIXED_TYPE (string, struct Lisp_String, s);
-set_lheader_implementation (&s->lheader, &lrecord_string);
+set_lheader_implementation (&(s->lheader), &lrecord_string);
-set_string_data (s, BIG_STRING_FULLSIZE_P (fullsize)
+s_chars = allocate_string_chars_struct (s, fullsize);
-		   ? xnew_array (Bufbyte, length + 1)
-		   : allocate_string_chars_struct (s, fullsize)->chars);
+set_string_data (s, &(s_chars->chars[0]));
 set_string_length (s, length);
 s->plist = Qnil;
 set_string_byte (s, length, 0);
 POS < 0, resize the string but don't copy any characters.  Use
 this if you're planning on completely overwriting the string.
 */
 void
-resize_string (Lisp_String *s, Bytecount pos, Bytecount delta)
+resize_string (struct Lisp_String *s, Bytecount pos, Bytecount delta)
 {
-Bytecount oldfullsize, newfullsize;
 #ifdef VERIFY_STRING_CHARS_INTEGRITY
 verify_string_chars_integrity ();
 #endif
 #ifdef ERROR_CHECK_BUFPOS
 if (delta < 0)
 	assert ((-delta) <= string_length (s));
 }
 #endif /* ERROR_CHECK_BUFPOS */
+if (pos >= 0 && delta < 0)
+/* If DELTA < 0, the functions below will delete the characters
+before POS.  We want to delete characters *after* POS, however,
+so convert this to the appropriate form. */
+pos += -delta;
 if (delta == 0)
 /* simplest case: no size change. */
 return;
+else
-if (pos >= 0 && delta < 0)
+{
-/* If DELTA < 0, the functions below will delete the characters
+Bytecount oldfullsize = STRING_FULLSIZE (string_length (s));
-before POS.  We want to delete characters *after* POS, however,
+Bytecount newfullsize = STRING_FULLSIZE (string_length (s) + delta);
-so convert this to the appropriate form. */
-pos += -delta;
+if (oldfullsize == newfullsize)
-oldfullsize = STRING_FULLSIZE (string_length (s));
-newfullsize = STRING_FULLSIZE (string_length (s) + delta);
-if (BIG_STRING_FULLSIZE_P (oldfullsize))
-{
-if (BIG_STRING_FULLSIZE_P (newfullsize))
 	{
-	  /* Both strings are big.  We can just realloc().
+	  /* next simplest case; size change but the necessary
-	     But careful!  If the string is shrinking, we have to
+	     allocation size won't change (up or down; code somewhere
-	     memmove() _before_ realloc(), and if growing, we have to
+	     depends on there not being any unused allocation space,
-	     memmove() _after_ realloc() - otherwise the access is
+	     modulo any alignment constraints). */
-	     illegal, and we might crash. */
-	  Bytecount len = string_length (s) + 1 - pos;
-	  if (delta < 0 && pos >= 0)
-	    memmove (string_data (s) + pos + delta, string_data (s) + pos, len);
-	  set_string_data (s, (Bufbyte *) xrealloc (string_data (s),
-						    string_length (s) + delta + 1));
-	  if (delta > 0 && pos >= 0)
-	    memmove (string_data (s) + pos + delta, string_data (s) + pos, len);
-	}
-else /* String has been demoted from BIG_STRING. */
-	{
-	  Bufbyte *new_data =
-	    allocate_string_chars_struct (s, newfullsize)->chars;
-	  Bufbyte *old_data = string_data (s);
 	  if (pos >= 0)
 	    {
-	      memcpy (new_data, old_data, pos);
+	      Bufbyte *addroff = pos + string_data (s);
-	      memcpy (new_data + pos + delta, old_data + pos,
-		      string_length (s) + 1 - pos);
+	      memmove (addroff + delta, addroff,
+		       /* +1 due to zero-termination. */
+		       string_length (s) + 1 - pos);
 	    }
-	  set_string_data (s, new_data);
-	  xfree (old_data);
 	}
-}
+else if (BIG_STRING_FULLSIZE_P (oldfullsize) &&
-else /* old string is small */
+	       BIG_STRING_FULLSIZE_P (newfullsize))
-{
-if (oldfullsize == newfullsize)
 	{
-	  /* special case; size change but the necessary
+	  /* next simplest case; the string is big enough to be malloc()ed
-	     allocation size won't change (up or down; code
+	     itself, so we just realloc.
-	     somewhere depends on there not being any unused
-	     allocation space, modulo any alignment
+	     It's important not to let the string get below the threshold
-	     constraints). */
+	     for making big strings and still remain malloc()ed; if that
+	     were the case, repeated calls to this function on the same
+	     string could result in memory leakage. */
+	  set_string_data (s, (Bufbyte *) xrealloc (string_data (s),
+						    newfullsize));
 	  if (pos >= 0)
 	    {
 	      Bufbyte *addroff = pos + string_data (s);
 	      memmove (addroff + delta, addroff,
 		       string_length (s) + 1 - pos);
 	    }
 	}
 else
 	{
-	  Bufbyte *old_data = string_data (s);
+	  /* worst case.  We make a new string_chars struct and copy
-	  Bufbyte *new_data =
+	     the string's data into it, inserting/deleting the delta
-	    BIG_STRING_FULLSIZE_P (newfullsize)
+	     in the process.  The old string data will either get
-	    ? xnew_array (Bufbyte, string_length (s) + delta + 1)
+	     freed by us (if it was malloc()ed) or will be reclaimed
-	    : allocate_string_chars_struct (s, newfullsize)->chars;
+	     in the normal course of garbage collection. */
+	  struct string_chars *s_chars =
+	    allocate_string_chars_struct (s, newfullsize);
+	  Bufbyte *new_addr = &(s_chars->chars[0]);
+	  Bufbyte *old_addr = string_data (s);
 	  if (pos >= 0)
 	    {
-	      memcpy (new_data, old_data, pos);
+	      memcpy (new_addr, old_addr, pos);
-	      memcpy (new_data + pos + delta, old_data + pos,
+	      memcpy (new_addr + pos + delta, old_addr + pos,
 		      string_length (s) + 1 - pos);
 	    }
-	  set_string_data (s, new_data);
+	  set_string_data (s, new_addr);
+	  if (BIG_STRING_FULLSIZE_P (oldfullsize))
-	  {
+	    xfree (old_addr);
-	    /* We need to mark this chunk of the string_chars_block
+	  else
-	       as unused so that compact_string_chars() doesn't
+	    {
-	       freak. */
+	      /* We need to mark this chunk of the string_chars_block
-	    struct string_chars *old_s_chars = (struct string_chars *)
+		 as unused so that compact_string_chars() doesn't
-	      ((char *) old_data - offsetof (struct string_chars, chars));
+		 freak. */
-	    /* Sanity check to make sure we aren't hosed by strange
+	      struct string_chars *old_s_chars =
-	       alignment/padding. */
+		(struct string_chars *) ((char *) old_addr -
-	    assert (old_s_chars->string == s);
+					 sizeof (struct Lisp_String *));
-	    MARK_STRUCT_AS_FREE (old_s_chars);
+	      /* Sanity check to make sure we aren't hosed by strange
-	    ((struct unused_string_chars *) old_s_chars)->fullsize =
+	         alignment/padding. */
-	      oldfullsize;
+	      assert (old_s_chars->string == s);
-	  }
+	      MARK_STRUCT_AS_FREE (old_s_chars);
+	      ((struct unused_string_chars *) old_s_chars)->fullsize =
+		oldfullsize;
+	    }
 	}
-}
+set_string_length (s, string_length (s) + delta);
-set_string_length (s, string_length (s) + delta);
+/* If pos < 0, the string won't be zero-terminated.
-/* If pos < 0, the string won't be zero-terminated.
+	 Terminate now just to make sure. */
-Terminate now just to make sure. */
+string_data (s)[string_length (s)] = '\0';
-string_data (s)[string_length (s)] = '\0';
+if (pos >= 0)
-if (pos >= 0)
+	{
-{
+	  Lisp_Object string;
-Lisp_Object string;
+	  XSETSTRING (string, s);
-XSETSTRING (string, s);
+	  /* We also have to adjust all of the extent indices after the
-/* We also have to adjust all of the extent indices after the
+	     place we did the change.  We say "pos - 1" because
-	 place we did the change.  We say "pos - 1" because
+	     adjust_extents() is exclusive of the starting position
-	 adjust_extents() is exclusive of the starting position
+	     passed to it. */
-	 passed to it. */
+	  adjust_extents (string, pos - 1, string_length (s),
-adjust_extents (string, pos - 1, string_length (s),
+			  delta);
-		      delta);
+	}
 }
 #ifdef VERIFY_STRING_CHARS_INTEGRITY
 verify_string_chars_integrity ();
 #endif
 }
 #ifdef MULE
 void
-set_string_char (Lisp_String *s, Charcount i, Emchar c)
+set_string_char (struct Lisp_String *s, Charcount i, Emchar c)
 {
 Bufbyte newstr[MAX_EMCHAR_LEN];
 Bytecount bytoff = charcount_to_bytecount (string_data (s), i);
 Bytecount oldlen = charcount_to_bytecount (string_data (s) + bytoff, 1);
 Bytecount newlen = set_charptr_emchar (newstr, c);
 if (len == 1)
 /* Optimize the single-byte case */
 memset (XSTRING_DATA (val), XCHAR (init), XSTRING_LENGTH (val));
 else
 {
-	size_t i;
+	int i;
 	Bufbyte *ptr = XSTRING_DATA (val);
 	for (i = XINT (length); i; i--)
 	  {
 	    Bufbyte *init_ptr = init_str;
 /* Take some raw memory, which MUST already be in internal format,
 and package it up into a Lisp string. */
 Lisp_Object
-make_string (const Bufbyte *contents, Bytecount length)
+make_string (CONST Bufbyte *contents, Bytecount length)
 {
 Lisp_Object val;
 /* Make sure we find out about bad make_string's when they happen */
 #if defined (ERROR_CHECK_BUFPOS) && defined (MULE)
 }
 /* Take some raw memory, encoded in some external data format,
 and convert it into a Lisp string. */
 Lisp_Object
-make_ext_string (const Extbyte *contents, EMACS_INT length,
+make_ext_string (CONST Extbyte *contents, EMACS_INT length,
-		 Lisp_Object coding_system)
+		 enum external_data_format fmt)
 {
-Lisp_Object string;
+Bufbyte *intstr;
-TO_INTERNAL_FORMAT (DATA, (contents, length),
+Bytecount intlen;
-		      LISP_STRING, string,
-		      coding_system);
+GET_CHARPTR_INT_DATA_ALLOCA (contents, length, fmt, intstr, intlen);
-return string;
+return make_string (intstr, intlen);
 }
 Lisp_Object
-build_string (const char *str)
+build_string (CONST char *str)
 {
 /* Some strlen's crash and burn if passed null. */
-return make_string ((const Bufbyte *) str, (str ? strlen(str) : 0));
+return make_string ((CONST Bufbyte *) str, (str ? strlen(str) : 0));
 }
 Lisp_Object
-build_ext_string (const char *str, Lisp_Object coding_system)
+build_ext_string (CONST char *str, enum external_data_format fmt)
 {
 /* Some strlen's crash and burn if passed null. */
-return make_ext_string ((const Extbyte *) str, (str ? strlen(str) : 0),
+return make_ext_string ((CONST Extbyte *) str, (str ? strlen(str) : 0), fmt);
-			  coding_system);
 }
 Lisp_Object
-build_translated_string (const char *str)
+build_translated_string (CONST char *str)
 {
 return build_string (GETTEXT (str));
 }
 Lisp_Object
-make_string_nocopy (const Bufbyte *contents, Bytecount length)
+make_string_nocopy (CONST Bufbyte *contents, Bytecount length)
 {
-Lisp_String *s;
+struct Lisp_String *s;
 Lisp_Object val;
 /* Make sure we find out about bad make_string_nocopy's when they happen */
 #if defined (ERROR_CHECK_BUFPOS) && defined (MULE)
 bytecount_to_charcount (contents, length); /* Just for the assertions */
 #endif
 /* Allocate the string header */
-ALLOCATE_FIXED_TYPE (string, Lisp_String, s);
+ALLOCATE_FIXED_TYPE (string, struct Lisp_String, s);
-set_lheader_implementation (&s->lheader, &lrecord_string);
+set_lheader_implementation (&(s->lheader), &lrecord_string);
 SET_C_READONLY_RECORD_HEADER (&s->lheader);
 s->plist = Qnil;
 set_string_data (s, (Bufbyte *)contents);
 set_string_length (s, length);
 It is similar to the Blocktype class.
 It works like this:
 1) Create an lcrecord-list object using make_lcrecord_list().
-This is often done at initialization.  Remember to staticpro_nodump
+This is often done at initialization.  Remember to staticpro
 this object!  The arguments to make_lcrecord_list() are the
 same as would be passed to alloc_lcrecord().
 2) Instead of calling alloc_lcrecord(), call allocate_managed_lcrecord()
 and pass the lcrecord-list earlier created.
 3) When done with the lcrecord, call free_managed_lcrecord().
 at the time that free_managed_lcrecord() is called.
 */
 static Lisp_Object
-mark_lcrecord_list (Lisp_Object obj)
+mark_lcrecord_list (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
 struct lcrecord_list *list = XLCRECORD_LIST (obj);
 Lisp_Object chain = list->free;
 while (!NILP (chain))
 {
 struct lrecord_header *lheader = XRECORD_LHEADER (chain);
 struct free_lcrecord_header *free_header =
 	(struct free_lcrecord_header *) lheader;
-gc_checking_assert
+#ifdef ERROR_CHECK_GC
-	(/* There should be no other pointers to the free list. */
+CONST struct lrecord_implementation *implementation
-	 ! MARKED_RECORD_HEADER_P (lheader)
+	= LHEADER_IMPLEMENTATION(lheader);
-	 &&
-	 /* Only lcrecords should be here. */
+/* There should be no other pointers to the free list. */
-	 ! LHEADER_IMPLEMENTATION (lheader)->basic_p
+assert (!MARKED_RECORD_HEADER_P (lheader));
-	 &&
+/* Only lcrecords should be here. */
-	 /* Only free lcrecords should be here. */
+assert (!implementation->basic_p);
-	 free_header->lcheader.free
+/* Only free lcrecords should be here. */
-	 &&
+assert (free_header->lcheader.free);
-	 /* The type of the lcrecord must be right. */
+/* The type of the lcrecord must be right. */
-	 LHEADER_IMPLEMENTATION (lheader) == list->implementation
+assert (implementation == list->implementation);
-	 &&
+/* So must the size. */
-	 /* So must the size. */
+assert (implementation->static_size == 0
-	 (LHEADER_IMPLEMENTATION (lheader)->static_size == 0 ||
+	      || implementation->static_size == list->size);
-	  LHEADER_IMPLEMENTATION (lheader)->static_size == list->size)
+#endif /* ERROR_CHECK_GC */
-	 );
 MARK_RECORD_HEADER (lheader);
 chain = free_header->chain;
 }
 return Qnil;
 }
 DEFINE_LRECORD_IMPLEMENTATION ("lcrecord-list", lcrecord_list,
 			       mark_lcrecord_list, internal_object_printer,
-			       0, 0, 0, 0, struct lcrecord_list);
+			       0, 0, 0, struct lcrecord_list);
 Lisp_Object
 make_lcrecord_list (size_t size,
-		    const struct lrecord_implementation *implementation)
+		    CONST struct lrecord_implementation *implementation)
 {
 struct lcrecord_list *p = alloc_lcrecord_type (struct lcrecord_list,
 						 &lrecord_lcrecord_list);
 Lisp_Object val;
 Lisp_Object val = list->free;
 struct free_lcrecord_header *free_header =
 	(struct free_lcrecord_header *) XPNTR (val);
 #ifdef ERROR_CHECK_GC
-struct lrecord_header *lheader = &free_header->lcheader.lheader;
+struct lrecord_header *lheader =
+	(struct lrecord_header *) free_header;
+CONST struct lrecord_implementation *implementation
+	= LHEADER_IMPLEMENTATION (lheader);
 /* There should be no other pointers to the free list. */
-assert (! MARKED_RECORD_HEADER_P (lheader));
+assert (!MARKED_RECORD_HEADER_P (lheader));
 /* Only lcrecords should be here. */
-assert (! LHEADER_IMPLEMENTATION (lheader)->basic_p);
+assert (!implementation->basic_p);
 /* Only free lcrecords should be here. */
 assert (free_header->lcheader.free);
 /* The type of the lcrecord must be right. */
-assert (LHEADER_IMPLEMENTATION (lheader) == list->implementation);
+assert (implementation == list->implementation);
 /* So must the size. */
-assert (LHEADER_IMPLEMENTATION (lheader)->static_size == 0 ||
+assert (implementation->static_size == 0
-	      LHEADER_IMPLEMENTATION (lheader)->static_size == list->size);
+	      || implementation->static_size == list->size);
 #endif /* ERROR_CHECK_GC */
 list->free = free_header->chain;
 free_header->lcheader.free = 0;
 return val;
 }
 else
 free_managed_lcrecord (Lisp_Object lcrecord_list, Lisp_Object lcrecord)
 {
 struct lcrecord_list *list = XLCRECORD_LIST (lcrecord_list);
 struct free_lcrecord_header *free_header =
 (struct free_lcrecord_header *) XPNTR (lcrecord);
-struct lrecord_header *lheader = &free_header->lcheader.lheader;
+struct lrecord_header *lheader =
-const struct lrecord_implementation *implementation
+(struct lrecord_header *) free_header;
+CONST struct lrecord_implementation *implementation
 = LHEADER_IMPLEMENTATION (lheader);
+#ifdef ERROR_CHECK_GC
 /* Make sure the size is correct.  This will catch, for example,
 putting a window configuration on the wrong free list. */
-gc_checking_assert ((implementation->size_in_bytes_method ?
+if (implementation->size_in_bytes_method)
-		       implementation->size_in_bytes_method (lheader) :
+assert (implementation->size_in_bytes_method (lheader) == list->size);
-		       implementation->static_size)
+else
-		      == list->size);
+assert (implementation->static_size == list->size);
+#endif /* ERROR_CHECK_GC */
 if (implementation->finalizer)
 implementation->finalizer (lheader, 0);
 free_header->chain = list->free;
 free_header->lcheader.free = 1;
 (obj))
 {
 return obj;
 }
 /************************************************************************/
 /*			   Garbage Collection				*/
 /************************************************************************/
-/* All the built-in lisp object types are enumerated in `enum lrecord_type'.
+/* This will be used more extensively In The Future */
-Additional ones may be defined by a module (none yet).  We leave some
+static int last_lrecord_type_index_assigned;
-room in `lrecord_implementations_table' for such new lisp object types. */
-#define MODULE_DEFINABLE_TYPE_COUNT 32
+CONST struct lrecord_implementation *lrecord_implementations_table[128];
-const struct lrecord_implementation *lrecord_implementations_table[lrecord_type_count + MODULE_DEFINABLE_TYPE_COUNT];
+#define max_lrecord_type (countof (lrecord_implementations_table) - 1)
-/* Object marker functions are in the lrecord_implementation structure.
-But copying them to a parallel array is much more cache-friendly.
-This hack speeds up (garbage-collect) by about 5%. */
-Lisp_Object (*lrecord_markers[countof (lrecord_implementations_table)]) (Lisp_Object);
 struct gcpro *gcprolist;
 /* 415 used Mly 29-Jun-93 */
 /* 1327 used slb 28-Feb-98 */
-/* 1328 used og  03-Oct-99 (moving slowly, heh?) */
 #ifdef HAVE_SHLIB
 #define NSTATICS 4000
 #else
 #define NSTATICS 2000
 #endif
+/* Not "static" because of linker lossage on some systems */
-/* Not "static" because used by dumper.c */
+Lisp_Object *staticvec[NSTATICS]
-Lisp_Object *staticvec[NSTATICS];
+/* Force it into data space! */
-int staticidx;
+= {0};
+static int staticidx;
 /* Put an entry in staticvec, pointing at the variable whose address is given
 */
 void
 staticpro (Lisp_Object *varaddress)
 {
-/* #### This is now a dubious assert() since this routine may be called */
+if (staticidx >= countof (staticvec))
-/* by Lisp attempting to load a DLL. */
+/* #### This is now a dubious abort() since this routine may be called */
-assert (staticidx < countof (staticvec));
+/* by Lisp attempting to load a DLL. */
+abort ();
 staticvec[staticidx++] = varaddress;
 }
-Lisp_Object *staticvec_nodump[200];
-int staticidx_nodump;
-/* Put an entry in staticvec_nodump, pointing at the variable whose address is given
-*/
-void
-staticpro_nodump (Lisp_Object *varaddress)
-{
-/* #### This is now a dubious assert() since this routine may be called */
-/* by Lisp attempting to load a DLL. */
-assert (staticidx_nodump < countof (staticvec_nodump));
-staticvec_nodump[staticidx_nodump++] = varaddress;
-}
-struct pdump_dumpstructinfo dumpstructvec[200];
-int dumpstructidx;
-/* Put an entry in dumpstructvec, pointing at the variable whose address is given
-*/
-void
-dumpstruct (void *varaddress, const struct struct_description *desc)
-{
-assert (dumpstructidx < countof (dumpstructvec));
-dumpstructvec[dumpstructidx].data = varaddress;
-dumpstructvec[dumpstructidx].desc = desc;
-dumpstructidx++;
-}
-struct pdump_dumpopaqueinfo dumpopaquevec[250];
-int dumpopaqueidx;
-/* Put an entry in dumpopaquevec, pointing at the variable whose address is given
-*/
-void
-dumpopaque (void *varaddress, size_t size)
-{
-assert (dumpopaqueidx < countof (dumpopaquevec));
-dumpopaquevec[dumpopaqueidx].data = varaddress;
-dumpopaquevec[dumpopaqueidx].size = size;
-dumpopaqueidx++;
-}
-Lisp_Object *pdump_wirevec[50];
-int pdump_wireidx;
-/* Put an entry in pdump_wirevec, pointing at the variable whose address is given
-*/
-void
-pdump_wire (Lisp_Object *varaddress)
-{
-assert (pdump_wireidx < countof (pdump_wirevec));
-pdump_wirevec[pdump_wireidx++] = varaddress;
-}
-Lisp_Object *pdump_wirevec_list[50];
-int pdump_wireidx_list;
-/* Put an entry in pdump_wirevec_list, pointing at the variable whose address is given
-*/
-void
-pdump_wire_list (Lisp_Object *varaddress)
-{
-assert (pdump_wireidx_list < countof (pdump_wirevec_list));
-pdump_wirevec_list[pdump_wireidx_list++] = varaddress;
-}
-#ifdef ERROR_CHECK_GC
-#define GC_CHECK_LHEADER_INVARIANTS(lheader) do {		\
-struct lrecord_header * GCLI_lh = (lheader);			\
-assert (GCLI_lh != 0);					\
-assert (GCLI_lh->type < lrecord_type_count);			\
-assert (! C_READONLY_RECORD_HEADER_P (GCLI_lh) ||		\
-	  (MARKED_RECORD_HEADER_P (GCLI_lh) &&			\
-	   LISP_READONLY_RECORD_HEADER_P (GCLI_lh)));		\
-} while (0)
-#else
-#define GC_CHECK_LHEADER_INVARIANTS(lheader)
-#endif
 /* Mark reference to a Lisp_Object.  If the object referred to has not been
 seen yet, recursively mark all the references contained in it. */
-void
+static void
 mark_object (Lisp_Object obj)
 {
 tail_recurse:
+#ifdef ERROR_CHECK_GC
+assert (! (GC_EQ (obj, Qnull_pointer)));
+#endif
 /* Checks we used to perform */
 /* if (EQ (obj, Qnull_pointer)) return; */
 /* if (!POINTER_TYPE_P (XGCTYPE (obj))) return; */
 /* if (PURIFIED (XPNTR (obj))) return; */
-if (XTYPE (obj) == Lisp_Type_Record)
+if (XGCTYPE (obj) == Lisp_Type_Record)
 {
 struct lrecord_header *lheader = XRECORD_LHEADER (obj);
+#if defined (ERROR_CHECK_GC)
-GC_CHECK_LHEADER_INVARIANTS (lheader);
+assert (lheader->type <= last_lrecord_type_index_assigned);
+#endif
-gc_checking_assert (LHEADER_IMPLEMENTATION (lheader)->basic_p ||
+if (C_READONLY_RECORD_HEADER_P (lheader))
-			  ! ((struct lcrecord_header *) lheader)->free);
+	return;
-/* All c_readonly objects have their mark bit set,
+if (! MARKED_RECORD_HEADER_P (lheader) &&
-	 so that we only need to check the mark bit here. */
+	  ! UNMARKABLE_RECORD_HEADER_P (lheader))
-if (! MARKED_RECORD_HEADER_P (lheader))
 	{
+	  CONST struct lrecord_implementation *implementation =
+	    LHEADER_IMPLEMENTATION (lheader);
 	  MARK_RECORD_HEADER (lheader);
+#ifdef ERROR_CHECK_GC
-	  if (RECORD_MARKER (lheader))
+	  if (!implementation->basic_p)
+	    assert (! ((struct lcrecord_header *) lheader)->free);
+#endif
+	  if (implementation->marker)
 	    {
-	      obj = RECORD_MARKER (lheader) (obj);
+	      obj = implementation->marker (obj, mark_object);
-	      if (!NILP (obj)) goto tail_recurse;
+	      if (!GC_NILP (obj)) goto tail_recurse;
 	    }
 	}
 }
 }
 static int gc_count_short_string_total_size;
 /* static int gc_count_total_records_used, gc_count_records_total_size; */
+int
+lrecord_type_index (CONST struct lrecord_implementation *implementation)
+{
+int type_index = *(implementation->lrecord_type_index);
+/* Have to do this circuitous validation test because of problems
+dumping out initialized variables (ie can't set xxx_type_index to -1
+because that would make xxx_type_index read-only in a dumped emacs. */
+if (type_index < 0 || type_index > max_lrecord_type
+|| lrecord_implementations_table[type_index] != implementation)
+{
+assert (last_lrecord_type_index_assigned < max_lrecord_type);
+type_index = ++last_lrecord_type_index_assigned;
+lrecord_implementations_table[type_index] = implementation;
+*(implementation->lrecord_type_index) = type_index;
+}
+return type_index;
+}
 /* stats on lcrecords in use - kinda kludgy */
 static struct
 {
 int instances_in_use;
 int bytes_freed;
 int instances_on_free_list;
 } lcrecord_stats [countof (lrecord_implementations_table)];
 static void
-tick_lcrecord_stats (const struct lrecord_header *h, int free_p)
+tick_lcrecord_stats (CONST struct lrecord_header *h, int free_p)
 {
-unsigned int type_index = h->type;
+CONST struct lrecord_implementation *implementation =
+LHEADER_IMPLEMENTATION (h);
+int type_index = lrecord_type_index (implementation);
 if (((struct lcrecord_header *) h)->free)
 {
-gc_checking_assert (!free_p);
+assert (!free_p);
 lcrecord_stats[type_index].instances_on_free_list++;
 }
 else
 {
-const struct lrecord_implementation *implementation =
+size_t sz = (implementation->size_in_bytes_method
-	LHEADER_IMPLEMENTATION (h);
+		   ? implementation->size_in_bytes_method (h)
+		   : implementation->static_size);
-size_t sz = (implementation->size_in_bytes_method ?
-		   implementation->size_in_bytes_method (h) :
-		   implementation->static_size);
 if (free_p)
 	{
 	  lcrecord_stats[type_index].instances_freed++;
 	  lcrecord_stats[type_index].bytes_freed += sz;
 	}
 other object. */
 for (header = *prev; header; header = header->next)
 {
 struct lrecord_header *h = &(header->lheader);
+if (!C_READONLY_RECORD_HEADER_P(h)
-GC_CHECK_LHEADER_INVARIANTS (h);
+	  && !MARKED_RECORD_HEADER_P (h)
+	  && ! (header->free))
-if (! MARKED_RECORD_HEADER_P (h) && ! header->free)
 	{
 	  if (LHEADER_IMPLEMENTATION (h)->finalizer)
 	    LHEADER_IMPLEMENTATION (h)->finalizer (h, 0);
 	}
 }
 for (header = *prev; header; )
 {
 struct lrecord_header *h = &(header->lheader);
-if (MARKED_RECORD_HEADER_P (h))
+if (C_READONLY_RECORD_HEADER_P(h) || MARKED_RECORD_HEADER_P (h))
 	{
-	  if (! C_READONLY_RECORD_HEADER_P (h))
+	  if (MARKED_RECORD_HEADER_P (h))
 	    UNMARK_RECORD_HEADER (h);
 	  num_used++;
 	  /* total_size += n->implementation->size_in_bytes (h);*/
-	  /* #### May modify header->next on a C_READONLY lcrecord */
+	  /* ### May modify header->next on a C_READONLY lcrecord */
 	  prev = &(header->next);
 	  header = *prev;
 	  tick_lcrecord_stats (h, 0);
 	}
 else
 their implementation */
 for (bit_vector = *prev; !EQ (bit_vector, Qzero); )
 {
 Lisp_Bit_Vector *v = XBIT_VECTOR (bit_vector);
 int len = v->size;
-if (MARKED_RECORD_P (bit_vector))
+if (C_READONLY_RECORD_HEADER_P(&(v->lheader)) || MARKED_RECORD_P (bit_vector))
 	{
-	  if (! C_READONLY_RECORD_HEADER_P(&(v->lheader)))
+	  if (MARKED_RECORD_P (bit_vector))
 	    UNMARK_RECORD_HEADER (&(v->lheader));
 	  total_size += len;
 total_storage +=
 	    MALLOC_OVERHEAD +
-	    FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_Bit_Vector, bits,
+	    STRETCHY_STRUCT_SIZEOF (Lisp_Bit_Vector, bits,
-					  BIT_VECTOR_LONG_STORAGE (len));
+				    BIT_VECTOR_LONG_STORAGE (len));
 	  num_used++;
-	  /* #### May modify next on a C_READONLY bitvector */
+	  /* ### May modify next on a C_READONLY bitvector */
 	  prev = &(bit_vector_next (v));
 	  bit_vector = *prev;
 	}
 else
 	{
 	    }								\
 	  else if (C_READONLY_RECORD_HEADER_P (&SFTB_victim->lheader))	\
 	    {								\
 	      num_used++;						\
 	    }								\
-	  else if (! MARKED_RECORD_HEADER_P (&SFTB_victim->lheader))	\
+	  else if (!MARKED_RECORD_HEADER_P (&SFTB_victim->lheader))	\
 	    {								\
 	      num_free++;						\
 	      FREE_FIXED_TYPE (typename, obj_type, SFTB_victim);	\
 	    }								\
 	  else								\
 	  else if (C_READONLY_RECORD_HEADER_P (&SFTB_victim->lheader))		\
 	    {									\
 	      SFTB_empty = 0;							\
 	      num_used++;							\
 	    }									\
-	  else if (! MARKED_RECORD_HEADER_P (&SFTB_victim->lheader))		\
+	  else if (!MARKED_RECORD_HEADER_P (&SFTB_victim->lheader))		\
 	    {									\
 	      num_free++;							\
 	      FREE_FIXED_TYPE (typename, obj_type, SFTB_victim);		\
 	    }									\
 	  else									\
 sweep_conses (void)
 {
 #define UNMARK_cons(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader))
 #define ADDITIONAL_FREE_cons(ptr)
-SWEEP_FIXED_TYPE_BLOCK (cons, Lisp_Cons);
+SWEEP_FIXED_TYPE_BLOCK (cons, struct Lisp_Cons);
 }
 /* Explicitly free a cons cell.  */
 void
-free_cons (Lisp_Cons *ptr)
+free_cons (struct Lisp_Cons *ptr)
 {
 #ifdef ERROR_CHECK_GC
 /* If the CAR is not an int, then it will be a pointer, which will
 always be four-byte aligned.  If this cons cell has already been
 placed on the free list, however, its car will probably contain
 if (POINTER_TYPE_P (XTYPE (ptr->car)))
 ASSERT_VALID_POINTER (XPNTR (ptr->car));
 #endif /* ERROR_CHECK_GC */
 #ifndef ALLOC_NO_POOLS
-FREE_FIXED_TYPE_WHEN_NOT_IN_GC (cons, Lisp_Cons, ptr);
+FREE_FIXED_TYPE_WHEN_NOT_IN_GC (cons, struct Lisp_Cons, ptr);
 #endif /* ALLOC_NO_POOLS */
 }
 /* explicitly free a list.  You **must make sure** that you have
 created all the cons cells that make up this list and that there
 sweep_floats (void)
 {
 #define UNMARK_float(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader))
 #define ADDITIONAL_FREE_float(ptr)
-SWEEP_FIXED_TYPE_BLOCK (float, Lisp_Float);
+SWEEP_FIXED_TYPE_BLOCK (float, struct Lisp_Float);
 }
 #endif /* LISP_FLOAT_TYPE */
 static void
 sweep_symbols (void)
 {
 #define UNMARK_symbol(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader))
 #define ADDITIONAL_FREE_symbol(ptr)
-SWEEP_FIXED_TYPE_BLOCK (symbol, Lisp_Symbol);
+SWEEP_FIXED_TYPE_BLOCK (symbol, struct Lisp_Symbol);
 }
 static void
 sweep_extents (void)
 {
 sweep_events (void)
 {
 #define UNMARK_event(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader))
 #define ADDITIONAL_FREE_event(ptr)
-SWEEP_FIXED_TYPE_BLOCK (event, Lisp_Event);
+SWEEP_FIXED_TYPE_BLOCK (event, struct Lisp_Event);
 }
 static void
 sweep_markers (void)
 {
 do { Lisp_Object tem;							\
 XSETMARKER (tem, ptr);						\
 unchain_marker (tem);						\
 } while (0)
-SWEEP_FIXED_TYPE_BLOCK (marker, Lisp_Marker);
+SWEEP_FIXED_TYPE_BLOCK (marker, struct Lisp_Marker);
 }
 /* Explicitly free a marker.  */
 void
-free_marker (Lisp_Marker *ptr)
+free_marker (struct Lisp_Marker *ptr)
 {
+#ifdef ERROR_CHECK_GC
 /* Perhaps this will catch freeing an already-freed marker. */
-gc_checking_assert (ptr->lheader.type = lrecord_type_marker);
+Lisp_Object temmy;
+XSETMARKER (temmy, ptr);
+assert (GC_MARKERP (temmy));
+#endif /* ERROR_CHECK_GC */
 #ifndef ALLOC_NO_POOLS
-FREE_FIXED_TYPE_WHEN_NOT_IN_GC (marker, Lisp_Marker, ptr);
+FREE_FIXED_TYPE_WHEN_NOT_IN_GC (marker, struct Lisp_Marker, ptr);
 #endif /* ALLOC_NO_POOLS */
 }
 #if defined (MULE) && defined (VERIFY_STRING_CHARS_INTEGRITY)
 /* POS is the index of the next string in the block.  */
 while (pos < sb->pos)
 {
 struct string_chars *s_chars =
 (struct string_chars *) &(sb->string_chars[pos]);
-Lisp_String *string;
+struct Lisp_String *string;
 	  int size;
 	  int fullsize;
 	  /* If the string_chars struct is marked as free (i.e. the STRING
 	     pointer is 0xFFFFFFFF) then this is an unused chunk of string
 while (from_pos < from_sb->pos)
 {
 struct string_chars *from_s_chars =
 (struct string_chars *) &(from_sb->string_chars[from_pos]);
 struct string_chars *to_s_chars;
-Lisp_String *string;
+struct Lisp_String *string;
 	  int size;
 	  int fullsize;
 	  /* If the string_chars struct is marked as free (i.e. the STRING
 	     pointer is 0xFFFFFFFF) then this is an unused chunk of string
 	  assert (!(FREE_STRUCT_P (string)));
 size = string_length (string);
 fullsize = STRING_FULLSIZE (size);
-gc_checking_assert (! BIG_STRING_FULLSIZE_P (fullsize));
+if (BIG_STRING_FULLSIZE_P (fullsize))
+abort ();
 /* Just skip it if it isn't marked.  */
 	  if (! MARKED_RECORD_HEADER_P (&(string->lheader)))
 {
 from_pos += fullsize;
 #if 1 /* Hack to debug missing purecopy's */
 static int debug_string_purity;
 static void
-debug_string_purity_print (Lisp_String *p)
+debug_string_purity_print (struct Lisp_String *p)
 {
 Charcount i;
 Charcount s = string_char_length (p);
-stderr_out ("\"");
+putc ('\"', stderr);
 for (i = 0; i < s; i++)
 {
 Emchar ch = string_char (p, i);
 if (ch < 32 || ch >= 126)
 stderr_out ("\\%03o", ch);
 sweep_strings (void)
 {
 int num_small_used = 0, num_small_bytes = 0, num_bytes = 0;
 int debug = debug_string_purity;
-#define UNMARK_string(ptr) do {			\
+#define UNMARK_string(ptr)				\
-Lisp_String *p = (ptr);			\
+do { struct Lisp_String *p = (ptr);			\
-size_t size = string_length (p);		\
+int size = string_length (p);			\
-UNMARK_RECORD_HEADER (&(p->lheader));	\
+UNMARK_RECORD_HEADER (&(p->lheader));		\
 num_bytes += size;				\
-if (!BIG_STRING_SIZE_P (size))		\
+if (!BIG_STRING_SIZE_P (size))			\
-{						\
+	 { num_small_bytes += size;			\
-	num_small_bytes += size;		\
+	   num_small_used++;				\
-num_small_used++;			\
+	 }						\
-}						\
+if (debug) debug_string_purity_print (p);	\
-if (debug)					\
+} while (0)
-debug_string_purity_print (p);		\
+#define ADDITIONAL_FREE_string(p)				\
-} while (0)
+do { int size = string_length (p);				\
-#define ADDITIONAL_FREE_string(ptr) do {	\
+if (BIG_STRING_SIZE_P (size))				\
-size_t size = string_length (ptr);		\
+	 xfree_1 (CHARS_TO_STRING_CHAR (string_data (p)));	\
-if (BIG_STRING_SIZE_P (size))		\
+} while (0)
-xfree (ptr->data);			\
-} while (0)
+SWEEP_FIXED_TYPE_BLOCK (string, struct Lisp_String);
-SWEEP_FIXED_TYPE_BLOCK (string, Lisp_String);
 gc_count_num_short_string_in_use = num_small_used;
 gc_count_string_total_size = num_bytes;
 gc_count_short_string_total_size = num_small_bytes;
 }
 /* I hate duplicating all this crap! */
-int
+static int
 marked_p (Lisp_Object obj)
 {
+#ifdef ERROR_CHECK_GC
+assert (! (GC_EQ (obj, Qnull_pointer)));
+#endif
 /* Checks we used to perform. */
 /* if (EQ (obj, Qnull_pointer)) return 1; */
 /* if (!POINTER_TYPE_P (XGCTYPE (obj))) return 1; */
 /* if (PURIFIED (XPNTR (obj))) return 1; */
-if (XTYPE (obj) == Lisp_Type_Record)
+if (XGCTYPE (obj) == Lisp_Type_Record)
 {
 struct lrecord_header *lheader = XRECORD_LHEADER (obj);
+#if defined (ERROR_CHECK_GC)
-GC_CHECK_LHEADER_INVARIANTS (lheader);
+assert (lheader->type <= last_lrecord_type_index_assigned);
+#endif
-return MARKED_RECORD_HEADER_P (lheader);
+return C_READONLY_RECORD_HEADER_P (lheader) || MARKED_RECORD_HEADER_P (lheader);
 }
 return 1;
 }
 static void
 Dechain each one first from the buffer into which it points. */
 sweep_markers ();
 sweep_events ();
-#ifdef PDUMP
-pdump_objects_unmark ();
-#endif
 }
 /* Clearing for disksave. */
 void
 To make it easier to tell when this has happened with strings(1) we
 clear some known-to-be-garbage blocks of memory, so that leftover
 results of old evaluation don't look like potential problems.
 But first we set some notable variables to nil and do one more GC,
 to turn those strings into garbage.
 */
 /* Yeah, this list is pretty ad-hoc... */
 Vprocess_environment = Qnil;
 Vexec_directory = Qnil;
 Vdata_directory = Qnil;
 for (scb = first_string_chars_block; scb; scb = scb->next)
 {
 	int count = sizeof (scb->string_chars) - scb->pos;
 	assert (count >= 0 && count < STRING_CHARS_BLOCK_SIZE);
-	if (count != 0)
+	if (count != 0) {
-	  {
+	  /* from the block's fill ptr to the end */
-	    /* from the block's fill ptr to the end */
+	  memset ((scb->string_chars + scb->pos), 0, count);
-	    memset ((scb->string_chars + scb->pos), 0, count);
+	}
-	  }
 }
 }
 /* There, that ought to be enough... */
 	  char *msg = (STRINGP (Vgc_message)
 		       ? GETTEXT ((char *) XSTRING_DATA (Vgc_message))
 		       : 0);
 	  Lisp_Object args[2], whole_msg;
 	  args[0] = build_string (msg ? msg :
-				  GETTEXT ((const char *) gc_default_message));
+				  GETTEXT ((CONST char *) gc_default_message));
 	  args[1] = build_string ("...");
 	  whole_msg = Fconcat (2, args);
 	  echo_area_message (f, (Bufbyte *) 0, whole_msg, 0, -1,
 			     Qgarbage_collecting);
 	}
 { /* staticpro() */
 int i;
 for (i = 0; i < staticidx; i++)
 mark_object (*(staticvec[i]));
-for (i = 0; i < staticidx_nodump; i++)
-mark_object (*(staticvec_nodump[i]));
 }
 { /* GCPRO() */
 struct gcpro *tail;
 int i;
 	  for (i = 0; i < nargs; i++)
 	    mark_object (backlist->args[i]);
 }
 }
-mark_redisplay ();
+mark_redisplay (mark_object);
-mark_profiling_info ();
+mark_profiling_info (mark_object);
 /* OK, now do the after-mark stuff.  This is for things that
 are only marked when something else is marked (e.g. weak hash tables).
 There may be complex dependencies between such objects -- e.g.
 a weak hash table might be unmarked, but after processing a later
 weak hash table, the former one might get marked.  So we have to
 iterate until nothing more gets marked. */
-while (finish_marking_weak_hash_tables () > 0 ||
+while (finish_marking_weak_hash_tables (marked_p, mark_object) > 0 ||
-	 finish_marking_weak_lists       () > 0)
+	 finish_marking_weak_lists       (marked_p, mark_object) > 0)
 ;
 /* And prune (this needs to be called after everything else has been
 marked and before we do any sweeping). */
 /* #### this is somewhat ad-hoc and should probably be an object
 method */
-prune_weak_hash_tables ();
+prune_weak_hash_tables (marked_p);
-prune_weak_lists ();
+prune_weak_lists (marked_p);
-prune_specifiers ();
+prune_specifiers (marked_p);
-prune_syntax_tables ();
+prune_syntax_tables (marked_p);
 gc_sweep ();
 consing_since_gc = 0;
 #ifndef DEBUG_XEMACS
 	  if (NILP (clear_echo_area (selected_frame (),
 				     Qgarbage_collecting, 0)))
 	    {
 	      Lisp_Object args[2], whole_msg;
 	      args[0] = build_string (msg ? msg :
-				      GETTEXT ((const char *)
+				      GETTEXT ((CONST char *)
 					       gc_default_message));
 	      args[1] = build_string ("... done");
 	      whole_msg = Fconcat (2, args);
 	      echo_area_message (selected_frame (), (Bufbyte *) 0,
 				 whole_msg, 0, -1,
 }
 /* Debugging aids.  */
 static Lisp_Object
-gc_plist_hack (const char *name, int value, Lisp_Object tail)
+gc_plist_hack (CONST char *name, int value, Lisp_Object tail)
 {
 /* C doesn't have local functions (or closures, or GC, or readable syntax,
 or portable numeric datatypes, or bit-vectors, or characters, or
 arrays, or exceptions, or ...) */
 return cons3 (intern (name), make_int (value), tail);
 int i;
 int gc_count_vector_total_size = 0;
 garbage_collect_1 ();
-for (i = 0; i < lrecord_type_count; i++)
+for (i = 0; i < last_lrecord_type_index_assigned; i++)
 {
 if (lcrecord_stats[i].bytes_in_use != 0
 || lcrecord_stats[i].bytes_freed != 0
 	  || lcrecord_stats[i].instances_on_free_list != 0)
 {
 char buf [255];
-const char *name = lrecord_implementations_table[i]->name;
+CONST char *name = lrecord_implementations_table[i]->name;
 	  int len = strlen (name);
 	  /* save this for the FSFmacs-compatible part of the summary */
-	  if (i == lrecord_vector.lrecord_type_index)
+	  if (i == *lrecord_vector.lrecord_type_index)
 	    gc_count_vector_total_size =
 	      lcrecord_stats[i].bytes_in_use + lcrecord_stats[i].bytes_freed;
 sprintf (buf, "%s-storage", name);
 pl = gc_plist_hack (buf, lcrecord_stats[i].bytes_in_use, pl);
 ())
 {
 return make_int (consing_since_gc);
 }
-#if 0
 DEFUN ("memory-limit", Fmemory_limit, 0, 0, "", /*
 Return the address of the last byte Emacs has allocated, divided by 1024.
 This may be helpful in debugging Emacs's memory usage.
 The value is divided by 1024 to make sure it will fit in a lisp integer.
 */
 ())
 {
 return make_int ((EMACS_INT) sbrk (0) / 1024);
 }
-#endif
 int
 object_dead_p (Lisp_Object obj)
 {
 #endif /* MEMORY_USAGE_STATS */
 /* Initialization */
 void
-reinit_alloc_once_early (void)
+init_alloc_once_early (void)
 {
+int iii;
+last_lrecord_type_index_assigned = -1;
+for (iii = 0; iii < countof (lrecord_implementations_table); iii++)
+{
+lrecord_implementations_table[iii] = 0;
+}
+/*
+* All the staticly
+* defined subr lrecords were initialized with lheader->type == 0.
+* See subr_lheader_initializer in lisp.h.  Force type index 0 to be
+* assigned to lrecord_subr so that those predefined indexes match
+* reality.
+*/
+lrecord_type_index (&lrecord_subr);
+assert (*(lrecord_subr.lrecord_type_index) == 0);
+/*
+* The same is true for symbol_value_forward objects, except the
+* type is 1.
+*/
+lrecord_type_index (&lrecord_symbol_value_forward);
+assert (*(lrecord_symbol_value_forward.lrecord_type_index) == 1);
 gc_generation_number[0] = 0;
+/* purify_flag 1 is correct even if CANNOT_DUMP.
+* loadup.el will set to nil at end. */
+purify_flag = 1;
 breathing_space = 0;
 XSETINT (all_bit_vectors, 0); /* Qzero may not be set yet. */
 XSETINT (Vgc_message, 0);
 all_lcrecords = 0;
 ignore_malloc_warnings = 1;
 init_marker_alloc ();
 init_extent_alloc ();
 init_event_alloc ();
 ignore_malloc_warnings = 0;
+staticidx = 0;
-staticidx_nodump = 0;
-dumpstructidx = 0;
-pdump_wireidx = 0;
 consing_since_gc = 0;
 #if 1
 gc_cons_threshold = 500000; /* XEmacs change */
 #else
 gc_cons_threshold = 15000; /* debugging */
 really_unlikely_name_to_have_accidentally_in_a_non_errb_structure = 42;
 ERROR_ME_WARN.
 really_unlikely_name_to_have_accidentally_in_a_non_errb_structure =
 3333632;
 #endif /* ERROR_CHECK_TYPECHECK */
-}
-void
-init_alloc_once_early (void)
-{
-reinit_alloc_once_early ();
-{
-int i;
-for (i = 0; i < countof (lrecord_implementations_table); i++)
-lrecord_implementations_table[i] = 0;
-}
-INIT_LRECORD_IMPLEMENTATION (cons);
-INIT_LRECORD_IMPLEMENTATION (vector);
-INIT_LRECORD_IMPLEMENTATION (string);
-INIT_LRECORD_IMPLEMENTATION (lcrecord_list);
-staticidx = 0;
 }
 int pure_bytes_used = 0;
 void
 DEFSUBR (Fstring);
 DEFSUBR (Fmake_symbol);
 DEFSUBR (Fmake_marker);
 DEFSUBR (Fpurecopy);
 DEFSUBR (Fgarbage_collect);
-#if 0
 DEFSUBR (Fmemory_limit);
-#endif
 DEFSUBR (Fconsing_since_gc);
 }
 void
 vars_of_alloc (void)
 This is printed in the echo area.  If the selected frame is on a
 window system and `gc-pointer-glyph' specifies a value (i.e. a pointer
 image instance) in the domain of the selected frame, the mouse pointer
 will change instead of this message being printed.
 */ );
-Vgc_message = build_string (gc_default_message);
+Vgc_message = make_string_nocopy ((CONST Bufbyte *) gc_default_message,
+				    countof (gc_default_message) - 1);
 DEFVAR_LISP ("gc-pointer-glyph", &Vgc_pointer_glyph /*
 Pointer glyph used to indicate that a garbage collection is in progress.
 If the selected window is on a window system and this glyph specifies a
 value (i.e. a pointer image instance) in the domain of the selected

Mercurial > hg > xemacs-beta

comparison src/alloc.c @ 412:697ef44129c6 r21-2-14