Get rid of compiler warnings
authorEddie Hung <eddie@fpgeh.com>
Fri, 14 Jun 2019 20:07:56 +0000 (13:07 -0700)
committerEddie Hung <eddie@fpgeh.com>
Fri, 14 Jun 2019 20:07:56 +0000 (13:07 -0700)
backends/aiger/xaiger.cc
passes/techmap/abc9.cc

index 7cb311736ecfcfb4209de6924b30f8e40de557c4..3f7edc627702ce5dbab22b71c4d13cb613e9f030 100644 (file)
@@ -190,7 +190,7 @@ struct XAigerWriter
 
                bool abc_box_seen = false;
 
 
                bool abc_box_seen = false;
 
-               for (auto cell : module->cells()) {
+               for (auto cell : module->selected_cells()) {
                        if (cell->type == "$_NOT_")
                        {
                                SigBit A = sigmap(cell->getPort("\\A").as_bit());
                        if (cell->type == "$_NOT_")
                        {
                                SigBit A = sigmap(cell->getPort("\\A").as_bit());
@@ -312,7 +312,7 @@ struct XAigerWriter
                        TopoSort<IdString, RTLIL::sort_by_id_str> toposort;
                        dict<SigBit, pool<IdString>> bit_drivers, bit_users;
 
                        TopoSort<IdString, RTLIL::sort_by_id_str> toposort;
                        dict<SigBit, pool<IdString>> bit_drivers, bit_users;
 
-                       for (auto cell : module->cells()) {
+                       for (auto cell : module->selected_cells()) {
                                RTLIL::Module* inst_module = module->design->module(cell->type);
                                if (!inst_module || !inst_module->attributes.count("\\abc_box_id"))
                                        continue;
                                RTLIL::Module* inst_module = module->design->module(cell->type);
                                if (!inst_module || !inst_module->attributes.count("\\abc_box_id"))
                                        continue;
index fe199f886b889eadb13a00ce4f50de558261cad0..f7f2e862a8c59075257804869066a37def2a75d4 100644 (file)
@@ -243,8 +243,8 @@ struct abc_output_filter
 
 void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::string script_file, std::string exe_file,
                bool cleanup, vector<int> lut_costs, bool dff_mode, std::string clk_str,
 
 void abc9_module(RTLIL::Design *design, RTLIL::Module *current_module, std::string script_file, std::string exe_file,
                bool cleanup, vector<int> lut_costs, bool dff_mode, std::string clk_str,
-               bool keepff, std::string delay_target, std::string lutin_shared, bool fast_mode,
-               const std::vector<RTLIL::Cell*> &cells, bool show_tempdir, bool sop_mode, std::string box_file, std::string lut_file,
+               bool /*keepff*/, std::string delay_target, std::string /*lutin_shared*/, bool fast_mode,
+               bool show_tempdir, std::string box_file, std::string lut_file,
                std::string wire_delay)
 {
        module = current_module;
                std::string wire_delay)
 {
        module = current_module;
@@ -835,7 +835,7 @@ struct Abc9Pass : public Pass {
                std::string script_file, clk_str, box_file, lut_file;
                std::string delay_target, lutin_shared = "-S 1", wire_delay;
                bool fast_mode = false, dff_mode = false, keepff = false, cleanup = true;
                std::string script_file, clk_str, box_file, lut_file;
                std::string delay_target, lutin_shared = "-S 1", wire_delay;
                bool fast_mode = false, dff_mode = false, keepff = false, cleanup = true;
-               bool show_tempdir = false, sop_mode = false;
+               bool show_tempdir = false;
                vector<int> lut_costs;
                markgroups = false;
 
                vector<int> lut_costs;
                markgroups = false;
 
@@ -997,7 +997,7 @@ struct Abc9Pass : public Pass {
 
                        if (!dff_mode || !clk_str.empty()) {
                                abc9_module(design, mod, script_file, exe_file, cleanup, lut_costs, dff_mode, clk_str, keepff,
 
                        if (!dff_mode || !clk_str.empty()) {
                                abc9_module(design, mod, script_file, exe_file, cleanup, lut_costs, dff_mode, clk_str, keepff,
-                                               delay_target, lutin_shared, fast_mode, mod->selected_cells(), show_tempdir, sop_mode,
+                                               delay_target, lutin_shared, fast_mode, show_tempdir,
                                                box_file, lut_file, wire_delay);
                                continue;
                        }
                                                box_file, lut_file, wire_delay);
                                continue;
                        }
@@ -1143,7 +1143,7 @@ struct Abc9Pass : public Pass {
                                en_polarity = std::get<2>(it.first);
                                en_sig = assign_map(std::get<3>(it.first));
                                abc9_module(design, mod, script_file, exe_file, cleanup, lut_costs, !clk_sig.empty(), "$",
                                en_polarity = std::get<2>(it.first);
                                en_sig = assign_map(std::get<3>(it.first));
                                abc9_module(design, mod, script_file, exe_file, cleanup, lut_costs, !clk_sig.empty(), "$",
-                                               keepff, delay_target, lutin_shared, fast_mode, it.second, show_tempdir, sop_mode,
+                                               keepff, delay_target, lutin_shared, fast_mode, show_tempdir,
                                                box_file, lut_file, wire_delay);
                                assign_map.set(mod);
                        }
                                                box_file, lut_file, wire_delay);
                                assign_map.set(mod);
                        }