Minor hotfixes (mostly gcc build fixes)

This commit is contained in:
Clifford Wolf 2013-03-03 13:18:37 +01:00
parent 65e5e1658c
commit 45bfe26f5f
5 changed files with 12 additions and 0 deletions

View File

@ -22,6 +22,8 @@
#include <string.h> #include <string.h>
#include <fnmatch.h> #include <fnmatch.h>
using RTLIL::id2cstr;
static std::vector<RTLIL::Selection> work_stack; static std::vector<RTLIL::Selection> work_stack;
static bool match_ids(RTLIL::IdString id, std::string pattern) static bool match_ids(RTLIL::IdString id, std::string pattern)

View File

@ -23,6 +23,8 @@
#include <string.h> #include <string.h>
#include <dirent.h> #include <dirent.h>
using RTLIL::id2cstr;
#undef CLUSTER_CELLS_AND_PORTBOXES #undef CLUSTER_CELLS_AND_PORTBOXES
struct ShowWorker struct ShowWorker

View File

@ -1274,6 +1274,10 @@ class SubCircuit::SolverWorker
const std::string &graphId = graph_it.first; const std::string &graphId = graph_it.first;
const auto &graph = graph_it.second.graph; const auto &graph = graph_it.second.graph;
int node2 = adj_it.first; int node2 = adj_it.first;
if (node1 == node2)
continue;
NodeSet pair(graphId, node1, node2); NodeSet pair(graphId, node1, node2);
if (usedPairs.count(pair) > 0) if (usedPairs.count(pair) > 0)

View File

@ -27,6 +27,8 @@
#include <stdio.h> #include <stdio.h>
#include <set> #include <set>
using RTLIL::id2cstr;
struct OptMuxtreeWorker struct OptMuxtreeWorker
{ {
RTLIL::Design *design; RTLIL::Design *design;

View File

@ -27,6 +27,8 @@
#include <stdio.h> #include <stdio.h>
#include <set> #include <set>
using RTLIL::id2cstr;
static CellTypes ct; static CellTypes ct;
static void rmunused_module_cells(RTLIL::Module *module) static void rmunused_module_cells(RTLIL::Module *module)