Skip to content

Commit acc9c21

Browse files
move to hide bits
Signed-off-by: Nikolaj Bjorner <[email protected]>
1 parent cfa6bd4 commit acc9c21

File tree

6 files changed

+253
-220
lines changed

6 files changed

+253
-220
lines changed

src/ast/sls/bv_sls.cpp

+14-12
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace bv {
6868
else if (bv.is_bv(e)) {
6969
auto& w = m_eval.wval0(e);
7070
if (w.get(w.fixed, i) || should_keep())
71-
return w.get(w.bits, i);
71+
return w.get_bit(i);
7272
}
7373
return m_rand() % 2 == 0;
7474
};
@@ -98,22 +98,24 @@ namespace bv {
9898
if (!e)
9999
return l_true;
100100
bool is_correct = eval_is_correct(e);
101-
IF_VERBOSE(20, verbose_stream() << (down ? "d #" : "u #")
102-
<< e->get_id() << ": "
103-
<< mk_bounded_pp(e, m, 1) << " ";
104-
if (bv.is_bv(e)) verbose_stream() << m_eval.wval0(e) << " ";
105-
if (m.is_bool(e)) verbose_stream() << m_eval.bval0(e) << " ";
106-
verbose_stream() << (is_correct?"C":"U") << "\n");
107101
if (is_correct) {
108102
if (down)
109103
m_repair_down.remove(e->get_id());
110104
else
111105
m_repair_up.remove(e->get_id());
112106
}
113-
else if (down)
114-
try_repair_down(e);
115-
else
116-
try_repair_up(e);
107+
else {
108+
IF_VERBOSE(20, verbose_stream() << (down ? "d #" : "u #")
109+
<< e->get_id() << ": "
110+
<< mk_bounded_pp(e, m, 1) << " ";
111+
if (bv.is_bv(e)) verbose_stream() << m_eval.wval0(e) << " " << (m_eval.is_fixed0(e)?"fixed ":" ");
112+
if (m.is_bool(e)) verbose_stream() << m_eval.bval0(e) << " ";
113+
verbose_stream() << "\n");
114+
if (down)
115+
try_repair_down(e);
116+
else
117+
try_repair_up(e);
118+
}
117119
}
118120
return l_undef;
119121
}
@@ -210,7 +212,7 @@ namespace bv {
210212
else if (bv.is_bv(e)) {
211213
auto const& v = m_eval.wval0(e);
212214
rational n;
213-
v.get_value(v.bits, n);
215+
v.get_value(v.bits(), n);
214216
mdl->register_decl(f, bv.mk_numeral(n, v.bw));
215217
}
216218
}

0 commit comments

Comments
 (0)