Fix handling of state. Optimize a bit.
authordrepper <drepper>
Sat, 6 Jan 2001 19:32:31 +0000 (19:32 +0000)
committerdrepper <drepper>
Sat, 6 Jan 2001 19:32:31 +0000 (19:32 +0000)
iconvdata/ibm930.c
iconvdata/ibm933.c
iconvdata/ibm935.c
iconvdata/ibm937.c
iconvdata/ibm939.c

index 11270ff..1a78b90 100644 (file)
@@ -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.
 
 #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.  */
index be7fc0c..9a9b053 100644 (file)
@@ -1,5 +1,5 @@
 /* Conversion from and to IBM933.
-   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.
 
 #define CHARSET_NAME   "IBM933//"
 #define FROM_LOOP      from_ibm933
 #define TO_LOOP                to_ibm933
+#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-933 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 = __ibm933sb_to_ucs4_idx;                          \
-    const struct gap *rp2 = __ibm933db_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 +110,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 +122,14 @@ enum
          }                                                                   \
        curcs = sb;                                                           \
        ++inptr;                                                              \
-       ch = *inptr;                                                          \
+       continue;                                                             \
       }                                                                              \
                                                                              \
-    if (curcs == sb || curcs == init)                                        \
+    if (curcs == sb)                                                         \
       {                                                                              \
        /* Use the IBM933 table for single byte.  */                          \
-       while (ch > rp1->end)                                                 \
-         ++rp1;                                                              \
-                                                                             \
-       if (__builtin_expect (rp1 == NULL, 0)                                 \
-           || __builtin_expect (ch < rp1->start, 0)                          \
-           || (res = __ibm933sb_to_ucs4[ch + rp1->idx],                      \
-               __builtin_expect (res, L'\1') == L'\0' && ch != '\0'))        \
+       res = __ibm933sb_to_ucs4[ch];                                         \
+       if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0')             \
          {                                                                   \
            /* This is an illegal character.  */                              \
            if (! ignore_errors_p ())                                         \
@@ -115,18 +138,20 @@ enum
                break;                                                        \
              }                                                               \
            ++*irreversible;                                                  \
-           ++inptr;                                                          \
-           continue;                                                         \
          }                                                                   \
        else                                                                  \
          {                                                                   \
            put32 (outptr, res);                                              \
            outptr += 4;                                                      \
-           ++inptr;                                                          \
          }                                                                   \
+       ++inptr;                                                              \
       }                                                                              \
-    else if (curcs == db)                                                    \
+    else                                                                     \
       {                                                                              \
+       const struct gap *rp2 = __ibm933db_to_ucs4_idx;                       \
+                                                                             \
+       assert (curcs == db);                                                 \
+                                                                             \
        /* Use the IBM933 table for double byte.  */                          \
        if (__builtin_expect (inptr + 1 >= inend, 0))                         \
          {                                                                   \
@@ -164,12 +189,15 @@ enum
       }                                                                              \
   }
 #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 \
   {                                                                          \
@@ -180,16 +208,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_ibm933sb[ch + rp1->idx],                           \
            __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0'))          \
       {                                                                              \
@@ -197,8 +230,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_ibm933db[ch + rp2->idx],                       \
                __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0'))        \
          {                                                                   \
@@ -212,7 +244,7 @@ enum
          }                                                                   \
        else                                                                  \
          {                                                                   \
-           if (curcs == init || curcs == sb)                                 \
+           if (curcs == sb)                                                  \
              {                                                               \
                if (__builtin_expect (outptr+1 > outend, 0))                  \
                  {                                                           \
@@ -257,6 +289,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.  */
index f63398d..04b8e9d 100644 (file)
@@ -1,5 +1,5 @@
 /* Conversion from and to IBM935
-   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.
 
 #define CHARSET_NAME   "IBM935//"
 #define FROM_LOOP      from_ibm935
 #define TO_LOOP                to_ibm935
+#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-935 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 = __ibm935sb_to_ucs4_idx;                          \
-    const struct gap *rp2 = __ibm935db_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 +110,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 +122,14 @@ enum
          }                                                                   \
        curcs = sb;                                                           \
        ++inptr;                                                              \
-       ch = *inptr;                                                          \
+       continue;                                                             \
       }                                                                              \
                                                                              \
-    if (curcs == sb || curcs == init)                                        \
+    if (curcs == sb)                                                         \
       {                                                                              \
        /* Use the IBM935 table for single byte.  */                          \
-       while (ch > rp1->end)                                                 \
-         ++rp1;                                                              \
-                                                                             \
-       if (__builtin_expect (rp1 == NULL, 0)                                 \
-           || __builtin_expect (ch < rp1->start, 0)                          \
-           || (res = __ibm935sb_to_ucs4[ch + rp1->idx],                      \
-               __builtin_expect (res, L'\1') == L'\0' && ch != '\0'))        \
+       res = __ibm935sb_to_ucs4[ch];                                         \
+       if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0')             \
          {                                                                   \
            /* This is an illegal character.  */                              \
            if (! ignore_errors_p ())                                         \
@@ -115,18 +138,20 @@ enum
                break;                                                        \
              }                                                               \
            ++*irreversible;                                                  \
-           ++inptr;                                                          \
-           continue;                                                         \
          }                                                                   \
        else                                                                  \
          {                                                                   \
            put32 (outptr, res);                                              \
            outptr += 4;                                                      \
-           inptr++;                                                          \
          }                                                                   \
+       ++inptr;                                                              \
       }                                                                              \
