lib9p: Unify some tables

4 files changed, 279 insertions, 303 deletions

diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index 2549b87..49bab14 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -48,230 +48,6 @@
  */
 #define is_ver(ctx, ver) _is_ver_##ver((ctx)->version)
 
-/* strings ********************************************************************/
-
-const char *const _lib9p_table_ver_name[LIB9P_VER_NUM] = {
-	[LIB9P_VER_unknown] = "unknown",
-#if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000] = "9P2000",
-#endif /* CONFIG_9P_ENABLE_9P2000 */
-#if CONFIG_9P_ENABLE_9P2000_L
-	[LIB9P_VER_9P2000_L] = "9P2000.L",
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = "9P2000.e",
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000_p9p
-	[LIB9P_VER_9P2000_p9p] = "9P2000.p9p",
-#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
-#if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = "9P2000.u",
-#endif /* CONFIG_9P_ENABLE_9P2000_u */
-};
-
-#define _MSG_NAME(typ) [LIB9P_TYP_##typ] = #typ
-const char *const _lib9p_table_msg_name[LIB9P_VER_NUM][0x100] = {
-	[LIB9P_VER_unknown] = {
-		_MSG_NAME(Tversion),
-		_MSG_NAME(Rversion),
-		_MSG_NAME(Rerror),
-	},
-#if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000] = {
-		_MSG_NAME(Tversion),
-		_MSG_NAME(Rversion),
-		_MSG_NAME(Tauth),
-		_MSG_NAME(Rauth),
-		_MSG_NAME(Tattach),
-		_MSG_NAME(Rattach),
-		_MSG_NAME(Rerror),
-		_MSG_NAME(Tflush),
-		_MSG_NAME(Rflush),
-		_MSG_NAME(Twalk),
-		_MSG_NAME(Rwalk),
-		_MSG_NAME(Topen),
-		_MSG_NAME(Ropen),
-		_MSG_NAME(Tcreate),
-		_MSG_NAME(Rcreate),
-		_MSG_NAME(Tread),
-		_MSG_NAME(Rread),
-		_MSG_NAME(Twrite),
-		_MSG_NAME(Rwrite),
-		_MSG_NAME(Tclunk),
-		_MSG_NAME(Rclunk),
-		_MSG_NAME(Tremove),
-		_MSG_NAME(Rremove),
-		_MSG_NAME(Tstat),
-		_MSG_NAME(Rstat),
-		_MSG_NAME(Twstat),
-		_MSG_NAME(Rwstat),
-	},
-#endif /* CONFIG_9P_ENABLE_9P2000 */
-#if CONFIG_9P_ENABLE_9P2000_L
-	[LIB9P_VER_9P2000_L] = {
-		_MSG_NAME(Rlerror),
-		_MSG_NAME(Tstatfs),
-		_MSG_NAME(Rstatfs),
-		_MSG_NAME(Tlopen),
-		_MSG_NAME(Rlopen),
-		_MSG_NAME(Tlcreate),
-		_MSG_NAME(Rlcreate),
-		_MSG_NAME(Tsymlink),
-		_MSG_NAME(Rsymlink),
-		_MSG_NAME(Tmknod),
-		_MSG_NAME(Rmknod),
-		_MSG_NAME(Trename),
-		_MSG_NAME(Rrename),
-		_MSG_NAME(Treadlink),
-		_MSG_NAME(Rreadlink),
-		_MSG_NAME(Tgetattr),
-		_MSG_NAME(Rgetattr),
-		_MSG_NAME(Tsetattr),
-		_MSG_NAME(Rsetattr),
-		_MSG_NAME(Txattrwalk),
-		_MSG_NAME(Rxattrwalk),
-		_MSG_NAME(Txattrcreate),
-		_MSG_NAME(Rxattrcreate),
-		_MSG_NAME(Treaddir),
-		_MSG_NAME(Rreaddir),
-		_MSG_NAME(Tfsync),
-		_MSG_NAME(Rfsync),
-		_MSG_NAME(Tlock),
-		_MSG_NAME(Rlock),
-		_MSG_NAME(Tgetlock),
-		_MSG_NAME(Rgetlock),
-		_MSG_NAME(Tlink),
-		_MSG_NAME(Rlink),
-		_MSG_NAME(Tmkdir),
-		_MSG_NAME(Rmkdir),
-		_MSG_NAME(Trenameat),
-		_MSG_NAME(Rrenameat),
-		_MSG_NAME(Tunlinkat),
-		_MSG_NAME(Runlinkat),
-		_MSG_NAME(Tversion),
-		_MSG_NAME(Rversion),
-		_MSG_NAME(Tauth),
-		_MSG_NAME(Rauth),
-		_MSG_NAME(Tattach),
-		_MSG_NAME(Rattach),
-		_MSG_NAME(Rerror),
-		_MSG_NAME(Tflush),
-		_MSG_NAME(Rflush),
-		_MSG_NAME(Twalk),
-		_MSG_NAME(Rwalk),
-		_MSG_NAME(Tread),
-		_MSG_NAME(Rread),
-		_MSG_NAME(Twrite),
-		_MSG_NAME(Rwrite),
-		_MSG_NAME(Tclunk),
-		_MSG_NAME(Rclunk),
-		_MSG_NAME(Tremove),
-		_MSG_NAME(Rremove),
-	},
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = {
-		_MSG_NAME(Tversion),
-		_MSG_NAME(Rversion),
-		_MSG_NAME(Tauth),
-		_MSG_NAME(Rauth),
-		_MSG_NAME(Tattach),
-		_MSG_NAME(Rattach),
-		_MSG_NAME(Rerror),
-		_MSG_NAME(Tflush),
-		_MSG_NAME(Rflush),
-		_MSG_NAME(Twalk),
-		_MSG_NAME(Rwalk),
-		_MSG_NAME(Topen),
-		_MSG_NAME(Ropen),
-		_MSG_NAME(Tcreate),
-		_MSG_NAME(Rcreate),
-		_MSG_NAME(Tread),
-		_MSG_NAME(Rread),
-		_MSG_NAME(Twrite),
-		_MSG_NAME(Rwrite),
-		_MSG_NAME(Tclunk),
-		_MSG_NAME(Rclunk),
-		_MSG_NAME(Tremove),
-		_MSG_NAME(Rremove),
-		_MSG_NAME(Tstat),
-		_MSG_NAME(Rstat),
-		_MSG_NAME(Twstat),
-		_MSG_NAME(Rwstat),
-		_MSG_NAME(Tsession),
-		_MSG_NAME(Rsession),
-		_MSG_NAME(Tsread),
-		_MSG_NAME(Rsread),
-		_MSG_NAME(Tswrite),
-		_MSG_NAME(Rswrite),
-	},
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000_p9p
-	[LIB9P_VER_9P2000_p9p] = {
-		_MSG_NAME(Topenfd),
-		_MSG_NAME(Ropenfd),
-		_MSG_NAME(Tversion),
-		_MSG_NAME(Rversion),
-		_MSG_NAME(Tauth),
-		_MSG_NAME(Rauth),
-		_MSG_NAME(Tattach),
-		_MSG_NAME(Rattach),
-		_MSG_NAME(Rerror),
-		_MSG_NAME(Tflush),
-		_MSG_NAME(Rflush),
-		_MSG_NAME(Twalk),
-		_MSG_NAME(Rwalk),
-		_MSG_NAME(Topen),
-		_MSG_NAME(Ropen),
-		_MSG_NAME(Tcreate),
-		_MSG_NAME(Rcreate),
-		_MSG_NAME(Tread),
-		_MSG_NAME(Rread),
-		_MSG_NAME(Twrite),
-		_MSG_NAME(Rwrite),
-		_MSG_NAME(Tclunk),
-		_MSG_NAME(Rclunk),
-		_MSG_NAME(Tremove),
-		_MSG_NAME(Rremove),
-		_MSG_NAME(Tstat),
-		_MSG_NAME(Rstat),
-		_MSG_NAME(Twstat),
-		_MSG_NAME(Rwstat),
-	},
-#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
-#if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = {
-		_MSG_NAME(Tversion),
-		_MSG_NAME(Rversion),
-		_MSG_NAME(Tauth),
-		_MSG_NAME(Rauth),
-		_MSG_NAME(Tattach),
-		_MSG_NAME(Rattach),
-		_MSG_NAME(Rerror),
-		_MSG_NAME(Tflush),
-		_MSG_NAME(Rflush),
-		_MSG_NAME(Twalk),
-		_MSG_NAME(Rwalk),
-		_MSG_NAME(Topen),
-		_MSG_NAME(Ropen),
-		_MSG_NAME(Tcreate),
-		_MSG_NAME(Rcreate),
-		_MSG_NAME(Tread),
-		_MSG_NAME(Rread),
-		_MSG_NAME(Twrite),
-		_MSG_NAME(Rwrite),
-		_MSG_NAME(Tclunk),
-		_MSG_NAME(Rclunk),
-		_MSG_NAME(Tremove),
-		_MSG_NAME(Rremove),
-		_MSG_NAME(Tstat),
-		_MSG_NAME(Rstat),
-		_MSG_NAME(Twstat),
-		_MSG_NAME(Rwstat),
-	},
-#endif /* CONFIG_9P_ENABLE_9P2000_u */
-};
-
 /* bitmasks *******************************************************************/
 
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
@@ -4745,24 +4521,227 @@ static bool marshal_Rswrite(struct lib9p_ctx *ctx, struct lib9p_msg_Rswrite *val
 }
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
 
-/* function tables ************************************************************/
+/* tables.h *******************************************************************/
+
+const struct _lib9p_ver_tentry _lib9p_table_ver[LIB9P_VER_NUM] = {
+	[LIB9P_VER_unknown] = {.name="unknown", .min_msg_size=9},
+#if CONFIG_9P_ENABLE_9P2000
+	[LIB9P_VER_9P2000] = {.name="9P2000", .min_msg_size=9},
+#endif /* CONFIG_9P_ENABLE_9P2000 */
+#if CONFIG_9P_ENABLE_9P2000_L
+	[LIB9P_VER_9P2000_L] = {.name="9P2000.L", .min_msg_size=9},
+#endif /* CONFIG_9P_ENABLE_9P2000_L */
+#if CONFIG_9P_ENABLE_9P2000_e
+	[LIB9P_VER_9P2000_e] = {.name="9P2000.e", .min_msg_size=9},
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = {.name="9P2000.p9p", .min_msg_size=9},
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
+#if CONFIG_9P_ENABLE_9P2000_u
+	[LIB9P_VER_9P2000_u] = {.name="9P2000.u", .min_msg_size=13},
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+};
 
-const uint32_t _lib9p_table_msg_min_size[LIB9P_VER_NUM] = {
-	[LIB9P_VER_unknown] = 9,
+#define _MSG(typ) [LIB9P_TYP_##typ] = {.name=#typ}
+const struct _lib9p_msg_tentry _lib9p_table_msg[LIB9P_VER_NUM][0x100] = {
+	[LIB9P_VER_unknown] = {
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Rerror),
+	},
 #if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000] = 9,
+	[LIB9P_VER_9P2000] = {
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Topen),
+		_MSG(Ropen),
+		_MSG(Tcreate),
+		_MSG(Rcreate),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+		_MSG(Tstat),
+		_MSG(Rstat),
+		_MSG(Twstat),
+		_MSG(Rwstat),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000 */
 #if CONFIG_9P_ENABLE_9P2000_L
-	[LIB9P_VER_9P2000_L] = 9,
+	[LIB9P_VER_9P2000_L] = {
+		_MSG(Rlerror),
+		_MSG(Tstatfs),
+		_MSG(Rstatfs),
+		_MSG(Tlopen),
+		_MSG(Rlopen),
+		_MSG(Tlcreate),
+		_MSG(Rlcreate),
+		_MSG(Tsymlink),
+		_MSG(Rsymlink),
+		_MSG(Tmknod),
+		_MSG(Rmknod),
+		_MSG(Trename),
+		_MSG(Rrename),
+		_MSG(Treadlink),
+		_MSG(Rreadlink),
+		_MSG(Tgetattr),
+		_MSG(Rgetattr),
+		_MSG(Tsetattr),
+		_MSG(Rsetattr),
+		_MSG(Txattrwalk),
+		_MSG(Rxattrwalk),
+		_MSG(Txattrcreate),
+		_MSG(Rxattrcreate),
+		_MSG(Treaddir),
+		_MSG(Rreaddir),
+		_MSG(Tfsync),
+		_MSG(Rfsync),
+		_MSG(Tlock),
+		_MSG(Rlock),
+		_MSG(Tgetlock),
+		_MSG(Rgetlock),
+		_MSG(Tlink),
+		_MSG(Rlink),
+		_MSG(Tmkdir),
+		_MSG(Rmkdir),
+		_MSG(Trenameat),
+		_MSG(Rrenameat),
+		_MSG(Tunlinkat),
+		_MSG(Runlinkat),
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
 #if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 9,
+	[LIB9P_VER_9P2000_e] = {
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Topen),
+		_MSG(Ropen),
+		_MSG(Tcreate),
+		_MSG(Rcreate),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+		_MSG(Tstat),
+		_MSG(Rstat),
+		_MSG(Twstat),
+		_MSG(Rwstat),
+		_MSG(Tsession),
+		_MSG(Rsession),
+		_MSG(Tsread),
+		_MSG(Rsread),
+		_MSG(Tswrite),
+		_MSG(Rswrite),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
 #if CONFIG_9P_ENABLE_9P2000_p9p
-	[LIB9P_VER_9P2000_p9p] = 9,
+	[LIB9P_VER_9P2000_p9p] = {
+		_MSG(Topenfd),
+		_MSG(Ropenfd),
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Topen),
+		_MSG(Ropen),
+		_MSG(Tcreate),
+		_MSG(Rcreate),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+		_MSG(Tstat),
+		_MSG(Rstat),
+		_MSG(Twstat),
+		_MSG(Rwstat),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 13,
+	[LIB9P_VER_9P2000_u] = {
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Topen),
+		_MSG(Ropen),
+		_MSG(Tcreate),
+		_MSG(Rcreate),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+		_MSG(Tstat),
+		_MSG(Rstat),
+		_MSG(Twstat),
+		_MSG(Rwstat),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
diff --git a/lib9p/protogen/c.py b/lib9p/protogen/c.py
index c487c03..b36e817 100644
--- a/lib9p/protogen/c.py
+++ b/lib9p/protogen/c.py
@@ -46,28 +46,6 @@ def gen_c(versions: set[str], typs: list[idl.UserType]) -> str:
     for msg in [msg for msg in typs if isinstance(msg, idl.Message)]:
         id2typ[msg.msgid] = msg
 
-    def msg_table(grp: str, meth: str, tentry: str, rng: tuple[int, int, int]) -> str:
-        ret = f"const {tentry} {c9util.ident(f'_table_{grp}_{meth}')}[{c9util.ver_enum('NUM')}][{hex(len(range(*rng)))}] = {{\n"
-        for ver in ["unknown", *sorted(versions)]:
-            if ver != "unknown":
-                ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
-            ret += f"\t[{c9util.ver_enum(ver)}] = {{\n"
-            for n in range(*rng):
-                xmsg: idl.Message | None = id2typ.get(n, None)
-                if xmsg:
-                    if ver == "unknown":  # SPECIAL (initialization)
-                        if xmsg.typname not in ["Tversion", "Rversion", "Rerror"]:
-                            xmsg = None
-                    else:
-                        if ver not in xmsg.in_versions:
-                            xmsg = None
-                if xmsg:
-                    ret += f"\t\t_MSG_{meth.upper()}({xmsg.typname}),\n"
-            ret += "\t},\n"
-        ret += cutil.ifdef_pop(0)
-        ret += "};\n"
-        return ret
-
     for v in sorted(versions):
         ret += f"#if CONFIG_9P_ENABLE_{v.replace('.', '_')}\n"
         ret += (
@@ -85,23 +63,6 @@ def gen_c(versions: set[str], typs: list[idl.UserType]) -> str:
     ret += " */\n"
     ret += "#define is_ver(ctx, ver) _is_ver_##ver((ctx)->version)\n"
 
-    # strings ##################################################################
-    ret += f"""
-/* strings ********************************************************************/
-
-const char *const {c9util.ident('_table_ver_name')}[{c9util.ver_enum('NUM')}] = {{
-"""
-    for ver in ["unknown", *sorted(versions)]:
-        if ver in versions:
-            ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
-        ret += f'\t[{c9util.ver_enum(ver)}] = "{ver}",\n'
-    ret += cutil.ifdef_pop(0)
-    ret += "};\n"
-
-    ret += "\n"
-    ret += f"#define _MSG_NAME(typ) [{c9util.Ident('TYP_')}##typ] = #typ\n"
-    ret += msg_table("msg", "name", "char *const", (0, 0x100, 1))
-
     # bitmasks #################################################################
     ret += """
 /* bitmasks *******************************************************************/
@@ -141,21 +102,52 @@ const char *const {c9util.ident('_table_ver_name')}[{c9util.ver_enum('NUM')}] =
     # marshal_* ################################################################
     ret += c_marshal.gen_c_marshal(versions, typs)
 
-    # function tables ##########################################################
+    # tables.h #################################################################
     ret += """
-/* function tables ************************************************************/
+/* tables.h *******************************************************************/
 """
 
     ret += "\n"
-    ret += f"const uint32_t {c9util.ident('_table_msg_min_size')}[{c9util.ver_enum('NUM')}] = {{\n"
+    ret += f"const struct {c9util.ident('_ver_tentry')} {c9util.ident('_table_ver')}[{c9util.ver_enum('NUM')}] = {{\n"
     rerror = next(typ for typ in typs if typ.typname == "Rerror")
-    ret += f"\t[{c9util.ver_enum('unknown')}] = {rerror.min_size('9P2000')},\n"  # SPECIAL (initialization)
-    for ver in sorted(versions):
-        ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
-        ret += f"\t[{c9util.ver_enum(ver)}] = {rerror.min_size(ver)},\n"
+    for ver in ["unknown", *sorted(versions)]:
+        if ver == "unknown":
+            min_msg_size = rerror.min_size("9P2000")  # SPECIAL (initialization)
+        else:
+            ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
+            min_msg_size = rerror.min_size(ver)
+        ret += f'\t[{c9util.ver_enum(ver)}] = {{.name="{ver}", .min_msg_size={min_msg_size}}},\n'
     ret += cutil.ifdef_pop(0)
     ret += "};\n"
 
+    def msg_table(
+        cstruct: str, cname: str, each: str, _range: tuple[int, int, int]
+    ) -> str:
+        ret = f"const struct {c9util.ident(cstruct)} {c9util.ident(cname)}[{c9util.ver_enum('NUM')}][{hex(len(range(*_range)))}] = {{\n"
+        for ver in ["unknown", *sorted(versions)]:
+            if ver != "unknown":
+                ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
+            ret += f"\t[{c9util.ver_enum(ver)}] = {{\n"
+            for n in range(*_range):
+                xmsg: idl.Message | None = id2typ.get(n, None)
+                if xmsg:
+                    if ver == "unknown":  # SPECIAL (initialization)
+                        if xmsg.typname not in ["Tversion", "Rversion", "Rerror"]:
+                            xmsg = None
+                    else:
+                        if ver not in xmsg.in_versions:
+                            xmsg = None
+                if xmsg:
+                    ret += f"\t\t{each}({xmsg.typname}),\n"
+            ret += "\t},\n"
+        ret += cutil.ifdef_pop(0)
+        ret += "};\n"
+        return ret
+
+    ret += "\n"
+    ret += f"#define _MSG(typ) [{c9util.Ident('TYP_')}##typ] = {{.name=#typ}}\n"
+    ret += msg_table("_msg_tentry", "_table_msg", "_MSG", (0, 0x100, 1))
+
     ret += "\n"
     ret += cutil.macro(
         f"#define _MSG_RECV(typ) [{c9util.Ident('TYP_')}##typ/2] = {{\n"
@@ -169,21 +161,13 @@ const char *const {c9util.ident('_table_ver_name')}[{c9util.ver_enum('NUM')}] =
         f"\t}}\n"
     )
     ret += "\n"
-    ret += msg_table(
-        "Tmsg", "recv", f"struct {c9util.ident('_recv_tentry')}", (0, 0x100, 2)
-    )
+    ret += msg_table("_recv_tentry", "_table_Tmsg_recv", "_MSG_RECV", (0, 0x100, 2))
     ret += "\n"
-    ret += msg_table(
-        "Rmsg", "recv", f"struct {c9util.ident('_recv_tentry')}", (1, 0x100, 2)
-    )
+    ret += msg_table("_recv_tentry", "_table_Rmsg_recv", "_MSG_RECV", (1, 0x100, 2))
     ret += "\n"
-    ret += msg_table(
-        "Tmsg", "send", f"struct {c9util.ident('_send_tentry')}", (0, 0x100, 2)
-    )
+    ret += msg_table("_send_tentry", "_table_Tmsg_send", "_MSG_SEND", (0, 0x100, 2))
     ret += "\n"
-    ret += msg_table(
-        "Rmsg", "send", f"struct {c9util.ident('_send_tentry')}", (1, 0x100, 2)
-    )
+    ret += msg_table("_send_tentry", "_table_Rmsg_send", "_MSG_SEND", (1, 0x100, 2))
 
     ret += f"""
 LM_FLATTEN ssize_t {c9util.ident('_stat_validate')}(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes, uint32_t *ret_net_size) {{
diff --git a/lib9p/tables.c b/lib9p/tables.c
index 7b46fb4..36fe3b3 100644
--- a/lib9p/tables.c
+++ b/lib9p/tables.c
@@ -31,18 +31,18 @@ static inline void assert_typ(enum lib9p_msg_type typ) {
 
 const char *lib9p_version_str(enum lib9p_version ver) {
 	assert_ver(ver);
-	return _lib9p_table_ver_name[ver];
+	return _lib9p_table_ver[ver].name;
 }
 
 uint32_t lib9p_version_min_msg_size(enum lib9p_version ver) {
 	assert_ver(ver);
-	return _lib9p_table_msg_min_size[ver];
+	return _lib9p_table_ver[ver].min_msg_size;
 }
 
 const char *lib9p_msgtype_str(enum lib9p_version ver, enum lib9p_msg_type typ) {
 	assert_ver(ver);
 	assert_typ(typ);
-	return _lib9p_table_msg_name[ver][typ] ?: const_byte_str(typ);
+	return _lib9p_table_msg[ver][typ].name ?: const_byte_str(typ);
 }
 
 /* main message functions *****************************************************/
diff --git a/lib9p/tables.h b/lib9p/tables.h
index 5591e4b..0b642eb 100644
--- a/lib9p/tables.h
+++ b/lib9p/tables.h
@@ -9,8 +9,27 @@
 
 #include <lib9p/9p.h>
 
+/* version ********************************************************************/
+
+struct _lib9p_ver_tentry {
+	const char      *name;
+	uint32_t         min_msg_size;
+};
+
+extern const struct _lib9p_ver_tentry _lib9p_table_ver[LIB9P_VER_NUM];
+
+/* message ********************************************************************/
+
+struct _lib9p_msg_tentry {
+	const char      *name;
+};
+
 typedef ssize_t (*_validate_fn_t)(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes);
 typedef void (*_unmarshal_fn_t)(struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out);
+struct _lib9p_recv_tentry {
+	_validate_fn_t           validate;
+	_unmarshal_fn_t          unmarshal;
+};
 
 struct _marshal_ret {
 	size_t                   net_iov_cnt;
@@ -19,24 +38,18 @@ struct _marshal_ret {
 	uint8_t                 *net_copied;
 };
 typedef bool (*_marshal_fn_t)(struct lib9p_ctx *ctx, void *host_val, struct _marshal_ret *ret);
-
-struct _lib9p_recv_tentry {
-	_validate_fn_t          validate;
-	_unmarshal_fn_t         unmarshal;
-};
-
 struct _lib9p_send_tentry {
-	_marshal_fn_t           marshal;
+	_marshal_fn_t            marshal;
 };
 
-extern const char *const _lib9p_table_ver_name[LIB9P_VER_NUM];
-extern const char *const _lib9p_table_msg_name[LIB9P_VER_NUM][0x100];
-extern const uint32_t _lib9p_table_msg_min_size[LIB9P_VER_NUM];
+extern const struct _lib9p_msg_tentry  _lib9p_table_msg[LIB9P_VER_NUM][0x100];
 extern const struct _lib9p_recv_tentry _lib9p_table_Tmsg_recv[LIB9P_VER_NUM][0x80];
 extern const struct _lib9p_recv_tentry _lib9p_table_Rmsg_recv[LIB9P_VER_NUM][0x80];
 extern const struct _lib9p_send_tentry _lib9p_table_Tmsg_send[LIB9P_VER_NUM][0x80];
 extern const struct _lib9p_send_tentry _lib9p_table_Rmsg_send[LIB9P_VER_NUM][0x80];
 
+/* stat ***********************************************************************/
+
 ssize_t _lib9p_stat_validate(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes, uint32_t *ret_net_size);
 void _lib9p_stat_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out);
 bool _lib9p_stat_marshal(struct lib9p_ctx *ctx, struct lib9p_stat *val, struct _marshal_ret *ret);