From 06427efb83e4d55321f73249abb8ed72c32801e4 Mon Sep 17 00:00:00 2001 From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:38:23 +1300 Subject: [PATCH] Fixing selections --- kernel/rtlil.cc | 2 +- passes/cmds/select.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc index 8e597bcd0..af1d55bfd 100644 --- a/kernel/rtlil.cc +++ b/kernel/rtlil.cc @@ -1179,7 +1179,7 @@ void RTLIL::Design::pop_selection() std::vector RTLIL::Design::selected_modules(RTLIL::SelectPartials partials, RTLIL::SelectBoxes boxes) const { bool include_partials = partials == RTLIL::SELECT_ALL; - bool exclude_boxes = (partials & RTLIL::SB_UNBOXED_ONLY) == 0; + bool exclude_boxes = (partials & RTLIL::SB_UNBOXED_ONLY) != 0; bool ignore_wb = (partials & RTLIL::SB_INCL_WB) != 0; std::vector result; result.reserve(modules_.size()); diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc index 4db1c2f28..1eed7c818 100644 --- a/passes/cmds/select.cc +++ b/passes/cmds/select.cc @@ -1000,7 +1000,7 @@ static void select_stmt(RTLIL::Design *design, std::string arg, bool disable_emp static std::string describe_selection_for_assert(RTLIL::Design *design, RTLIL::Selection *sel, bool whole_modules = false) { std::string desc = "Selection contains:\n"; - for (auto mod : design->selected_modules()) + for (auto mod : design->all_selected_modules()) { if (whole_modules && sel->selected_whole_module(mod->name)) desc += stringf("%s\n", id2cstr(mod->name)); @@ -1501,7 +1501,7 @@ struct SelectPass : public Pass { design->push_selection(work_stack.back()); RTLIL::Selection *sel = &design->selection(); sel->optimize(design); - for (auto mod : design->selected_modules()) + for (auto mod : design->all_selected_modules()) { if (sel->selected_whole_module(mod->name) && list_mode) log("%s\n", id2cstr(mod->name)); @@ -1578,7 +1578,7 @@ struct SelectPass : public Pass { RTLIL::Selection *sel = &work_stack.back(); design->push_selection(*sel); sel->optimize(design); - for (auto mod : design->selected_modules()) { + for (auto mod : design->all_selected_modules()) { module_count++; for ([[maybe_unused]] auto member_name : mod->selected_members()) total_count++; @@ -1777,7 +1777,7 @@ struct LsPass : public Pass { { std::vector matches; - for (auto mod : design->selected_modules()) + for (auto mod : design->all_selected_modules()) matches.push_back(mod->name); if (!matches.empty()) {