Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
/* Conversion from and to IBM935
|
2014-01-01 12:03:15 +01:00
|
|
|
Copyright (C) 2000-2014 Free Software Foundation, Inc.
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 06:58:11 +02:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
|
|
|
|
The GNU C Library 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
|
2001-07-06 06:58:11 +02:00
|
|
|
Lesser General Public License for more details.
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
|
2001-07-06 06:58:11 +02:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-10 00:18:22 +01:00
|
|
|
License along with the GNU C Library; if not, see
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
|
|
|
|
#include <dlfcn.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
#include <byteswap.h>
|
|
|
|
#include "ibm935.h"
|
|
|
|
|
|
|
|
/* The shift sequences for this charset (it does not use ESC). */
|
|
|
|
#define SI 0x0F /* Shift In, host code to turn DBCS off. */
|
|
|
|
#define SO 0x0E /* Shift Out, host code to turn DBCS on. */
|
|
|
|
|
|
|
|
/* Definitions used in the body of the `gconv' function. */
|
|
|
|
#define CHARSET_NAME "IBM935//"
|
|
|
|
#define FROM_LOOP from_ibm935
|
|
|
|
#define TO_LOOP to_ibm935
|
2014-05-01 22:42:40 +02:00
|
|
|
#define ONE_DIRECTION 0
|
Update.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/testdata/EUC-JISX0213: New file.
* iconvdata/testdata/EUC-JISX0213..UTF8: New file.
* iconvdata/testdata/SHIFT_JISX0213: New file.
* iconvdata/testdata/SHIFT_JISX0213..UTF8: New file.
* iconvdata/testdata/ISO-2022-JP-3: New file.
* iconvdata/testdata/ISO-2022-JP-3..UTF8: New file.
* iconvdata/TESTS: Add EUC-JISX0213, SHIFT_JISX0213, ISO-2022-JP-3.
* iconvdata/run-iconv-test.sh: Skip the charmap test if the charmap
contains comments indicating precomposed characters.
2002-04-21 Bruno Haible <bruno@clisp.org>
* iconvdata/iso-2022-jp-3.c: New file.
* iconvdata/gconv-modules (ISO-2022-JP-3): New module.
* iconvdata/Makefile (modules): Add ISO-2022-JP-3.
(LDFLAGS-ISO-2022-JP-3.so): New variable.
(ISO-2022-JP-3.so): Depend on libJIS.so and libJISX0213.so.
(distribute): Add iso-2022-jp-3.c.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/tst-table-to.c (main): Restore handling of
transliterations, broken by last patch.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/TESTS: Add IBM922, IBM1124, IBM1129.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Don't advance inptr
when there is not enough room in the output buffer.
* iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise.
2002-04-20 Bruno Haible <bruno@clisp.org>
* iconv/skeleton.c ({FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}): New
macros.
(RESET_INPUT_BUFFER): Use them instead of {MIN,MAX}_NEEDED_{FROM,TO}.
Also make this macro work if FROM_DIRECTION evaluates to 0.
(gconv_init): Use the new macros instead of {MIN,MAX}_NEEDED_{FROM,TO}.
(FUNCTION_NAME): Likewise, in the handling of unaligned accesses and
of consume_incomplete.
* iconvdata/cp1255.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}
instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to
4, not 8.
* iconvdata/cp1258.c: Likewise.
* iconvdata/ibm930.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}
instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 3,
not 2.
* iconvdata/ibm933.c: Likewise.
* iconvdata/ibm935.c: Likewise.
* iconvdata/ibm937.c: Likewise.
* iconvdata/ibm939.c: Likewise.
* iconvdata/iso-2022-cn.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 6, not 4.
* iconvdata/iso-2022-cn-ext.c: Likewise.
* iconvdata/iso-2022-jp.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}.
* iconvdata/tcvn5712-1.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_FROM to 1, not 2.
* iconvdata/euc-jisx0213.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 8, not 4.
* iconvdata/shift_jisx0213.c: Likewise.
2002-05-14 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* sysdeps/powerpc/Makefile (sysdeps_routines): Add divdi3, cmpdi2,
shdi3, fixdfdi, fixsfdi in csu dir.
(shared-only-routines): Likewise.
* sysdeps/wordsize-32/cmpdi2.c: New file.
* sysdeps/wordsize-32/shdi3.c: New file.
* sysdeps/wordsize-32/fixdfdi.c: New file.
* sysdeps/wordsize-32/fixsfdi.c: New file.
* sysdeps/powerpc/Versions (__divdi3, __moddi3, __udivdi3, __umoddi3,
__ashldi3, __ashrdi3, __lshrdi3, __cmpdi2, __ucmpdi2, __fixdfdi,
__fixsfdi, __fixunsdfdi, __fixunssfdi): Export at GLIBC_2.0.
* sysdeps/unix/sysv/linux/semctl.c (__old_semctl, __new_semctl):
Only use va_arg if the argument will be used [PR libc/3259].
2002-05-06 Michael A. Schmidt <mmaass@us.ibm.com>
* catgets/catgets.c (catopen): Free buffer if internal catalog
open fails.
2002-05-14 Ulrich Drepper <drepper@redhat.com>
* debug/xtrace.sh: Make more robust. For realtime tracking use
non-buffering methods.
* debug/pcprofiledump.c: Implement -u option.
Patch by Roger Luethi <rl@hellgate.ch>.
2002-05-15 08:02:35 +02:00
|
|
|
#define FROM_LOOP_MIN_NEEDED_FROM 1
|
|
|
|
#define FROM_LOOP_MAX_NEEDED_FROM 2
|
|
|
|
#define FROM_LOOP_MIN_NEEDED_TO 4
|
|
|
|
#define FROM_LOOP_MAX_NEEDED_TO 4
|
|
|
|
#define TO_LOOP_MIN_NEEDED_FROM 4
|
|
|
|
#define TO_LOOP_MAX_NEEDED_FROM 4
|
|
|
|
#define TO_LOOP_MIN_NEEDED_TO 1
|
|
|
|
#define TO_LOOP_MAX_NEEDED_TO 3
|
2001-01-06 21:21:33 +01:00
|
|
|
#define PREPARE_LOOP \
|
|
|
|
int save_curcs; \
|
|
|
|
int *curcsp = &data->__statep->__count;
|
|
|
|
#define EXTRA_LOOP_ARGS , curcsp
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
|
|
|
|
/* Definitions of initialization and destructor function. */
|
|
|
|
#define DEFINE_INIT 1
|
|
|
|
#define DEFINE_FINI 1
|
|
|
|
|
2001-01-06 21:21:33 +01:00
|
|
|
|
|
|
|
/* Since this is a stateful encoding we have to provide code which resets
|
|
|
|
the output state to the initial state. This has to be done during the
|
|
|
|
flushing. */
|
|
|
|
#define EMIT_SHIFT_TO_INIT \
|
|
|
|
if ((data->__statep->__count & ~7) != sb) \
|
|
|
|
{ \
|
|
|
|
if (FROM_DIRECTION) \
|
|
|
|
data->__statep->__count &= 7; \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
/* We are not in the initial state. To switch back we have \
|
|
|
|
to emit `SI'. */ \
|
2014-02-10 14:45:42 +01:00
|
|
|
if (__glibc_unlikely (outbuf >= outend)) \
|
2001-01-06 21:21:33 +01:00
|
|
|
/* We don't have enough room in the output buffer. */ \
|
|
|
|
status = __GCONV_FULL_OUTPUT; \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
/* Write out the shift sequence. */ \
|
|
|
|
*outbuf++ = SI; \
|
|
|
|
data->__statep->__count &= 7; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Since we might have to reset input pointer we must be able to save
|
|
|
|
and retore the state. */
|
|
|
|
#define SAVE_RESET_STATE(Save) \
|
|
|
|
if (Save) \
|
|
|
|
save_curcs = *curcsp; \
|
|
|
|
else \
|
|
|
|
*curcsp = save_curcs
|
|
|
|
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
|
|
|
|
/* Current codeset type. */
|
|
|
|
enum
|
|
|
|
{
|
2001-01-06 21:21:33 +01:00
|
|
|
sb = 0,
|
|
|
|
db = 64
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/* First, define the conversion function from IBM-935 to UCS4. */
|
Update.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/testdata/EUC-JISX0213: New file.
* iconvdata/testdata/EUC-JISX0213..UTF8: New file.
* iconvdata/testdata/SHIFT_JISX0213: New file.
* iconvdata/testdata/SHIFT_JISX0213..UTF8: New file.
* iconvdata/testdata/ISO-2022-JP-3: New file.
* iconvdata/testdata/ISO-2022-JP-3..UTF8: New file.
* iconvdata/TESTS: Add EUC-JISX0213, SHIFT_JISX0213, ISO-2022-JP-3.
* iconvdata/run-iconv-test.sh: Skip the charmap test if the charmap
contains comments indicating precomposed characters.
2002-04-21 Bruno Haible <bruno@clisp.org>
* iconvdata/iso-2022-jp-3.c: New file.
* iconvdata/gconv-modules (ISO-2022-JP-3): New module.
* iconvdata/Makefile (modules): Add ISO-2022-JP-3.
(LDFLAGS-ISO-2022-JP-3.so): New variable.
(ISO-2022-JP-3.so): Depend on libJIS.so and libJISX0213.so.
(distribute): Add iso-2022-jp-3.c.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/tst-table-to.c (main): Restore handling of
transliterations, broken by last patch.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/TESTS: Add IBM922, IBM1124, IBM1129.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Don't advance inptr
when there is not enough room in the output buffer.
* iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise.
2002-04-20 Bruno Haible <bruno@clisp.org>
* iconv/skeleton.c ({FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}): New
macros.
(RESET_INPUT_BUFFER): Use them instead of {MIN,MAX}_NEEDED_{FROM,TO}.
Also make this macro work if FROM_DIRECTION evaluates to 0.
(gconv_init): Use the new macros instead of {MIN,MAX}_NEEDED_{FROM,TO}.
(FUNCTION_NAME): Likewise, in the handling of unaligned accesses and
of consume_incomplete.
* iconvdata/cp1255.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}
instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to
4, not 8.
* iconvdata/cp1258.c: Likewise.
* iconvdata/ibm930.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}
instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 3,
not 2.
* iconvdata/ibm933.c: Likewise.
* iconvdata/ibm935.c: Likewise.
* iconvdata/ibm937.c: Likewise.
* iconvdata/ibm939.c: Likewise.
* iconvdata/iso-2022-cn.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 6, not 4.
* iconvdata/iso-2022-cn-ext.c: Likewise.
* iconvdata/iso-2022-jp.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}.
* iconvdata/tcvn5712-1.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_FROM to 1, not 2.
* iconvdata/euc-jisx0213.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 8, not 4.
* iconvdata/shift_jisx0213.c: Likewise.
2002-05-14 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* sysdeps/powerpc/Makefile (sysdeps_routines): Add divdi3, cmpdi2,
shdi3, fixdfdi, fixsfdi in csu dir.
(shared-only-routines): Likewise.
* sysdeps/wordsize-32/cmpdi2.c: New file.
* sysdeps/wordsize-32/shdi3.c: New file.
* sysdeps/wordsize-32/fixdfdi.c: New file.
* sysdeps/wordsize-32/fixsfdi.c: New file.
* sysdeps/powerpc/Versions (__divdi3, __moddi3, __udivdi3, __umoddi3,
__ashldi3, __ashrdi3, __lshrdi3, __cmpdi2, __ucmpdi2, __fixdfdi,
__fixsfdi, __fixunsdfdi, __fixunssfdi): Export at GLIBC_2.0.
* sysdeps/unix/sysv/linux/semctl.c (__old_semctl, __new_semctl):
Only use va_arg if the argument will be used [PR libc/3259].
2002-05-06 Michael A. Schmidt <mmaass@us.ibm.com>
* catgets/catgets.c (catopen): Free buffer if internal catalog
open fails.
2002-05-14 Ulrich Drepper <drepper@redhat.com>
* debug/xtrace.sh: Make more robust. For realtime tracking use
non-buffering methods.
* debug/pcprofiledump.c: Implement -u option.
Patch by Roger Luethi <rl@hellgate.ch>.
2002-05-15 08:02:35 +02:00
|
|
|
#define MIN_NEEDED_INPUT FROM_LOOP_MIN_NEEDED_FROM
|
|
|
|
#define MAX_NEEDED_INPUT FROM_LOOP_MAX_NEEDED_FROM
|
|
|
|
#define MIN_NEEDED_OUTPUT FROM_LOOP_MIN_NEEDED_TO
|
|
|
|
#define MAX_NEEDED_OUTPUT FROM_LOOP_MAX_NEEDED_TO
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
#define LOOPFCT FROM_LOOP
|
|
|
|
#define BODY \
|
|
|
|
{ \
|
|
|
|
uint32_t ch = *inptr; \
|
|
|
|
uint32_t res; \
|
|
|
|
\
|
|
|
|
if (__builtin_expect(ch, 0) == SO) \
|
|
|
|
{ \
|
|
|
|
/* Shift OUT, change to DBCS converter. */ \
|
|
|
|
if (curcs == db) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
curcs = db; \
|
|
|
|
++inptr; \
|
2001-01-06 21:21:33 +01:00
|
|
|
continue; \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
} \
|
|
|
|
else if (__builtin_expect (ch, 0) == SI) \
|
|
|
|
{ \
|
|
|
|
/* Shift IN, change to SBCS converter. */ \
|
|
|
|
if (curcs == sb) \
|
|
|
|
{ \
|
|
|
|
result = __GCONV_ILLEGAL_INPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
curcs = sb; \
|
|
|
|
++inptr; \
|
2001-01-06 21:21:33 +01:00
|
|
|
continue; \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
} \
|
|
|
|
\
|
2001-01-06 21:21:33 +01:00
|
|
|
if (curcs == sb) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
|
|
|
/* Use the IBM935 table for single byte. */ \
|
2001-01-06 21:21:33 +01:00
|
|
|
res = __ibm935sb_to_ucs4[ch]; \
|
|
|
|
if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0') \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
|
|
|
/* This is an illegal character. */ \
|
2002-06-28 23:23:06 +02:00
|
|
|
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
} \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
put32 (outptr, res); \
|
|
|
|
outptr += 4; \
|
|
|
|
} \
|
2001-01-06 21:21:33 +01:00
|
|
|
++inptr; \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
} \
|
2001-01-06 21:21:33 +01:00
|
|
|
else \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
2001-01-06 21:21:33 +01:00
|
|
|
const struct gap *rp2 = __ibm935db_to_ucs4_idx; \
|
|
|
|
\
|
|
|
|
assert (curcs == db); \
|
|
|
|
\
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
/* Use the IBM935 table for double byte. */ \
|
2014-02-10 14:45:42 +01:00
|
|
|
if (__glibc_unlikely (inptr + 1 >= inend)) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
|
|
|
/* The second character is not available. \
|
|
|
|
Store the intermediate result. */ \
|
|
|
|
result = __GCONV_INCOMPLETE_INPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
ch = (ch * 0x100) + inptr[1]; \
|
|
|
|
while (ch > rp2->end) \
|
|
|
|
++rp2; \
|
|
|
|
\
|
2014-09-03 19:45:43 +02:00
|
|
|
if (__builtin_expect (rp2->start == 0xffff, 0) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
|| __builtin_expect (ch < rp2->start, 0) \
|
|
|
|
|| (res = __ibm935db_to_ucs4[ch + rp2->idx], \
|
|
|
|
__builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \
|
|
|
|
{ \
|
|
|
|
/* This is an illegal character. */ \
|
2002-06-28 23:23:06 +02:00
|
|
|
STANDARD_FROM_LOOP_ERR_HANDLER (2); \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
} \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
put32 (outptr, res); \
|
|
|
|
outptr += 4; \
|
|
|
|
} \
|
2001-01-06 21:21:33 +01:00
|
|
|
inptr += 2; \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
} \
|
|
|
|
}
|
|
|
|
#define LOOP_NEED_FLAGS
|
2001-01-06 21:21:33 +01:00
|
|
|
#define EXTRA_LOOP_DECLS , int *curcsp
|
|
|
|
#define INIT_PARAMS int curcs = *curcsp & ~7
|
|
|
|
#define UPDATE_PARAMS *curcsp = curcs
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
|
|
/* Next, define the other direction. */
|
Update.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/testdata/EUC-JISX0213: New file.
* iconvdata/testdata/EUC-JISX0213..UTF8: New file.
* iconvdata/testdata/SHIFT_JISX0213: New file.
* iconvdata/testdata/SHIFT_JISX0213..UTF8: New file.
* iconvdata/testdata/ISO-2022-JP-3: New file.
* iconvdata/testdata/ISO-2022-JP-3..UTF8: New file.
* iconvdata/TESTS: Add EUC-JISX0213, SHIFT_JISX0213, ISO-2022-JP-3.
* iconvdata/run-iconv-test.sh: Skip the charmap test if the charmap
contains comments indicating precomposed characters.
2002-04-21 Bruno Haible <bruno@clisp.org>
* iconvdata/iso-2022-jp-3.c: New file.
* iconvdata/gconv-modules (ISO-2022-JP-3): New module.
* iconvdata/Makefile (modules): Add ISO-2022-JP-3.
(LDFLAGS-ISO-2022-JP-3.so): New variable.
(ISO-2022-JP-3.so): Depend on libJIS.so and libJISX0213.so.
(distribute): Add iso-2022-jp-3.c.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/tst-table-to.c (main): Restore handling of
transliterations, broken by last patch.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/TESTS: Add IBM922, IBM1124, IBM1129.
2002-05-12 Bruno Haible <bruno@clisp.org>
* iconvdata/euc-jisx0213.c (BODY for FROM_LOOP): Don't advance inptr
when there is not enough room in the output buffer.
* iconvdata/shift_jisx0213.c (BODY for FROM_LOOP): Likewise.
2002-04-20 Bruno Haible <bruno@clisp.org>
* iconv/skeleton.c ({FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}): New
macros.
(RESET_INPUT_BUFFER): Use them instead of {MIN,MAX}_NEEDED_{FROM,TO}.
Also make this macro work if FROM_DIRECTION evaluates to 0.
(gconv_init): Use the new macros instead of {MIN,MAX}_NEEDED_{FROM,TO}.
(FUNCTION_NAME): Likewise, in the handling of unaligned accesses and
of consume_incomplete.
* iconvdata/cp1255.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}
instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to
4, not 8.
* iconvdata/cp1258.c: Likewise.
* iconvdata/ibm930.c: Define {FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO}
instead of {MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 3,
not 2.
* iconvdata/ibm933.c: Likewise.
* iconvdata/ibm935.c: Likewise.
* iconvdata/ibm937.c: Likewise.
* iconvdata/ibm939.c: Likewise.
* iconvdata/iso-2022-cn.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set TO_LOOP_MAX_NEEDED_TO to 6, not 4.
* iconvdata/iso-2022-cn-ext.c: Likewise.
* iconvdata/iso-2022-jp.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}.
* iconvdata/tcvn5712-1.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_FROM to 1, not 2.
* iconvdata/euc-jisx0213.c: Define
{FROM,TO}_LOOP_{MIN,MAX}_NEEDED_{FROM,TO} instead of
{MIN,MAX}_NEEDED_{FROM,TO}. Set FROM_LOOP_MAX_NEEDED_TO to 8, not 4.
* iconvdata/shift_jisx0213.c: Likewise.
2002-05-14 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* sysdeps/powerpc/Makefile (sysdeps_routines): Add divdi3, cmpdi2,
shdi3, fixdfdi, fixsfdi in csu dir.
(shared-only-routines): Likewise.
* sysdeps/wordsize-32/cmpdi2.c: New file.
* sysdeps/wordsize-32/shdi3.c: New file.
* sysdeps/wordsize-32/fixdfdi.c: New file.
* sysdeps/wordsize-32/fixsfdi.c: New file.
* sysdeps/powerpc/Versions (__divdi3, __moddi3, __udivdi3, __umoddi3,
__ashldi3, __ashrdi3, __lshrdi3, __cmpdi2, __ucmpdi2, __fixdfdi,
__fixsfdi, __fixunsdfdi, __fixunssfdi): Export at GLIBC_2.0.
* sysdeps/unix/sysv/linux/semctl.c (__old_semctl, __new_semctl):
Only use va_arg if the argument will be used [PR libc/3259].
2002-05-06 Michael A. Schmidt <mmaass@us.ibm.com>
* catgets/catgets.c (catopen): Free buffer if internal catalog
open fails.
2002-05-14 Ulrich Drepper <drepper@redhat.com>
* debug/xtrace.sh: Make more robust. For realtime tracking use
non-buffering methods.
* debug/pcprofiledump.c: Implement -u option.
Patch by Roger Luethi <rl@hellgate.ch>.
2002-05-15 08:02:35 +02:00
|
|
|
#define MIN_NEEDED_INPUT TO_LOOP_MIN_NEEDED_FROM
|
|
|
|
#define MAX_NEEDED_INPUT TO_LOOP_MAX_NEEDED_FROM
|
|
|
|
#define MIN_NEEDED_OUTPUT TO_LOOP_MIN_NEEDED_TO
|
|
|
|
#define MAX_NEEDED_OUTPUT TO_LOOP_MAX_NEEDED_TO
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
#define LOOPFCT TO_LOOP
|
|
|
|
#define BODY \
|
|
|
|
{ \
|
|
|
|
uint32_t ch = get32 (inptr); \
|
|
|
|
const struct gap *rp1 = __ucs4_to_ibm935sb_idx; \
|
|
|
|
const struct gap *rp2 = __ucs4_to_ibm935db_idx; \
|
|
|
|
const char *cp; \
|
|
|
|
\
|
2014-02-10 14:45:42 +01:00
|
|
|
if (__glibc_unlikely (ch >= 0xffff)) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
Update.
2001-06-04 Bruno Haible <haible@clisp.cons.org>
* iconv/loop.c (UNICODE_TAG_HANDLER): New macro.
* iconv/gconv_simple.c (__gconv_transform_internal_ascii): Invoke
UNICODE_TAG_HANDLER.
(__gconv_transform_internal_ucs2): Likewise.
(__gconv_transform_internal_ucs2reverse): Likewise.
* iconvdata/8bit-gap.c (BODY for TO_LOOP): Invoke UNICODE_TAG_HANDLER.
* iconvdata/8bit-generic.c (BODY for TO_LOOP): Likewise.
* iconvdata/ansi_x3.110.c (BODY for TO_LOOP): Likewise.
* iconvdata/big5.c (BODY for TO_LOOP): Likewise.
* iconvdata/big5hkscs.c (BODY for TO_LOOP): Likewise.
* iconvdata/cp1255.c (BODY for TO_LOOP): Likewise.
* iconvdata/cp1258.c (BODY for TO_LOOP): Likewise.
* iconvdata/euc-cn.c (BODY for TO_LOOP): Likewise.
* iconvdata/euc-jp.c (BODY for TO_LOOP): Likewise.
* iconvdata/euc-kr.c (BODY for TO_LOOP): Likewise.
* iconvdata/euc-tw.c (BODY for TO_LOOP): Likewise.
* iconvdata/gbk.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm930.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm932.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm933.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm935.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm937.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm939.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm943.c (BODY for TO_LOOP): Likewise.
* iconvdata/iso646.c (BODY for TO_LOOP): Likewise.
* iconvdata/iso8859-1.c (BODY for TO_LOOP): Likewise.
* iconvdata/iso_6937.c (BODY for TO_LOOP): Likewise.
* iconvdata/iso_6937-2.c (BODY for TO_LOOP): Likewise.
* iconvdata/iso-2022-cn.c (BODY for TO_LOOP): Likewise.
* iconvdata/iso-2022-cn-ext.c (BODY for TO_LOOP): Likewise.
* iconvdata/iso-2022-kr.c (BODY for TO_LOOP): Likewise.
* iconvdata/johab.c (BODY for TO_LOOP): Likewise.
* iconvdata/sjis.c (BODY for TO_LOOP): Likewise.
* iconvdata/t.61.c (BODY for TO_LOOP): Likewise.
* iconvdata/uhc.c (BODY for TO_LOOP): Likewise.
* iconvdata/unicode.c (BODY for TO_LOOP): Likewise.
* iconvdata/iso-2022-jp.c (TAG_none, TAG_language, TAG_language_j,
TAG_language_ja, TAG_language_k, TAG_language_ko, TAG_language_z,
TAG_language_zh, CURRENT_TAG_MASK): New enum values.
(EMIT_SHIFT_TO_INIT): Don't emit an escape sequence if ASCII_set
is already selected but set2 or tag are set.
(conversion): New enum type.
(cvlist_t): New type.
(CVLIST, CVLIST_FIRST, CVLIST_REST): New macros.
(conversion_lists): New array.
(BODY for TO_LOOP): Keep track of Unicode 3.1 language tag. If "ja",
prefer conversion to Japanese character sets. If "zh", prefer
conversion to GB2312. If "ko", prefer conversion to KSC5601. Small
optimizations.
(INIT_PARAMS): Add tag.
(UPDATE_PARAMS): Add tag.
2001-06-04 Bruno Haible <haible@clisp.cons.org>
* locale/programs/locfile.c (write_locale_data): Before creat(),
unlink the file, to avoid crashing the processes that mmap it. Change
a double slash to a single slash. Free fname in case of error return.
2001-06-02 Jakub Jelinek <jakub@redhat.com>
* sysdeps/i386/fpu/s_frexpl.S (__frexpl): Mostly revert 2000-12-03
changes, do the special handling for denormal numbers, not for
normalized numbers (patch by <trevin@xmission.com>).
* math/test-misc.c (main): Test frexpl with denormal arguments.
2001-06-04 Jakub Jelinek <jakub@redhat.com>
* math/libm-test.inc (llround_test): Add two new llround tests.
* sysdeps/ieee754/ldbl-96/s_llroundl.c (__llroundl): Don't allow
overflow when rounding away from zero.
2001-06-04 Jakub Jelinek <jakub@redhat.com>
* math/Makefile (libm-calls): Add e_log2, w_log2, remove s_log2.
* math/math_private.h (__ieee754_log2, __ieee754_log2f,
__ieee754_log2l): New prototypes.
* sysdeps/generic/w_log2.c: New file.
* sysdeps/generic/w_log2f.c: New file.
* sysdeps/generic/w_log2l.c: New file.
* sysdeps/generic/s_log2l.c: Move...
* sysdeps/generic/e_log2l.c: ...to here. Rename to __ieee754_log2l.
* sysdeps/ieee754/k_standard.c (__kernel_standard): Handle log2(0)
and log2(x < 0).
* sysdeps/i386/fpu/s_log2.S: Move...
* sysdeps/i386/fpu/e_log2.S: ...to here. Rename to __ieee754_log2.
* sysdeps/i386/fpu/s_log2f.S: Move...
* sysdeps/i386/fpu/e_log2f.S: ...to here. Rename to __ieee754_log2f.
* sysdeps/i386/fpu/s_log2l.S: Move...
* sysdeps/i386/fpu/e_log2l.S: ...to here. Rename to __ieee754_log2l.
* sysdeps/m68k/fpu/s_log2.S: Move...
* sysdeps/m68k/fpu/e_log2.S: ...to here. Rename to __ieee754_log2.
* sysdeps/m68k/fpu/s_log2f.S: Move...
* sysdeps/m68k/fpu/e_log2f.S: ...to here. Rename to __ieee754_log2f.
* sysdeps/m68k/fpu/s_log2l.S: Move...
* sysdeps/m68k/fpu/e_log2l.S: ...to here. Rename to __ieee754_log2l.
* sysdeps/ieee754/dbl-64/s_log2.c: Move...
* sysdeps/ieee754/dbl-64/e_log2.c: ...to here. Rename to
__ieee754_log2.
* sysdeps/ieee754/flt-32/s_log2f.c: Move...
* sysdeps/ieee754/flt-32/e_log2f.c: ...to here. Rename to
__ieee754_log2f.
2001-06-04 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/w_exp2.c (u_threshold): Lower threshold so that
even arguments which result in denormalized exp2 are accepted.
(__exp2): Arguments equal to u_threshold already result into
underflow.
* sysdeps/generic/w_exp2f.c (u_threshold, __exp2f): Likewise.
* sysdeps/generic/w_exp2l.c (u_threshold, __exp2l): Likewise.
* sysdeps/ieee754/dbl-64/e_exp2.c (__ieee754_exp2): Lomark was too
low, with corrected lowmark use greaterequal, not greater.
* sysdeps/ieee754/flt-32/e_exp2f.c (__ieee754_exp2f): Likewise.
2001-06-04 Jakub Jelinek <jakub@redhat.com>
* math/libm-test.inc (ilogb_test): Test that ilogb(+-Inf) == INT_MAX.
* sysdeps/i386/fpu/s_ilogb.S (__ilogb): Return INT_MAX for +-Inf.
* sysdeps/i386/fpu/s_ilogbf.S (__ilogbf): Likewise.
* sysdeps/i386/fpu/s_ilogbl.S (__ilogbl): Likewise.
* sysdeps/ieee754/dbl-64/s_ilogb.c (__ilogb): Likewise.
* sysdeps/ieee754/flt-32/s_ilogbf.c (__ilogbf): Likewise.
* sysdeps/ieee754/ldbl-128/s_ilogbl.c (__ilogbl): Likewise.
* sysdeps/ieee754/ldbl-96/s_ilogbl.c (__ilogbl): Likewise.
2001-06-04 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/w_coshl.c (__coshl): Test if finite argument
gave non-finite result instead of using constant in generic
version.
* sysdeps/generic/w_coshf.c (__coshf): Likewise.
* sysdeps/generic/w_cosh.c (__cosh): Likewise.
* sysdeps/generic/w_exp10.c (o_threshold, u_threshold): Remove.
(__exp10): Test if finite argument gave non-finite result.
* sysdeps/generic/w_exp10f.c (o_threshold, u_threshold, __exp10f):
Likewise.
* sysdeps/generic/w_exp10l.c (o_threshold, u_threshold, __exp10l):
Likewise.
2001-06-04 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ieee754/ldbl-96/e_coshl.c (__ieee754_coshl): Fix
overflow threshold constant (log(LDBL_MAX)+M_LN2l).
2001-05-29 Bruno Haible <haible@clisp.cons.org>
* locale/programs/ld-ctype.c (idx_table): New struct type.
(idx_table_init, idx_table_get, idx_table_add): New functions.
(MAX_CHARNAMES_IDX): Remove macro.
(locale_ctype_t): Change type of charnames_idx field.
(ctype_startup): Change initialization of charnames_idx field.
(find_idx): Use idx_table_get and idx_table_add for speed.
* locale/programs/charmap.c (charmap_new_char): Fix ucs4 value
computation of characters in a range.
2001-05-29 Bruno Haible <haible@clisp.cons.org>
* iconvdata/gb18030.c (__fourbyte_to_ucs1): Add mappings for <U03F4>,
<U03F5>.
(__ucs_to_gb18030_tab1): Likewise.
(BODY for FROM_LOOP): Add mapping for <U00010000>..<U0010FFFF>.
(BODY for TO_LOOP): Likewise.
* iconvdata/tst-table-charmap.sh: Update for charmaps containing
<U00xxxxxx> syntax.
* iconvdata/tst-table-from.c (bmp_only): New variable.
(utf8_decode): If bmp_only, don't return characters outside Unicode
plane 0.
(main): When testing UTF-8 or GB18030, set bmp_only to 1. Don't print
a conversion line if utf8_decode returns NULL.
* iconvdata/tst-table-to.c (main): When testing encodings other than
UTF-8 and GB18030, loop upto U+30000 instead of U+10000. Use UTF-8
instead of UCS-2 as input.
* iconvdata/tst-table.sh: For GB18030, use only the part < 0x10000
of the charmap.
2001-05-29 Bruno Haible <haible@clisp.cons.org>
* iconvdata/cns11643l1.c: Update to Unicode 3.1.
(__cns11643l1_to_ucs4_tab): Regenerated.
(__cns11643l1_from_ucs4_tab12): Regenerated.
* iconvdata/cns11643.c: Update to Unicode 3.1.
(__cns11643l14_to_ucs4_tab): Remove array.
(__cns11643l3_to_ucs4_tab, __cns11643l4_to_ucs4_tab,
__cns11643l5_to_ucs4_tab, __cns11643l6_to_ucs4_tab,
__cns11643l7_to_ucs4_tab, __cns11643l15_to_ucs4_tab): New arrays.
(__cns11643_from_ucs4p0_tab): Renamed from __cns11643_from_ucs4_tab.
(__cns11643_from_ucs4p2_tab): New array.
* iconvdata/cns11643.h (__cns11643l14_to_ucs4_tab): Remove declaration.
(__cns11643l3_to_ucs4_tab, __cns11643l4_to_ucs4_tab,
__cns11643l5_to_ucs4_tab, __cns11643l6_to_ucs4_tab,
__cns11643l7_to_ucs4_tab, __cns11643l15_to_ucs4_tab): New declarations.
(cns11643_to_ucs4): Treat planes 3, 4, 5, 6, 7, 15 instead of 14.
(__cns11643_from_ucs4_tab): Remove declaration.
(__cns11643_from_ucs4p0_tab, __cns11643_from_ucs4p2_tab): New
declarations.
(ucs4_to_cns11643): Update for new arrays. Treat U+3400..U+4DFF and
U+20000..U+2A6D6.
* iconvdata/cns11643l2.h (__cns11643_from_ucs4_tab): Remove
declaration.
(__cns11643_from_ucs4p0_tab): New declaration.
(ucs4_to_cns11643l2): Update for new arrays.
* iconvdata/iso-2022-cn-ext.c (BODY for FROM_LOOP): Handle planes
3 to 7.
(BODY for TO_LOOP): Handle planes 3 to 7, instead of plane 14.
* iconvdata/EUC-TW.irreversible: New file.
* iconvdata/tst-table.sh: Use it.
* iconvdata/Makefile (distribute): Add CP1255.irreversible,
CP1258.irreversible, EUC-TW.irreversible.
2001-05-29 Bruno Haible <haible@clisp.cons.org>
* locale/C-translit.h.in: Add transliterations for new Unicode 3.1
mathematical symbols.
2001-06-06 14:55:46 +02:00
|
|
|
UNICODE_TAG_HANDLER (ch, 4); \
|
|
|
|
\
|
2002-06-28 23:23:06 +02:00
|
|
|
STANDARD_TO_LOOP_ERR_HANDLER (4); \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
} \
|
2001-01-06 21:21:33 +01:00
|
|
|
\
|
|
|
|
while (ch > rp1->end) \
|
|
|
|
++rp1; \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
\
|
|
|
|
/* Use the UCS4 table for single byte. */ \
|
2001-01-06 21:21:33 +01:00
|
|
|
if (__builtin_expect (ch < rp1->start, 0) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
|| (cp = __ucs4_to_ibm935sb[ch + rp1->idx], \
|
|
|
|
__builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \
|
|
|
|
{ \
|
|
|
|
/* Use the UCS4 table for double byte. */ \
|
|
|
|
while (ch > rp2->end) \
|
|
|
|
++rp2; \
|
|
|
|
\
|
2001-01-06 21:21:33 +01:00
|
|
|
if (__builtin_expect (ch < rp2->start, 0) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
|| (cp = __ucs4_to_ibm935db[ch + rp2->idx], \
|
|
|
|
__builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \
|
|
|
|
{ \
|
|
|
|
/* This is an illegal character. */ \
|
2002-06-28 23:23:06 +02:00
|
|
|
STANDARD_TO_LOOP_ERR_HANDLER (4); \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
} \
|
|
|
|
else \
|
|
|
|
{ \
|
2001-01-06 21:21:33 +01:00
|
|
|
if (curcs == sb) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
2014-02-10 14:45:42 +01:00
|
|
|
if (__glibc_unlikely (outptr + 1 > outend)) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
*outptr++ = SO; \
|
|
|
|
curcs = db; \
|
|
|
|
} \
|
|
|
|
\
|
2014-02-10 14:45:42 +01:00
|
|
|
if (__glibc_unlikely (outptr + 2 > outend)) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
*outptr++ = cp[0]; \
|
|
|
|
*outptr++ = cp[1]; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
if (curcs == db) \
|
|
|
|
{ \
|
2014-02-10 14:45:42 +01:00
|
|
|
if (__glibc_unlikely (outptr + 1 > outend)) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
*outptr++ = SI; \
|
|
|
|
} \
|
|
|
|
\
|
2014-02-10 14:45:42 +01:00
|
|
|
if (__glibc_unlikely (outptr + 1 > outend)) \
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
{ \
|
|
|
|
result = __GCONV_FULL_OUTPUT; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
*outptr++ = cp[0]; \
|
|
|
|
curcs = sb; \
|
|
|
|
} \
|
|
|
|
\
|
|
|
|
/* Now that we wrote the output increment the input pointer. */ \
|
|
|
|
inptr += 4; \
|
|
|
|
}
|
|
|
|
#define LOOP_NEED_FLAGS
|
2001-01-06 21:21:33 +01:00
|
|
|
#define EXTRA_LOOP_DECLS , int *curcsp
|
|
|
|
#define INIT_PARAMS int curcs = *curcsp & ~7
|
2008-01-09 21:03:58 +01:00
|
|
|
#define REINIT_PARAMS curcs = *curcsp & ~7
|
2001-01-06 21:21:33 +01:00
|
|
|
#define UPDATE_PARAMS *curcsp = curcs
|
Update.
2000-10-31 Ulrich Drepper <drepper@redhat.com>
* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
IBM937, IBM939, and IBM1046.
(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
ibm939.h, and ibm1046.h.
* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
IBM935, IBM937, IBM939, and IBM1046.
Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.
2000-10-31 09:24:06 +01:00
|
|
|
#include <iconv/loop.c>
|
|
|
|
|
|
|
|
/* Now define the toplevel functions. */
|
|
|
|
#include <iconv/skeleton.c>
|