Mercurial > hg > xemacs-beta
view src/glade.c @ 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 | db7068430402 |
children | 304aebb79cd3 |
line wrap: on
line source
/* glade.c ** ** Description: Interface to `libglade' for XEmacs/GTK ** ** Created by: William M. Perry <wmperry@gnu.org> ** ** Copyright (C) 1999 John Harper <john@dcs.warwick.ac.uk> ** Copyright (c) 2000 Free Software Foundation ** ** 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., 51 Franklin Street - Fifth Floor, ** Boston, MA 02111-1301, USA. */ */ #if defined(HAVE_GLADE_H) || defined(HAVE_GLADE_GLADE_H) /* For COMPILED_FUNCTIONP */ #include "bytecode.h" #ifdef HAVE_GLADE_GLADE_H #include <glade/glade.h> #endif #ifdef HAVE_GLADE_H #include <glade.h> #endif /* This is based on the code from rep-gtk 0.11 in libglade-support.c */ static void connector (const gchar *handler_name, GtkObject *object, const gchar *signal_name, const gchar *signal_data, GtkObject *connect_object, gboolean after, gpointer user_data) { Lisp_Object func; Lisp_Object lisp_data = Qnil; func = VOID_TO_LISP (user_data); if (NILP (func)) { /* Look for a lisp function called HANDLER_NAME */ func = intern (handler_name); } if (signal_data && signal_data[0]) { lisp_data = IGNORE_MULTIPLE_VALUES (Feval (Fread (build_string (signal_data)))); } /* obj, name, func, cb_data, object_signal, after_p */ Fgtk_signal_connect (build_gtk_object (object), intern (signal_name), func, lisp_data, connect_object ? Qt : Qnil, after ? Qt : Qnil); } /* This differs from lisp/subr.el (functionp) definition by allowing ** symbol names that may not necessarily be fboundp yet. */ static int __almost_functionp (Lisp_Object obj) { return (SYMBOLP (obj) || SUBRP (obj) || COMPILED_FUNCTIONP (obj) || EQ (Fcar_safe (obj), Qlambda)); } DEFUN ("glade-xml-signal-connect", Fglade_xml_signal_connect, 3, 3, 0, /* Connect a glade handler. */ (xml, handler_name, func)) { CHECK_GTK_OBJECT (xml); CHECK_STRING (handler_name); if (!__almost_functionp (func)) { func = wrong_type_argument (intern ("functionp"), func); } glade_xml_signal_connect_full (GLADE_XML (XGTK_OBJECT (xml)->object), (char*) XSTRING_DATA (handler_name), connector, LISP_TO_VOID (func)); return (Qt); } DEFUN ("glade-xml-signal-autoconnect", Fglade_xml_signal_autoconnect, 1, 1, 0, /* Connect all glade handlers. */ (xml)) { CHECK_GTK_OBJECT (xml); glade_xml_signal_autoconnect_full (GLADE_XML (XGTK_OBJECT (xml)->object), connector, LISP_TO_VOID (Qnil)); return (Qt); } DEFUN ("glade-xml-textdomain", Fglade_xml_textdomain, 1, 1, 0, /* Return the textdomain of a GladeXML object. */ (xml)) { gchar *the_domain = NULL; CHECK_GTK_OBJECT (xml); if (!GLADE_IS_XML (XGTK_OBJECT (xml)->object)) { wtaerror ("Object is not a GladeXML type.", xml); } #ifdef LIBGLADE_XML_TXTDOMAIN the_domain = GLADE_XML (XGTK_OBJECT (xml)->object)->txtdomain; #else the_domain = GLADE_XML (XGTK_OBJECT (xml)->object)->textdomain; #endif return (build_string (the_domain)); } void syms_of_glade (void) { DEFSUBR (Fglade_xml_signal_connect); DEFSUBR (Fglade_xml_signal_autoconnect); DEFSUBR (Fglade_xml_textdomain); } void vars_of_glade (void) { Fprovide (intern ("glade")); } #else /* !(HAVE_GLADE_H || HAVE_GLADE_GLADE_H) */ #define syms_of_glade() #define vars_of_glade() #endif