Mercurial > hg > xemacs-beta
view lisp/version.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 | 6a3006b37260 |
children | 788c38f20376 |
line wrap: on
line source
;; version.el --- Record version number of Emacs. ;; Copyright (C) 1985, 1991-1994, 1997 Free Software Foundation, Inc. ;; Maintainer: XEmacs Development Team ;; Keywords: internal, 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 Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: FSF 19.34. ;;; Commentary: ;; This file is dumped with XEmacs. ;;; Code: (defconst xemacs-betaname (and emacs-beta-version (format "(beta%d)" emacs-beta-version)) "Non-nil when this is a test (beta) version of XEmacs. Warning, this variable did not exist in XEmacs versions prior to 20.3. Its value is derived from `emacs-beta-version'. It is mutually exclusive with `emacs-patch-level'.") (defconst emacs-version (format "%d.%d %s%s%s%s%s" emacs-major-version emacs-minor-version (if emacs-patch-level (format "(patch %d)" emacs-patch-level) "") (if xemacs-betaname (concat " " xemacs-betaname) "") (if xemacs-codename (concat " \"" xemacs-codename "\"") "") (if xemacs-extra-name (concat " " xemacs-extra-name) "") " XEmacs Lucid") "Version numbers of this version of XEmacs.") (if (featurep 'infodock) (require 'id-vers)) ;; Moved to C code as of XEmacs 20.3 ;(defconst emacs-major-version ; (progn (or (string-match "^[0-9]+" emacs-version) ; (error "emacs-version unparsable")) ; (string-to-int (match-string 0 emacs-version))) ; "Major version number of this version of Emacs, as an integer. ;Warning, this variable did not exist in Emacs versions earlier than: ; FSF Emacs: 19.23 ; XEmacs: 19.10") ;; Moved to C code as of XEmacs 20.3 ;(defconst emacs-minor-version ; (progn (or (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version) ; (error "emacs-version unparsable")) ; (string-to-int (match-string 1 emacs-version))) ; "Minor version number of this version of Emacs, as an integer. ;Warning, this variable did not exist in Emacs versions earlier than: ; FSF Emacs: 19.23 ; XEmacs: 19.10") (defconst emacs-build-time (current-time-string) "Time at which Emacs was dumped out.") (defconst emacs-build-system (system-name)) (defun emacs-version (&optional arg) "Return string describing the version of Emacs that is running. When called interactively with a prefix argument, insert string at point. Don't use this function in programs to choose actions according to the system configuration; look at `system-configuration' instead." (interactive "p") (save-match-data (let ((version-string (format "XEmacs %s %s(%s%s) of %s %s on %s" (substring emacs-version 0 (string-match " XEmacs" emacs-version)) (if (not (featurep 'infodock)) "[Lucid] " "") system-configuration (cond ((or (and (fboundp 'featurep) (featurep 'mule)) (memq 'mule features)) ", Mule") (t "")) (substring emacs-build-time 0 (string-match " *[0-9]*:" emacs-build-time)) (substring emacs-build-time (string-match "[0-9]*$" emacs-build-time)) emacs-build-system))) (cond ((null arg) version-string) ((eq arg 1) (message "%s" version-string)) (t (insert version-string)))))) ;; from emacs-vers.el (defun emacs-version>= (major &optional minor patch) "Return true if the Emacs version is >= to the given MAJOR, MINOR, and PATCH numbers. The MAJOR version number argument is required, but the other arguments argument are optional. Only the Non-nil arguments are used in the test." (let ((emacs-patch (or emacs-patch-level emacs-beta-version -1))) (cond ((> emacs-major-version major)) ((< emacs-major-version major) nil) ((null minor)) ((> emacs-minor-version minor)) ((< emacs-minor-version minor) nil) ((null patch)) ((>= emacs-patch patch))))) ;;; We hope that this alias is easier for people to find. (define-function 'version 'emacs-version) (defvar Installation-file-coding-system (eval-when-compile `,(coding-system-name (find-coding-system 'native))) "The coding system used to create the `Installation' file. The `Installation' file is created by configure, and the `Installation-string' variable reflects its contents. This is initialized to reflect the native coding system at the time version.el was byte-compiled; ideally it would reflect the native coding system of the environment when XEmacs was dumped, but the locale initialization code isn't called at dump time, and the appropriate value at byte-compile time should be close enough. Note that this means that the value of `Installation-string' during dump time thus reflects loading the file using the `binary' coding system. ") (defvar Installation-string ;; Initialize Installation-string. We do it before loading ;; anything so that dumped code can make use of its value. (save-current-buffer (set-buffer (get-buffer-create (generate-new-buffer-name " *temp*"))) ;; insert-file-contents-internal bogusly calls ;; format-decode without checking if it's defined. (fset 'format-decode #'(lambda (f l &optional v) l)) (insert-file-contents-internal (expand-file-name "Installation" build-directory) ;; Relies on our working out the system coding system ;; correctly at startup. nil nil nil nil ;; Installation-file-coding-system is actually respected in ;; mule/general-late.el, after all the dumped coding systems have been ;; loaded. 'binary) (fmakunbound 'format-decode) (prog1 (buffer-substring) (kill-buffer (current-buffer)))) "Description of XEmacs installation. This reflects the values that the configure script worked out at build time, including things like the C code features included at compile time and the installation prefix. Normally used when submitting a bug report; occasionally used, in a way the XEmacs developers don't endorse, to work out version information. ") ;;; version.el ends here