Mercurial > hg > xemacs-beta
view src/mc-alloc.h @ 4921:17362f371cc2
add more byte-code assertions and better failure output
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* alloc.c (Fmake_byte_code):
* bytecode.h:
* lisp.h:
* lread.c:
* lread.c (readevalloop):
* lread.c (Fread):
* lread.c (Fread_from_string):
* lread.c (read_list_conser):
* lread.c (read_list):
* lread.c (vars_of_lread):
* symbols.c:
* symbols.c (Fdefine_function):
Turn on the "compiled-function annotation hack". Implement it
properly by hooking into Fdefalias(). Note in the docstring to
`defalias' that we do this. Remove some old broken code and
change code that implemented the old kludgy way of hooking into
the Lisp reader into bracketed by `#ifdef
COMPILED_FUNCTION_ANNOTATION_HACK_OLD_WAY', which is not enabled.
Also enable byte-code metering when DEBUG_XEMACS -- this is a form
of profiling for computing histograms of which sequences of two
bytecodes are used most often.
* bytecode-ops.h:
* bytecode-ops.h (OPCODE):
New file. Extract out all the opcodes and declare them using
OPCODE(), a bit like frame slots and such. This way the file can
be included multiple times if necessary to iterate multiple times
over the byte opcodes.
* bytecode.c:
* bytecode.c (NUM_REMEMBERED_BYTE_OPS):
* bytecode.c (OPCODE):
* bytecode.c (assert_failed_with_remembered_ops):
* bytecode.c (READ_UINT_2):
* bytecode.c (READ_INT_1):
* bytecode.c (READ_INT_2):
* bytecode.c (PEEK_INT_1):
* bytecode.c (PEEK_INT_2):
* bytecode.c (JUMP_RELATIVE):
* bytecode.c (JUMP_NEXT):
* bytecode.c (PUSH):
* bytecode.c (POP_WITH_MULTIPLE_VALUES):
* bytecode.c (DISCARD):
* bytecode.c (UNUSED):
* bytecode.c (optimize_byte_code):
* bytecode.c (optimize_compiled_function):
* bytecode.c (Fbyte_code):
* bytecode.c (vars_of_bytecode):
* bytecode.c (init_opcode_table_multi_op):
* bytecode.c (reinit_vars_of_bytecode):
* emacs.c (main_1):
* eval.c (funcall_compiled_function):
* symsinit.h:
Any time we change either the instruction pointer or the stack
pointer, assert that we're going to move it to a valid location.
This should catch failures right when they occur rather than
sometime later. This requires that we pass in another couple of
parameters into some functions (only with error-checking enabled,
see below).
Also keep track, using a circular queue, of the last 100 byte
opcodes seen, and when we hit an assert failure during byte-code
execution, output the contents of the queue in a nice readable
fashion. This requires that bytecode-ops.h be included a second
time so that a table mapping opcodes to the name of their operation
can be constructed. This table is constructed in new function
reinit_vars_of_bytecode().
Everything in the last two paras happens only when
ERROR_CHECK_BYTE_CODE.
Add some longish comments describing how the arrays that hold the
stack and instructions, and the pointers used to access them, work.
* gc.c:
Import some code from my `latest-fix' workspace to mark the
staticpro's in order from lowest to highest, rather than highest to
lowest, so it's easier to debug when something goes wrong.
* lisp.h (abort_with_message): Renamed from abort_with_msg().
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symeval.h (DEFVAR_SYMVAL_FWD_OBJECT):
Make the various calls to staticpro() instead call staticpro_1(),
passing in the name of the C var being staticpro'ed, so that it
shows up in staticpro_names. Otherwise staticpro_names just has
1000+ copies of the word `location'.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 08:01:55 -0600 |
parents | 229bd619740a |
children | 1fae11d56ad2 |
line wrap: on
line source
/* New allocator for XEmacs. Copyright (C) 2005 Marcus Crestani. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_mc_alloc_h_ #define INCLUDED_mc_alloc_h_ /*--- prototypes -------------------------------------------------------*/ BEGIN_C_DECLS /* Set to 1 if memory becomes short. */ extern EMACS_INT memory_shortage; /* Internal Allocator Functions: */ /* Initialize the allocator. This has to be called prior to requesting memory. */ void init_mc_allocator (void); /* Allocate a block of memory of given size and return the pointer to it. */ void *mc_alloc (size_t size); /* Allocate a block of memory as an array with elemcount elements of given size and return the pointer to it. Arrays contain several objects that are allocated in one consecutive block of memory with each element being a fully qualified object---that is, it has a Lisp object header and a mark bit. Objects like hash tables and dynamic arrays use this function. */ void *mc_alloc_array (size_t size, EMACS_INT elemcount); /* Modify the size of the memory block pointed to by ptr. Return the address of the new block of given size. The content of the memory block will be unchanged to the minimum of the old and new sizes: if the new size is smaller, the overlaying data is cut off; if the new size is bigger, the newly allocated memory will be uninitialized.*/ void *mc_realloc (void *ptr, size_t size); /* Modify the size of the array pointed to by ptr. Return the address of the new array block with elemcount elements of given size. The content of the memory block will be unchanged to the minimum of the old and new sizes: if the new size is smaller, the overlaying data is cut off; if the new size is bigger, the newly allocated memory will be uninitialized.*/ void *mc_realloc_array (void *ptr, size_t size, EMACS_INT elemcount); /* Garbage collection related functions and macros: */ enum mark_bit_colors { WHITE = 0, BLACK = 1, GREY = 2 }; /* Set the mark bit of the object pointed to by ptr to value.*/ void set_mark_bit (void *ptr, EMACS_INT value); /* Return the mark bit of the object pointed to by ptr. */ EMACS_INT get_mark_bit (void *ptr); /* mark bit macros */ /* Returns true if the mark bit of the object pointed to by ptr is set. */ #define MARKED_P(ptr) (get_mark_bit (ptr) != WHITE) /* Marks the object pointed to by ptr (sets the mark bit to 1). */ #define MARK(ptr) set_mark_bit (ptr, BLACK) /* Unmarks the object pointed to by ptr (sets the mark bit to 0). */ #define UNMARK(ptr) set_mark_bit (ptr, WHITE) #define MARK_WHITE(ptr) set_mark_bit (ptr, WHITE) #define MARK_GREY(ptr) set_mark_bit (ptr, GREY) #define MARK_BLACK(ptr) set_mark_bit (ptr, BLACK) #define MARKED_WHITE_P(ptr) (get_mark_bit (ptr) == WHITE) #define MARKED_GREY_P(ptr) (get_mark_bit (ptr) == GREY) #define MARKED_BLACK_P(ptr) (get_mark_bit (ptr) == BLACK) /* The finalizer of every not marked object is called. The macro MC_ALLOC_CALL_FINALIZER has to be defined and call the finalizer of the object. Returns number of processed pages. */ EMACS_INT mc_finalize (void); /* All not marked objects of the used heap are freed. Returns number of processed pages. */ EMACS_INT mc_sweep (void); /* Portable dumper related functions and macros: */ /* The finalizer for disksave of every object is called to shrink the dump image. The macro MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE has to be defined and call the finalizer for disksave of the object. Returns number of processed pages. */ EMACS_INT mc_finalize_for_disksave (void); /* Functions and macros related with allocation statistics: */ #ifdef MEMORY_USAGE_STATS /* Returns the real size, including overhead, which is actually alloced for an object with given claimed_size. */ Bytecount mc_alloced_storage_size (Bytecount claimed_size, struct overhead_stats *stats); #endif /* MEMORY_USAGE_STATS */ /* Incremental Garbage Collector / Write Barrier Support: */ /* Return the PAGESIZE the allocator uses. Generally equals to the system's PAGESIZE. */ EMACS_INT mc_get_page_size (void); /* Is the fault at ptr on a protected page? */ EMACS_INT fault_on_protected_page (void *ptr); /* Remove protection (if there) of heap page of given page header ph. Returns number of processed pages. */ EMACS_INT protect_heap_pages (void); /* Remove protection for all heap pages which are protected. Returns number of processed pages. */ EMACS_INT unprotect_heap_pages (void); /* Remove protection and mark page dirty. */ void unprotect_page_and_mark_dirty (void *ptr); /* Repush all objects on dirty pages onto the mark stack. Return number of repushed objects. */ int repush_all_objects_on_page (void *ptr); /* Mark black if object is currently grey. */ EMACS_INT maybe_mark_black (void *ptr); /* Only for debugging---not used anywhere in the sources. */ EMACS_INT object_on_heap_p (void *ptr); END_C_DECLS #endif /* INCLUDED_mc_alloc_h_ */