Mercurial > hg > xemacs-beta
view lisp/mule/thai-xtis.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
;;; thai-xtis.el --- Support for Thai (XTIS) -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp> ;; MORIOKA Tomohiko <tomo@etl.go.jp> ;; Created: 1998-03-27 for Emacs-20.3 by TAKAHASHI Naoto ;; 1999-03-29 imported and modified for XEmacs by MORIOKA Tomohiko ;; Keywords: mule, multilingual, Thai, XTIS ;; 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. ;;; Commentary: ;; For Thai, the pre-composed character set proposed by ;; Virach Sornlertlamvanich <virach@links.nectec.or.th> is supported. ;;; Code: (make-charset 'thai-xtis "Precomposed Thai (XTIS by Virach)." '(registries ["xtis-0"] dimension 2 columns 1 chars 94 final ?? graphic 0)) (define-category ?x "Precomposed Thai character.") (modify-category-entry 'thai-xtis ?x) (when (featurep 'xemacs) (let ((deflist '(;; chars syntax ("$(?!0(B-$(?NxP0R0S0`0(B-$(?e0(B" "w") ("$(?p0(B-$(?y0(B" "w") ("$(?O0f0_0o0z0{0(B" "_") )) elm chars len syntax to ch i) (while deflist (setq elm (car deflist)) (setq chars (car elm) len (length chars) syntax (nth 1 elm) i 0) (while (< i len) (if (= (aref chars i) ?-) (setq i (1+ i) to (nth 1 (split-char (aref chars i)))) (setq ch (nth 1 (split-char (aref chars i))) to ch)) (while (<= ch to) (modify-syntax-entry (vector 'thai-xtis ch) syntax) (setq ch (1+ ch))) (setq i (1+ i))) (setq deflist (cdr deflist)))) (put-charset-property 'thai-xtis 'preferred-coding-system 'tis-620) ) ;; This is the ccl-decode-thai-xtis automaton. ;; ;; "WRITE x y" == (insert (make-char 'thai-xtis x y)) ;; "write x" == (insert x) ;; rx' == (tis620-to-thai-xtis-second-byte-bitpattern rx) ;; r3 == "no vower nor tone" ;; r4 == (charset-id 'thai-xtis) ;; ;; | input (= r0) ;; state |-------------------------------------------- ;; | consonant | vowel | tone ;; ---------+-------------+-------------+---------------- ;; r1 == 0 | r1 = r0 | WRITE r0,r3 | WRITE r0,r3 ;; r2 == 0 | | | ;; ---------+-------------+-------------+---------------- ;; r1 == C | WRITE r1,r3 | r2 = r0' | WRITE r1,r3|r0' ;; r2 == 0 | r1 = r0 | | r1 = 0 ;; ---------+-------------+-------------+---------------- ;; r1 == C | WRITE r1,r2 | WRITE r1,r2 | WRITE r1,r2|r0' ;; r2 == V | r1 = r0 | WRITE r0,r3 | r1 = r2 = 0 ;; | r2 = 0 | r1 = r2 = 0 | ;; ;; ;; | input (= r0) ;; state |----------------------------------------- ;; | symbol | ASCII | EOF ;; ---------+-------------+-------------+------------- ;; r1 == 0 | WRITE r0,r3 | write r0 | ;; r2 == 0 | | | ;; ---------+-------------+-------------+------------- ;; r1 == C | WRITE r1,r3 | WRITE r1,r3 | WRITE r1,r3 ;; r2 == 0 | WRITE r0,r3 | write r0 | ;; | r1 = 0 | r1 = 0 | ;; ---------+-------------+-------------+------------- ;; r1 == C | WRITE r1,r2 | WRITE r1,r2 | WRITE r1,r2 ;; r2 == V | WRITE r0,r3 | write r0 | ;; | r1 = r2 = 0 | r1 = r2 = 0 | (eval-and-compile ;; input : r5 = 1st byte, r6 = 2nd byte ;; Their values will be destroyed. (define-ccl-program ccl-thai-xtis-write '(0 ((r5 = ((r5 & #x7F) << 7)) (r6 = ((r6 & #x7F) | r5)) (write-multibyte-character r4 r6)))) (define-ccl-program ccl-thai-xtis-consonant '(0 (if (r1 == 0) (r1 = r0) (if (r2 == 0) ((r5 = r1) (r6 = r3) (call ccl-thai-xtis-write) (r1 = r0)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r1 = r0) (r2 = 0)))))) (define-ccl-program ccl-thai-xtis-vowel '(0 ((if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) ((if (r2 == 0) (r2 = ((r0 - 204) << 3)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))))) (define-ccl-program ccl-thai-xtis-vowel-d1 '(0 ((if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) ((if (r2 == 0) (r2 = #x38) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))))) (define-ccl-program ccl-thai-xtis-vowel-ee '(0 ((if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) ((if (r2 == 0) (r2 = #x78) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))))) (define-ccl-program ccl-thai-xtis-tone '(0 (if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) (if (r2 == 0) ((r5 = r1) (r6 = ((r0 - #xE6) | r3)) (call ccl-thai-xtis-write) (r1 = 0)) ((r5 = r1) (r6 = ((r0 - #xE6) | r2)) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))) (define-ccl-program ccl-thai-xtis-symbol '(0 (if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) (if (r2 == 0) ((r5 = r1) (r6 = r3) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))) (define-ccl-program ccl-thai-xtis-ascii '(0 (if (r1 == 0) (write r0) (if (r2 == 0) ((r5 = r1) (r6 = r3) (call ccl-thai-xtis-write) (write r0) (r1 = 0)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (write r0) (r1 = 0) (r2 = 0)))))) (define-ccl-program ccl-thai-xtis-eof '(0 (if (r1 != 0) (if (r2 == 0) ((r5 = r1) (r6 = r3) (call ccl-thai-xtis-write)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write)))))) (define-ccl-program ccl-decode-thai-xtis `(4 ((read r0) (r1 = 0) (r2 = 0) (r3 = #x30) (r4 = ,(charset-id 'thai-xtis)) (loop (if (r0 < 161) (call ccl-thai-xtis-ascii) (branch (r0 - 161) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-vowel-d1) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) nil nil nil nil (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-vowel-ee) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) nil nil nil)) (read r0) (repeat))) (call ccl-thai-xtis-eof))) ) (defconst leading-code-private-21 #x9F) (define-ccl-program ccl-encode-thai-xtis `(1 ((read r0) (loop (if (r0 == ,leading-code-private-21) ((read r1) (if (r1 == ,(charset-id 'thai-xtis)) ((read r0) (write r0) (read r0) (r1 = (r0 & 7)) (r0 = ((r0 - #xB0) >> 3)) (if (r0 != 0) (write r0 [0 209 212 213 214 215 216 217 218 238])) (if (r1 != 0) (write r1 [0 231 232 233 234 235 236 237])) (read r0) (repeat)) ((write r0 r1) (read r0) (repeat)))) (write-read-repeat r0)))))) (make-coding-system 'tis-620 'ccl "TIS620 (Thai)" `(mnemonic "TIS620" decode ccl-decode-thai-xtis encode ccl-encode-thai-xtis safe-charsets (ascii thai-xtis) documentation "external=tis620, internal=thai-xtis")) (coding-system-put 'tis-620 'category 'iso-8-1) (set-language-info-alist "Thai-XTIS" '((charset thai-xtis) (coding-system tis-620 iso-2022-7bit) (tutorial . "TUTORIAL.th") (tutorial-coding-system . tis-620) (coding-priority tis-620 iso-2022-7bit) (sample-text . "$(?!:(B") (documentation . t))) ;; thai-xtis.el ends here.