aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rtlil.cc
diff options
context:
space:
mode:
authorEddie Hung <eddieh@ece.ubc.ca>2019-03-19 13:11:30 -0700
committerEddie Hung <eddieh@ece.ubc.ca>2019-03-19 13:11:30 -0700
commit24553326dde876b51179e092e608ce8174a44681 (patch)
tree29af5ce1fabcef3a105f45898b411ec4188bf97f /kernel/rtlil.cc
parent0ea7eba5f13b20de28181a66181ee821820027db (diff)
parent8c0740bcf7a1149ac11332f7e7fd9c8f78f0a0b5 (diff)
downloadyosys-24553326dde876b51179e092e608ce8174a44681.tar.gz
yosys-24553326dde876b51179e092e608ce8174a44681.tar.bz2
yosys-24553326dde876b51179e092e608ce8174a44681.zip
Merge remote-tracking branch 'origin/master' into xc7srl
Diffstat (limited to 'kernel/rtlil.cc')
-rw-r--r--kernel/rtlil.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 7f1816190..d0fa88890 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -760,7 +760,7 @@ namespace {
void check()
{
- if (cell->type.substr(0, 1) != "$" || cell->type.substr(0, 3) == "$__" || cell->type.substr(0, 8) == "$paramod" ||
+ if (cell->type.substr(0, 1) != "$" || cell->type.substr(0, 3) == "$__" || cell->type.substr(0, 8) == "$paramod" || cell->type.substr(0,10) == "$fmcombine" ||
cell->type.substr(0, 9) == "$verific$" || cell->type.substr(0, 7) == "$array:" || cell->type.substr(0, 8) == "$extern:")
return;
@@ -2360,7 +2360,7 @@ void RTLIL::Cell::check()
void RTLIL::Cell::fixup_parameters(bool set_a_signed, bool set_b_signed)
{
- if (type.substr(0, 1) != "$" || type.substr(0, 2) == "$_" || type.substr(0, 8) == "$paramod" ||
+ if (type.substr(0, 1) != "$" || type.substr(0, 2) == "$_" || type.substr(0, 8) == "$paramod" || type.substr(0,10) == "$fmcombine" ||
type.substr(0, 9) == "$verific$" || type.substr(0, 7) == "$array:" || type.substr(0, 8) == "$extern:")
return;