mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-15 18:36:16 +00:00
Code Activity

name change

Browse source 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
This commit is contained in:
Lev Nachmanson 2018-06-28 15:02:23 -07:00
parent fd8f972cac
commit c2f3428373
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/util/mpz.cpp
View file

@ -237,7 +237,7 @@ void mpz_manager<SYNCH>::set_big_i64(mpz & c, int64_t v) {
c.m_ptr = allocate(m_init_cell_capacity); c.m_ptr = allocate(m_init_cell_capacity);
c.m_owner = mpz_self; c.m_owner = mpz_self;
} }
c.m_kind = mpz_ptr; c.m_kind = mpz_ptr_k;
SASSERT(capacity(c) >= m_init_cell_capacity); SASSERT(capacity(c) >= m_init_cell_capacity);
uint64_t _v; uint64_t _v;
if (v < 0) { if (v < 0) {
@ -293,7 +293,7 @@ void mpz_manager<SYNCH>::set_big_ui64(mpz & c, uint64_t v) {
c.m_ptr = allocate(m_init_cell_capacity); c.m_ptr = allocate(m_init_cell_capacity);
c.m_owner = mpz_self; c.m_owner = mpz_self;
} }
c.m_kind = mpz_ptr; c.m_kind = mpz_ptr_k;
SASSERT(capacity(c) >= m_init_cell_capacity); SASSERT(capacity(c) >= m_init_cell_capacity);
c.m_val = 1; c.m_val = 1;
if (sizeof(digit_t) == sizeof(uint64_t)) { if (sizeof(digit_t) == sizeof(uint64_t)) {
@ -368,7 +368,7 @@ void mpz_manager<SYNCH>::set(mpz_cell& src, mpz & a, int sign, unsigned sz) {
set_digits(a, i, src.m_digits); set_digits(a, i, src.m_digits);
a.m_val = sign; a.m_val = sign;
SASSERT(a.m_kind == mpz_ptr); SASSERT(a.m_kind == mpz_ptr_k);
} }
#endif #endif
@ -413,7 +413,7 @@ void mpz_manager<SYNCH>::set_digits(mpz & target, unsigned sz, digit_t const * d
target.m_ptr = allocate(c); target.m_ptr = allocate(c);
target.m_ptr->m_size = sz; target.m_ptr->m_size = sz;
target.m_ptr->m_capacity = c; target.m_ptr->m_capacity = c;
target.m_kind = mpz_ptr; target.m_kind = mpz_ptr_k;
target.m_owner = mpz_self; target.m_owner = mpz_self;
memcpy(target.m_ptr->m_digits, digits, sizeof(digit_t) * sz); memcpy(target.m_ptr->m_digits, digits, sizeof(digit_t) * sz);
} }
@ -426,14 +426,14 @@ void mpz_manager<SYNCH>::set_digits(mpz & target, unsigned sz, digit_t const * d
deallocate(target); deallocate(target);
target.m_val = 1; target.m_val = 1;
target.m_ptr = ptr; target.m_ptr = ptr;
target.m_kind = mpz_ptr; target.m_kind = mpz_ptr_k;
target.m_owner = mpz_self; target.m_owner = mpz_self;
} }
else { else {
target.m_ptr->m_size = sz; target.m_ptr->m_size = sz;
if (target.m_ptr->m_digits != digits) if (target.m_ptr->m_digits != digits)
memcpy(target.m_ptr->m_digits, digits, sizeof(digit_t) * sz); memcpy(target.m_ptr->m_digits, digits, sizeof(digit_t) * sz);
target.m_kind = mpz_ptr; target.m_kind = mpz_ptr_k;
} }
#else #else
mk_big(target); mk_big(target);
@ -1453,7 +1453,7 @@ void mpz_manager<SYNCH>::big_set(mpz & target, mpz const & source) {
target.m_ptr = allocate(capacity(source)); target.m_ptr = allocate(capacity(source));
target.m_ptr->m_size = size(source); target.m_ptr->m_size = size(source);
target.m_ptr->m_capacity = capacity(source); target.m_ptr->m_capacity = capacity(source);
target.m_kind = mpz_ptr; target.m_kind = mpz_ptr_k;
target.m_owner = mpz_self; target.m_owner = mpz_self;
memcpy(target.m_ptr->m_digits, source.m_ptr->m_digits, sizeof(digit_t) * size(source)); memcpy(target.m_ptr->m_digits, source.m_ptr->m_digits, sizeof(digit_t) * size(source));
} }
@ -1462,14 +1462,14 @@ void mpz_manager<SYNCH>::big_set(mpz & target, mpz const & source) {
target.m_ptr = allocate(capacity(source)); target.m_ptr = allocate(capacity(source));
target.m_ptr->m_size = size(source); target.m_ptr->m_size = size(source);
target.m_ptr->m_capacity = capacity(source); target.m_ptr->m_capacity = capacity(source);
target.m_kind = mpz_ptr; target.m_kind = mpz_ptr_k;
target.m_owner = mpz_self; target.m_owner = mpz_self;
memcpy(target.m_ptr->m_digits, source.m_ptr->m_digits, sizeof(digit_t) * size(source)); memcpy(target.m_ptr->m_digits, source.m_ptr->m_digits, sizeof(digit_t) * size(source));
} }
else { else {
target.m_ptr->m_size = size(source); target.m_ptr->m_size = size(source);
memcpy(target.m_ptr->m_digits, source.m_ptr->m_digits, sizeof(digit_t) * size(source)); memcpy(target.m_ptr->m_digits, source.m_ptr->m_digits, sizeof(digit_t) * size(source));
target.m_kind = mpz_ptr; target.m_kind = mpz_ptr_k;
} }
#else #else
// GMP version // GMP version
@ -1736,7 +1736,7 @@ void mpz_manager<SYNCH>::power(mpz const & a, unsigned p, mpz & b) {
b.m_ptr->m_digits[i] = 0; b.m_ptr->m_digits[i] = 0;
b.m_ptr->m_digits[sz-1] = 1 << shift; b.m_ptr->m_digits[sz-1] = 1 << shift;
b.m_val = 1; b.m_val = 1;
b.m_kind = mpz_ptr; b.m_kind = mpz_ptr_k;
} }
return; return;
} }
@ -1822,7 +1822,7 @@ void mpz_manager<SYNCH>::ensure_capacity(mpz & a, unsigned capacity) {
if (a.m_ptr == nullptr) { if (a.m_ptr == nullptr) {
a.m_ptr = allocate(capacity); a.m_ptr = allocate(capacity);
a.m_owner = mpz_self; a.m_owner = mpz_self;
a.m_kind = mpz_ptr; a.m_kind = mpz_ptr_k;
SASSERT(a.m_ptr->m_capacity == capacity); SASSERT(a.m_ptr->m_capacity == capacity);
if (a.m_val == INT_MIN) { if (a.m_val == INT_MIN) {
unsigned intmin_sz = m_int_min.m_ptr->m_size; unsigned intmin_sz = m_int_min.m_ptr->m_size;
@ -1852,7 +1852,7 @@ void mpz_manager<SYNCH>::ensure_capacity(mpz & a, unsigned capacity) {
deallocate(a); deallocate(a);
a.m_ptr = new_cell; a.m_ptr = new_cell;
a.m_owner = mpz_self; a.m_owner = mpz_self;
a.m_kind = mpz_ptr; a.m_kind = mpz_ptr_k;
} }
} }

4
src/util/mpz.h
View file

@ -79,7 +79,7 @@ class mpz_cell {
under winodws, m_ptr points to a mpz_cell that store the value. under winodws, m_ptr points to a mpz_cell that store the value.
*/ */
enum mpz_kind { mpz_small = 0, mpz_ptr = 1}; enum mpz_kind { mpz_small = 0, mpz_ptr_k = 1};
enum mpz_owner { mpz_self = 0, mpz_ext = 1}; enum mpz_owner { mpz_self = 0, mpz_ext = 1};
class mpz { class mpz {
@ -172,7 +172,7 @@ class mpz_manager {
if (n.m_ptr == nullptr || capacity(n) < c) { if (n.m_ptr == nullptr || capacity(n) < c) {
deallocate(n); deallocate(n);
n.m_val = 1; n.m_val = 1;
n.m_kind = mpz_ptr; n.m_kind = mpz_ptr_k;
n.m_owner = mpz_self; n.m_owner = mpz_self;
n.m_ptr = allocate(c); n.m_ptr = allocate(c);
} }