Fix typos

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 0c7216520c76b640d920f617341e557f24c9bb2c..c8bfa8da612b8ffeb28b851b4e3715dba9d915fe 100644 (file)
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -828,7 +828,7 @@ namespace {
 
                void check()
                {
-                       if (cell->type.begins_with("$") || cell->type.begins_with("$__") || cell->type.begins_with("$paramod") || cell->type.begins_with("$fmcombine") ||
+                       if (!cell->type.begins_with("$") || cell->type.begins_with("$__") || cell->type.begins_with("$paramod") || cell->type.begins_with("$fmcombine") ||
                                        cell->type.begins_with("$verific$") || cell->type.begins_with("$array:") || cell->type.begins_with("$extern:"))
                                return;
 
@@ -2553,7 +2553,7 @@ void RTLIL::Cell::check()
 
 void RTLIL::Cell::fixup_parameters(bool set_a_signed, bool set_b_signed)
 {
-       if (type.begins_with("$") || type.begins_with("$_") || type.begins_with("$paramod") || type.begins_with("$fmcombine") ||
+       if (!type.begins_with("$") || type.begins_with("$_") || type.begins_with("$paramod") || type.begins_with("$fmcombine") ||
                        type.begins_with("$verific$") || type.begins_with("$array:") || type.begins_with("$extern:"))
                return;
 

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index d7e0364313875ae9e7f513a2343fae73dd61b8b7..275b0b269a33e049b0d1e97d7b387b3dc3bc9680 100644 (file)
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -283,13 +283,13 @@ namespace RTLIL
                bool begins_with(const char* prefix) const {
                        size_t len = strlen(prefix);
                        if (size() < len) return false;
-                       return compare(0, len, prefix);
+                       return compare(0, len, prefix) == 0;
                }
 
                bool ends_with(const char* suffix) const {
                        size_t len = strlen(suffix);
                        if (size() < len) return false;
-                       return compare(size()-len, len, suffix);
+                       return compare(size()-len, len, suffix) == 0;
                }
 
                size_t size() const {

diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index 19bf531cf96887126fbb26185c339701ad09515e..ff5c3b6a144957ce301fdac467381bac3885c40f 100644 (file)
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -143,7 +143,7 @@ void generate(RTLIL::Design *design, const std::vector<std::string> &celltypes,
 // Return the "basic" type for an array item.
 std::string basic_cell_type(const std::string celltype, int pos[3] = nullptr) {
        std::string basicType = celltype;
-       if (celltype.compare(0, strlen("$array:"), "$array:")) {
+       if (celltype.compare(0, strlen("$array:"), "$array:") == 0) {
                int pos_idx = celltype.find_first_of(':');
                int pos_num = celltype.find_first_of(':', pos_idx + 1);
                int pos_type = celltype.find_first_of(':', pos_num + 1);
@@ -200,8 +200,8 @@ bool expand_module(RTLIL::Design *design, RTLIL::Module *module, bool flag_check
                        int pos_idx = pos[0];
                        int pos_num = pos[1];
                        int pos_type = pos[2];
-                       int idx = std::stoi(cell->type.str().substr(pos_idx + 1, pos_num));
-                       int num = std::stoi(cell->type.str().substr(pos_num + 1, pos_type));
+                       int idx = std::stoi(cell->type.substr(pos_idx + 1, pos_num));
+                       int num = std::stoi(cell->type.substr(pos_num + 1, pos_type));
                        array_cells[cell] = std::pair<int, int>(idx, num);
                        cell->type = cell->type.str().substr(pos_type + 1);
                }
@@ -457,7 +457,7 @@ void hierarchy_worker(RTLIL::Design *design, std::set<RTLIL::Module*, IdString::
 
        for (auto cell : mod->cells()) {
                std::string celltype = cell->type.str();
-               if (celltype.compare(0, strlen("$array:"), "$array:"))
+               if (celltype.compare(0, strlen("$array:"), "$array:") == 0)
                        celltype = basic_cell_type(celltype);
                if (design->module(celltype))
                        hierarchy_worker(design, used, design->module(celltype), indent+4);
@@ -520,7 +520,7 @@ int find_top_mod_score(Design *design, Module *module, dict<Module*, int> &db)
                for (auto cell : module->cells()) {
                        std::string celltype = cell->type.str();
                        // Is this an array instance
-                       if (celltype.compare(0, strlen("$array:"), "$array:"))
+                       if (celltype.compare(0, strlen("$array:"), "$array:") == 0)
                                celltype = basic_cell_type(celltype);
                        // Is this cell a module instance?
                        auto instModule = design->module(celltype);