/* Mapping tables for CP932 handling.
- Copyright (C) 1997,1998,1999,2000,2001,2003 Free Software Foundation, Inc.
+ Copyright (C) 1997-2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by MORIYAMA Masayuki <msyk@mtg.biglobe.ne.jp>, 2003.
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#include <dlfcn.h>
#include <stdint.h>
#define MIN_NEEDED_FROM 1
#define MAX_NEEDED_FROM 2
#define MIN_NEEDED_TO 4
+#define ONE_DIRECTION 0
/* First define the conversion function from CP932 to UCS4. */
#define MIN_NEEDED_INPUT MIN_NEEDED_FROM
++inptr; \
else if (ch >= 0xa1 && ch <= 0xdf) \
{ \
- ch += 0xfec0; \
- ++inptr; \
+ ch += 0xfec0; \
+ ++inptr; \
} \
else if (__builtin_expect (ch, 0) == 0xa0 \
|| __builtin_expect (ch <= 0x80, 0) \
uint32_t ch2; \
uint_fast32_t idx; \
\
- if (__builtin_expect (inptr + 1 >= inend, 0)) \
+ if (__glibc_unlikely (inptr + 1 >= inend)) \
{ \
/* The second character is not available. Store \
the intermediate result. */ \
if (__builtin_expect (ch2 < 0x40, 0) \
|| __builtin_expect (ch2 > 0xfc, 0) \
|| __builtin_expect (ch2 == 0x7f, 0) \
- || (__builtin_expect (idx > 0x84be, 0) && idx < 0x8740) \
- || (__builtin_expect (idx > 0x879c, 0) && idx < 0x889f) \
- || (__builtin_expect (idx > 0x88fc, 0) && idx < 0x8940) \
- || (__builtin_expect (idx > 0x9ffc, 0) && idx < 0xe040) \
- || (__builtin_expect (idx > 0xeaa4, 0) && idx < 0xed40) \
- || (__builtin_expect (idx > 0xeefc, 0) && idx < 0xf040) \
+ || (__builtin_expect (idx > 0x84be, 0) && idx < 0x8740) \
+ || (__builtin_expect (idx > 0x879c, 0) && idx < 0x889f) \
+ || (__builtin_expect (idx > 0x88fc, 0) && idx < 0x8940) \
+ || (__builtin_expect (idx > 0x9ffc, 0) && idx < 0xe040) \
+ || (__builtin_expect (idx > 0xeaa4, 0) && idx < 0xed40) \
+ || (__builtin_expect (idx > 0xeefc, 0) && idx < 0xf040) \
|| __builtin_expect (idx > 0xfc4b, 0)) \
{ \
/* This is illegal. */ \
if (! ignore_errors_p ()) \
{ \
- /* This is an illegal character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
- break; \
+ /* This is an illegal character. */ \
+ result = __GCONV_ILLEGAL_INPUT; \
+ break; \
} \
\
++inptr; \
++*irreversible; \
continue; \
} \
- else \
- { \
- /* We could pack the data a bit more dense. The second \
- byte will never be 0x7f and it will also be never \
- >0xfc. But this would mean yet more `if's. */ \
- if (idx <= 0x84be) \
- ch = cjk_block1[(ch - 0x81) * 192 + ch2 - 0x40]; \
- else if (idx <= 0x879c) \
- ch = cjk_block2[(ch - 0x87) * 192 + ch2 - 0x40]; \
- else if (idx <= 0x88fc) \
- ch = cjk_block3[(ch - 0x88) * 192 + ch2 - 0x9f]; \
- else if (idx <= 0x9ffc) \
- ch = cjk_block4[(ch - 0x89) * 192 + ch2 - 0x40]; \
- else if (idx <= 0xeaa4) \
- ch = cjk_block5[(ch - 0xe0) * 192 + ch2 - 0x40]; \
- else if (idx <= 0xeefc) \
- ch = cjk_block6[(ch - 0xed) * 192 + ch2 - 0x40]; \
- else if (idx <= 0xf9fc) \
- ch = (ch-0xf0)*188 + ch2-((ch2<0x7f)?0x40:0x41) + 0xe000; \
- else \
- ch = cjk_block7[(ch - 0xfa) * 192 + ch2 - 0x40]; \
\
- inptr += 2; \
- } \
+ /* We could pack the data a bit more dense. The second \
+ byte will never be 0x7f and it will also be never \
+ >0xfc. But this would mean yet more `if's. */ \
+ if (idx <= 0x84be) \
+ ch = cjk_block1[(ch - 0x81) * 192 + ch2 - 0x40]; \
+ else if (idx <= 0x879c) \
+ ch = cjk_block2[(ch - 0x87) * 192 + ch2 - 0x40]; \
+ else if (idx <= 0x88fc) \
+ ch = cjk_block3[(ch - 0x88) * 192 + ch2 - 0x9f]; \
+ else if (idx <= 0x9ffc) \
+ ch = cjk_block4[(ch - 0x89) * 192 + ch2 - 0x40]; \
+ else if (idx <= 0xeaa4) \
+ ch = cjk_block5[(ch - 0xe0) * 192 + ch2 - 0x40]; \
+ else if (idx <= 0xeefc) \
+ ch = cjk_block6[(ch - 0xed) * 192 + ch2 - 0x40]; \
+ else if (idx <= 0xf9fc) \
+ ch = (ch-0xf0)*188 + ch2-((ch2<0x7f)?0x40:0x41) + 0xe000; \
+ else \
+ ch = cjk_block7[(ch - 0xfa) * 192 + ch2 - 0x40]; \
\
if (__builtin_expect (ch, 1) == 0) \
{ \
/* This is an illegal character. */ \
if (! ignore_errors_p ()) \
{ \
- /* This is an illegal character. */ \
- result = __GCONV_ILLEGAL_INPUT; \
- break; \
+ /* This is an illegal character. */ \
+ result = __GCONV_ILLEGAL_INPUT; \
+ break; \
} \
\
inptr += 2; \
++*irreversible; \
continue; \
} \
+ \
+ inptr += 2; \
} \
\
put32 (outptr, ch); \
else if (ch >= 0x2010 && ch <= 0x9fa0) \
cp = from_ucs4_cjk[ch - 0x2010]; \
else if (ch >= 0xe000 && ch <= 0xe757) \
- { \
+ { \
pua[0] = (ch - 0xe000) / 188 + 0xf0; \
pua[1] = (ch - 0xe000) % 188 + 0x40; \
if (pua[1] > 0x7e) \
/* Now test for a possible second byte and write this if possible. */\
if (cp[1] != '\0') \
{ \
- if (__builtin_expect (outptr + 1 >= outend, 0)) \
+ if (__glibc_unlikely (outptr + 1 >= outend)) \
{ \
/* The result does not fit into the buffer. */ \
result = __GCONV_FULL_OUTPUT; \
projects / framework / base / tizen-locale.git / blobdiff