Fixed "extract" pass for non-optimized needles

diff --git a/passes/extract/extract.cc b/passes/extract/extract.cc
index 7541b26039524e61a28fc69275f9a265f2d0a247..9b5991bfe3d435f65eeb1806032cfa534917a98a 100644 (file)
--- a/passes/extract/extract.cc
+++ b/passes/extract/extract.cc
@@ -158,18 +158,17 @@ namespace
                        RTLIL::Cell *needle_cell = (RTLIL::Cell*)mapping.needleUserData;
                        RTLIL::Cell *haystack_cell = (RTLIL::Cell*)mapping.haystackUserData;
 
-                       for (auto &conn : needle_cell->connections)
-                               if (mapping.portMapping.count(conn.first) > 0 && sig2port.has(conn.second))
-                               {
-                                       RTLIL::SigSpec sig = sigmap(conn.second);
+                       for (auto &conn : needle_cell->connections) {
+                               RTLIL::SigSpec sig = sigmap(conn.second);
+                               if (mapping.portMapping.count(conn.first) > 0 && sig2port.has(sigmap(sig))) {
                                        sig.expand();
-
                                        for (int i = 0; i < sig.width; i++)
                                        for (auto &port : sig2port.find(sig.chunks[i])) {
                                                RTLIL::SigSpec bitsig = haystack_cell->connections.at(mapping.portMapping[conn.first]).extract(i, 1);
                                                cell->connections.at(port.first).replace(port.second, bitsig);
                                        }
                                }
+                       }
 
                        haystack->cells.erase(haystack_cell->name);
                        delete haystack_cell;