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

More dependency fixes and upgrades #97

Merged
merged 4 commits into from
Apr 20, 2024
Merged

More dependency fixes and upgrades #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11b721c
makefile: download libdwarf from github release page
vitalych Apr 20, 2024
d87b263
makefile: updated lua + download lua from github releases
vitalych Apr 20, 2024
adb7d48
makefile: upgraded z3
vitalych Apr 20, 2024
fe19f55
klee: fixed z3 api
vitalych Apr 20, 2024
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
14 changes: 6 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,24 +110,24 @@ CLANG_LLVM_RELEASE_URL=https://github.com/S2E/s2e/releases/download/v2.0.0/$(CLA
KLEE_DIRS=$(foreach suffix,-debug -release -coverage,$(addsuffix $(suffix),klee))

# Z3 variables
Z3_VERSION=4.7.1
Z3_VERSION=4.13.0
Z3_SRC=z3-$(Z3_VERSION).tar.gz
Z3_SRC_DIR=z3-z3-$(Z3_VERSION)
Z3_BUILD_DIR=z3
Z3_URL=https://github.com/Z3Prover/z3
Z3_BINARY_URL=https://github.com/Z3Prover/z3/releases/download/z3-$(Z3_VERSION)/
Z3_BINARY=z3-$(Z3_VERSION)-x64-ubuntu-16.04.zip
Z3_BINARY_DIR=z3-$(Z3_VERSION)-x64-ubuntu-16.04
Z3_BINARY=z3-$(Z3_VERSION)-x64-glibc-2.31.zip
Z3_BINARY_DIR=z3-$(Z3_VERSION)-x64-glibc-2.31

# Lua variables
LUA_VERSION=5.3.4
LUA_VERSION=5.4.6
LUA_SRC=lua-$(LUA_VERSION).tar.gz
LUA_DIR=lua-$(LUA_VERSION)

# libdwarf
# We don't use the one that ships with the distro because we need
# the latest features (PE file support mostly).
LIBDWARF_URL=https://www.prevanders.net/libdwarf-0.9.1.tar.xz
LIBDWARF_URL=https://github.com/S2E/s2e/releases/download/v2.0.0/libdwarf-0.9.1.tar.xz
LIBDWARF_SRC_DIR=libdwarf-0.9.1
LIBDWARF_BUILD_DIR=libdwarf

Expand Down Expand Up @@ -199,11 +199,10 @@ $(CLANG_LLVM_RELEASE_ARCHIVE):

# Download Lua
$(LUA_SRC):
$(call DOWNLOAD,https://www.lua.org/ftp/$(LUA_SRC),$@)
$(call DOWNLOAD,https://github.com/S2E/s2e/releases/download/v2.0.0/$(LUA_SRC),$@)

$(LUA_DIR): | $(LUA_SRC)
tar -zxf $(LUA_SRC)
cp $(S2E_SRC)/lua/luaconf.h $(LUA_DIR)/src

# Download Z3
$(Z3_BUILD_DIR):
Expand Down Expand Up @@ -301,7 +300,6 @@ stamps/libdwarf-make: stamps/libdwarf-configure

stamps/lua-make: $(LUA_DIR)
if [ "$(PLATFORM)" = "linux" ]; then \
$(SED) -i 's/-lreadline//g' $(LUA_DIR)/src/Makefile; \
$(MAKE) -C $^ linux CFLAGS="-DLUA_USE_LINUX -O2 -g -fPIC"; \
elif [ "$(PLATFORM)" = "darwin" ]; then \
$(MAKE) -C $^ macosx CFLAGS="-DLUA_USE_LINUX -O2 -g -fPIC"; \
Expand Down
4 changes: 2 additions & 2 deletions klee/lib/Solver/Z3Solver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ void Z3BaseSolverImpl::extractModel(const ArrayVec &objects, std::vector<std::ve
z3::expr value_ast = model.eval(builder_->getInitialRead(array, offset), true);
unsigned value_num;

Z3_bool conv_result = Z3_get_numeral_uint(context_, value_ast, &value_num);
::check(conv_result == Z3_TRUE, "Could not convert value");
auto conv_result = Z3_get_numeral_uint(context_, value_ast, &value_num);
::check(conv_result, "Could not convert value");
assert(value_num < (1 << 8 * sizeof(unsigned char)) && "Invalid model value");

data.push_back((unsigned char) value_num);
Expand Down
Loading