mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-07 09:55:19 +00:00
Code Activity

bugfixes

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2024-02-21 02:11:53 -08:00
parent cd6382f1c8
commit 659e384ee7
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ast/sls/bv_sls_eval.cpp
View file

@ -429,6 +429,8 @@ namespace bv {
break; break;
} }
case OP_CONCAT: { case OP_CONCAT: {
if (e->get_num_args() != 2)
verbose_stream() << mk_bounded_pp(e, m) << "\n";
SASSERT(e->get_num_args() == 2); SASSERT(e->get_num_args() == 2);
auto const& a = wval0(e->get_arg(0)); auto const& a = wval0(e->get_arg(0));
auto const& b = wval0(e->get_arg(1)); auto const& b = wval0(e->get_arg(1));

23
src/ast/sls/bv_sls_terms.cpp
View file

@ -18,6 +18,7 @@ Author:
--*/ --*/
#include "ast/ast_ll_pp.h"
#include "ast/sls/bv_sls.h" #include "ast/sls/bv_sls.h"
namespace bv { namespace bv {
@ -60,13 +61,15 @@ namespace bv {
} }
void sls_terms::ensure_binary_core(expr* e) { void sls_terms::ensure_binary_core(expr* e) {
if (m_translated.get(e->get_id(), nullptr))
return;
app* a = to_app(e); app* a = to_app(e);
auto arg = [&](unsigned i) { auto arg = [&](unsigned i) {
return m_translated.get(a->get_arg(i)->get_id()); return m_translated.get(a->get_arg(i)->get_id());
}; };
unsigned num_args = a->get_num_args(); unsigned num_args = a->get_num_args();
expr_ref r(m); expr_ref r(m);
expr* x, * y;
#define FOLD_OP(oper) \ #define FOLD_OP(oper) \
r = arg(0); \ r = arg(0); \
for (unsigned i = 1; i < num_args; ++i)\ for (unsigned i = 1; i < num_args; ++i)\
@ -106,20 +109,20 @@ namespace bv {
es.push_back(m.mk_not(m.mk_eq(arg(i), arg(j)))); es.push_back(m.mk_not(m.mk_eq(arg(i), arg(j))));
r = m.mk_and(es); r = m.mk_and(es);
} }
else if (bv.is_bv_sdiv(e, x, y) || bv.is_bv_sdiv0(e, x, y) || bv.is_bv_sdivi(e, x, y)) { else if (bv.is_bv_sdiv(e) || bv.is_bv_sdiv0(e) || bv.is_bv_sdivi(e)) {
r = mk_sdiv(x, y); r = mk_sdiv(arg(0), arg(1));
} }
else if (bv.is_bv_smod(e, x, y) || bv.is_bv_smod0(e, x, y) || bv.is_bv_smodi(e, x, y)) { else if (bv.is_bv_smod(e) || bv.is_bv_smod0(e) || bv.is_bv_smodi(e)) {
r = mk_smod(x, y); r = mk_smod(arg(0), arg(1));
} }
else if (bv.is_bv_srem(e, x, y) || bv.is_bv_srem0(e, x, y) || bv.is_bv_sremi(e, x, y)) { else if (bv.is_bv_srem(e) || bv.is_bv_srem0(e) || bv.is_bv_sremi(e)) {
r = mk_srem(x, y); r = mk_srem(arg(0), arg(1));
} }
else { else {
for (unsigned i = 0; i < num_args; ++i) for (unsigned i = 0; i < num_args; ++i)
m_todo.push_back(arg(i)); m_args.push_back(arg(i));
r = m.mk_app(a->get_decl(), num_args, m_todo.data()); r = m.mk_app(a->get_decl(), num_args, m_args.data());
m_todo.reset(); m_args.reset();
} }
m_translated.setx(e->get_id(), r); m_translated.setx(e->get_id(), r);
} }

2
src/ast/sls/bv_sls_terms.h
View file

@ -31,7 +31,7 @@ namespace bv {
class sls_terms { class sls_terms {
ast_manager& m; ast_manager& m;
bv_util bv; bv_util bv;
ptr_vector<expr> m_todo; ptr_vector<expr> m_todo, m_args;
expr_ref_vector m_assertions, m_pinned, m_translated; expr_ref_vector m_assertions, m_pinned, m_translated;
app_ref_vector m_terms; app_ref_vector m_terms;
vector<ptr_vector<expr>> m_parents; vector<ptr_vector<expr>> m_parents;