aboutsummaryrefslogtreecommitdiffstats
path: root/passes
diff options
context:
space:
mode:
authorEddie Hung <eddie@fpgeh.com>2019-04-12 16:30:53 -0700
committerEddie Hung <eddie@fpgeh.com>2019-04-12 16:30:53 -0700
commitd880f73c79d897107a54f7734c2a1dea302c930c (patch)
treed4fbb25c6b59707ecb6645672c9f336e142da0c9 /passes
parent2217d59e299ce0cc15887d53308d7b7cb6400c52 (diff)
parentdb1a5ec6a2a437b296e7ba9de78afaf3b440327f (diff)
downloadyosys-d880f73c79d897107a54f7734c2a1dea302c930c.tar.gz
yosys-d880f73c79d897107a54f7734c2a1dea302c930c.tar.bz2
yosys-d880f73c79d897107a54f7734c2a1dea302c930c.zip
Merge remote-tracking branch 'origin/master' into xaig
Diffstat (limited to 'passes')
-rw-r--r--passes/pmgen/README.md6
-rw-r--r--passes/proc/proc_rmdead.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/passes/pmgen/README.md b/passes/pmgen/README.md
index 223b43059..7a46558b1 100644
--- a/passes/pmgen/README.md
+++ b/passes/pmgen/README.md
@@ -83,8 +83,8 @@ They are declared like state variables, just using the `udata` statement:
udata <int> min_data_width max_data_width
udata <IdString> data_port_name
-They are atomatically initialzed to the default constructed value of their type
-when ther pattern matcher object is constructed.
+They are automatically initialized to the default constructed value of their type
+when the pattern matcher object is constructed.
Embedded C++ code
-----------------
@@ -158,7 +158,7 @@ Finally, `filter <expression>` narrows down the remaining list of cells. For
performance reasons `filter` statements should only be used for things that
can't be done using `select` and `index`.
-The `optional` statement marks optional matches. I.e. the matcher will also
+The `optional` statement marks optional matches. That is, the matcher will also
explore the case where `mul` is set to `nullptr`. Without the `optional`
statement a match may only be assigned nullptr when one of the `if` expressions
evaluates to `false`.
diff --git a/passes/proc/proc_rmdead.cc b/passes/proc/proc_rmdead.cc
index 7c334e661..d2f8d9ead 100644
--- a/passes/proc/proc_rmdead.cc
+++ b/passes/proc/proc_rmdead.cc
@@ -34,7 +34,7 @@ void proc_rmdead(RTLIL::SwitchRule *sw, int &counter)
for (size_t i = 0; i < sw->cases.size(); i++)
{
- bool is_default = GetSize(sw->cases[i]->compare) == 0 && (!pool.empty() || GetSize(sw->signal) == 0);
+ bool is_default = GetSize(sw->cases[i]->compare) == 0 || GetSize(sw->signal) == 0;
for (size_t j = 0; j < sw->cases[i]->compare.size(); j++) {
RTLIL::SigSpec sig = sw->cases[i]->compare[j];