Mercurial > hg > xemacs-beta
view lisp/mule/general-late.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 | 257b468bf2ca |
children | 308d34e9f07d |
line wrap: on
line source
;;; general-late.el --- General Mule code that needs to be run late when ;; dumping. ;; Copyright (C) 2006 Free Software Foundation ;; Author: Aidan Kehoe ;; 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., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;;; Code: ;; The variable is declared in mule-cmds.el; it's initialised here, to give ;; the language-specific code a chance to create its coding systems. (setq posix-charset-to-coding-system-hash (loop ;; We want both normal and internal coding systems in order ;; to pick up coding system aliases. for coding-system in (coding-system-list 'every) with res = (make-hash-table :test #'equal) do (setq coding-system (symbol-name coding-system)) (unless (or (string-match #r"\(-unix\|-mac\|-dos\)$" coding-system) (string-match #r"^\(internal\|mswindows\)" coding-system)) (puthash (replace-in-string (downcase coding-system) "[^a-z0-9]" "") (coding-system-name (intern coding-system)) res)) finally return res) ;; In a thoughtless act of cultural imperialism, move English, German ;; and Japanese to the front of language-info-alist to make start-up a ;; fraction faster for those languages. language-info-alist (cons (assoc "Japanese" language-info-alist) (remassoc "Japanese" language-info-alist)) language-info-alist (cons (assoc "German" language-info-alist) (remassoc "German" language-info-alist)) language-info-alist (cons (assoc "English" language-info-alist) (remassoc "English" language-info-alist)) ;; Make Installation-string actually reflect the environment at ;; byte-compile time. (We can't necessarily decode it when version.el ;; is loaded, since not all the coding systems are available then.) Installation-string (if-boundp 'Installation-file-coding-system (decode-coding-string Installation-string Installation-file-coding-system) Installation-string) ;; This used to be here to convince the byte-compiler to encode the ;; output file using escape-quoted. This is no longer necessary, but ;; keeping it here avoids doing the eval-when-compile clause below ;; twice, which is a significant improvement. system-type (symbol-value (intern "\u0073ystem-type"))) ;; When this file is being compiled, all the charsets have been loaded, so ;; we can construct the query-skip-chars-arg string correctly. (set-unicode-query-skip-chars-args (eval-when-compile (when-fboundp 'map-charset-chars (loop for charset in (charset-list) with skip-chars-string = "" do (block no-ucs-mapping (map-charset-chars #'(lambda (begin end) (loop while (and begin (>= end begin)) do (when (= -1 (char-to-unicode begin)) (return-from no-ucs-mapping)) (setq begin (int-to-char (1+ begin))))) charset) (setq skip-chars-string (concat skip-chars-string (charset-skip-chars-string charset)))) finally return skip-chars-string))) unicode-invalid-sequence-regexp-range (eval-when-compile (concat (loop for i from #x80 to #xFF collect (aref (decode-coding-string (int-char i) 'utf-8) 0))))) ;; At this point in the dump, all the charsets have been loaded. Now, load ;; their Unicode mappings. (if load-unicode-tables-at-dump-time (let ((data-directory (expand-file-name "etc" source-directory))) (load-unicode-tables))) ;;; general-late.el ends here