riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minisat compile fix

This commit is contained in:
Clifford Wolf 2014-04-20 14:17:40 +02:00
parent 12a3c05229
commit d2d48996c4
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/minisat/PATCH_mkLit_default_arg.patch Normal file
View File

@ -0,0 +1,20 @@
--- SolverTypes.h
+++ SolverTypes.h
@@ -52,7 +52,7 @@ struct Lit {
int x;
// Use this as a constructor:
- friend Lit mkLit(Var var, bool sign = false);
+ friend Lit mkLit(Var var, bool sign);
bool operator == (Lit p) const { return x == p.x; }
bool operator != (Lit p) const { return x != p.x; }
@@ -60,7 +60,7 @@ struct Lit {
};
-inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
+inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; }
inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
inline bool sign (Lit p) { return p.x & 1; }

4
libs/minisat/SolverTypes.h
View File

@ -52,7 +52,7 @@ struct Lit {
int x; int x;
// Use this as a constructor: // Use this as a constructor:
friend Lit mkLit(Var var, bool sign = false); friend Lit mkLit(Var var, bool sign);
bool operator == (Lit p) const { return x == p.x; } bool operator == (Lit p) const { return x == p.x; }
bool operator != (Lit p) const { return x != p.x; } bool operator != (Lit p) const { return x != p.x; }
@ -60,7 +60,7 @@ struct Lit {
}; };
inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; }
inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
inline bool sign (Lit p) { return p.x & 1; } inline bool sign (Lit p) { return p.x & 1; }

3
libs/minisat/UPDATE.sh
View File

@ -11,3 +11,6 @@ sed -i -e 's/Minisat::memUsedPeak()/Minisat::memUsedPeak(bool)/' System.cc
sed -i -e 's/PRI[iu]64/ & /' Options.h Solver.cc sed -i -e 's/PRI[iu]64/ & /' Options.h Solver.cc
sed -i -e '1 i #define __STDC_LIMIT_MACROS' *.cc sed -i -e '1 i #define __STDC_LIMIT_MACROS' *.cc
sed -i -e '1 i #define __STDC_FORMAT_MACROS' *.cc sed -i -e '1 i #define __STDC_FORMAT_MACROS' *.cc
patch -p0 < PATCH_mkLit_default_arg.patch