riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed assignment of out-of bounds array element

This commit is contained in:
Clifford Wolf 2014-09-06 17:58:27 +02:00
parent b847ec8a0b
commit deff416ea7
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frontends/ast/genrtlil.cc
View File

@ -276,6 +276,7 @@ struct AST_INTERNAL::ProcessGenerator
for (auto &init_lvalue_c : init_lvalue.chunks()) { for (auto &init_lvalue_c : init_lvalue.chunks()) {
RTLIL::SigSpec lhs = init_lvalue_c; RTLIL::SigSpec lhs = init_lvalue_c;
RTLIL::SigSpec rhs = init_rvalue.extract(offset, init_lvalue_c.width); RTLIL::SigSpec rhs = init_rvalue.extract(offset, init_lvalue_c.width);
remove_unwanted_lvalue_bits(lhs, rhs);
sync->actions.push_back(RTLIL::SigSig(lhs, rhs)); sync->actions.push_back(RTLIL::SigSig(lhs, rhs));
offset += lhs.size(); offset += lhs.size();
} }
@ -284,6 +285,22 @@ struct AST_INTERNAL::ProcessGenerator
outputSignals = RTLIL::SigSpec(subst_lvalue_from); outputSignals = RTLIL::SigSpec(subst_lvalue_from);
} }
void remove_unwanted_lvalue_bits(RTLIL::SigSpec &lhs, RTLIL::SigSpec &rhs)
{
RTLIL::SigSpec new_lhs, new_rhs;
log_assert(SIZE(lhs) == SIZE(rhs));
for (int i = 0; i < SIZE(lhs); i++) {
if (lhs[i].wire == nullptr)
continue;
new_lhs.append(lhs[i]);
new_rhs.append(rhs[i]);
}
lhs = new_lhs;
rhs = new_rhs;
}
// create new temporary signals // create new temporary signals
RTLIL::SigSpec new_temp_signal(RTLIL::SigSpec sig) RTLIL::SigSpec new_temp_signal(RTLIL::SigSpec sig)
{ {
@ -349,8 +366,13 @@ struct AST_INTERNAL::ProcessGenerator
log_abort(); log_abort();
} }
if (run_sort_and_unify) if (run_sort_and_unify) {
reg.sort_and_unify(); std::set<RTLIL::SigBit> sorted_reg;
for (auto bit : reg)
if (bit.wire)
sorted_reg.insert(bit);
reg = RTLIL::SigSpec(sorted_reg);
}
} }
// remove all assignments to the given signal pattern in a case and all its children. // remove all assignments to the given signal pattern in a case and all its children.
@ -384,6 +406,7 @@ struct AST_INTERNAL::ProcessGenerator
RTLIL::SigSpec rhs = rvalue.extract(offset, lvalue_c.width); RTLIL::SigSpec rhs = rvalue.extract(offset, lvalue_c.width);
if (inSyncRule && lvalue_c.wire && lvalue_c.wire->get_bool_attribute("\\nosync")) if (inSyncRule && lvalue_c.wire && lvalue_c.wire->get_bool_attribute("\\nosync"))
rhs = RTLIL::SigSpec(RTLIL::State::Sx, rhs.size()); rhs = RTLIL::SigSpec(RTLIL::State::Sx, rhs.size());
remove_unwanted_lvalue_bits(lhs, rhs);
actions.push_back(RTLIL::SigSig(lhs, rhs)); actions.push_back(RTLIL::SigSig(lhs, rhs));
offset += lhs.size(); offset += lhs.size();
} }
@ -412,6 +435,7 @@ struct AST_INTERNAL::ProcessGenerator
} }
removeSignalFromCaseTree(lvalue.to_sigbit_set(), current_case); removeSignalFromCaseTree(lvalue.to_sigbit_set(), current_case);
remove_unwanted_lvalue_bits(lvalue, rvalue);
current_case->actions.push_back(RTLIL::SigSig(lvalue, rvalue)); current_case->actions.push_back(RTLIL::SigSig(lvalue, rvalue));
} }
break; break;