PoC: put big5 codec in cjk module state

Author: erlend-aasland

Modules/cjkcodecs/_codecs_hk.c

@@ -6,23 +6,23 @@
 
 #define USING_IMPORTED_MAPS
 
+#define CJK_MOD_SPECIFIC_STATE      \
+    const encode_map *big5_encmap;  \
+    const decode_map *big5_decmap;
+
 #include "cjkcodecs.h"
 #include "mappings_hk.h"
 
 /*
  * BIG5HKSCS codec
  */
 
-static const encode_map *big5_encmap = NULL;
-static const decode_map *big5_decmap = NULL;
-
 CODEC_INIT(big5hkscs)
 {
-    static int initialized = 0;
-
-    if (!initialized && IMPORT_MAP(tw, big5, &big5_encmap, &big5_decmap))
+    cjkcodecs_module_state *st = codec->modstate;
+    if (IMPORT_MAP(tw, big5, &st->big5_encmap, &st->big5_decmap)) {
         return -1;
-    initialized = 1;
+    }
     return 0;
 }
 
@@ -81,7 +81,7 @@ ENCODER(big5hkscs)
                     }
                 }
             }
-            else if (TRYMAP_ENC(big5, code, c))
+            else if (TRYMAP_ENC_ST(big5, code, c))
                 ;
             else
                 return 1;
@@ -122,7 +122,7 @@ DECODER(big5hkscs)
         REQUIRE_INBUF(2);
 
         if (0xc6 > c || c > 0xc8 || (c < 0xc7 && INBYTE2 < 0xa1)) {
-            if (TRYMAP_DEC(big5, decoded, c, INBYTE2)) {
+            if (TRYMAP_DEC_ST(big5, decoded, c, INBYTE2)) {
                 OUTCHAR(decoded);
                 NEXT_IN(2);
                 continue;

Modules/cjkcodecs/cjkcodecs.h

@@ -211,6 +211,9 @@ get_module_state(PyObject *mod)
         (m)->bottom]) != NOCHAR)
 #define TRYMAP_ENC(charset, assi, uni)                     \
     _TRYMAP_ENC(&charset##_encmap[(uni) >> 8], assi, (uni) & 0xff)
+#define TRYMAP_ENC_ST(charset, assi, uni) \
+    _TRYMAP_ENC(&(codec->modstate->charset##_encmap)[(uni) >> 8], \
+                assi, (uni) & 0xff)
 
 #define _TRYMAP_DEC(m, assi, val)                             \
     ((m)->map != NULL &&                                        \
@@ -219,6 +222,8 @@ get_module_state(PyObject *mod)
      ((assi) = (m)->map[(val) - (m)->bottom]) != UNIINV)
 #define TRYMAP_DEC(charset, assi, c1, c2)                     \
     _TRYMAP_DEC(&charset##_decmap[c1], assi, c2)
+#define TRYMAP_DEC_ST(charset, assi, c1, c2) \
+    _TRYMAP_DEC(&(codec->modstate->charset##_decmap)[c1], assi, c2)
 
 #define BEGIN_MAPPINGS_LIST(NUM)                                    \
 static int                                                          \

Tools/c-analyzer/cpython/globals-to-fix.tsv

@@ -485,9 +485,6 @@ Modules/_decimal/_decimal.c	-	_py_float_abs	-
 Modules/_decimal/_decimal.c	-	_py_long_bit_length	-
 Modules/_decimal/_decimal.c	-	_py_float_as_integer_ratio	-
 Modules/_elementtree.c	-	expat_capi	-
-Modules/cjkcodecs/_codecs_hk.c	-	big5_encmap	-
-Modules/cjkcodecs/_codecs_hk.c	-	big5_decmap	-
-Modules/cjkcodecs/_codecs_hk.c	big5hkscs_codec_init	initialized	-
 Modules/cjkcodecs/_codecs_iso2022.c	-	cp949_encmap	-
 Modules/cjkcodecs/_codecs_iso2022.c	-	ksx1001_decmap	-
 Modules/cjkcodecs/_codecs_iso2022.c	-	jisxcommon_encmap	-