diff options
Diffstat (limited to 'iconvdata/ibm930.c')
| -rw-r--r-- | iconvdata/ibm930.c | 137 |
1 files changed, 84 insertions, 53 deletions
diff --git a/iconvdata/ibm930.c b/iconvdata/ibm930.c index 11270ff4af..1a78b90e01 100644 --- a/iconvdata/ibm930.c +++ b/iconvdata/ibm930.c @@ -1,5 +1,5 @@ /* Conversion from and to IBM930. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000. @@ -32,42 +32,77 @@ #define CHARSET_NAME "IBM930//" #define FROM_LOOP from_ibm930 #define TO_LOOP to_ibm930 +#define MIN_NEEDED_FROM 1 +#define MAX_NEEDED_FROM 2 +#define MIN_NEEDED_TO 4 +#define MAX_NEEDED_TO 4 +#define PREPARE_LOOP \ + int save_curcs; \ + int *curcsp = &data->__statep->__count; +#define EXTRA_LOOP_ARGS , curcsp /* Definitions of initialization and destructor function. */ #define DEFINE_INIT 1 #define DEFINE_FINI 1 -#define MIN_NEEDED_FROM 1 -#define MIN_NEEDED_TO 4 + +/* 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 \ + { \ + unsigned char *outbuf = data->__outbuf; \ + \ + /* We are not in the initial state. To switch back we have \ + to emit `SI'. */ \ + if (__builtin_expect (outbuf >= data->__outbufend, 0)) \ + /* We don't have enough room in the output buffer. */ \ + status = __GCONV_FULL_OUTPUT; \ + else \ + { \ + /* Write out the shift sequence. */ \ + *outbuf++ = SI; \ + data->__outbuf = outbuf; \ + 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 + /* Current codeset type. */ enum { - init = 0, - sb, - db + sb = 0, + db = 64 }; + /* First, define the conversion function from IBM-930 to UCS4. */ #define MIN_NEEDED_INPUT MIN_NEEDED_FROM +#define MAX_NEEDED_INPUT MAX_NEEDED_FROM #define MIN_NEEDED_OUTPUT MIN_NEEDED_TO -#define INIT_PARAMS int curcs = init; #define LOOPFCT FROM_LOOP #define BODY \ { \ uint32_t ch = *inptr; \ uint32_t res; \ - const struct gap *rp1 = __ibm930sb_to_ucs4_idx; \ - const struct gap *rp2 = __ibm930db_to_ucs4_idx; \ \ if (__builtin_expect (ch, 0) == SO) \ { \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ - { \ - result = __GCONV_INCOMPLETE_INPUT; \ - break; \ - } \ - \ /* Shift OUT, change to DBCS converter. */ \ if (curcs == db) \ { \ @@ -76,16 +111,10 @@ enum } \ curcs = db; \ ++inptr; \ - ch = *inptr; \ + continue; \ } \ else if (__builtin_expect (ch, 0) == SI) \ { \ - if (__builtin_expect (inptr + 1 >= inend, 0)) \ - { \ - result = __GCONV_INCOMPLETE_INPUT; \ - break; \ - } \ - \ /* Shift IN, change to SBCS converter */ \ if (curcs == sb) \ { \ @@ -94,19 +123,14 @@ enum } \ curcs = sb; \ ++inptr; \ - ch = *inptr; \ + continue; \ } \ \ - if (curcs == sb || curcs == init) \ + if (curcs == sb) \ { \ /* Use the IBM930 table for single byte. */ \ - while (ch > rp1->end) \ - ++rp1; \ - \ - if (__builtin_expect (rp1 == NULL, 0) \ - || __builtin_expect (ch < rp1->start, 0) \ - || (res = __ibm930sb_to_ucs4[ch + rp1->idx], \ - __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \ + res = __ibm930sb_to_ucs4[ch]; \ + if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0') \ { \ /* This is an illegal character. */ \ if (! ignore_errors_p ()) \ @@ -115,21 +139,21 @@ enum break; \ } \ ++*irreversible; \ - ++inptr; \ - continue; \ } \ else \ { \ - if (res == 0xa5) \ - res = 0x5c; \ put32 (outptr, res); \ outptr += 4; \ - ++inptr; \ } \ + ++inptr; \ } \ - else if (curcs == db) \ + else \ { \ /* Use the IBM930 table for double byte. */ \ + const struct gap *rp2 = __ibm930db_to_ucs4_idx; \ + \ + assert (curcs == db); \ + \ if (__builtin_expect (inptr + 1 >= inend, 0)) \ { \ /* The second character is not available. Store the \ @@ -142,8 +166,7 @@ enum while (ch > rp2->end) \ ++rp2; \ \ - if (__builtin_expect (rp2 == NULL, 0) \ - || __builtin_expect (ch < rp2->start, 0) \ + if (__builtin_expect (ch < rp2->start, 0) \ || (res = __ibm930db_to_ucs4[ch + rp2->idx], \ __builtin_expect (res, L'\1') == L'\0' && ch != '\0')) \ { \ @@ -154,24 +177,25 @@ enum break; \ } \ ++*irreversible; \ - inptr += 2; \ - continue; \ } \ else \ { \ put32 (outptr, res); \ outptr += 4; \ - inptr += 2; \ } \ + inptr += 2; \ } \ } #define LOOP_NEED_FLAGS +#define EXTRA_LOOP_DECLS , int *curcsp +#define INIT_PARAMS int curcs = *curcsp & ~7 +#define UPDATE_PARAMS *curcsp = curcs #include <iconv/loop.c> /* Next, define the other direction. */ #define MIN_NEEDED_INPUT MIN_NEEDED_TO #define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM -#define INIT_PARAMS int curcs = init; +#define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM #define LOOPFCT TO_LOOP #define BODY \ { \ @@ -182,16 +206,21 @@ enum \ if (__builtin_expect (ch, 0) >= 0xffff) \ { \ - rp1 = NULL; \ - rp2 = NULL; \ + if (! ignore_errors_p ()) \ + { \ + result = __GCONV_ILLEGAL_INPUT; \ + break; \ + } \ + ++*irreversible; \ + inptr += 4; \ + continue; \ } \ - else \ - while (ch > rp1->end) \ - ++rp1; \ + \ + while (ch > rp1->end) \ + ++rp1; \ \ /* Use the UCS4 table for single byte. */ \ - if (__builtin_expect (rp1 == NULL, 0) \ - || __builtin_expect (ch < rp1->start, 0) \ + if (__builtin_expect (ch < rp1->start, 0) \ || (cp = __ucs4_to_ibm930sb[ch + rp1->idx], \ __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0')) \ { \ @@ -199,8 +228,7 @@ enum while (ch > rp2->end) \ ++rp2; \ \ - if (__builtin_expect (rp2 == NULL, 0) \ - || __builtin_expect (ch < rp2->start, 0) \ + if (__builtin_expect (ch < rp2->start, 0) \ || (cp = __ucs4_to_ibm930db[ch + rp2->idx], \ __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0')) \ { \ @@ -214,7 +242,7 @@ enum } \ else \ { \ - if (curcs == init || curcs == sb) \ + if (curcs == sb) \ { \ if (__builtin_expect (outptr+1 > outend, 0)) \ { \ @@ -264,6 +292,9 @@ enum inptr += 4; \ } #define LOOP_NEED_FLAGS +#define EXTRA_LOOP_DECLS , int *curcsp +#define INIT_PARAMS int curcs = *curcsp & ~7 +#define UPDATE_PARAMS *curcsp = curcs #include <iconv/loop.c> /* Now define the toplevel functions. */ |