lib9p: protogen: flatten the unmarshal functions, same as marshal

2 files changed, 665 insertions, 682 deletions

diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index 13ce0f4..36e1e14 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -2012,917 +2012,867 @@ LM_FLATTEN static bool validate_Twstat(struct _validate_ctx *ctx) {
 
 /* unmarshal_* ****************************************************************/
 
-LM_ALWAYS_INLINE static void unmarshal_1(struct _unmarshal_ctx *ctx, uint8_t *out) {
-	*out = ctx->net_bytes[ctx->net_offset];
+#define UNMARSHAL_BYTES(ctx, data_lvalue, len)                  \
+	data_lvalue = (char *)&ctx->net_bytes[ctx->net_offset]; \
+	ctx->net_offset += len;
+#define UNMARSHAL_U8LE(ctx, val_lvalue)               \
+	val_lvalue = ctx->net_bytes[ctx->net_offset]; \
 	ctx->net_offset += 1;
-}
-
-LM_ALWAYS_INLINE static void unmarshal_2(struct _unmarshal_ctx *ctx, uint16_t *out) {
-	*out = uint16le_decode(&ctx->net_bytes[ctx->net_offset]);
+#define UNMARSHAL_U16LE(ctx, val_lvalue)                                \
+	val_lvalue = uint16le_decode(&ctx->net_bytes[ctx->net_offset]); \
 	ctx->net_offset += 2;
-}
-
-LM_ALWAYS_INLINE static void unmarshal_4(struct _unmarshal_ctx *ctx, uint32_t *out) {
-	*out = uint32le_decode(&ctx->net_bytes[ctx->net_offset]);
+#define UNMARSHAL_U32LE(ctx, val_lvalue)                                \
+	val_lvalue = uint32le_decode(&ctx->net_bytes[ctx->net_offset]); \
 	ctx->net_offset += 4;
-}
-
-LM_ALWAYS_INLINE static void unmarshal_8(struct _unmarshal_ctx *ctx, uint64_t *out) {
-	*out = uint64le_decode(&ctx->net_bytes[ctx->net_offset]);
+#define UNMARSHAL_U64LE(ctx, val_lvalue)                                \
+	val_lvalue = uint64le_decode(&ctx->net_bytes[ctx->net_offset]); \
 	ctx->net_offset += 8;
-}
-
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_ALWAYS_INLINE static void unmarshal_tag(struct _unmarshal_ctx *ctx, lib9p_tag_t *out) {
-	unmarshal_2(ctx, (uint16_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_fid(struct _unmarshal_ctx *ctx, lib9p_fid_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_s(struct _unmarshal_ctx *ctx, struct lib9p_s *out) {
-	memset(out, 0, sizeof(*out));
-	unmarshal_2(ctx, &out->len);
-	out->utf8 = (char *)&ctx->net_bytes[ctx->net_offset];
-	ctx->net_offset += out->len;
-}
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_ALWAYS_INLINE static void unmarshal_dm(struct _unmarshal_ctx *ctx, lib9p_dm_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
+static void unmarshal_stat(struct _unmarshal_ctx *ctx, struct lib9p_stat *out) {
+	ctx->net_offset += 2;
+	UNMARSHAL_U16LE(ctx, out->kern_type);
+	UNMARSHAL_U32LE(ctx, out->kern_dev);
+	UNMARSHAL_U8LE(ctx, out->file_qid.type);
+	UNMARSHAL_U32LE(ctx, out->file_qid.vers);
+	UNMARSHAL_U64LE(ctx, out->file_qid.path);
+	UNMARSHAL_U32LE(ctx, out->file_mode);
+	UNMARSHAL_U32LE(ctx, out->file_atime);
+	UNMARSHAL_U32LE(ctx, out->file_mtime);
+	UNMARSHAL_U64LE(ctx, out->file_size);
+	UNMARSHAL_U16LE(ctx, out->file_name.len);
+	UNMARSHAL_BYTES(ctx, out->file_name.utf8, out->file_name.len);
+	UNMARSHAL_U16LE(ctx, out->file_owner_uid.len);
+	UNMARSHAL_BYTES(ctx, out->file_owner_uid.utf8, out->file_owner_uid.len);
+	UNMARSHAL_U16LE(ctx, out->file_owner_gid.len);
+	UNMARSHAL_BYTES(ctx, out->file_owner_gid.utf8, out->file_owner_gid.len);
+	UNMARSHAL_U16LE(ctx, out->file_last_modified_uid.len);
+	UNMARSHAL_BYTES(ctx, out->file_last_modified_uid.utf8, out->file_last_modified_uid.len);
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U16LE(ctx, out->file_extension.len);
+		UNMARSHAL_BYTES(ctx, out->file_extension.utf8, out->file_extension.len);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->file_owner_n_uid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->file_owner_n_gid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->file_last_modified_n_uid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_ALWAYS_INLINE static void unmarshal_qt(struct _unmarshal_ctx *ctx, lib9p_qt_t *out) {
-	unmarshal_1(ctx, (uint8_t *)out);
-}
-
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
-LM_ALWAYS_INLINE static void unmarshal_nuid(struct _unmarshal_ctx *ctx, lib9p_nuid_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
-}
-
-#endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_ALWAYS_INLINE static void unmarshal_o(struct _unmarshal_ctx *ctx, lib9p_o_t *out) {
-	unmarshal_1(ctx, (uint8_t *)out);
-}
-
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
-LM_ALWAYS_INLINE static void unmarshal_errno(struct _unmarshal_ctx *ctx, lib9p_errno_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
-}
-
-#endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_L
-LM_ALWAYS_INLINE static void unmarshal_super_magic(struct _unmarshal_ctx *ctx, lib9p_super_magic_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_lo(struct _unmarshal_ctx *ctx, lib9p_lo_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_dt(struct _unmarshal_ctx *ctx, lib9p_dt_t *out) {
-	unmarshal_1(ctx, (uint8_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_mode(struct _unmarshal_ctx *ctx, lib9p_mode_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_b4(struct _unmarshal_ctx *ctx, lib9p_b4_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_getattr(struct _unmarshal_ctx *ctx, lib9p_getattr_t *out) {
-	unmarshal_8(ctx, (uint64_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_setattr(struct _unmarshal_ctx *ctx, lib9p_setattr_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_lock_type(struct _unmarshal_ctx *ctx, lib9p_lock_type_t *out) {
-	unmarshal_1(ctx, (uint8_t *)out);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_lock_flags(struct _unmarshal_ctx *ctx, lib9p_lock_flags_t *out) {
-	unmarshal_4(ctx, (uint32_t *)out);
+static void unmarshal_Tversion(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tversion *out) {
+	ctx->net_offset += 4;
+	ctx->net_offset += 1;
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->max_msg_size);
+	UNMARSHAL_U16LE(ctx, out->version.len);
+	UNMARSHAL_BYTES(ctx, out->version.utf8, out->version.len);
 }
 
-LM_ALWAYS_INLINE static void unmarshal_lock_status(struct _unmarshal_ctx *ctx, lib9p_lock_status_t *out) {
-	unmarshal_1(ctx, (uint8_t *)out);
+static void unmarshal_Rversion(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rversion *out) {
+	ctx->net_offset += 4;
+	ctx->net_offset += 1;
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->max_msg_size);
+	UNMARSHAL_U16LE(ctx, out->version.len);
+	UNMARSHAL_BYTES(ctx, out->version.utf8, out->version.len);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Tflush(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tflush *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tauth(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tauth *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_2(ctx, &out->oldtag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->afid);
+	UNMARSHAL_U16LE(ctx, out->uname.len);
+	UNMARSHAL_BYTES(ctx, out->uname.utf8, out->uname.len);
+	UNMARSHAL_U16LE(ctx, out->aname.len);
+	UNMARSHAL_BYTES(ctx, out->aname.utf8, out->aname.len);
+#if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
+	if (( is_ver(ctx, 9P2000_L) || is_ver(ctx, 9P2000_u) )) {
+		UNMARSHAL_U32LE(ctx, out->n_uid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 }
 
-LM_FLATTEN static void unmarshal_Rflush(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rflush *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rauth(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rauth *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->aqid.type);
+	UNMARSHAL_U32LE(ctx, out->aqid.vers);
+	UNMARSHAL_U64LE(ctx, out->aqid.path);
 }
 
-LM_FLATTEN static void unmarshal_Rread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rread *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tattach(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tattach *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_4(ctx, &out->count);
-	out->data = (char *)&ctx->net_bytes[ctx->net_offset];
-	ctx->net_offset += out->count;
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U32LE(ctx, out->afid);
+	UNMARSHAL_U16LE(ctx, out->uname.len);
+	UNMARSHAL_BYTES(ctx, out->uname.utf8, out->uname.len);
+	UNMARSHAL_U16LE(ctx, out->aname.len);
+	UNMARSHAL_BYTES(ctx, out->aname.utf8, out->aname.len);
+#if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
+	if (( is_ver(ctx, 9P2000_L) || is_ver(ctx, 9P2000_u) )) {
+		UNMARSHAL_U32LE(ctx, out->n_uid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 }
 
-LM_FLATTEN static void unmarshal_Rwrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rwrite *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rattach(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rattach *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_4(ctx, &out->count);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
 }
 
-LM_FLATTEN static void unmarshal_Rclunk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rclunk *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rerror(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rerror *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U16LE(ctx, out->ename.len);
+	UNMARSHAL_BYTES(ctx, out->ename.utf8, out->ename.len);
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->errno);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
 
-LM_FLATTEN static void unmarshal_Rremove(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rremove *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tflush(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tflush *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U16LE(ctx, out->oldtag);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Rwstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rwstat *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rflush(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rflush *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_L
-LM_FLATTEN static void unmarshal_Rrename(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rrename *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Twalk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Twalk *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U32LE(ctx, out->newfid);
+	UNMARSHAL_U16LE(ctx, out->nwname);
+	out->wname = ctx->extra;
+	ctx->extra += sizeof(out->wname[0]) * out->nwname;
+	for (uint16_t i = 0; i < out->nwname; i++) {
+		UNMARSHAL_U16LE(ctx, out->wname[i].len);
+		UNMARSHAL_BYTES(ctx, out->wname[i].utf8, out->wname[i].len);
+	}
 }
 
-LM_FLATTEN static void unmarshal_Rsetattr(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsetattr *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rwalk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rwalk *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U16LE(ctx, out->nwqid);
+	out->wqid = ctx->extra;
+	ctx->extra += sizeof(out->wqid[0]) * out->nwqid;
+	for (uint16_t i = 0; i < out->nwqid; i++) {
+		UNMARSHAL_U8LE(ctx, out->wqid[i].type);
+		UNMARSHAL_U32LE(ctx, out->wqid[i].vers);
+		UNMARSHAL_U64LE(ctx, out->wqid[i].path);
+	}
 }
 
-LM_FLATTEN static void unmarshal_Rxattrwalk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rxattrwalk *out) {
-	memset(out, 0, sizeof(*out));
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+static void unmarshal_Topen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Topen *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_8(ctx, &out->attr_size);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U8LE(ctx, out->mode);
 }
 
-LM_FLATTEN static void unmarshal_Rxattrcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rxattrcreate *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Ropen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Ropen *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
+	UNMARSHAL_U32LE(ctx, out->iounit);
 }
 
-LM_FLATTEN static void unmarshal_Rreaddir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rreaddir *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tcreate *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_4(ctx, &out->count);
-	out->data = (char *)&ctx->net_bytes[ctx->net_offset];
-	ctx->net_offset += out->count;
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
+	UNMARSHAL_U32LE(ctx, out->perm);
+	UNMARSHAL_U8LE(ctx, out->mode);
 }
 
-LM_FLATTEN static void unmarshal_Rfsync(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rfsync *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rcreate *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
+	UNMARSHAL_U32LE(ctx, out->iounit);
 }
 
-LM_FLATTEN static void unmarshal_Rlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlink *out) {
-	memset(out, 0, sizeof(*out));
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+static void unmarshal_Tread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tread *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U64LE(ctx, out->offset);
+	UNMARSHAL_U32LE(ctx, out->count);
 }
 
-LM_FLATTEN static void unmarshal_Rrenameat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rrenameat *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rread *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->count);
+	UNMARSHAL_BYTES(ctx, out->data, out->count);
 }
 
-LM_FLATTEN static void unmarshal_Runlinkat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Runlinkat *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Twrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Twrite *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U64LE(ctx, out->offset);
+	UNMARSHAL_U32LE(ctx, out->count);
+	UNMARSHAL_BYTES(ctx, out->data, out->count);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000_e
-LM_FLATTEN static void unmarshal_Tsession(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tsession *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rwrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rwrite *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_8(ctx, &out->key);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->count);
 }
 
-LM_FLATTEN static void unmarshal_Rsession(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsession *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tclunk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tclunk *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
 }
 
-LM_FLATTEN static void unmarshal_Rsread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsread *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rclunk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rclunk *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_4(ctx, &out->count);
-	out->data = (char *)&ctx->net_bytes[ctx->net_offset];
-	ctx->net_offset += out->count;
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-LM_FLATTEN static void unmarshal_Rswrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rswrite *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tremove(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tremove *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_4(ctx, &out->count);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Tread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tread *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rremove(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rremove *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_8(ctx, &out->offset);
-	unmarshal_4(ctx, &out->count);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-LM_FLATTEN static void unmarshal_Twrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Twrite *out) {
-	memset(out, 0, sizeof(*out));
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+static void unmarshal_Tstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tstat *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_8(ctx, &out->offset);
-	unmarshal_4(ctx, &out->count);
-	out->data = (char *)&ctx->net_bytes[ctx->net_offset];
-	ctx->net_offset += out->count;
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
 }
 
-LM_FLATTEN static void unmarshal_Tclunk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tclunk *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rstat *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	ctx->net_offset += 2;
+	ctx->net_offset += 2;
+	UNMARSHAL_U16LE(ctx, out->stat.kern_type);
+	UNMARSHAL_U32LE(ctx, out->stat.kern_dev);
+	UNMARSHAL_U8LE(ctx, out->stat.file_qid.type);
+	UNMARSHAL_U32LE(ctx, out->stat.file_qid.vers);
+	UNMARSHAL_U64LE(ctx, out->stat.file_qid.path);
+	UNMARSHAL_U32LE(ctx, out->stat.file_mode);
+	UNMARSHAL_U32LE(ctx, out->stat.file_atime);
+	UNMARSHAL_U32LE(ctx, out->stat.file_mtime);
+	UNMARSHAL_U64LE(ctx, out->stat.file_size);
+	UNMARSHAL_U16LE(ctx, out->stat.file_name.len);
+	UNMARSHAL_BYTES(ctx, out->stat.file_name.utf8, out->stat.file_name.len);
+	UNMARSHAL_U16LE(ctx, out->stat.file_owner_uid.len);
+	UNMARSHAL_BYTES(ctx, out->stat.file_owner_uid.utf8, out->stat.file_owner_uid.len);
+	UNMARSHAL_U16LE(ctx, out->stat.file_owner_gid.len);
+	UNMARSHAL_BYTES(ctx, out->stat.file_owner_gid.utf8, out->stat.file_owner_gid.len);
+	UNMARSHAL_U16LE(ctx, out->stat.file_last_modified_uid.len);
+	UNMARSHAL_BYTES(ctx, out->stat.file_last_modified_uid.utf8, out->stat.file_last_modified_uid.len);
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U16LE(ctx, out->stat.file_extension.len);
+		UNMARSHAL_BYTES(ctx, out->stat.file_extension.utf8, out->stat.file_extension.len);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->stat.file_owner_n_uid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->stat.file_owner_n_gid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->stat.file_last_modified_n_uid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
 
-LM_FLATTEN static void unmarshal_Tremove(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tremove *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Twstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Twstat *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	ctx->net_offset += 2;
+	ctx->net_offset += 2;
+	UNMARSHAL_U16LE(ctx, out->stat.kern_type);
+	UNMARSHAL_U32LE(ctx, out->stat.kern_dev);
+	UNMARSHAL_U8LE(ctx, out->stat.file_qid.type);
+	UNMARSHAL_U32LE(ctx, out->stat.file_qid.vers);
+	UNMARSHAL_U64LE(ctx, out->stat.file_qid.path);
+	UNMARSHAL_U32LE(ctx, out->stat.file_mode);
+	UNMARSHAL_U32LE(ctx, out->stat.file_atime);
+	UNMARSHAL_U32LE(ctx, out->stat.file_mtime);
+	UNMARSHAL_U64LE(ctx, out->stat.file_size);
+	UNMARSHAL_U16LE(ctx, out->stat.file_name.len);
+	UNMARSHAL_BYTES(ctx, out->stat.file_name.utf8, out->stat.file_name.len);
+	UNMARSHAL_U16LE(ctx, out->stat.file_owner_uid.len);
+	UNMARSHAL_BYTES(ctx, out->stat.file_owner_uid.utf8, out->stat.file_owner_uid.len);
+	UNMARSHAL_U16LE(ctx, out->stat.file_owner_gid.len);
+	UNMARSHAL_BYTES(ctx, out->stat.file_owner_gid.utf8, out->stat.file_owner_gid.len);
+	UNMARSHAL_U16LE(ctx, out->stat.file_last_modified_uid.len);
+	UNMARSHAL_BYTES(ctx, out->stat.file_last_modified_uid.utf8, out->stat.file_last_modified_uid.len);
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U16LE(ctx, out->stat.file_extension.len);
+		UNMARSHAL_BYTES(ctx, out->stat.file_extension.utf8, out->stat.file_extension.len);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->stat.file_owner_n_uid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->stat.file_owner_n_gid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_u
+	if (is_ver(ctx, 9P2000_u)) {
+		UNMARSHAL_U32LE(ctx, out->stat.file_last_modified_n_uid);
+	}
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Tstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tstat *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rwstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rwstat *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_L
-LM_FLATTEN static void unmarshal_Tstatfs(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tstatfs *out) {
-	memset(out, 0, sizeof(*out));
+#if CONFIG_9P_ENABLE_9P2000_p9p
+static void unmarshal_Topenfd(struct _unmarshal_ctx *ctx, struct lib9p_msg_Topenfd *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U8LE(ctx, out->mode);
 }
 
-LM_FLATTEN static void unmarshal_Treadlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Treadlink *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Ropenfd(struct _unmarshal_ctx *ctx, struct lib9p_msg_Ropenfd *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
+	UNMARSHAL_U32LE(ctx, out->iounit);
+	UNMARSHAL_U32LE(ctx, out->unixfd);
 }
 
-LM_FLATTEN static void unmarshal_Treaddir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Treaddir *out) {
-	memset(out, 0, sizeof(*out));
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
+#if CONFIG_9P_ENABLE_9P2000_L
+static void unmarshal_Rlerror(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlerror *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_8(ctx, &out->offset);
-	unmarshal_4(ctx, &out->count);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->ecode);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Tversion(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tversion *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tstatfs(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tstatfs *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_4(ctx, &out->max_msg_size);
-	unmarshal_s(ctx, &out->version);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
 }
 
-LM_FLATTEN static void unmarshal_Rversion(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rversion *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rstatfs(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rstatfs *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_4(ctx, &out->max_msg_size);
-	unmarshal_s(ctx, &out->version);
-}
-
-LM_FLATTEN static void unmarshal_Twalk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Twalk *out) {
-	memset(out, 0, sizeof(*out));
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->type);
+	UNMARSHAL_U32LE(ctx, out->bsize);
+	UNMARSHAL_U64LE(ctx, out->blocks);
+	UNMARSHAL_U64LE(ctx, out->bfree);
+	UNMARSHAL_U64LE(ctx, out->bavail);
+	UNMARSHAL_U64LE(ctx, out->files);
+	UNMARSHAL_U64LE(ctx, out->ffree);
+	UNMARSHAL_U64LE(ctx, out->fsid);
+	UNMARSHAL_U32LE(ctx, out->namelen);
+}
+
+static void unmarshal_Tlopen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tlopen *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_fid(ctx, &out->newfid);
-	unmarshal_2(ctx, &out->nwname);
-	out->wname = ctx->extra;
-	ctx->extra += sizeof(out->wname[0]) * out->nwname;
-	for (typeof(out->nwname) i = 0; i < out->nwname; i++)
-		unmarshal_s(ctx, &out->wname[i]);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U32LE(ctx, out->flags);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_L
-LM_FLATTEN static void unmarshal_Trename(struct _unmarshal_ctx *ctx, struct lib9p_msg_Trename *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rlopen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlopen *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_fid(ctx, &out->dfid);
-	unmarshal_s(ctx, &out->name);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
+	UNMARSHAL_U32LE(ctx, out->iounit);
 }
 
-LM_FLATTEN static void unmarshal_Rreadlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rreadlink *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tlcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tlcreate *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_s(ctx, &out->target);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
+	UNMARSHAL_U32LE(ctx, out->flags);
+	UNMARSHAL_U32LE(ctx, out->mode);
+	UNMARSHAL_U32LE(ctx, out->gid);
 }
 
-LM_FLATTEN static void unmarshal_Txattrwalk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Txattrwalk *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rlcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlcreate *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_fid(ctx, &out->newfid);
-	unmarshal_s(ctx, &out->name);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
+	UNMARSHAL_U32LE(ctx, out->iounit);
 }
 
-LM_FLATTEN static void unmarshal_Txattrcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Txattrcreate *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tsymlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tsymlink *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_s(ctx, &out->name);
-	unmarshal_8(ctx, &out->attr_size);
-	unmarshal_4(ctx, &out->flags);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
+	UNMARSHAL_U16LE(ctx, out->symtgt.len);
+	UNMARSHAL_BYTES(ctx, out->symtgt.utf8, out->symtgt.len);
+	UNMARSHAL_U32LE(ctx, out->gid);
 }
 
-LM_FLATTEN static void unmarshal_Tlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tlink *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rsymlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsymlink *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->dfid);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_s(ctx, &out->name);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
 }
 
-LM_FLATTEN static void unmarshal_Trenameat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Trenameat *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tmknod(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tmknod *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->olddirfid);
-	unmarshal_s(ctx, &out->oldname);
-	unmarshal_fid(ctx, &out->newdirfid);
-	unmarshal_s(ctx, &out->newname);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->dfid);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
+	UNMARSHAL_U32LE(ctx, out->mode);
+	UNMARSHAL_U32LE(ctx, out->major);
+	UNMARSHAL_U32LE(ctx, out->minor);
+	UNMARSHAL_U32LE(ctx, out->gid);
 }
 
-LM_FLATTEN static void unmarshal_Tunlinkat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tunlinkat *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rmknod(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rmknod *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->dirfd);
-	unmarshal_s(ctx, &out->name);
-	unmarshal_4(ctx, &out->flags);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000_e
-LM_FLATTEN static void unmarshal_Tsread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tsread *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Trename(struct _unmarshal_ctx *ctx, struct lib9p_msg_Trename *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_4(ctx, &out->fid);
-	unmarshal_2(ctx, &out->nwname);
-	out->wname = ctx->extra;
-	ctx->extra += sizeof(out->wname[0]) * out->nwname;
-	for (typeof(out->nwname) i = 0; i < out->nwname; i++)
-		unmarshal_s(ctx, &out->wname[i]);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U32LE(ctx, out->dfid);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
 }
 
-LM_FLATTEN static void unmarshal_Tswrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tswrite *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rrename(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rrename *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_4(ctx, &out->fid);
-	unmarshal_2(ctx, &out->nwname);
-	out->wname = ctx->extra;
-	ctx->extra += sizeof(out->wname[0]) * out->nwname;
-	for (typeof(out->nwname) i = 0; i < out->nwname; i++)
-		unmarshal_s(ctx, &out->wname[i]);
-	unmarshal_4(ctx, &out->count);
-	out->data = (char *)&ctx->net_bytes[ctx->net_offset];
-	ctx->net_offset += out->count;
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_ALWAYS_INLINE static void unmarshal_qid(struct _unmarshal_ctx *ctx, struct lib9p_qid *out) {
-	memset(out, 0, sizeof(*out));
-	unmarshal_qt(ctx, &out->type);
-	unmarshal_4(ctx, &out->vers);
-	unmarshal_8(ctx, &out->path);
-}
-
-LM_FLATTEN static void unmarshal_Tauth(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tauth *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Treadlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Treadlink *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->afid);
-	unmarshal_s(ctx, &out->uname);
-	unmarshal_s(ctx, &out->aname);
-#if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
-	if ( ( is_ver(ctx, 9P2000_L) || is_ver(ctx, 9P2000_u) ) ) unmarshal_nuid(ctx, &out->n_uid);
-#endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
 }
 
-LM_FLATTEN static void unmarshal_Tattach(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tattach *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rreadlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rreadlink *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_fid(ctx, &out->afid);
-	unmarshal_s(ctx, &out->uname);
-	unmarshal_s(ctx, &out->aname);
-#if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
-	if ( ( is_ver(ctx, 9P2000_L) || is_ver(ctx, 9P2000_u) ) ) unmarshal_nuid(ctx, &out->n_uid);
-#endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U16LE(ctx, out->target.len);
+	UNMARSHAL_BYTES(ctx, out->target.utf8, out->target.len);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_L
-LM_FLATTEN static void unmarshal_Tsymlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tsymlink *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tgetattr(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tgetattr *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_s(ctx, &out->name);
-	unmarshal_s(ctx, &out->symtgt);
-	unmarshal_nuid(ctx, &out->gid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U64LE(ctx, out->request_mask);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Topen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Topen *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rgetattr(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rgetattr *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_o(ctx, &out->mode);
-}
-
-LM_FLATTEN static void unmarshal_Tcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tcreate *out) {
-	memset(out, 0, sizeof(*out));
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U64LE(ctx, out->valid);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
+	UNMARSHAL_U32LE(ctx, out->mode);
+	UNMARSHAL_U32LE(ctx, out->uid);
+	UNMARSHAL_U32LE(ctx, out->gid);
+	UNMARSHAL_U64LE(ctx, out->nlink);
+	UNMARSHAL_U64LE(ctx, out->rdev);
+	UNMARSHAL_U64LE(ctx, out->filesize);
+	UNMARSHAL_U64LE(ctx, out->blksize);
+	UNMARSHAL_U64LE(ctx, out->blocks);
+	UNMARSHAL_U64LE(ctx, out->atime_sec);
+	UNMARSHAL_U64LE(ctx, out->atime_nsec);
+	UNMARSHAL_U64LE(ctx, out->mtime_sec);
+	UNMARSHAL_U64LE(ctx, out->mtime_nsec);
+	UNMARSHAL_U64LE(ctx, out->ctime_sec);
+	UNMARSHAL_U64LE(ctx, out->ctime_nsec);
+	UNMARSHAL_U64LE(ctx, out->btime_sec);
+	UNMARSHAL_U64LE(ctx, out->btime_nsec);
+	UNMARSHAL_U64LE(ctx, out->gen);
+	UNMARSHAL_U64LE(ctx, out->data_version);
+}
+
+static void unmarshal_Tsetattr(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tsetattr *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_s(ctx, &out->name);
-	unmarshal_dm(ctx, &out->perm);
-	unmarshal_o(ctx, &out->mode);
-}
-
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_p9p
-LM_FLATTEN static void unmarshal_Topenfd(struct _unmarshal_ctx *ctx, struct lib9p_msg_Topenfd *out) {
-	memset(out, 0, sizeof(*out));
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U32LE(ctx, out->valid);
+	UNMARSHAL_U32LE(ctx, out->mode);
+	UNMARSHAL_U32LE(ctx, out->uid);
+	UNMARSHAL_U32LE(ctx, out->gid);
+	UNMARSHAL_U64LE(ctx, out->filesize);
+	UNMARSHAL_U64LE(ctx, out->atime_sec);
+	UNMARSHAL_U64LE(ctx, out->atime_nsec);
+	UNMARSHAL_U64LE(ctx, out->mtime_sec);
+	UNMARSHAL_U64LE(ctx, out->mtime_nsec);
+}
+
+static void unmarshal_Rsetattr(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsetattr *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_o(ctx, &out->mode);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Rerror(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rerror *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Txattrwalk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Txattrwalk *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_s(ctx, &out->ename);
-#if CONFIG_9P_ENABLE_9P2000_u
-	if ( is_ver(ctx, 9P2000_u) ) unmarshal_errno(ctx, &out->errno);
-#endif /* CONFIG_9P_ENABLE_9P2000_u */
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U32LE(ctx, out->newfid);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_L
-LM_FLATTEN static void unmarshal_Rlerror(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlerror *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rxattrwalk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rxattrwalk *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_errno(ctx, &out->ecode);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U64LE(ctx, out->attr_size);
 }
 
-LM_FLATTEN static void unmarshal_Rstatfs(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rstatfs *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Txattrcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Txattrcreate *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_super_magic(ctx, &out->type);
-	unmarshal_4(ctx, &out->bsize);
-	unmarshal_8(ctx, &out->blocks);
-	unmarshal_8(ctx, &out->bfree);
-	unmarshal_8(ctx, &out->bavail);
-	unmarshal_8(ctx, &out->files);
-	unmarshal_8(ctx, &out->ffree);
-	unmarshal_8(ctx, &out->fsid);
-	unmarshal_4(ctx, &out->namelen);
-}
-
-LM_FLATTEN static void unmarshal_Tlopen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tlopen *out) {
-	memset(out, 0, sizeof(*out));
-	ctx->net_offset += 4;
-	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_lo(ctx, &out->flags);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
+	UNMARSHAL_U64LE(ctx, out->attr_size);
+	UNMARSHAL_U32LE(ctx, out->flags);
 }
 
-LM_FLATTEN static void unmarshal_Tlcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tlcreate *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rxattrcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rxattrcreate *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_s(ctx, &out->name);
-	unmarshal_lo(ctx, &out->flags);
-	unmarshal_mode(ctx, &out->mode);
-	unmarshal_nuid(ctx, &out->gid);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-LM_FLATTEN static void unmarshal_Tmknod(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tmknod *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Treaddir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Treaddir *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->dfid);
-	unmarshal_s(ctx, &out->name);
-	unmarshal_mode(ctx, &out->mode);
-	unmarshal_4(ctx, &out->major);
-	unmarshal_4(ctx, &out->minor);
-	unmarshal_nuid(ctx, &out->gid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U64LE(ctx, out->offset);
+	UNMARSHAL_U32LE(ctx, out->count);
 }
 
-LM_FLATTEN static void unmarshal_Tmkdir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tmkdir *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rreaddir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rreaddir *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->dfid);
-	unmarshal_s(ctx, &out->name);
-	unmarshal_mode(ctx, &out->mode);
-	unmarshal_nuid(ctx, &out->gid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->count);
+	UNMARSHAL_BYTES(ctx, out->data, out->count);
 }
 
-LM_FLATTEN static void unmarshal_Tfsync(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tfsync *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tfsync(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tfsync *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_b4(ctx, &out->datasync);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U32LE(ctx, out->datasync);
 }
 
-LM_FLATTEN static void unmarshal_Tgetattr(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tgetattr *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rfsync(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rfsync *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_getattr(ctx, &out->request_mask);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-LM_FLATTEN static void unmarshal_Tsetattr(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tsetattr *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tlock(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tlock *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_setattr(ctx, &out->valid);
-	unmarshal_mode(ctx, &out->mode);
-	unmarshal_nuid(ctx, &out->uid);
-	unmarshal_nuid(ctx, &out->gid);
-	unmarshal_8(ctx, &out->filesize);
-	unmarshal_8(ctx, &out->atime_sec);
-	unmarshal_8(ctx, &out->atime_nsec);
-	unmarshal_8(ctx, &out->mtime_sec);
-	unmarshal_8(ctx, &out->mtime_nsec);
-}
-
-LM_FLATTEN static void unmarshal_Tgetlock(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tgetlock *out) {
-	memset(out, 0, sizeof(*out));
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U8LE(ctx, out->type);
+	UNMARSHAL_U32LE(ctx, out->flags);
+	UNMARSHAL_U64LE(ctx, out->start);
+	UNMARSHAL_U64LE(ctx, out->length);
+	UNMARSHAL_U32LE(ctx, out->proc_id);
+	UNMARSHAL_U16LE(ctx, out->client_id.len);
+	UNMARSHAL_BYTES(ctx, out->client_id.utf8, out->client_id.len);
+}
+
+static void unmarshal_Rlock(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlock *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_lock_type(ctx, &out->type);
-	unmarshal_8(ctx, &out->start);
-	unmarshal_8(ctx, &out->length);
-	unmarshal_4(ctx, &out->proc_id);
-	unmarshal_s(ctx, &out->client_id);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->status);
 }
 
-LM_FLATTEN static void unmarshal_Rgetlock(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rgetlock *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tgetlock(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tgetlock *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_lock_type(ctx, &out->type);
-	unmarshal_8(ctx, &out->start);
-	unmarshal_8(ctx, &out->length);
-	unmarshal_4(ctx, &out->proc_id);
-	unmarshal_s(ctx, &out->client_id);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U8LE(ctx, out->type);
+	UNMARSHAL_U64LE(ctx, out->start);
+	UNMARSHAL_U64LE(ctx, out->length);
+	UNMARSHAL_U32LE(ctx, out->proc_id);
+	UNMARSHAL_U16LE(ctx, out->client_id.len);
+	UNMARSHAL_BYTES(ctx, out->client_id.utf8, out->client_id.len);
 }
 
-LM_FLATTEN static void unmarshal_Tlock(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tlock *out) {
-	memset(out, 0, sizeof(*out));
-	ctx->net_offset += 4;
-	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_lock_type(ctx, &out->type);
-	unmarshal_lock_flags(ctx, &out->flags);
-	unmarshal_8(ctx, &out->start);
-	unmarshal_8(ctx, &out->length);
-	unmarshal_4(ctx, &out->proc_id);
-	unmarshal_s(ctx, &out->client_id);
-}
-
-LM_FLATTEN static void unmarshal_Rlock(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlock *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rgetlock(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rgetlock *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_lock_status(ctx, &out->status);
-}
-
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_ALWAYS_INLINE static void unmarshal_stat(struct _unmarshal_ctx *ctx, struct lib9p_stat *out) {
-	memset(out, 0, sizeof(*out));
-	ctx->net_offset += 2;
-	unmarshal_2(ctx, &out->kern_type);
-	unmarshal_4(ctx, &out->kern_dev);
-	unmarshal_qid(ctx, &out->file_qid);
-	unmarshal_dm(ctx, &out->file_mode);
-	unmarshal_4(ctx, &out->file_atime);
-	unmarshal_4(ctx, &out->file_mtime);
-	unmarshal_8(ctx, &out->file_size);
-	unmarshal_s(ctx, &out->file_name);
-	unmarshal_s(ctx, &out->file_owner_uid);
-	unmarshal_s(ctx, &out->file_owner_gid);
-	unmarshal_s(ctx, &out->file_last_modified_uid);
-#if CONFIG_9P_ENABLE_9P2000_u
-	if ( is_ver(ctx, 9P2000_u) ) unmarshal_s(ctx, &out->file_extension);
-	if ( is_ver(ctx, 9P2000_u) ) unmarshal_nuid(ctx, &out->file_owner_n_uid);
-	if ( is_ver(ctx, 9P2000_u) ) unmarshal_nuid(ctx, &out->file_owner_n_gid);
-	if ( is_ver(ctx, 9P2000_u) ) unmarshal_nuid(ctx, &out->file_last_modified_n_uid);
-#endif /* CONFIG_9P_ENABLE_9P2000_u */
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->type);
+	UNMARSHAL_U64LE(ctx, out->start);
+	UNMARSHAL_U64LE(ctx, out->length);
+	UNMARSHAL_U32LE(ctx, out->proc_id);
+	UNMARSHAL_U16LE(ctx, out->client_id.len);
+	UNMARSHAL_BYTES(ctx, out->client_id.utf8, out->client_id.len);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Rauth(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rauth *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tlink *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->aqid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->dfid);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
 }
 
-LM_FLATTEN static void unmarshal_Rattach(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rattach *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlink *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->qid);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-LM_FLATTEN static void unmarshal_Rwalk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rwalk *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tmkdir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tmkdir *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_2(ctx, &out->nwqid);
-	out->wqid = ctx->extra;
-	ctx->extra += sizeof(out->wqid[0]) * out->nwqid;
-	for (typeof(out->nwqid) i = 0; i < out->nwqid; i++)
-		unmarshal_qid(ctx, &out->wqid[i]);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->dfid);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
+	UNMARSHAL_U32LE(ctx, out->mode);
+	UNMARSHAL_U32LE(ctx, out->gid);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Ropen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Ropen *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rmkdir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rmkdir *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->qid);
-	unmarshal_4(ctx, &out->iounit);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U8LE(ctx, out->qid.type);
+	UNMARSHAL_U32LE(ctx, out->qid.vers);
+	UNMARSHAL_U64LE(ctx, out->qid.path);
 }
 
-LM_FLATTEN static void unmarshal_Rcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rcreate *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Trenameat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Trenameat *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->qid);
-	unmarshal_4(ctx, &out->iounit);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->olddirfid);
+	UNMARSHAL_U16LE(ctx, out->oldname.len);
+	UNMARSHAL_BYTES(ctx, out->oldname.utf8, out->oldname.len);
+	UNMARSHAL_U32LE(ctx, out->newdirfid);
+	UNMARSHAL_U16LE(ctx, out->newname.len);
+	UNMARSHAL_BYTES(ctx, out->newname.utf8, out->newname.len);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000_p9p
-LM_FLATTEN static void unmarshal_Ropenfd(struct _unmarshal_ctx *ctx, struct lib9p_msg_Ropenfd *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rrenameat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rrenameat *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->qid);
-	unmarshal_4(ctx, &out->iounit);
-	unmarshal_4(ctx, &out->unixfd);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
-#if CONFIG_9P_ENABLE_9P2000_L
-LM_FLATTEN static void unmarshal_Rlopen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlopen *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tunlinkat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tunlinkat *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->qid);
-	unmarshal_4(ctx, &out->iounit);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->dirfd);
+	UNMARSHAL_U16LE(ctx, out->name.len);
+	UNMARSHAL_BYTES(ctx, out->name.utf8, out->name.len);
+	UNMARSHAL_U32LE(ctx, out->flags);
 }
 
-LM_FLATTEN static void unmarshal_Rlcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlcreate *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Runlinkat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Runlinkat *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->qid);
-	unmarshal_4(ctx, &out->iounit);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-LM_FLATTEN static void unmarshal_Rsymlink(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsymlink *out) {
-	memset(out, 0, sizeof(*out));
+#endif /* CONFIG_9P_ENABLE_9P2000_L */
+#if CONFIG_9P_ENABLE_9P2000_e
+static void unmarshal_Tsession(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tsession *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->qid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U64LE(ctx, out->key);
 }
 
-LM_FLATTEN static void unmarshal_Rmknod(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rmknod *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rsession(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsession *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->qid);
+	UNMARSHAL_U16LE(ctx, out->tag);
 }
 
-LM_FLATTEN static void unmarshal_Rgetattr(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rgetattr *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tsread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tsread *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_getattr(ctx, &out->valid);
-	unmarshal_qid(ctx, &out->qid);
-	unmarshal_mode(ctx, &out->mode);
-	unmarshal_nuid(ctx, &out->uid);
-	unmarshal_nuid(ctx, &out->gid);
-	unmarshal_8(ctx, &out->nlink);
-	unmarshal_8(ctx, &out->rdev);
-	unmarshal_8(ctx, &out->filesize);
-	unmarshal_8(ctx, &out->blksize);
-	unmarshal_8(ctx, &out->blocks);
-	unmarshal_8(ctx, &out->atime_sec);
-	unmarshal_8(ctx, &out->atime_nsec);
-	unmarshal_8(ctx, &out->mtime_sec);
-	unmarshal_8(ctx, &out->mtime_nsec);
-	unmarshal_8(ctx, &out->ctime_sec);
-	unmarshal_8(ctx, &out->ctime_nsec);
-	unmarshal_8(ctx, &out->btime_sec);
-	unmarshal_8(ctx, &out->btime_nsec);
-	unmarshal_8(ctx, &out->gen);
-	unmarshal_8(ctx, &out->data_version);
-}
-
-LM_FLATTEN static void unmarshal_Rmkdir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rmkdir *out) {
-	memset(out, 0, sizeof(*out));
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U16LE(ctx, out->nwname);
+	out->wname = ctx->extra;
+	ctx->extra += sizeof(out->wname[0]) * out->nwname;
+	for (uint16_t i = 0; i < out->nwname; i++) {
+		UNMARSHAL_U16LE(ctx, out->wname[i].len);
+		UNMARSHAL_BYTES(ctx, out->wname[i].utf8, out->wname[i].len);
+	}
+}
+
+static void unmarshal_Rsread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsread *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_qid(ctx, &out->qid);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->count);
+	UNMARSHAL_BYTES(ctx, out->data, out->count);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Rstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rstat *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Tswrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tswrite *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	ctx->net_offset += 2;
-	unmarshal_stat(ctx, &out->stat);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->fid);
+	UNMARSHAL_U16LE(ctx, out->nwname);
+	out->wname = ctx->extra;
+	ctx->extra += sizeof(out->wname[0]) * out->nwname;
+	for (uint16_t i = 0; i < out->nwname; i++) {
+		UNMARSHAL_U16LE(ctx, out->wname[i].len);
+		UNMARSHAL_BYTES(ctx, out->wname[i].utf8, out->wname[i].len);
+	}
+	UNMARSHAL_U32LE(ctx, out->count);
+	UNMARSHAL_BYTES(ctx, out->data, out->count);
 }
 
-LM_FLATTEN static void unmarshal_Twstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Twstat *out) {
-	memset(out, 0, sizeof(*out));
+static void unmarshal_Rswrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rswrite *out) {
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	ctx->net_offset += 2;
-	unmarshal_stat(ctx, &out->stat);
+	UNMARSHAL_U16LE(ctx, out->tag);
+	UNMARSHAL_U32LE(ctx, out->count);
 }
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
 
 /* marshal_* ******************************************************************/
 
diff --git a/lib9p/protogen/c_unmarshal.py b/lib9p/protogen/c_unmarshal.py
index e17f456..d076352 100644
--- a/lib9p/protogen/c_unmarshal.py
+++ b/lib9p/protogen/c_unmarshal.py
@@ -3,6 +3,7 @@
 # Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
+import typing
 
 import idl
 
@@ -21,72 +22,104 @@ def gen_c_unmarshal(versions: set[str], typs: list[idl.UserType]) -> str:
     ret = """
 /* unmarshal_* ****************************************************************/
 
-LM_ALWAYS_INLINE static void unmarshal_1(struct _unmarshal_ctx *ctx, uint8_t *out) {
-\t*out = ctx->net_bytes[ctx->net_offset];
-\tctx->net_offset += 1;
-}
-
-LM_ALWAYS_INLINE static void unmarshal_2(struct _unmarshal_ctx *ctx, uint16_t *out) {
-\t*out = uint16le_decode(&ctx->net_bytes[ctx->net_offset]);
-\tctx->net_offset += 2;
-}
-
-LM_ALWAYS_INLINE static void unmarshal_4(struct _unmarshal_ctx *ctx, uint32_t *out) {
-\t*out = uint32le_decode(&ctx->net_bytes[ctx->net_offset]);
-\tctx->net_offset += 4;
-}
-
-LM_ALWAYS_INLINE static void unmarshal_8(struct _unmarshal_ctx *ctx, uint64_t *out) {
-\t*out = uint64le_decode(&ctx->net_bytes[ctx->net_offset]);
-\tctx->net_offset += 8;
-}
 """
-    for typ in idlutil.topo_sorted(typs):
-        inline = "LM_FLATTEN" if isinstance(typ, idl.Message) else "LM_ALWAYS_INLINE"
-        argfn = (
-            c9util.arg_unused
-            if (isinstance(typ, idl.Struct) and not typ.members)
-            else c9util.arg_used
-        )
+    ret += cutil.macro(
+        "#define UNMARSHAL_BYTES(ctx, data_lvalue, len)\n"
+        "\tdata_lvalue = (char *)&ctx->net_bytes[ctx->net_offset];\n"
+        "\tctx->net_offset += len;\n"
+    )
+    ret += cutil.macro(
+        "#define UNMARSHAL_U8LE(ctx, val_lvalue)\n"
+        "\tval_lvalue = ctx->net_bytes[ctx->net_offset];\n"
+        "\tctx->net_offset += 1;\n"
+    )
+    ret += cutil.macro(
+        "#define UNMARSHAL_U16LE(ctx, val_lvalue)\n"
+        "\tval_lvalue = uint16le_decode(&ctx->net_bytes[ctx->net_offset]);\n"
+        "\tctx->net_offset += 2;\n"
+    )
+    ret += cutil.macro(
+        "#define UNMARSHAL_U32LE(ctx, val_lvalue)\n"
+        "\tval_lvalue = uint32le_decode(&ctx->net_bytes[ctx->net_offset]);\n"
+        "\tctx->net_offset += 4;\n"
+    )
+    ret += cutil.macro(
+        "#define UNMARSHAL_U64LE(ctx, val_lvalue)\n"
+        "\tval_lvalue = uint64le_decode(&ctx->net_bytes[ctx->net_offset]);\n"
+        "\tctx->net_offset += 8;\n"
+    )
+
+    class IndentLevel(typing.NamedTuple):
+        ifdef: bool  # whether this is both `{` and `#if`, or just `{`
+
+    indent_stack: list[IndentLevel]
+
+    def ifdef_lvl() -> int:
+        return sum(1 if lvl.ifdef else 0 for lvl in indent_stack)
+
+    def indent_lvl() -> int:
+        return len(indent_stack)
+
+    def handle(
+        path: idlutil.Path,
+    ) -> tuple[idlutil.WalkCmd, typing.Callable[[], None]]:
+        nonlocal ret
+        nonlocal indent_stack
+        indent_stack_len = len(indent_stack)
+
+        def pop() -> None:
+            nonlocal ret
+            nonlocal indent_stack
+            nonlocal indent_stack_len
+            while len(indent_stack) > indent_stack_len:
+                ret += f"{'\t'*(indent_lvl()-1)}}}\n"
+                if indent_stack.pop().ifdef:
+                    ret += cutil.ifdef_pop(ifdef_lvl())
+
+        if not path.elems:
+            return idlutil.WalkCmd.KEEP_GOING, pop
+
+        child = path.elems[-1]
+        parent = path.elems[-2].typ if len(path.elems) > 1 else path.root
+        if child.in_versions < parent.in_versions:
+            ret += cutil.ifdef_push(
+                ifdef_lvl() + 1, c9util.ver_ifdef(child.in_versions)
+            )
+            ret += f"{'\t'*indent_lvl()}if ({c9util.ver_cond(child.in_versions)}) {{\n"
+            indent_stack.append(IndentLevel(ifdef=True))
+        if child.cnt:
+            cnt_path = path.parent().add(child.cnt)
+            if child.typ.static_size == 1:  # SPECIAL (zerocopy)
+                ret += f"{'\t'*indent_lvl()}UNMARSHAL_BYTES(ctx, {path.c_str('out->')[:-3]}, {cnt_path.c_str('out->')});\n"
+                return idlutil.WalkCmd.KEEP_GOING, pop
+            ret += f"{'\t'*indent_lvl()}{path.c_str('out->')[:-3]} = ctx->extra;\n"
+            ret += f"{'\t'*indent_lvl()}ctx->extra += sizeof({path.c_str('out->')[:-3]}[0]) * {cnt_path.c_str('out->')};\n"
+            loopdepth = sum(1 for elem in path.elems if elem.cnt)
+            loopvar = chr(ord("i") + loopdepth - 1)
+            ret += f"{'\t'*indent_lvl()}for ({c9util.typename(child.cnt.typ)} {loopvar} = 0; {loopvar} < {cnt_path.c_str('out->')}; {loopvar}++) {{\n"
+            indent_stack.append(IndentLevel(ifdef=False))
+        if not isinstance(child.typ, idl.Struct):
+            if child.val:
+                ret += (
+                    f"{'\t'*indent_lvl()}ctx->net_offset += {child.typ.static_size};\n"
+                )
+            else:
+                ret += f"{'\t'*indent_lvl()}UNMARSHAL_U{child.typ.static_size*8}LE(ctx, {path.c_str('out->')});\n"
+        return idlutil.WalkCmd.KEEP_GOING, pop
+
+    for typ in typs:
+        if not (
+            isinstance(typ, idl.Message) or typ.typname == "stat"
+        ):  # SPECIAL (include stat)
+            continue
+        assert isinstance(typ, idl.Struct)
         ret += "\n"
         ret += cutil.ifdef_push(1, c9util.ver_ifdef(typ.in_versions))
-        ret += f"{inline} static void unmarshal_{typ.typname}(struct _unmarshal_ctx *{argfn('ctx')}, {c9util.typename(typ)} *out) {{\n"
-        match typ:
-            case idl.Number():
-                ret += f"\tunmarshal_{typ.prim.typname}(ctx, ({c9util.typename(typ.prim)} *)out);\n"
-            case idl.Bitfield():
-                ret += f"\tunmarshal_{typ.prim.typname}(ctx, ({c9util.typename(typ.prim)} *)out);\n"
-            case idl.Struct():
-                ret += "\tmemset(out, 0, sizeof(*out));\n"
-
-                for member in typ.members:
-                    ret += cutil.ifdef_push(2, c9util.ver_ifdef(member.in_versions))
-                    if member.val:
-                        ret += f"\tctx->net_offset += {member.static_size};\n"
-                        continue
-                    ret += "\t"
-
-                    prefix = "\t"
-                    if member.in_versions != typ.in_versions:
-                        ret += "if ( " + c9util.ver_cond(member.in_versions) + " ) "
-                        prefix = "\t\t"
-                    if member.cnt:
-                        if member.in_versions != typ.in_versions:
-                            ret += "{\n"
-                            ret += prefix
-                        if member.typ.static_size == 1:  # SPECIAL (string, zerocopy)
-                            ret += f"out->{member.membname} = (char *)&ctx->net_bytes[ctx->net_offset];\n"
-                            ret += f"{prefix}ctx->net_offset += out->{member.cnt.membname};\n"
-                        else:
-                            ret += f"out->{member.membname} = ctx->extra;\n"
-                            ret += f"{prefix}ctx->extra += sizeof(out->{member.membname}[0]) * out->{member.cnt.membname};\n"
-                            ret += f"{prefix}for (typeof(out->{member.cnt.membname}) i = 0; i < out->{member.cnt.membname}; i++)\n"
-                            ret += f"{prefix}\tunmarshal_{member.typ.typname}(ctx, &out->{member.membname}[i]);\n"
-                        if member.in_versions != typ.in_versions:
-                            ret += "\t}\n"
-                    else:
-                        ret += f"unmarshal_{member.typ.typname}(ctx, &out->{member.membname});\n"
-        ret += cutil.ifdef_pop(1)
+        ret += f"static void unmarshal_{typ.typname}(struct _unmarshal_ctx *ctx, {c9util.typename(typ)} *out) {{\n"
+
+        indent_stack = [IndentLevel(ifdef=True)]
+        idlutil.walk(typ, handle)
+
         ret += "}\n"
     ret += cutil.ifdef_pop(0)
     return ret