Mercurial > hg > xemacs-beta
view src/insdel.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 | 804517e16990 |
children | 304aebb79cd3 |
line wrap: on
line source
/* Buffer insertion/deletion and gap motion for XEmacs. 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: Not in FSF. */ /* Mostly rewritten by Ben Wing. */ #ifndef INCLUDED_insdel_h_ #define INCLUDED_insdel_h_ /************************************************************************/ /* changing a buffer's text */ /************************************************************************/ int begin_multiple_change (struct buffer *buf, Charbpos start, Charbpos end); void end_multiple_change (struct buffer *buf, int count); /* flags for functions below */ #define INSDEL_BEFORE_MARKERS 1 #define INSDEL_NO_LOCKING 2 Charcount buffer_insert_string_1 (struct buffer *buf, Charbpos pos, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, int flags); Charcount buffer_insert_raw_string_1 (struct buffer *buf, Charbpos pos, const Ibyte *nonreloc, Bytecount length, int flags); Charcount buffer_insert_lisp_string_1 (struct buffer *buf, Charbpos pos, Lisp_Object str, int flags); Charcount buffer_insert_c_string_1 (struct buffer *buf, Charbpos pos, const char *s, int flags); Charcount buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos, Ichar ch, int flags); Charcount buffer_insert_c_char_1 (struct buffer *buf, Charbpos pos, char c, int flags); Charcount buffer_insert_from_buffer_1 (struct buffer *buf, Charbpos pos, struct buffer *buf2, Charbpos pos2, Charcount length, int flags); /* Macros for insertion functions that insert at point after markers. All of these can GC. */ #define buffer_insert_string(buf, nonreloc, reloc, offset, length) \ buffer_insert_string_1 (buf, -1, nonreloc, reloc, offset, length, 0) #define buffer_insert_raw_string(buf, string, length) \ buffer_insert_raw_string_1 (buf, -1, string, length, 0) #define buffer_insert_c_string(buf, s) \ buffer_insert_c_string_1 (buf, -1, s, 0) #define buffer_insert_lisp_string(buf, str) \ buffer_insert_lisp_string_1 (buf, -1, str, 0) #define buffer_insert_c_char(buf, c) \ buffer_insert_c_char_1 (buf, -1, c, 0) #define buffer_insert_emacs_char(buf, ch) \ buffer_insert_emacs_char_1 (buf, -1, ch, 0) #define buffer_insert_from_buffer(buf, b, index, length) \ buffer_insert_from_buffer_1 (buf, -1, b, index, length, 0) void buffer_delete_range (struct buffer *buf, Charbpos from, Charbpos to, int flags); void buffer_replace_char (struct buffer *b, Charbpos pos, Ichar ch, int not_real_change, int force_lock_check); /************************************************************************/ /* tracking buffer changes */ /************************************************************************/ /* Split into two parts. One part goes with a buffer's text (possibly shared), the other with the buffer itself. */ struct buffer_text_change_data { /* multiple change stuff */ int in_multiple_change; Charbpos mc_begin, mc_orig_end, mc_new_end; int mc_begin_signaled; }; struct each_buffer_change_data { Charcount begin_unchanged, end_unchanged; /* redisplay needs to know if a newline was deleted so its incremental-redisplay algorithm will fail */ int newline_was_deleted; Charcount begin_extent_unchanged, end_extent_unchanged; }; /* Number of characters at the beginning and end of the buffer that have not changed since the last call to buffer_reset_changes(). If no changes have occurred since then, both values will be -1. "Changed" means that the text has changed. */ #define BUF_BEGIN_UNCHANGED(buf) ((buf)->changes->begin_unchanged) #define BUF_END_UNCHANGED(buf) ((buf)->changes->end_unchanged) /* Number of characters at the beginning and end of the buffer that have not had a covering extent change since the last call to buffer_reset_changes (). If no changes have occurred since then, both values will be -1. "Changed" means that the extents covering the text have changed. */ #define BUF_EXTENT_BEGIN_UNCHANGED(buf) \ ((buf)->changes->begin_extent_unchanged) #define BUF_EXTENT_END_UNCHANGED(buf) \ ((buf)->changes->end_extent_unchanged) #define BUF_NEWLINE_WAS_DELETED(buf) \ ((buf)->changes->newline_was_deleted) void buffer_extent_signal_changed_region (struct buffer *buf, Charbpos start, Charbpos end); void buffer_reset_changes (struct buffer *buf); /************************************************************************/ /* other related functions */ /************************************************************************/ Membpos do_marker_adjustment (Membpos mpos, Membpos from, Membpos to, Bytecount amount); void fixup_internal_substring (const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount *len); /* In font-lock.c */ void font_lock_maybe_update_syntactic_caches (struct buffer *buf, Charbpos start, Charbpos orig_end, Charbpos new_end); void font_lock_buffer_was_killed (struct buffer *buf); void barf_if_buffer_read_only (struct buffer *buf, Charbpos from, Charbpos to); void init_buffer_text (struct buffer *b); void uninit_buffer_text (struct buffer *b); #endif /* INCLUDED_insdel_h_ */