diff options
Diffstat (limited to 'lib9p/idl.gen')
| -rwxr-xr-x | lib9p/idl.gen | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib9p/idl.gen b/lib9p/idl.gen index e796855..27396b4 100755 --- a/lib9p/idl.gen +++ b/lib9p/idl.gen @@ -90,6 +90,10 @@ def c_expr(expr: idl.Expr) -> str: ret += [str(tok.val)] case idl.ExprSym(name="end"): ret += ["ctx->net_offset"] + case idl.ExprSym(name="s32_max"): + ret += ["INT32_MAX"] + case idl.ExprSym(name="s64_max"): + ret += ["INT64_MAX"] case idl.ExprSym(): ret += [f"_{tok.name[1:]}_offset"] return " ".join(ret) @@ -480,13 +484,17 @@ LM_ALWAYS_INLINE static bool _validate_list(struct _validate_ctx *ctx, # Pass 4 - validate ,max= and ,val= constraints for member in typ.members: if member.max: + assert member.static_size + nbits = member.static_size * 8 ret += ifdef_push(2, c_ver_ifdef(member.in_versions)) - ret += f"\t || ({{ uint32_t max = {c_expr(member.max)}; (((uint32_t){member.name}) > max) &&\n" - ret += f'\t lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "{member.name} value is too large (%"PRIu32" > %"PRIu32")", {member.name}, max); }})\n' + ret += f"\t || ({{ uint{nbits}_t max = {c_expr(member.max)}; (((uint{nbits}_t){member.name}) > max) &&\n" + ret += f'\t lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "{member.name} value is too large (%"PRIu{nbits}" > %"PRIu{nbits}")", {member.name}, max); }})\n' if member.val: + assert member.static_size + nbits = member.static_size * 8 ret += ifdef_push(2, c_ver_ifdef(member.in_versions)) - ret += f"\t || ({{ uint32_t exp = {c_expr(member.val)}; (((uint32_t){member.name}) != exp) &&\n" - ret += f'\t lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "{member.name} value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t){member.name}, exp); }})\n' + ret += f"\t || ({{ uint{nbits}_t exp = {c_expr(member.val)}; (((uint{nbits}_t){member.name}) != exp) &&\n" + ret += f'\t lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "{member.name} value is wrong (actual:%"PRIu{nbits}" != correct:%"PRIu{nbits}")", (uint{nbits}_t){member.name}, exp); }})\n' ret += ifdef_pop(1) ret += "\t ;\n" |