From 70da8db6b5d27934aa89ea0eff6c5e3339160633 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 5 Oct 2019 20:12:52 +0100 Subject: [PATCH] Fix assignment to scalar class property in tgt-vvp. --- tgt-vvp/stmt_assign.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tgt-vvp/stmt_assign.c b/tgt-vvp/stmt_assign.c index 889371ee7..306530994 100644 --- a/tgt-vvp/stmt_assign.c +++ b/tgt-vvp/stmt_assign.c @@ -1084,8 +1084,8 @@ static int show_stmt_assign_sig_cobject(ivl_statement_t net) ivl_type_t prop_type = ivl_type_prop_type(sig_type, prop_idx); if (ivl_type_base(prop_type) == IVL_VT_BOOL) { - assert(ivl_type_packed_dimensions(prop_type) == 1); - assert(ivl_type_packed_msb(prop_type,0) >= ivl_type_packed_lsb(prop_type, 0)); + assert(ivl_type_packed_dimensions(prop_type) == 0 + || ivl_type_packed_dimensions(prop_type) == 1 && ivl_type_packed_msb(prop_type,0) >= ivl_type_packed_lsb(prop_type, 0)); draw_eval_vec4(rval); if (ivl_expr_value(rval)!=IVL_VT_BOOL) @@ -1097,8 +1097,8 @@ static int show_stmt_assign_sig_cobject(ivl_statement_t net) fprintf(vvp_out, " %%pop/obj 1, 0;\n"); } else if (ivl_type_base(prop_type) == IVL_VT_LOGIC) { - assert(ivl_type_packed_dimensions(prop_type) == 1); - assert(ivl_type_packed_msb(prop_type,0) >= ivl_type_packed_lsb(prop_type, 0)); + assert(ivl_type_packed_dimensions(prop_type) == 0 + || ivl_type_packed_dimensions(prop_type) == 1 && ivl_type_packed_msb(prop_type,0) >= ivl_type_packed_lsb(prop_type, 0)); draw_eval_vec4(rval);