Mercurial > hg > xemacs-beta
view src/emodules.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 | ecf1ebac70d8 |
| children | 19a72041c5ed |
line wrap: on
line source
/* emodules.h - Declarations and definitions for XEmacs loadable modules. (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved. 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. */ #ifndef EMODULES_HDR #ifndef EMODULES_GATHER_VERSION #define EMODULES_HDR #endif #define EMODULES_VERSION "1.1.0" #define EMODULES_MAJOR 1 #define EMODULES_MINOR 1 #define EMODULES_PATCH 0 #define EMODULES_REVISION (long)((EMODULES_MAJOR * 1000) + \ (EMODULES_MINOR * 10) + \ (EMODULES_PATCH)) #ifndef EMODULES_GATHER_VERSION #include <config.h> #include "lisp.h" #include "sysdep.h" #include "window.h" #include "buffer.h" #include "insdel.h" #include "frame.h" #include "lstream.h" #include "file-coding.h" /* Module loading technology version number */ extern Lisp_Object Vmodule_version; /* XEmacs version Information */ extern Lisp_Object Vemacs_major_version; extern Lisp_Object Vemacs_minor_version; /* * Load in a C module. The first argument is the name of the .so file, the * second is the name of the module, and the third is the module version. * If the module name is NULL, we will always reload the .so. If it is not * NULL, we check to make sure we haven't loaded it before. If the version * is specified, we check to make sure we didn't load the module of the * specified version before. We also use these as checks when we open the * module to make sure we have the right module. */ extern void emodules_load (const char *module, const char *name, const char *version); /* * Because subrs and symbols added by a dynamic module are not part of * the make-docfile process, we need a clean way to get the variables * and functions documented. Since people don't like the idea of making * shared modules use different versions of DEFSUBR() and DEFVAR_LISP() * and friends, we need these two functions to insert the documentation * into the right place. These functions will be called by the module * init code, generated by ellcc during initialization mode. */ EXTERN_C MODULE_API void emodules_doc_subr (const char *objname, const char *docstr); EXTERN_C MODULE_API void emodules_doc_sym (const char *objname, const char *docstr); #define CDOCSUBR(Fname, DOC) emodules_doc_subr (Fname, DOC) #define CDOCSYM(Sname, DOC) emodules_doc_sym (Sname, DOC) #endif /* EMODULES_GATHER_VERSION */ /* We should not expose module entities to the portable dumper. */ #if defined(PDUMP) && defined(EMACS_MODULE) #undef dump_add_root_block_ptr #define dump_add_root_block_ptr(varaddr,descaddr) DO_NOTHING #undef dump_add_opaque #define dump_add_opaque(varaddr,size) DO_NOTHING #undef dump_add_root_block #define dump_add_root_block(ptraddress,desc) DO_NOTHING #undef dump_add_opaque_int #define dump_add_opaque_int(int_varaddr) DO_NOTHING #undef dump_add_opaque_fixnum #define dump_add_opaque_fixnum(fixnum_varaddr) DO_NOTHING #undef dump_add_root_lisp_object #define dump_add_root_lisp_object(varaddr) DO_NOTHING #undef dump_add_weak_object_chain #define dump_add_weak_object_chain(varaddr) DO_NOTHING #undef staticpro #define staticpro(DSF_location) staticpro_nodump(DSF_location) #undef unstaticpro #define unstaticpro(DSF_location) unstaticpro_nodump(DFS_location) #undef DEFSYMBOL #define DEFSYMBOL(name) DEFSYMBOL_NO_DUMP (name) #undef DEFSYMBOL_MULTIWORD_PREDICATE #define DEFSYMBOL_MULTIWORD_PREDICATE(name) \ DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP (name) #undef defsymbol #define defsymbol(location,name) defsymbol_nodump (location, name) #endif /* defined(PDUMP) && defined(EMACS_MODULE) */ #endif /* EMODULES_HDR */