mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-22 16:45:32 +00:00
Code Activity

More win32 (mxe and vs) build fixes

Browse source
This commit is contained in:
Clifford Wolf 2014-10-17 15:51:33 +02:00
parent 468ae92374
commit b3a6f8f530
5 changed files with 86 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libs/ezsat/ezsat.cc
View file

@ -22,12 +22,24 @@
#include <cmath>
#include <algorithm>
#include <cassert>
#include <string>
#include <stdlib.h>
const int ezSAT::CONST_TRUE = 1;
const int ezSAT::CONST_FALSE = 2;
static std::string my_int_to_string(int i)
{
#ifdef __MINGW32__
char buffer[64];
snprintf(buffer, 64, "%d", i);
return buffer;
#else
return std::to_string(i);
#endif
}
ezSAT::ezSAT()
{
flag_keep_cnf = false;
@ -183,7 +195,7 @@ int ezSAT::expression(OpId op, const std::vector<int> &args)
if (expressionsCache.count(myExpr) > 0) {
id = expressionsCache.at(myExpr);
} else {
id = -(expressions.size() + 1);
id = -(int(expressions.size()) + 1);
expressionsCache[myExpr] = id;
expressions.push_back(myExpr);
}
@ -490,13 +502,13 @@ int ezSAT::bound(int id) const
std::string ezSAT::cnfLiteralInfo(int idx) const
{
for (size_t i = 0; i < cnfLiteralVariables.size(); i++) {
for (int i = 0; i < int(cnfLiteralVariables.size()); i++) {
if (cnfLiteralVariables[i] == idx)
return to_string(i+1);
if (cnfLiteralVariables[i] == -idx)
return "NOT " + to_string(i+1);
}
for (size_t i = 0; i < cnfExpressionVariables.size(); i++) {
for (int i = 0; i < int(cnfExpressionVariables.size()); i++) {
if (cnfExpressionVariables[i] == idx)
return to_string(-i-1);
if (cnfExpressionVariables[i] == -idx)
@ -670,9 +682,7 @@ std::vector<int> ezSAT::vec_var(std::string name, int numBits)
{
std::vector<int> vec;
for (int i = 0; i < numBits; i++) {
char buf[64];
snprintf(buf, 64, " [%d]", i);
vec.push_back(VAR(name + buf));
vec.push_back(VAR(name + my_int_to_string(i)));
}
return vec;
}
@ -1245,11 +1255,8 @@ static std::string expression2str(const std::pair<ezSAT::OpId, std::vector<int>>
#undef X
}
text += ":";
for (auto it : data.second) {
char buf[64];
snprintf(buf, 64, " %d", it);
text += buf;
}
for (auto it : data.second)
text += " " + my_int_to_string(it);
return text;
}