Fix opt_rmdff handling of $_DFFSR_???_ and $_DLATCHSR_???_, fixes #816

Signed-off-by: Clifford Wolf <clifford@clifford.at>

diff --git a/passes/opt/opt_rmdff.cc b/passes/opt/opt_rmdff.cc
index 5880254c1446639b36588e623db7d41fa6b8deba..e8570f0ebe75869cf49e827558ef028060361a12 100644 (file)
--- a/passes/opt/opt_rmdff.cc
+++ b/passes/opt/opt_rmdff.cc
@@ -174,8 +174,6 @@ bool handle_dffsr(RTLIL::Module *mod, RTLIL::Cell *cell)
                        cell->unsetParam("\\CLR_POLARITY");
                        cell->unsetPort("\\SET");
                        cell->unsetPort("\\CLR");
-
-                       return true;
                }
                else
                {
@@ -186,11 +184,12 @@ bool handle_dffsr(RTLIL::Module *mod, RTLIL::Cell *cell)
                        cell->unsetParam("\\CLR_POLARITY");
                        cell->unsetPort("\\SET");
                        cell->unsetPort("\\CLR");
-
-                       return true;
                }
+
+               return true;
        }
-       else
+
+       if (!hasreset)
        {
                IdString new_type;
 
@@ -207,8 +206,10 @@ bool handle_dffsr(RTLIL::Module *mod, RTLIL::Cell *cell)
                cell->unsetPort("\\S");
                cell->unsetPort("\\R");
 
-               return did_something;
+               return true;
        }
+
+       return did_something;
 }
 
 bool handle_dlatch(RTLIL::Module *mod, RTLIL::Cell *dlatch)