Mercurial > hg > xemacs-beta
view lisp/cus-dep.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 | b4a8cd0dd8df |
children | 308d34e9f07d |
line wrap: on
line source
;;; cus-dep.el --- Find customization dependencies. ;; ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Copyright (C) 2003 Ben Wing. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>, then ;; Richard Stallman <rms@gnu.ai.mit.edu>, then ;; Hrvoje Niksic <hniksic@xemacs.org> (rewritten for XEmacs) ;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org> ;; Keywords: internal ;; 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 synched with FSF. ;;; Commentary: ;; This file generates the custom-load files, loaded by cus-load.el. ;; Entry points are `Custom-make-dependencies' and ;; `Custom-make-one-dependency'. ;; It works by scanning all the `.el' files in a directory, and ;; evaluates any `defcustom', `defgroup', or `defface' expression that ;; it finds. The symbol changed by this expression is stored to a ;; hash table as the hash key, file name being the value. ;; After all the files have been examined, custom-loads.el is ;; generated by mapping all the atoms, and seeing if any of them ;; contains a `custom-group' property. This property is a list whose ;; each element's car is the "child" group symbol. If that property ;; is in the hash-table, the file name will be looked up from the ;; hash-table, and added to cusload-file. Because the hash-table is ;; cleared whenever we process a new directory, we cannot get confused ;; by custom-loads from another directory, or from a previous ;; installation. This is also why it is perfectly safe to have old ;; custom-loads around, and have them loaded by `cus-load.el' (as ;; invoked by `cus-edit.el'). ;; A trivial, but useful optimization is that if cusload-file exists, ;; and no .el files in the directory are newer than cusload-file, it ;; will not be generated. This means that the directories where ;; nothing has changed will be skipped. ;; The `custom-add-loads' function, used by files generated by ;; `Custom-make-dependencies', updates the symbol's `custom-loads' ;; property (a list of strings) with a new list of strings, ;; eliminating the duplicates. Additionally, it adds the symbol to ;; `custom-group-hash-table'. It is defined in `cus-load.el'. ;; Example: ;; (custom-add-loads 'foo 'custom-loads '("bar" "baz")) ;; (get 'foo 'custom-loads) ;; => ("bar" "baz") ;; ;; (custom-add-loads 'foo 'custom-loads '("hmph" "baz" "quz")) ;; (get 'foo 'custom-loads) ;; => ("bar" "baz" "hmph" "qux") ;; Obviously, this allows correct incremental loading of custom-load ;; files. This is not necessary under FSF (they simply use `put'), ;; since they have only one file with custom dependencies. With the ;; advent of packages, we cannot afford the same luxury. ;; ;; Feb 2003: Added code to speed up building by caching the values we've ;; constructed, and using them instead of scanning a file when custom-load ;; is up-to-date w.r.t. the file. Also use `message' not `princ' to print ;; out messages so nl's are correctly inserted when necessary. --ben ;;; Code: (require 'cl) (require 'widget) (require 'cus-face) ;; #### This and the autoloads file naming variables belong in a separate ;; file to be required here. ;; #### Compare this with the autoloads handling. ;; Don't change this, unless you plan to change the code in ;; cus-start.el, too. (defconst cusload-base-file "custom-load.el") (defconst cusload-hash-table-marker ";old-cus-dep-hash: ") ;; Be very careful when changing this function. It looks easy to ;; understand, but is in fact very easy to break. Be sure to read and ;; understand the commentary above! (defun Custom-make-dependencies-1 (subdirs) (setq subdirs (mapcar #'expand-file-name subdirs)) (with-temp-buffer (let ((enable-local-eval nil) (hash (make-hash-table :test 'eq)) (hash-cache (make-hash-table :test 'equal)) old-hash) (dolist (dir subdirs) (message "Processing %s\n" dir) (let ((cusload-file (expand-file-name cusload-base-file dir)) (files (directory-files dir t "\\`[^=].*\\.el\\'"))) ;; A trivial optimization: if no file in the directory is ;; newer than custom-load.el, no need to do anything! (if (and (file-exists-p cusload-file) (dolist (file files t) (when (file-newer-than-file-p file cusload-file) (return nil)))) (message "(No changes need to be written)") (when (file-exists-p cusload-file) (let ((buf (find-file-noselect cusload-file))) (with-current-buffer buf (goto-char (point-min)) (when (search-forward cusload-hash-table-marker nil t) (setq old-hash (read buf)))) (kill-buffer buf))) ;; Process directory (dolist (file files) (let ((old-cache (if (hash-table-p old-hash) (gethash file old-hash t) t))) (if (and (not (file-newer-than-file-p file cusload-file)) (not (eq old-cache t))) (progn (dolist (c old-cache) (puthash (car c) (cdr c) hash)) (puthash file old-cache hash-cache)) (erase-buffer) (insert-file-contents file) (goto-char (point-min)) (let ((name (file-name-sans-extension (file-name-nondirectory file))) cache (first t)) ;; Search for defcustom/defface/defgroup ;; expressions, and evaluate them. (while (re-search-forward "^(defcustom\\|^(defface\\|^(defgroup" nil t) (when first (message "Computing custom-loads for %s..." name) (setq first nil)) (beginning-of-line) (let ((expr (read (current-buffer)))) ;; We need to ignore errors here, so that ;; defcustoms with :set don't bug out. Of ;; course, their values will not be assigned in ;; case of errors, but their `custom-group' ;; properties will by that time be in place, and ;; that's all we care about. (ignore-errors (eval expr)) ;; Hash the file of the affected symbol. (setf (gethash (nth 1 expr) hash) name) ;; Remember the values computed. (push (cons (nth 1 expr) name) cache))) (or cache (message "No custom-loads for %s" name)) (puthash file cache hash-cache))) )) (cond ((zerop (hash-table-count hash)) (message "(No customization dependencies)") (write-region "" nil cusload-file)) (t (message "Generating %s...\n" cusload-base-file) (with-temp-file cusload-file (insert ";;; " cusload-base-file " --- automatically extracted custom dependencies\n" "\n;;; Code:\n\n") (insert cusload-hash-table-marker) (let ((print-readably t) (standard-output (current-buffer))) (princ hash-cache) (terpri)) (insert "(autoload 'custom-add-loads \"cus-load\")\n\n") (mapatoms (lambda (sym) (let ((members (get sym 'custom-group)) item where found) (when members (while members (setq item (car (car members)) members (cdr members) where (gethash item hash)) (unless (or (null where) (member where found)) (if found (insert " ") (insert "(custom-add-loads '" (prin1-to-string sym) " '(")) (prin1 where (current-buffer)) (push where found))) (when found (insert "))\n")))))) (insert "\n;;; custom-load.el ends here\n")) (clrhash hash))))))))) (defun Custom-make-one-dependency () "Extract custom dependencies from .el files in one dir, on the command line. Like `Custom-make-dependencies' but snarfs only one command-line argument, making it useful in a chain of batch commands in a single XEmacs invocation." (let ((subdir (car command-line-args-left))) (setq command-line-args-left (cdr command-line-args-left)) (Custom-make-dependencies-1 (list subdir)))) ;;;###autoload (defun Custom-make-dependencies (&optional subdirs) "Extract custom dependencies from .el files in SUBDIRS. SUBDIRS is a list of directories. If it is nil, the command-line arguments are used. If it is a string, only that directory is processed. This function is especially useful in batch mode. Batch usage: xemacs -batch -l cus-dep.el -f Custom-make-dependencies DIRS" (interactive "DDirectory: ") (and (stringp subdirs) (setq subdirs (list subdirs))) (or subdirs ;; Usurp the command-line-args (setq subdirs command-line-args-left command-line-args-left nil)) (Custom-make-dependencies-1 subdirs)) (provide 'cus-dep) ;;; cus-dep.el ends here