Mercurial > hg > xemacs-beta
view lisp/events.el @ 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 | a25c824ed558 |
children | 308d34e9f07d |
line wrap: on
line source
;;; events.el --- event functions for XEmacs. ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Copyright (C) 1996-7 Sun Microsystems, Inc. ;; Copyright (C) 1996 Ben Wing. ;; Maintainer: Martin Buchholz ;; Keywords: internal, event, dumped ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;;; Code: (defun event-console (event) "Return the console that EVENT occurred on. This will be nil for some types of events (e.g. eval events)." (cdfw-console (event-channel event))) (defun event-device (event) "Return the device that EVENT occurred on. This will be nil for some types of events (e.g. keyboard and eval events)." (dfw-device (event-channel event))) (defun event-frame (event) "Return the frame that EVENT occurred on. This will be nil for some types of events (e.g. keyboard and eval events)." (fw-frame (event-channel event))) (defun event-buffer (event) "Return the buffer of the window over which mouse event EVENT occurred. Return nil unless both (mouse-event-p EVENT) and (event-over-text-area-p EVENT) are non-nil." (let ((window (event-window event))) (and (windowp window) (window-buffer window)))) (defalias 'allocate-event 'make-event) (defun key-press-event-p (object) "Return t if OBJECT is a key-press event." (and (event-live-p object) (eq 'key-press (event-type object)))) (defun button-press-event-p (object) "Return t if OBJECT is a mouse button-press event." (and (event-live-p object) (eq 'button-press (event-type object)))) (defun button-release-event-p (object) "Return t if OBJECT is a mouse button-release event." (and (event-live-p object) (eq 'button-release (event-type object)))) (defun button-event-p (object) "Return t if OBJECT is a mouse button-press or button-release event." (and (event-live-p object) (memq (event-type object) '(button-press button-release)) t)) (defun motion-event-p (object) "Return t if OBJECT is a mouse motion event." (and (event-live-p object) (eq 'motion (event-type object)))) (defun mouse-event-p (object) "Return t if OBJECT is a mouse button-press, button-release or motion event." (and (event-live-p object) (memq (event-type object) '(button-press button-release motion)) t)) (defun process-event-p (object) "Return t if OBJECT is a process-output event." (and (event-live-p object) (eq 'process (event-type object)))) (defun timeout-event-p (object) "Return t if OBJECT is a timeout event." (and (event-live-p object) (eq 'timeout (event-type object)))) (defun eval-event-p (object) "Return t if OBJECT is an eval event." (and (event-live-p object) (eq 'eval (event-type object)))) (defun misc-user-event-p (object) "Return t if OBJECT is a misc-user event. A misc-user event is a user event that is not a keypress or mouse click; normally this means a menu selection or scrollbar action." (and (event-live-p object) (eq 'misc-user (event-type object)))) ;; You could just as easily use event-glyph but we include this for ;; consistency. (defun event-over-glyph-p (object) "Return t if OBJECT is a mouse event occurring over a glyph. Mouse events are events of type button-press, button-release or motion." (and (event-live-p object) (event-glyph object) t)) (defun keyboard-translate (&rest pairs) "Translate character or keysym FROM to TO at a low level. Multiple FROM-TO pairs may be specified. See `keyboard-translate-table' for more information." (while pairs (puthash (pop pairs) (pop pairs) keyboard-translate-table))) (defun set-character-of-keysym (keysym character) "Make CHARACTER be inserted when KEYSYM is pressed, and the key has been bound to `self-insert-command'. " (check-argument-type 'symbolp keysym) (check-argument-type 'characterp character) (put keysym 'character-of-keysym character)) (defun get-character-of-keysym (keysym) "Return the character inserted when KEYSYM is pressed, and the key is bound to `self-insert-command'. " (check-argument-type 'symbolp keysym) (event-to-character (make-event 'key-press (list 'key keysym)))) ;; We could take the first few of these out by removing the "/* Optimize for ;; ASCII keysyms */" code in event-Xt.c, and I've a suspicion that may be ;; the right thing to do anyway. (loop for (keysym char) in '((tab ?\t) (linefeed ?\n) (clear ?\014) (return ?\r) (escape ?\e) (space ? ) ;; Do the same voodoo for the keypad keys. I used to bind these to ;; keyboard macros (for instance, kp-0 was bound to "0") so that they ;; would track the bindings of the corresponding keys by default, but ;; that made the display of M-x describe-bindings much harder to read, ;; so now we'll just bind them to self-insert by default. Not a big ;; difference... (kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4) (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9) (kp-space ? ) (kp-tab ?\t) (kp-enter ?\r) (kp-equal ?=) (kp-multiply ?*) (kp-add ?+) (kp-separator ?,) (kp-subtract ?-) (kp-decimal ?.) (kp-divide ?/)) do (set-character-of-keysym keysym char)) ;;; events.el ends here