aboutsummaryrefslogtreecommitdiffstats
path: root/passes
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2018-12-16 15:27:23 +0100
committerGitHub <noreply@github.com>2018-12-16 15:27:23 +0100
commit556341a77fccd990fa8c06c78b2b41a956b9b98f (patch)
tree3d17ec6597da109b30b13f3d1d92fdfef489ad65 /passes
parent0b9bb852c66ec2a6e9b4b510b3e2e32b8c6a6b16 (diff)
parentd1f2cb01dcde4bd8972e28df9e600a4060b77344 (diff)
downloadyosys-556341a77fccd990fa8c06c78b2b41a956b9b98f.tar.gz
yosys-556341a77fccd990fa8c06c78b2b41a956b9b98f.tar.bz2
yosys-556341a77fccd990fa8c06c78b2b41a956b9b98f.zip
Merge pull request #720 from whitequark/master
lut2mux: handle 1-bit INIT constant in $lut cells
Diffstat (limited to 'passes')
-rw-r--r--passes/opt/opt_lut.cc2
-rw-r--r--passes/techmap/lut2mux.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/passes/opt/opt_lut.cc b/passes/opt/opt_lut.cc
index ba2cc6ee7..be050c713 100644
--- a/passes/opt/opt_lut.cc
+++ b/passes/opt/opt_lut.cc
@@ -58,7 +58,7 @@ struct OptLutWorker
}
}
- return lut_table.extract(lut_index).as_int();
+ return lut_table.extract(lut_index).as_bool();
}
void show_stats_by_arity()
diff --git a/passes/techmap/lut2mux.cc b/passes/techmap/lut2mux.cc
index d32bbff14..a4ed79550 100644
--- a/passes/techmap/lut2mux.cc
+++ b/passes/techmap/lut2mux.cc
@@ -32,7 +32,7 @@ int lut2mux(Cell *cell)
if (GetSize(sig_a) == 1)
{
- cell->module->addMuxGate(NEW_ID, lut[0], lut[1], sig_a, sig_y);
+ cell->module->addMuxGate(NEW_ID, lut.extract(0)[0], lut.extract(1)[0], sig_a, sig_y);
}
else
{