luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle nested l-values in vec4-stack code generator.

This commit is contained in:
Stephen Williams 2014-03-01 16:49:15 -08:00
parent 4068570f43
commit 1afe7476e3
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net_assign.cc
View File

@ -135,7 +135,7 @@ ivl_variable_type_t NetAssign_::expr_type() const
return darray->element_base_type(); return darray->element_base_type();
} }
if (sig_->data_type()==IVL_VT_STRING && base_!=0) if (sig_ && sig_->data_type()==IVL_VT_STRING && base_!=0)
return IVL_VT_BOOL; return IVL_VT_BOOL;
if (ntype) return ntype->base_type(); if (ntype) return ntype->base_type();

18
tgt-vvp/stmt_assign.c
View File

@ -298,7 +298,6 @@ static void put_vec_to_lval(ivl_statement_t net, struct vec_slice_info*slices)
} }
} }
#if 0
static ivl_type_t draw_lval_expr(ivl_lval_t lval) static ivl_type_t draw_lval_expr(ivl_lval_t lval)
{ {
ivl_lval_t lval_nest = ivl_lval_nest(lval); ivl_lval_t lval_nest = ivl_lval_nest(lval);
@ -319,7 +318,6 @@ static ivl_type_t draw_lval_expr(ivl_lval_t lval)
fprintf(vvp_out, " %%pop/obj 1, 1;\n"); fprintf(vvp_out, " %%pop/obj 1, 1;\n");
return ivl_type_prop_type(sub_type, ivl_lval_property_idx(lval)); return ivl_type_prop_type(sub_type, ivl_lval_property_idx(lval));
} }
#endif
#if 0 #if 0
static void set_vec_to_lval_slice_nest(ivl_lval_t lval, unsigned bit, unsigned wid) static void set_vec_to_lval_slice_nest(ivl_lval_t lval, unsigned bit, unsigned wid)
@ -552,8 +550,10 @@ static void store_vec4_to_lval(ivl_statement_t net)
for (unsigned lidx = 0 ; lidx < ivl_stmt_lvals(net) ; lidx += 1) { for (unsigned lidx = 0 ; lidx < ivl_stmt_lvals(net) ; lidx += 1) {
ivl_lval_t lval = ivl_stmt_lval(net,lidx); ivl_lval_t lval = ivl_stmt_lval(net,lidx);
ivl_signal_t lsig = ivl_lval_sig(lval); ivl_signal_t lsig = ivl_lval_sig(lval);
ivl_lval_t nest = ivl_lval_nest(lval);
unsigned lwid = ivl_lval_width(lval); unsigned lwid = ivl_lval_width(lval);
ivl_expr_t part_off_ex = ivl_lval_part_off(lval); ivl_expr_t part_off_ex = ivl_lval_part_off(lval);
/* This is non-nil if the l-val is the word of a memory, /* This is non-nil if the l-val is the word of a memory,
and nil otherwise. */ and nil otherwise. */
@ -578,6 +578,7 @@ static void store_vec4_to_lval(ivl_statement_t net)
clr_flag(flag_index); clr_flag(flag_index);
} }
assert(lsig);
fprintf(vvp_out, " %%store/vec4a v%p, %d, %d;\n", fprintf(vvp_out, " %%store/vec4a v%p, %d, %d;\n",
lsig, word_index, part_index); lsig, word_index, part_index);
@ -590,6 +591,7 @@ static void store_vec4_to_lval(ivl_statement_t net)
int offset_index = allocate_word(); int offset_index = allocate_word();
draw_eval_expr_into_integer(part_off_ex, offset_index); draw_eval_expr_into_integer(part_off_ex, offset_index);
/* Note that flag4 is set by the eval above. */ /* Note that flag4 is set by the eval above. */
assert(lsig);
if (ivl_signal_type(lsig)==IVL_SIT_UWIRE) { if (ivl_signal_type(lsig)==IVL_SIT_UWIRE) {
fprintf(vvp_out, " %%force/vec4/off v%p_0, %u;\n", fprintf(vvp_out, " %%force/vec4/off v%p_0, %u;\n",
lsig, offset_index); lsig, offset_index);
@ -599,8 +601,20 @@ static void store_vec4_to_lval(ivl_statement_t net)
} }
clr_word(offset_index); clr_word(offset_index);
} else if (nest) {
/* No offset expression, but the l-value is
nested, which probably means that it is a class
member. We will use a property assign
function. */
assert(!lsig);
ivl_type_t sub_type = draw_lval_expr(nest);
assert(ivl_type_base(sub_type) == IVL_VT_CLASS);
fprintf(vvp_out, " %%store/prop/v %u;\n", ivl_lval_property_idx(lval));
fprintf(vvp_out, " %%pop/obj 1, 0;\n");
} else { } else {
/* No offset expression, so use simpler store function. */ /* No offset expression, so use simpler store function. */
assert(lsig);
assert(lwid == ivl_signal_width(lsig)); assert(lwid == ivl_signal_width(lsig));
fprintf(vvp_out, " %%store/vec4 v%p_0, 0, %u;\n", lsig, lwid); fprintf(vvp_out, " %%store/vec4 v%p_0, 0, %u;\n", lsig, lwid);
} }