mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-03 19:35:42 +00:00
Code Activity

add u256

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-08-04 10:32:18 -07:00
parent 8a773d2bee
commit 91ac15d716
4 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/math/bigfix/u256.cpp
View file

@ -13,6 +13,12 @@ u256::u256(uint64_t n) {
m_num[1] = m_num[2] = m_num[3] = 0; m_num[1] = m_num[2] = m_num[3] = 0;
} }
u256::u256(int n) {
SASSERT(n >= 0);
m_num[0] = n;
m_num[1] = m_num[2] = m_num[3] = 0;
}
u256::u256(rational const& n) { u256::u256(rational const& n) {
#if 1 #if 1
for (unsigned i = 0; i < 4; ++i) { for (unsigned i = 0; i < 4; ++i) {

15
src/math/bigfix/u256.h
View file

@ -9,8 +9,13 @@ class u256 {
public: public:
u256(); u256();
u256(uint64_t n); u256(uint64_t n);
u256(int n);
u256(rational const& n); u256(rational const& n);
rational to_rational() const; rational to_rational() const;
u256& operator=(uint64_t n) {
*this = u256(n);
return *this;
}
u256 operator*(u256 const& other) const; u256 operator*(u256 const& other) const;
u256 operator+(u256 const& other) const { u256 r = *this; return r += other; } u256 operator+(u256 const& other) const { u256 r = *this; return r += other; }
u256 operator-(u256 const& other) const { u256 r = *this; return r -= other; } u256 operator-(u256 const& other) const { u256 r = *this; return r -= other; }
@ -43,6 +48,8 @@ public:
bool operator>(u256 const& other) const { return other < *this; } bool operator>(u256 const& other) const { return other < *this; }
bool operator>=(u256 const& other) const { return !(*this < other); } bool operator>=(u256 const& other) const { return !(*this < other); }
bool operator==(uint64_t other) const { return m_num[0] == other && m_num[1] == 0 && m_num[2] == 0 && m_num[3] == 0; }
bool operator!=(uint64_t other) const { return !(m_num[0] == other && m_num[1] == 0 && m_num[2] == 0 && m_num[3] == 0); }
bool operator<(uint64_t other) const; bool operator<(uint64_t other) const;
bool operator<=(uint64_t other) const { return !(*this > other); } bool operator<=(uint64_t other) const { return !(*this > other); }
bool operator>(uint64_t other) const; bool operator>(uint64_t other) const;
@ -63,4 +70,12 @@ inline std::ostream& operator<<(std::ostream& out, u256 const& u) {
inline bool operator<(uint64_t n, u256 const& y) { return y > n; } inline bool operator<(uint64_t n, u256 const& y) { return y > n; }
inline bool operator<=(uint64_t n, u256 const& y) { return y >= n; } inline bool operator<=(uint64_t n, u256 const& y) { return y >= n; }
inline bool operator>(uint64_t n, u256 const& y) { return y < n; } inline bool operator>(uint64_t n, u256 const& y) { return y < n; }
inline unsigned trailing_zeros(u256 const& n) {
NOT_IMPLEMENTED_YET();
return 0;
}
inline u256 operator-(uint64_t n, u256 const& y) {
u256 x(n);
return x - y;
}
inline bool operator>=(uint64_t n, u256 const& y) { return y <= n; } inline bool operator>=(uint64_t n, u256 const& y) { return y <= n; }

3
src/math/polysat/fixplex_def.h
View file

@ -1224,7 +1224,4 @@ namespace polysat {
st.update("fixplex num non-integral", m_num_non_integral); st.update("fixplex num non-integral", m_num_non_integral);
st.update("fixplex num approximated row additions", m_stats.m_num_approx); st.update("fixplex num approximated row additions", m_stats.m_num_approx);
} }
} }

5
src/math/polysat/linear_solver.cpp
View file

@ -15,6 +15,7 @@ Author:
#include "math/polysat/linear_solver.h" #include "math/polysat/linear_solver.h"
#include "math/polysat/fixplex_def.h" #include "math/polysat/fixplex_def.h"
#include "math/polysat/solver.h" #include "math/polysat/solver.h"
#include "math/bigfix/u256.h"
namespace polysat { namespace polysat {
@ -77,7 +78,11 @@ namespace polysat {
b = alloc(fixplex<uint64_ext>, s.m_lim); b = alloc(fixplex<uint64_ext>, s.m_lim);
break; break;
case 128: case 128:
NOT_IMPLEMENTED_YET();
break;
case 256: case 256:
b = alloc(fixplex<generic_uint_ext<u256>>, s.m_lim);
break;
default: default:
NOT_IMPLEMENTED_YET(); NOT_IMPLEMENTED_YET();
break; break;