Mercurial > hg > xemacs-beta
view src/dump-data.c @ 4745:0c54de4c4b9d
Resolve the unregistered-CCL-programs-get-garbage-collected problem correctly
src/ChangeLog addition:
2009-11-15 Aidan Kehoe <kehoea@parhasard.net>
* mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always
have a symbol in this macro.
(setup_ccl_program): Ensure we're not allocating unreachable
memory in this function; all symbols must have been resolved in a
given CCL program before this function is called.
(find_ccl_program): New function, return a CCL program with all
its symbols resolved if it is valid (possibly allocating memory),
Qnil otherwise.
(get_ccl_program): New function, exported to other files; call
find_ccl_program, and error if it gives nil.
(Fccl_program_p): Call find_ccl_program from this function instead
of implementing the bulk of it here.
(Fccl_execute): Call get_ccl_program instead of implementing the
bulk of it here.
(Fccl_execute_on_string): Ditto.
* mule-ccl.h (Vfont_ccl_encoder_alist): Remove this declaration,
it hasn't been used in years.
(get_ccl_program): Declare this function.
* mule-coding.c (ccl_putprop): Use get_ccl_program on any
specified encode or decode CCL program property.
(fixed_width_putprop): Ditto.
* mule-charset.c (Fmake_charset): Use get_ccl_program on any
specified ccl-program.
(Fset_charset_ccl_program): Ditto.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 15 Nov 2009 16:53:14 +0000 |
parents | ecf1ebac70d8 |
children | 308d34e9f07d |
line wrap: on
line source
/* Static array to put the dumped data in and its management Copyright (C) 2003 Olivier Galibert 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 in FSF. */ /* Mule-ized? Mwahahahahahaha */ /* Magic values by Larry McVoy to prevent every known compiler, including an especially perverse HP-UX one, from putting the array in BSS. */ #include <config.h> #include "lisp.h" #include "dump-data.h" /* 4 bytes for the data size, 4096 for alignment */ static Rawbyte dumped_data[MAX_SIZE+4096+4] = { 255, 6, 1, 2, 3, 4, 255, 3, 9, 62, 255, 10, 4, 61, 255 }; size_t dumped_data_size (void) { return dumped_data[0] | (dumped_data[1] << 8) | (dumped_data[2] << 16) | (dumped_data[3] << 24); } size_t dumped_data_max_size (void) { return MAX_SIZE; } size_t dumped_data_align_offset (void) { EMACS_INT iptr = (EMACS_INT) dumped_data; EMACS_INT iptr2; iptr2 = (iptr + 4 + 4095) & ~(EMACS_INT) 4095; return iptr2 - iptr; } Rawbyte * dumped_data_get (void) { EMACS_INT iptr = (EMACS_INT) dumped_data; iptr = (iptr + 4 + 4095) & ~(EMACS_INT) 4095; return (Rawbyte *) iptr; }