-
Notifications
You must be signed in to change notification settings - Fork 0
/
minisat.patch
183 lines (160 loc) · 7.71 KB
/
minisat.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
diff --git a/Makefile b/Makefile
index ceb9d77..4090987 100644
--- a/Makefile
+++ b/Makefile
@@ -62,6 +62,14 @@ SORELEASE?=.0# Declare empty to leave out from library file name.
MINISAT_CXXFLAGS = -I. -D __STDC_LIMIT_MACROS -D __STDC_FORMAT_MACROS -Wall -Wno-parentheses -Wextra
MINISAT_LDFLAGS = -Wall -lz
+ifeq (Darwin, $(findstring Darwin, $(shell uname)))
+SHARED_LDFLAGS += -shared -Wl,-dylib_install_name,$(MINISAT_DLIB).$(SOMAJOR)
+RELEASE_LDFLAGS +=
+else
+SHARED_LDFLAGS += -shared -Wl,-soname,$(MINISAT_DLIB).$(SOMAJOR)
+RELEASE_LDFLAGS += -static
+endif
+
ECHO=@echo
ifeq ($(VERB),)
VERB=@
@@ -96,9 +104,9 @@ $(BUILD_DIR)/dynamic/%.o: MINISAT_CXXFLAGS +=$(MINISAT_REL) $(MINISAT_FPIC)
## Build-type Link-flags:
$(BUILD_DIR)/profile/bin/$(MINISAT): MINISAT_LDFLAGS += -pg
-$(BUILD_DIR)/release/bin/$(MINISAT): MINISAT_LDFLAGS += --static $(MINISAT_RELSYM)
+$(BUILD_DIR)/release/bin/$(MINISAT): MINISAT_LDFLAGS += $(RELEASE_LDFLAGS) $(MINISAT_RELSYM)
$(BUILD_DIR)/profile/bin/$(MINISAT_CORE): MINISAT_LDFLAGS += -pg
-$(BUILD_DIR)/release/bin/$(MINISAT_CORE): MINISAT_LDFLAGS += --static $(MINISAT_RELSYM)
+$(BUILD_DIR)/release/bin/$(MINISAT_CORE): MINISAT_LDFLAGS += $(RELEASE_LDFLAGS) $(MINISAT_RELSYM)
## Executable dependencies
$(BUILD_DIR)/release/bin/$(MINISAT): $(BUILD_DIR)/release/minisat/simp/Main.o $(BUILD_DIR)/release/lib/$(MINISAT_SLIB)
@@ -162,7 +170,7 @@ $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR).$(SOMINOR)$(SORELEASE)\
$(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB):
$(ECHO) Linking Shared Library: $@
$(VERB) mkdir -p $(dir $@)
- $(VERB) $(CXX) $(MINISAT_LDFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(MINISAT_DLIB).$(SOMAJOR) $^
+ $(VERB) $(CXX) $^ $(SHARED_LDFLAGS) $(MINISAT_LDFLAGS) $(LDFLAGS) -o $@
$(VERB) ln -sf $(MINISAT_DLIB).$(SOMAJOR).$(SOMINOR)$(SORELEASE) $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB).$(SOMAJOR)
$(VERB) ln -sf $(MINISAT_DLIB).$(SOMAJOR) $(BUILD_DIR)/dynamic/lib/$(MINISAT_DLIB)
diff --git a/minisat/core/Main.cc b/minisat/core/Main.cc
index 69302ae..6a4a330 100644
--- a/minisat/core/Main.cc
+++ b/minisat/core/Main.cc
@@ -84,9 +84,16 @@ int main(int argc, char** argv)
if (argc == 1)
printf("Reading from standard input... Use '--help' for help.\n");
- gzFile in = (argc == 1) ? gzdopen(0, "rb") : gzopen(argv[1], "rb");
+ gzFile in;
+ bool is_stdin = false;
+ if (argc == 1 || strcmp(argv[1], "-") == 0) {
+ in = gzdopen(0, "rb");
+ is_stdin = true;
+ }
+ else
+ in = gzopen(argv[1], "rb");
if (in == NULL)
- printf("ERROR! Could not open file: %s\n", argc == 1 ? "<stdin>" : argv[1]), exit(1);
+ printf("ERROR! Could not open file: %s\n", is_stdin ? "<stdin>" : argv[1]), exit(1);
if (S.verbosity > 0){
printf("============================[ Problem Statistics ]=============================\n");
@@ -94,7 +101,9 @@ int main(int argc, char** argv)
parse_DIMACS(in, S, (bool)strictp);
gzclose(in);
- FILE* res = (argc >= 3) ? fopen(argv[2], "wb") : NULL;
+ FILE* res = NULL;
+ if (argc >= 3)
+ res = (strcmp(argv[2], "-") == 0) ? stdout : fopen(argv[2], "wb");
if (S.verbosity > 0){
printf("| Number of variables: %12d |\n", S.nVars());
diff --git a/minisat/core/SolverTypes.h b/minisat/core/SolverTypes.h
index 89986d1..aa45ddb 100644
--- a/minisat/core/SolverTypes.h
+++ b/minisat/core/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; }
diff --git a/minisat/simp/Main.cc b/minisat/simp/Main.cc
index 87dea1b..fbcbcc9 100644
--- a/minisat/simp/Main.cc
+++ b/minisat/simp/Main.cc
@@ -88,9 +88,16 @@ int main(int argc, char** argv)
if (argc == 1)
printf("Reading from standard input... Use '--help' for help.\n");
- gzFile in = (argc == 1) ? gzdopen(0, "rb") : gzopen(argv[1], "rb");
+ gzFile in;
+ bool is_stdin = false;
+ if (argc == 1 || strcmp(argv[1], "-") == 0) {
+ in = gzdopen(0, "rb");
+ is_stdin = true;
+ }
+ else
+ in = gzopen(argv[1], "rb");
if (in == NULL)
- printf("ERROR! Could not open file: %s\n", argc == 1 ? "<stdin>" : argv[1]), exit(1);
+ printf("ERROR! Could not open file: %s\n", is_stdin ? "<stdin>" : argv[1]), exit(1);
if (S.verbosity > 0){
printf("============================[ Problem Statistics ]=============================\n");
@@ -98,7 +105,9 @@ int main(int argc, char** argv)
parse_DIMACS(in, S, (bool)strictp);
gzclose(in);
- FILE* res = (argc >= 3) ? fopen(argv[2], "wb") : NULL;
+ FILE* res = NULL;
+ if (argc >= 3)
+ res = (strcmp(argv[2], "-") == 0) ? stdout : fopen(argv[2], "wb");
if (S.verbosity > 0){
printf("| Number of variables: %12d |\n", S.nVars());
diff --git a/minisat/utils/Options.cc b/minisat/utils/Options.cc
index 142c37d..2d6a25a 100644
--- a/minisat/utils/Options.cc
+++ b/minisat/utils/Options.cc
@@ -43,10 +43,8 @@ void Minisat::parseOptions(int& argc, char** argv, bool strict)
}
if (!parsed_ok){
- if (strict && match(argv[i], "-"))
- fprintf(stderr, "ERROR! Unknown flag \"%s\". Use '--%shelp' for help.\n", argv[i], Option::getHelpPrefixString()), exit(1);
- else
- argv[j++] = argv[i];
+ (void) strict;
+ argv[j++] = argv[i];
}
}
}
diff --git a/minisat/utils/System.cc b/minisat/utils/System.cc
index 21aa4ff..fe5a5a1 100644
--- a/minisat/utils/System.cc
+++ b/minisat/utils/System.cc
@@ -77,7 +77,7 @@ double Minisat::memUsed() {
struct rusage ru;
getrusage(RUSAGE_SELF, &ru);
return (double)ru.ru_maxrss / 1024; }
-double Minisat::memUsedPeak() { return memUsed(); }
+double Minisat::memUsedPeak(bool strictlyPeak) { (void) strictlyPeak; return memUsed(); }
#elif defined(__APPLE__)
@@ -87,11 +87,11 @@ double Minisat::memUsed() {
malloc_statistics_t t;
malloc_zone_statistics(NULL, &t);
return (double)t.max_size_in_use / (1024*1024); }
-double Minisat::memUsedPeak() { return memUsed(); }
+double Minisat::memUsedPeak(bool strictlyPeak) { (void) strictlyPeak; return memUsed(); }
#else
double Minisat::memUsed() { return 0; }
-double Minisat::memUsedPeak() { return 0; }
+double Minisat::memUsedPeak(bool strictlyPeak) { (void) strictlyPeak; return 0; }
#endif
@@ -101,7 +101,7 @@ void Minisat::setX86FPUPrecision()
// Only correct FPU precision on Linux architectures that needs and supports it:
fpu_control_t oldcw, newcw;
_FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
- printf("WARNING: for repeatability, setting FPU to use double precision\n");
+ // printf("WARNING: for repeatability, setting FPU to use double precision\n");
#endif
}