Merge pull request #1258 from YosysHQ/eddie/cleanup
authorClifford Wolf <clifford@clifford.at>
Sat, 10 Aug 2019 07:52:14 +0000 (09:52 +0200)
committerGitHub <noreply@github.com>
Sat, 10 Aug 2019 07:52:14 +0000 (09:52 +0200)
Cleanup a few barnacles across codebase

1  2 
backends/aiger/xaiger.cc
backends/firrtl/firrtl.cc
frontends/aiger/aigerparse.cc
frontends/ast/ast.cc
frontends/verific/verific.cc
kernel/celltypes.h
passes/techmap/abc.cc
passes/techmap/abc9.cc
techlibs/ice40/synth_ice40.cc

Simple merge
Simple merge
index f8ac2724f7ac28decf419ca2c9c7f70ceb6934df,4ecd019932148f13d9478c29afe9d6042e6841fb..bd0596cc04460155769595e006e6e5a56d2cd942
@@@ -372,8 -371,23 +372,8 @@@ void AigerReader::parse_xaiger(const di
  
        RTLIL::Wire* n0 = module->wire("\\__0__");
        if (n0)
-               module->connect(n0, RTLIL::S0);
+               module->connect(n0, State::S0);
  
 -      dict<int,IdString> box_lookup;
 -      for (auto m : design->modules()) {
 -              auto it = m->attributes.find("\\abc_box_id");
 -              if (it == m->attributes.end())
 -                      continue;
 -              if (m->name.begins_with("$paramod"))
 -                      continue;
 -              auto id = it->second.as_int();
 -              auto r = box_lookup.insert(std::make_pair(id, m->name));
 -              if (!r.second)
 -                      log_error("Module '%s' has the same abc_box_id = %d value as '%s'.\n",
 -                                      log_id(m), id, log_id(r.first->second));
 -              log_assert(r.second);
 -      }
 -
        // Parse footer (symbol table, comments, etc.)
        std::string s;
        bool comment_seen = false;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge