Mercurial > hg > xemacs-beta
view src/mule-ccl.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 | 0c54de4c4b9d |
| children | 308d34e9f07d |
line wrap: on
line source
/* Header for CCL (Code Conversion Language) interpreter. Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. Licensed to the 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef INCLUDED_mule_ccl_h_ #define INCLUDED_mule_ccl_h_ /* Macros for exit status of CCL program. */ #define CCL_STAT_SUCCESS 0 /* Terminated successfully. */ #define CCL_STAT_SUSPEND_BY_SRC 1 /* Terminated by empty input. */ #define CCL_STAT_SUSPEND_BY_DST 2 /* Terminated by output buffer full. */ #define CCL_STAT_INVALID_CMD 3 /* Terminated because of invalid command. */ #define CCL_STAT_QUIT 4 /* Terminated because of quit. */ /* Structure to hold information about running CCL code. Read comments in the file ccl.c for the detail of each field. */ struct ccl_program { int size; /* Size of the compiled code. */ Lisp_Object *prog; /* Pointer into the compiled code. */ int ic; /* Instruction Counter (index for PROG). */ int eof_ic; /* Instruction Counter for end-of-file processing code. */ int reg[8]; /* CCL registers, reg[7] is used for condition flag of relational operations. */ int private_state; /* CCL instruction may use this for private use, mainly for saving internal states on suspending. This variable is set to 0 when ccl is set up. */ int last_block; /* Set to 1 while processing the last block. */ int status; /* Exit status of the CCL program. */ int buf_magnification; /* Output buffer magnification. How many times bigger the output buffer should be than the input buffer. */ int stack_idx; /* How deep the call of CCL_Call is nested. */ int eol_type; /* When the CCL program is used for encoding by a coding system, set to the eol_type of the coding system. */ int multibyte; /* 1 if the source text is multibyte. */ }; #define CCL_MODE_ENCODING 0 #define CCL_MODE_DECODING 1 #define CCL_CODING_EOL_LF 0 /* Line-feed only, same as Emacs' internal format. */ #define CCL_CODING_EOL_CRLF 1 /* Sequence of carriage-return and line-feed. */ #define CCL_CODING_EOL_CR 2 /* Carriage-return only. */ /* If OBJECT is symbol designating a registered CCL program, return it. Else if OBJECT is a vector CCL program with no unresolved symbols, return it. Else, if OBJECT is a vector CCL program with unresolved symbols, return a newly-created vector reflecting the CCL program with all symbols resolved, if that is currently possible in this XEmacs. Otherwise, signal `invalid-argument'. */ extern Lisp_Object get_ccl_program (Lisp_Object object); /* Set up fields of the structure pointed by CCL appropriately for the execution of ccl program CCL_PROG (a symbol or a vector). If CCL_PROG is a vector and contains unresolved symbols, this function will throw an assertion failure. To avoid this, call get_ccl_program at the point that you receive the CCL program from Lisp, and use and store its (resolved) result instead. */ extern int setup_ccl_program (struct ccl_program *, Lisp_Object ccl_prog); extern int ccl_driver (struct ccl_program *, const unsigned char *, unsigned_char_dynarr *, int, int *, int); EXFUN (Fregister_ccl_program, 2); extern Lisp_Object Qccl_program; /* Vector of CCL program names vs corresponding program data. */ extern Lisp_Object Vccl_program_table; /* Symbols of ccl program have this property, a value of the property is an index for Vccl_program_table. */ extern Lisp_Object Qccl_program_idx; #endif /* INCLUDED_mule_ccl_h_ */