-    else if (curcs == db)                                                    \
+    else                                                                     \
       {                                                                              \
+       const struct gap *rp2 = __ibm935db_to_ucs4_idx;                       \
+                                                                             \
+       assert (curcs == db);                                                 \
+                                                                             \
        /* Use the IBM935 table for double byte.  */                          \
        if (__builtin_expect (inptr + 1 >= inend, 0))                         \
          {                                                                   \
@@ -152,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 \
   {                                                                          \
@@ -180,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_ibm935sb[ch + rp1->idx],                           \
            __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0'))          \
       {                                                                              \
@@ -197,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_ibm935db[ch + rp2->idx],                       \
                __builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0'))        \
          {                                                                   \
@@ -212,7 +242,7 @@ enum
          }                                                                   \
        else                                                                  \
          {                                                                   \
-           if (curcs == init || curcs == sb)                                 \
+           if (curcs == sb)                                                  \
              {                                                               \
                if (__builtin_expect (outptr+1 > outend, 0))                  \
                  {                                                           \
@@ -257,6 +287,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.  */
index 98e9683..6da55ae 100644 (file)
@@ -1,5 +1,5 @@
 /* Conversion to and from IBM937.
-   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.
 
 #define CHARSET_NAME   "IBM937//"
 #define FROM_LOOP      from_ibm937
 #define TO_LOOP                to_ibm937
+#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-937 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 \
   {                                                                          \
@@ -59,12 +101,6 @@ enum
                                                                              \
     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)                                                      \
          {                                                                   \
@@ -73,16 +109,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)                                                      \
          {                                                                   \
@@ -91,10 +121,10 @@ enum
          }                                                                   \
        curcs = sb;                                                           \
        ++inptr;                                                              \
-       ch = *inptr;                                                          \
+       continue;                                                             \
       }                                                                              \
                                                                              \
-    if (curcs == sb || curcs == init)                                        \
+    if (curcs == sb)                                                         \
       {                                                                              \
        /* Use the UCS4 table for single byte.  */                            \
        ch = __ibm937sb_to_ucs4[ch];                                          \
@@ -107,19 +137,20 @@ enum
                break;                                                        \
              }                                                               \
            ++*irreversible;                                                  \
-           ++inptr;                                                          \
-           continue;                                                         \
          }                                                                   \
        else                                                                  \
          {                                                                   \
            put32 (outptr, ch);                                               \
            outptr += 4;                                                      \
-           inptr++;                                                          \
          }                                                                   \
+       ++inptr;                                                              \
       }                                                                              \
-    else if (curcs == db)                                                    \
+    else                                                                     \
       {                                                                              \
        /* Use the IBM937 table for double byte.  */                          \
+                                                                             \
+       assert (curcs == db);                                                 \
+                                                                             \
        ch = ibm937db_to_ucs4(inptr[0], inptr[1]);                            \
        if (__builtin_expect (ch, L'\1') == L'\0' && *inptr != '\0')          \
          {                                                                   \
@@ -130,24 +161,25 @@ enum
                break;                                                        \
              }                                                               \
            ++*irreversible;                                                  \
-           inptr += 2;                                                       \
-           continue;                                                         \
          }                                                                   \
        else                                                                  \
          {                                                                   \
            put32 (outptr, ch);                                               \
            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 \
   {                                                                          \
@@ -174,7 +206,7 @@ enum
          }                                                                   \
        else                                                                  \
          {                                                                   \
-           if (curcs == init || curcs == sb)                                 \
+           if (curcs == sb)                                                  \
              {                                                               \
                *outptr++ = SO;                                               \
                if (__builtin_expect (outptr == outend, 0))                   \
@@ -207,6 +239,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.  */
index 7dd7284..d50d880 100644 (file)
@@ -1,5 +1,5 @@
 /* Conversion to and from IBM939.
-   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.
 
 #define CHARSET_NAME   "IBM939//"
 #define FROM_LOOP      from_ibm939
 #define TO_LOOP                to_ibm939
+#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-939 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 = __ibm939sb_to_ucs4_idx;                          \
-    const struct gap *rp2 = __ibm939db_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 +110,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 +122,14 @@ enum
          }                                                                   \
        curcs = sb;                                                           \
        ++inptr;                                                              \
-       ch = *inptr;                                                          \
+       continue;                                                             \
       }                                                                              \
                                                                              \
-    if (curcs == sb || curcs == init)                                        \
+    if (curcs == sb)                                                         \
       {                                                                              \
        /* Use the IBM939 table for single byte.  */                          \
-       while (ch > rp1->end)                                                 \
-         ++rp1;                                                              \
-                                                                             \
-       if (__builtin_expect (rp1 == NULL, 0)                                 \
-           || __builtin_expect (ch < rp1->start, 0)                          \
-           || (res = __ibm939sb_to_ucs4[ch + rp1->idx],                      \
-               __builtin_expect (res, L'\1') == L'\0' && ch != '\0'))        \
+       res = __ibm939sb_to_ucs4[ch];                                         \
+       if (__builtin_expect (res, L'\1') == L'\0' && ch != '\0')             \
          {                                                                   \
            /* This is an illegal character.  */                              \
            if (! ignore_errors_p ())                                         \
@@ -115,21 +138,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 IBM939 table for double byte.  */                          \
+       const struct gap *rp2 = __ibm939db_to_ucs4_idx;                       \
+                                                                             \
+       assert (curcs == db);                                                 \
+                                                                             \
        if (__builtin_expect (inptr + 1 >= inend, 0))                         \
          {                                                                   \
            /* The second character is not available.  Store the              \
@@ -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 \
   {                                                                          \
@@ -214,7 +238,7 @@ enum
          }                                                                   \
        else                                                                  \
          {                                                                   \
-           if (curcs == init || curcs == sb)                                 \
+           if (curcs == sb)                                                  \
              {                                                               \
                if (__builtin_expect (outptr+1 > outend, 0))                  \
                  {                                                           \
@@ -264,6 +288,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. */