Mercurial > hg > xemacs-beta
view src/console-gtk-impl.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 | 141c2920ea48 |
| children | 5502045ec510 e0db3c197671 |
line wrap: on
line source
/* Define GTK specific console, device, and frame object for XEmacs. Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 2002 Ben Wing. 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. */ /* Authorship: Ultimately based on FSF, then later on JWZ work for Lemacs. Rewritten over time by Ben Wing and Chuck Thompson (original multi-device work by Chuck Thompson). Gtk version by William M. Perry */ #ifndef INCLUDED_console_gtk_impl_h_ #define INCLUDED_console_gtk_impl_h_ #ifdef HAVE_GTK #include "console-impl.h" #include "console-gtk.h" #include <X11/Xlib.h> #define GDK_DRAWABLE(x) (GdkDrawable *) (x) #define GET_GTK_WIDGET_WINDOW(x) (GTK_WIDGET (x)->window) #define GET_GTK_WIDGET_PARENT(x) (GTK_WIDGET (x)->parent) DECLARE_CONSOLE_TYPE (gtk); struct gtk_device { #ifdef NEW_GC struct lrecord_header header; #endif /* NEW_GC */ /* Gtk application info. */ GtkWidget *gtk_app_shell; /* Cache of GC's for frame's on this device. */ struct gc_cache *gc_cache; /* Selected visual, depth and colormap for this device */ GdkVisual *visual; int depth; GdkColormap *device_cmap; /* Used by x_bevel_modeline in redisplay-x.c */ GdkBitmap *gray_pixmap; /* frame that holds the WM_COMMAND property; there should be exactly one of these per device. */ Lisp_Object WM_COMMAND_frame; /* The following items are all used exclusively in event-gtk.c. */ int MetaMask, HyperMask, SuperMask, AltMask, ModeMask; KeySym lock_interpretation; XModifierKeymap *x_modifier_keymap; KeySym *x_keysym_map; int x_keysym_map_min_code; int x_keysym_map_max_code; int x_keysym_map_keysyms_per_code; Lisp_Object x_keysym_map_hashtable; /* #### It's not clear that there is much distinction anymore between mouse_timestamp and global_mouse_timestamp, now that Emacs doesn't see most (all?) events not destined for it. */ /* The timestamp of the last button or key event used by emacs itself. This is used for asserting selections and input focus. */ guint32 mouse_timestamp; /* This is the timestamp the last button or key event whether it was dispatched to emacs or widgets. */ guint32 global_mouse_timestamp; /* This is the last known timestamp received from the server. It is maintained by x_event_to_emacs_event and used to patch bogus WM_TAKE_FOCUS messages sent by Mwm. */ guint32 last_server_timestamp; GdkAtom atom_WM_PROTOCOLS; GdkAtom atom_WM_TAKE_FOCUS; GdkAtom atom_WM_STATE; #if 0 /* #### BILL!!! */ /* stuff for sticky modifiers: */ unsigned int need_to_add_mask, down_mask; KeyCode last_downkey; guint32 release_time; #endif }; #ifdef NEW_GC typedef struct gtk_device Lisp_Gtk_Device; DECLARE_LRECORD (gtk_device, Lisp_Gtk_Device); #define XGTK_DEVICE(x) \ XRECORD (x, gtk_device, Lisp_Gtk_Device) #define wrap_gtk_device(p) wrap_record (p, gtk_device) #define GTK_DEVICE_P(x) RECORDP (x, gtk_device) #endif /* NEW_GC */ #define DEVICE_GTK_DATA(d) DEVICE_TYPE_DATA (d, gtk) #define DEVICE_GTK_VISUAL(d) (DEVICE_GTK_DATA (d)->visual) #define DEVICE_GTK_DEPTH(d) (DEVICE_GTK_DATA (d)->depth) #define DEVICE_GTK_COLORMAP(d) (DEVICE_GTK_DATA (d)->device_cmap) #define DEVICE_GTK_APP_SHELL(d) (DEVICE_GTK_DATA (d)->gtk_app_shell) #define DEVICE_GTK_GC_CACHE(d) (DEVICE_GTK_DATA (d)->gc_cache) #define DEVICE_GTK_GRAY_PIXMAP(d) (DEVICE_GTK_DATA (d)->gray_pixmap) #define DEVICE_GTK_WM_COMMAND_FRAME(d) (DEVICE_GTK_DATA (d)->WM_COMMAND_frame) #define DEVICE_GTK_MOUSE_TIMESTAMP(d) (DEVICE_GTK_DATA (d)->mouse_timestamp) #define DEVICE_GTK_GLOBAL_MOUSE_TIMESTAMP(d) (DEVICE_GTK_DATA (d)->global_mouse_timestamp) #define DEVICE_GTK_LAST_SERVER_TIMESTAMP(d) (DEVICE_GTK_DATA (d)->last_server_timestamp) /* The maximum number of widgets that can be displayed above the text area at one time. Currently no more than 3 will ever actually be displayed (menubar, psheet, debugger panel). */ #define MAX_CONCURRENT_TOP_WIDGETS 8 struct gtk_frame { #ifdef NEW_GC struct lrecord_header header; #endif /* NEW_GC */ /* The widget of this frame. */ GtkWidget *widget; /* This is really a GtkWindow */ /* The layout manager */ GtkWidget *container; /* actually a GtkVBox. */ /* The widget of the menubar */ GtkWidget *menubar_widget; /* The widget of the edit portion of this frame; this is a GtkDrawingArea, and the window of this widget is what the redisplay code draws on. */ GtkWidget *edit_widget; /* Lists the widgets above the text area, in the proper order. */ GtkWidget *top_widgets[MAX_CONCURRENT_TOP_WIDGETS]; int num_top_widgets; /* Our container widget as a Lisp_Object */ Lisp_Object lisp_visible_widgets[3]; Lisp_Object menubar_data; /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */ Lisp_Object icon_pixmap; Lisp_Object icon_pixmap_mask; /* geometry string that ought to be freed. */ char *geom_free_me_please; /* 1 if the frame is completely visible on the display, 0 otherwise. if 0 the frame may have been iconified or may be totally or partially hidden by another X window */ unsigned int totally_visible_p :1; /* Is it visible at all? */ unsigned int visible_p :1; /* Are we a top-level frame? This means that our shell is a TopLevelShell, and we should do certain things to interact with the window manager. */ unsigned int top_level_frame_p :1; /* Are we iconfied right now? */ unsigned int iconified_p :1; /* Data for widget callbacks. It is impossible to pass all the necessary data through the GTK signal API so instead it is registered here and the hash key is passed instead. */ Lisp_Object widget_instance_hash_table; Lisp_Object widget_callback_hash_table; Lisp_Object widget_callback_ex_hash_table; }; #ifdef NEW_GC typedef struct gtk_frame Lisp_Gtk_Frame; DECLARE_LRECORD (gtk_frame, Lisp_Gtk_Frame); #define XGTK_FRAME(x) \ XRECORD (x, gtk_frame, Lisp_Gtk_Frame) #define wrap_gtk_frame(p) wrap_record (p, gtk_frame) #define GTK_FRAME_P(x) RECORDP (x, gtk_frame) #endif /* NEW_GC */ #define FRAME_GTK_DATA(f) FRAME_TYPE_DATA (f, gtk) #define FRAME_GTK_SHELL_WIDGET(f) (FRAME_GTK_DATA (f)->widget) #define FRAME_GTK_CONTAINER_WIDGET(f) (FRAME_GTK_DATA (f)->container) #define FRAME_GTK_MENUBAR_WIDGET(f) (FRAME_GTK_DATA (f)->menubar_widget) #define FRAME_GTK_TEXT_WIDGET(f) (FRAME_GTK_DATA (f)->edit_widget) #define FRAME_GTK_TOP_WIDGETS(f) (FRAME_GTK_DATA (f)->top_widgets) #define FRAME_GTK_NUM_TOP_WIDGETS(f) (FRAME_GTK_DATA (f)->num_top_widgets) #define FRAME_GTK_ICONIFIED_P(f) (FRAME_GTK_DATA (f)->iconfigied_p) #define FRAME_GTK_MENUBAR_DATA(f) (FRAME_GTK_DATA (f)->menubar_data) #define FRAME_GTK_LISP_WIDGETS(f) (FRAME_GTK_DATA (f)->lisp_visible_widgets) #define FRAME_GTK_ICON_PIXMAP(f) (FRAME_GTK_DATA (f)->icon_pixmap) #define FRAME_GTK_ICON_PIXMAP_MASK(f) (FRAME_GTK_DATA (f)->icon_pixmap_mask) #define FRAME_GTK_GEOM_FREE_ME_PLEASE(f) (FRAME_GTK_DATA (f)->geom_free_me_please) #define FRAME_GTK_TOTALLY_VISIBLE_P(f) (FRAME_GTK_DATA (f)->totally_visible_p) #define FRAME_GTK_VISIBLE_P(f) (FRAME_GTK_DATA (f)->visible_p) #define FRAME_GTK_TOP_LEVEL_FRAME_P(f) (FRAME_GTK_DATA (f)->top_level_frame_p) #define FRAME_GTK_WIDGET_INSTANCE_HASH_TABLE(f) (FRAME_GTK_DATA (f)->widget_instance_hash_table) #define FRAME_GTK_WIDGET_CALLBACK_HASH_TABLE(f) (FRAME_GTK_DATA (f)->widget_callback_hash_table) #define FRAME_GTK_WIDGET_CALLBACK_EX_HASH_TABLE(f) (FRAME_GTK_DATA (f)->widget_callback_ex_hash_table) extern struct console_type *gtk_console_type; /* Special data used to quickly identify the frame that contains a widget. */ #define GTK_DATA_FRAME_IDENTIFIER "xemacs::frame" /* The hashcode in the frame hash table of a tab_control tab's callback data. */ #define GTK_DATA_TAB_HASHCODE_IDENTIFIER "xemacs::tab_hashcode" #define GTK_DATA_GUI_IDENTIFIER "xemacs::gui_id" #endif /* HAVE_GTK */ #endif /* INCLUDED_console_gtk_impl_h_ */