Mercurial > hg > xemacs-beta
view lisp/mule/mule-win32-init.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 | d402d7b18bd8 |
children | a63e666bb68a 308d34e9f07d |
line wrap: on
line source
;;; mule-win32-init.el --- initialization code for MS Windows/Cygwin under MULE ;;; Copyright (C) 2001, 2002 Ben Wing. ;; 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. (make-coding-system 'mswindows-multibyte 'mswindows-multibyte "MS Windows Multibyte (current code page)" '(mnemonic "MSW-MB" documentation "MS Windows multibyte -- current code page. This implements the encoding specified by the current code page -- i.e. the ANSI code page corresponding to the current locale, as returned by (mswindows-locale-code-page (mswindows-current-locale)) " locale current code-page ansi)) ;; we temporarily aliased this to raw-text in intl-win32.c. (define-coding-system-alias 'mswindows-multibyte-system-default nil) (make-coding-system 'mswindows-multibyte-system-default 'mswindows-multibyte "MS Windows Multibyte (system default code page)" '(mnemonic "MSW-MB-SysDef" documentation "MS Windows multibyte -- system default code page. This implements the encoding specified by the system default code page -- i.e. the ANSI code page corresponding to the system default locale, as returned by (mswindows-locale-code-page (mswindows-system-default-locale)) " locale system-default code-page ansi)) (make-coding-system 'mswindows-multibyte-user-default 'mswindows-multibyte "MS Windows Multibyte (user default code page)" '(mnemonic "MSW-MB-UserDef" documentation "MS Windows multibyte -- user default code page. This implements the encoding specified by the user default code page -- i.e. the ANSI code page corresponding to the user default locale, as returned by (mswindows-locale-code-page (mswindows-user-default-locale)) " locale user-default code-page ansi)) (make-coding-system 'mswindows-multibyte-oem 'mswindows-multibyte "MS Windows Multibyte (current OEM code page)" '(mnemonic "MSW-MB-OEM" documentation "MS Windows multibyte -- current OEM code page. This implements the encoding specified by the current OEM code page -- i.e. the OEM code page corresponding to the current locale, as returned by (mswindows-locale-oem-code-page (mswindows-current-locale)) " locale current code-page oem)) (make-coding-system 'mswindows-multibyte-oem-system-default 'mswindows-multibyte "MS Windows Multibyte (system default OEM code page)" '(mnemonic "MSW-MB-OEM-SysDef" documentation "MS Windows multibyte -- system default OEM code page. This implements the encoding specified by the system default OEM code page -- i.e. the OEM code page corresponding to the system default locale, as returned by (mswindows-locale-oem-code-page (mswindows-system-default-locale)) " locale system-default code-page oem)) (make-coding-system 'mswindows-multibyte-oem-user-default 'mswindows-multibyte "MS Windows Multibyte (user default OEM code page)" '(mnemonic "MSW-MB-OEM-UserDef" documentation "MS Windows multibyte -- user default OEM code page. This implements the encoding specified by the user default OEM code page -- i.e. the OEM code page corresponding to the user default locale, as returned by (mswindows-locale-oem-code-page (mswindows-user-default-locale)) " locale user-default code-page oem)) (loop for (ansioem cp category name) in '(("EBCDIC" 037 no-conversion "EBCDIC") ("OEM" 437 no-conversion "MS-DOS United States") ("EBCDIC" 500 no-conversion "EBCDIC \"500V1\"") ;; This is ISO-8859-6. ;; ("OEM" 708 "Arabic (ASMO 708)") ("OEM" 709 no-conversion "Arabic (ASMO 449+, BCON V4)") ("OEM" 710 no-conversion "Arabic (Transparent Arabic)") ("OEM" 720 no-conversion "Arabic (Transparent ASMO)") ("OEM" 737 no-conversion "Greek (formerly 437G)") ("OEM" 775 no-conversion "Baltic") ("OEM" 850 no-conversion "MS-DOS Multilingual (Latin I)") ("OEM" 852 no-conversion "MS-DOS Slavic (Latin II)") ("OEM" 855 no-conversion "IBM Cyrillic (primarily Russian)") ("OEM" 857 no-conversion "IBM Turkish") ("OEM" 860 no-conversion "MS-DOS Portuguese") ("OEM" 861 no-conversion "MS-DOS Icelandic") ("OEM" 862 no-conversion "Hebrew") ("OEM" 863 no-conversion "MS-DOS Canadian-French") ("OEM" 864 no-conversion "Arabic") ("OEM" 865 no-conversion "MS-DOS Nordic") ; ("OEM" 866 no-conversion "MS-DOS Russian") ("OEM" 869 no-conversion "IBM Modern Greek") ("Ansi/OEM" 874 no-conversion "Thai") ("EBCDIC" 875 no-conversion "EBCDIC") ("Ansi/OEM" 932 shift_jis "Japanese") ("Ansi/OEM" 936 iso_8_2 "Chinese (PRC, Singapore)") ("Ansi/OEM" 949 iso_8_2 "Korean") ("Ansi/OEM" 950 big5 "Chinese (Taiwan; Hong Kong SAR, PRC)") ("EBCDIC" 1026 no-conversion "EBCDIC") ;; This code page doesn't work. See ;; http://blogs.msdn.com/michkap/archive/2005/08/01/446475.aspx ; ("ANSI" 1200 utf-16-little-endian "Unicode (BMP of ISO 10646)") ;; We implement this ourselves, and keeping the same implementation ;; across platforms means behaviour is a bit more consistent. ; ("ANSI" 1250 no-conversion "Windows 3.1 Eastern European") ; ("ANSI" 1251 no-conversion "Windows 3.1 Cyrillic") ; ("ANSI" 1252 no-conversion "Windows 3.1 US (ANSI)") ; ("ANSI" 1253 no-conversion "Windows 3.1 Greek") ("ANSI" 1254 no-conversion "Windows 3.1 Turkish") ("ANSI" 1255 no-conversion "Hebrew") ;; We implement these ourselves. ; ("ANSI" 1256 no-conversion "Arabic") ("ANSI" 1257 no-conversion "Baltic") ("ANSI" 1258 no-conversion "VietNam") ;; #### Is this category right? I don't have Lunde to hand, and the ;; online information on Johab is scant. ("Ansi/OEM" 1361 iso_8_2 "Korean (Johab)") ("Mac" 10000 no-conversion "Macintosh Roman") ("Mac" 10001 shift_jis "Macintosh Japanese") ("Mac" 10006 no-conversion "Macintosh Greek I") ("Mac" 10007 no-conversion "Macintosh Cyrillic") ("Mac" 10029 no-conversion "Macintosh Latin 2") ("Mac" 10079 no-conversion "Macintosh Icelandic") ("Mac" 10081 no-conversion "Macintosh Turkish")) do (make-coding-system (intern (format "windows-%s" cp)) 'mswindows-multibyte (format "MS Windows code page %s (%s, %s)" cp ansioem name) `(mnemonic ,(format "MSW-%s" cp) code-page ,cp documentation ,(format "MS Windows Multibyte -- code page %s (%s, %s). This implements the encoding specified by code page %s. For more information on code pages, see `mswindows-charset-code-page'." cp ansioem name cp))) (define-coding-system-alias (intern (format "cp%s" cp)) (intern (format "windows-%s" cp))) (coding-system-put (intern (format "windows-%s" cp)) 'category category))