view src/s/irix6-5.h @ 5776:65d65b52d608

Pass character count from coding systems to buffer insertion code. src/ChangeLog addition: 2014-01-16 Aidan Kehoe <kehoea@parhasard.net> Pass character count information from the no-conversion and unicode coding systems to the buffer insertion code, making #'find-file on large buffers a little snappier (if ERROR_CHECK_TEXT is not defined). * file-coding.c: * file-coding.c (coding_character_tell): New. * file-coding.c (conversion_coding_stream_description): New. * file-coding.c (no_conversion_convert): Update characters_seen when decoding. * file-coding.c (no_conversion_character_tell): New. * file-coding.c (lstream_type_create_file_coding): Create the no_conversion type with data. * file-coding.c (coding_system_type_create): Make the character_tell method available here. * file-coding.h: * file-coding.h (struct coding_system_methods): Add a new character_tell() method, passing charcount information from the coding systems to the buffer code, avoiding duplicate bytecount-to-charcount work especially with large buffers. * fileio.c (Finsert_file_contents_internal): Update this to pass charcount information to buffer_insert_string_1(), if that is available from the lstream code. * insdel.c: * insdel.c (buffer_insert_string_1): Add a new CCLEN argument, giving the character count of the string to insert. It can be -1 to indicate that te function should work it out itself using bytecount_to_charcount(), as it used to. * insdel.c (buffer_insert_raw_string_1): * insdel.c (buffer_insert_lisp_string_1): * insdel.c (buffer_insert_ascstring_1): * insdel.c (buffer_insert_emacs_char_1): * insdel.c (buffer_insert_from_buffer_1): * insdel.c (buffer_replace_char): Update these functions to use the new calling convention. * insdel.h: * insdel.h (buffer_insert_string): Update this header to reflect the new buffer_insert_string_1() argument. * lstream.c (Lstream_character_tell): New. Return the number of characters *read* and seen by the consumer so far, taking into account the unget buffer, and buffered reading. * lstream.c (Lstream_unread): Update unget_character_count here as appropriate. * lstream.c (Lstream_rewind): Reset unget_character_count here too. * lstream.h: * lstream.h (struct lstream): Provide the character_tell method, add a new field, unget_character_count, giving the number of characters ever passed to Lstream_unread(). Declare Lstream_character_tell(). Make Lstream_ungetc(), which happens to be unused, an inline function rather than a macro, in the course of updating it to modify unget_character_count. * print.c (output_string): Use the new argument to buffer_insert_string_1(). * tests.c: * tests.c (Ftest_character_tell): New test function. * tests.c (syms_of_tests): Make it available. * unicode.c: * unicode.c (struct unicode_coding_stream): * unicode.c (unicode_character_tell): New method. * unicode.c (unicode_convert): Update the character counter as appropriate. * unicode.c (coding_system_type_create_unicode): Make the character_tell method available.
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 16 Jan 2014 16:27:52 +0000
parents 861f2601a38b
children
line wrap: on
line source

/* Definitions file for XEmacs running on Silicon Graphics Irix system 6.5.

Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
  2008, 2009, 2010  Free Software Foundation, Inc.
Copyright (C) 2010 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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>.  */

/* Synced up with: FSF 23.1.92. */
/* Synced by: Ben Wing, 2-18-10. */

#define IRIX6_5			/* [[ used in m/iris4d ]] -- not currently */
#include "usg5-4.h"

/* Delete sigsetmask, _longjmp, _setjmp */

/* Delete SETPGRP_RELEASES_CTTY */

#ifdef LIB_STANDARD
#undef LIB_STANDARD
#endif

#ifdef SYSTEM_TYPE
#undef SYSTEM_TYPE
#endif
#define SYSTEM_TYPE "irix"

/* Delete SETUP_SLAVE_PTY -- unused in XEmacs */

/* Delete SIGNALS_VIA_CHARACTERS, PTY_TTY_NAME_SPRINTF, PTY_NAME_SPRINTF,
   PTY_ITERATION, PTY_OPEN -- unnecessary and/or autoconfigured on XEmacs */

/* Delete POSIX_SIGNALS -- autoconfigured in XEmacs */

/* Ulimit(UL_GMEMLIM) is busted...  */
#define ULIMIT_BREAK_VALUE 0x14000000

/* Delete PREFER_VSUSP -- unused in XEmacs */

/* define MAIL_USE_FLOCK if the mailer uses flock
   to interlock access to /usr/spool/mail/$USER.
   The alternative is that a lock file named
   /usr/spool/mail/$USER.lock.  */

#define MAIL_USE_FLOCK

/* Delete NARROWPROTO -- autoconfigured in XEmacs */

/* Delete USE_MMAP_FOR_BUFFERS -- unused in XEmacs */

/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
   (do not change this comment) */


#if _MIPS_SZLONG == 64		/* -mabi=64 (gcc) or -64 (MIPSpro) */
#define _LP64			/* lisp.h takes care of the rest */
#endif /* _MIPS_SZLONG */

/* #### Delete C_DEBUG_SWITCH, but should be moved to configure.ac;
   see comments there under with_cflags_debugging */
/* #define C_DEBUG_SWITCH -g3 -O -OPT:Olimit=3500 */

/* Delete undef of SA_RESTART, TIOCSIGSEND -- unused in XEmacs */

/* Delete GC_SETJMP_WORKS, GC_MARK_STACK -- unused in XEmacs */

/* arch-tag: d7ad9ec2-54ad-4b2f-adf2-0070c5c63e83
   (do not change this comment) */



/* XEmacs additions: */

/* jpff@maths.bath.ac.uk reports `struct exception' is not defined
 * on this system, so inhibit use of matherr.  */
#define NO_MATHERR

/* use K&R C */
/* XEmacs change -- use ANSI, not K&R */
#ifndef __GNUC__
#define C_SWITCH_SYSTEM "-xansi"
#endif

/* jackr@engr.sgi.com says that you can't mix different kinds of
 * signal-handling functions under IRIX 5.3.  I'm going to assume
 * that that was the reason this got broken.  Now that the
 * signal routines are fixed up, maybe this will work. --ben */
/* Nope, it doesn't.  I've tried lots of things; it must be
 * genuinely broken. */
/* XEmacs addition: People on IRIX 5.2 and IRIX 5.3 systems have
 * reported that they can't break out of (while t) using C-g or C-G.
 * This does not occur on other systems, so let's assume that SIGIO
 * is broken on these systems. */
#define BROKEN_SIGIO

/* By Tor Arntsen <tor@spacetec.no> for XEmacs.
 * With the following kludge the above LD_SWITCH_SYSTEM will still work just 
 * fine even with USE_GCC, and additional tweaking of config.h or ymakefile 
 * is avoided. */
#ifdef NOT_C_CODE
# ifdef USE_GCC
#  undef LINKER
#  undef LIB_GCC
#  define LINKER "ld"
#  define LIB_GCC "`gcc --print`"
#  endif
#endif