Mercurial > hg > xemacs-beta
view src/commands.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 | 61855263cb07 |
children | 308d34e9f07d |
line wrap: on
line source
/* Definitions needed by most editing commands. Copyright (C) 1985-1994 Free Software Foundation, Inc. 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: FSF 19.30. */ #ifndef INCLUDED_commands_h_ #define INCLUDED_commands_h_ #if 0 /* FSFmacs */ #define Ctl(c) ((c)&037) #endif /* bunches of FSF keymap and minibuffer stuff not here (in Lisp) */ extern Lisp_Object Vlast_command_event; extern Lisp_Object Vlast_input_event; /* These next two for compatibility; they are V... because they can be nil. (Many FSFmacs equivalent variables incorrectly omit the V even though they are Lisp_Objects.) */ /* Last character of last key sequence. */ extern Lisp_Object Vlast_command_char; extern Lisp_Object Vlast_input_char; #if 0 /* FSFmacs */ /* Last input character read as a command, not counting menus reached by the mouse. */ extern Lisp_Object Vlast_nonmenu_event; #endif #if 0 /* Local to event-stream.c */ /* List of command events to be re-read, or Qnil. */ extern Lisp_Object Vunread_command_events; #endif #if 0 /* FSFmacs */ /* Command char event to be re-read, or -1 if none. Setting this is obsolete, but some things should still check it. */ extern int unread_command_char; #endif /* Last command executed by the editor command loop, not counting commands that set the prefix argument. */ extern Lisp_Object Vlast_command; /* The command being executed by the command loop. Commands may set this, and the value set will be copied into Vlast_command instead of the actual command. */ extern Lisp_Object Vthis_command; #if 0 /* FSFmacs */ /* If not Qnil, this is a switch-frame event which we decided to put off until the end of a key sequence. This should be read as the next command input, after any Vunread_command_events. read_key_sequence uses this to delay switch-frame events until the end of the key sequence; Fread_char uses it to put off switch-frame events until a non-ASCII event is acceptable as input. */ extern Lisp_Object unread_switch_frame; #endif #if 0 /* Local to event-stream.c */ /* The value of point when the last command was executed. */ extern int last_point_position; /* The buffer that was current when the last command was started. */ extern Lisp_Object last_point_position_buffer; #endif /* This is so incredibly losing that it's been completely eliminated from the code. Trust me, there are cleaner, safer ways of achieving the same functionality (e.g. use select()). */ /* extern int immediate_quit; Nonzero means ^G can quit instantly */ /* Nonzero if input is coming from the keyboard */ #define INTERACTIVE (NILP (Vexecuting_macro) && !noninteractive) /* Set this nonzero to force reconsideration of modeline. */ extern int modeline_changed; extern Lisp_Object recent_keys_ring; extern int recent_keys_ring_index; /* #ifndef LISP_COMMAND_LOOP */ extern Lisp_Object Vtop_level; /* #else */ extern Lisp_Object Vcommand_loop; /* #endif */ DECLARE_DOESNT_RETURN (initial_command_loop (Lisp_Object)); DECLARE_DOESNT_RETURN_TYPE (Lisp_Object, call_command_loop (Lisp_Object catch_errors)); extern Fixnum command_loop_level; extern Lisp_Object Vkeyboard_translate_table; extern Lisp_Object Vlast_input_time; extern Lisp_Object Vcurrent_mouse_event; extern int zmacs_regions; extern int zmacs_region_active_p; extern int zmacs_region_stays; void zmacs_update_region (void); void zmacs_deactivate_region (void); Lisp_Object zmacs_region_buffer (void); extern Lisp_Object Vthis_command_keys; /* event-stream.c */ #endif /* INCLUDED_commands_h_ */