Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Bitwuzla to version 0.2.0 #1286

Merged
merged 1 commit into from
Sep 14, 2023
+7 −7
Merged

Upgrade Bitwuzla to version 0.2.0 #1286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
run: |
git clone https://github.com/bitwuzla/bitwuzla.git
cd bitwuzla
git checkout -b 0.1.0 0.1.0
git checkout -b 0.2.0 0.2.0
python ./configure.py --shared
cd build
sudo ninja install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: |
git clone https://github.com/bitwuzla/bitwuzla.git
cd bitwuzla
git checkout -b 0.1.0 0.1.0
git checkout -b 0.2.0 0.2.0
python ./configure.py --shared
cd build
sudo ninja install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/osx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
run: |
git clone https://github.com/bitwuzla/bitwuzla.git
cd bitwuzla
git checkout -b 0.1.0 0.1.0
git checkout -b 0.2.0 0.2.0
python ./configure.py --shared --prefix $(pwd)/install
cd build
sudo ninja install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ jobs:
run: |
git clone https://github.com/bitwuzla/bitwuzla.git
cd bitwuzla
git checkout -b 0.1.0 0.1.0
git checkout -b 0.2.0 0.2.0
python ./configure.py --shared --prefix $(pwd)/install
cd build
sudo ninja install
Expand Down
4 changes: 2 additions & 2 deletions src/libtriton/engines/solver/bitwuzla/bitwuzlaSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ namespace triton {
// Parse model.
std::unordered_map<triton::usize, SolverModel> model;
for (const auto& it : bzlaAst.getVariables()) {
const char* svalue = bitwuzla_term_value_get_str(bitwuzla_get_value(bzla, it.first), 2);
const char* svalue = bitwuzla_term_value_get_str_fmt(bitwuzla_get_value(bzla, it.first), 2);
auto value = this->fromBvalueToUint512(svalue);
auto m = SolverModel(it.second, value);
model[m.getId()] = m;
Expand Down Expand Up @@ -231,7 +231,7 @@ namespace triton {
if (bitwuzla_term_is_bool(term_value)) {
res = bitwuzla_term_value_get_bool(term_value);
} else {
res = triton::uint512{bitwuzla_term_value_get_str(term_value, 10)};
res = triton::uint512{bitwuzla_term_value_get_str_fmt(term_value, 10)};
}

bitwuzla_delete(bzla);
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN echo "[+] Download, build and install Bitwuzla" && \
cd $DEPENDENCIES_DIR && \
git clone https://github.com/bitwuzla/bitwuzla.git && \
cd bitwuzla && \
git checkout -b 0.1.0 0.1.0 && \
git checkout -b 0.2.0 0.2.0 && \
CC=clang CXX=clang++ PATH=$PATH:/opt/_internal/cpython-3.10.13/bin python3.10 ./configure.py --shared --prefix $(pwd)/install && \
cd build && \
PATH=$PATH:/opt/_internal/cpython-3.10.13/bin ninja install
Expand Down