xemacs-beta: src/alloc.c comparison

comparison src/alloc.c @ 452:3d3049ae1304 r21-2-41

Import from CVS: tag r21-2-41

author	cvs
date	Mon, 13 Aug 2007 11:40:21 +0200
parents	98528da0b7fc
children	d7a9135ec789

comparison

equal deleted inserted replaced

-:8ad70c5cd5d7
+:3d3049ae1304
 */
 #include <config.h>
 #include "lisp.h"
-#include "alloc.h"
 #include "backtrace.h"
 #include "buffer.h"
 #include "bytecode.h"
 #include "chartab.h"
 #include "device.h"
 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. */
+But `char *' can legally alias any pointer.  Hence this union trick...
+It turned out that the union trick was not good enough for xlC -O3;
+and it is questionable whether it really complies with the C standard.
+so we use memset instead, which should be safe from optimizations. */
 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)
-#define MARK_STRUCT_AS_FREE(ptr) \
+#define MARK_STRUCT_AS_FREE(ptr) memset (ptr, 0xff, sizeof (void *))
-(ALIASING_VOIDPP_DEREFERENCE (ptr) = (void *) INVALID_POINTER_VALUE)
+#define MARK_STRUCT_AS_NOT_FREE(ptr) memset (ptr, 0x00, sizeof (void *))
-#define MARK_STRUCT_AS_NOT_FREE(ptr) \
-(ALIASING_VOIDPP_DEREFERENCE (ptr) = 0)
 #ifdef ERROR_CHECK_GC
 #define PUT_FIXED_TYPE_ON_FREE_LIST(type, structtype, ptr)		\
 do { if (type##_free_list_tail)						\
 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 */
+/* We want the staticpros relocated, but not the pointers found therein.
-/* 1327 used slb 28-Feb-98 */
+Hence we use a trivial description, as for pointerless objects. */
-/* 1328 used og  03-Oct-99 (moving slowly, heh?) */
+static const struct lrecord_description staticpro_description_1[] = {
-#ifdef HAVE_SHLIB
+{ XD_END }
-#define NSTATICS 4000
+};
-#else
-#define NSTATICS 2000
+static const struct struct_description staticpro_description = {
-#endif
+sizeof (Lisp_Object *),
+staticpro_description_1
-/* Not "static" because used by dumper.c */
+};
-Lisp_Object *staticvec[NSTATICS];
-int staticidx;
+static const struct lrecord_description staticpros_description_1[] = {
+XD_DYNARR_DESC (Lisp_Object_ptr_dynarr, &staticpro_description),
-/* Put an entry in staticvec, pointing at the variable whose address is given
+{ XD_END }
-*/
+};
+static const struct struct_description staticpros_description = {
+sizeof (Lisp_Object_ptr_dynarr),
+staticpros_description_1
+};
+Lisp_Object_ptr_dynarr *staticpros;
+/* Mark the Lisp_Object at non-heap VARADDRESS as a root object for
+garbage collection, and for dumping. */
 void
 staticpro (Lisp_Object *varaddress)
 {
-/* #### This is now a dubious assert() since this routine may be called */
+Dynarr_add (staticpros, varaddress);
-/* by Lisp attempting to load a DLL. */
+dump_add_root_object (varaddress);
-assert (staticidx < countof (staticvec));
+}
-staticvec[staticidx++] = varaddress;
-}
+Lisp_Object_ptr_dynarr *staticpros_nodump;
-Lisp_Object *staticvec_nodump[200];
+/* Mark the Lisp_Object at non-heap VARADDRESS as a root object for
-int staticidx_nodump;
+garbage collection, but not for dumping. */
-/* 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 */
+Dynarr_add (staticpros_nodump, varaddress);
-/* 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);			\
 cleanup_specifiers ();
 /* Mark all the special slots that serve as the roots of accessibility. */
 { /* staticpro() */
-int i;
+Lisp_Object **p = Dynarr_begin (staticpros);
-for (i = 0; i < staticidx; i++)
+size_t count;
-mark_object (*(staticvec[i]));
+for (count = Dynarr_length (staticpros); count; count--)
-for (i = 0; i < staticidx_nodump; i++)
+mark_object (**p++);
-mark_object (*(staticvec_nodump[i]));
+}
+{ /* staticpro_nodump() */
+Lisp_Object **p = Dynarr_begin (staticpros_nodump);
+size_t count;
+for (count = Dynarr_length (staticpros_nodump); count; count--)
+mark_object (**p++);
 }
 { /* GCPRO() */
 struct gcpro *tail;
 int i;
 {
 	int nargs = backlist->nargs;
 	int i;
 	mark_object (*backlist->function);
-	if (nargs == UNEVALLED || nargs == MANY)
+	if (nargs < 0 /* nargs == UNEVALLED || nargs == MANY */)
 	  mark_object (backlist->args[0]);
 	else
 	  for (i = 0; i < nargs; i++)
 	    mark_object (backlist->args[i]);
 }
 init_extent_alloc ();
 init_event_alloc ();
 ignore_malloc_warnings = 0;
-staticidx_nodump = 0;
+if (staticpros_nodump)
-dumpstructidx = 0;
+Dynarr_free (staticpros_nodump);
-pdump_wireidx = 0;
+staticpros_nodump = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *);
+Dynarr_resize (staticpros_nodump, 100); /* merely a small optimization */
 consing_since_gc = 0;
 #if 1
 gc_cons_threshold = 500000; /* XEmacs change */
 #else
 INIT_LRECORD_IMPLEMENTATION (cons);
 INIT_LRECORD_IMPLEMENTATION (vector);
 INIT_LRECORD_IMPLEMENTATION (string);
 INIT_LRECORD_IMPLEMENTATION (lcrecord_list);
-staticidx = 0;
+staticpros = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *);
+Dynarr_resize (staticpros, 1410); /* merely a small optimization */
+dump_add_root_struct_ptr (&staticpros, &staticpros_description);
 }
 void
 reinit_alloc (void)
 {

Mercurial > hg > xemacs-beta

comparison src/alloc.c @ 452:3d3049ae1304 r21-2-41